From 2d5a0bf5a732beb16f193e84f5c4154f1e6e8111 Mon Sep 17 00:00:00 2001 From: MM20 <15646950+MM2-0@users.noreply.github.com> Date: Thu, 5 Oct 2023 21:51:48 +0200 Subject: [PATCH] Modernize gradle scripts, migrate to TOML version catalog --- app/app/build.gradle.kts | 10 +- app/ui/build.gradle.kts | 11 +- .../launcher2/ui/launcher/PullDownScaffold.kt | 2 + build.gradle.kts | 37 +-- core/base/build.gradle.kts | 11 +- core/compat/build.gradle.kts | 11 +- core/crashreporter/build.gradle.kts | 11 +- core/database/build.gradle.kts | 13 +- core/i18n/build.gradle.kts | 11 +- core/ktx/build.gradle.kts | 11 +- core/permissions/build.gradle.kts | 11 +- core/preferences/build.gradle.kts | 15 +- core/shared/build.gradle.kts | 11 +- data/applications/build.gradle.kts | 11 +- data/appshortcuts/build.gradle.kts | 11 +- data/calculator/build.gradle.kts | 11 +- data/calendar/build.gradle.kts | 11 +- data/contacts/build.gradle.kts | 11 +- data/currencies/build.gradle.kts | 11 +- data/customattrs/build.gradle.kts | 11 +- data/files/build.gradle.kts | 11 +- data/notifications/build.gradle.kts | 11 +- data/search-actions/build.gradle.kts | 11 +- data/searchable/build.gradle.kts | 11 +- data/themes/build.gradle.kts | 13 +- data/unitconverter/build.gradle.kts | 11 +- data/weather/build.gradle.kts | 11 +- data/websites/build.gradle.kts | 11 +- data/widgets/build.gradle.kts | 13 +- data/wikipedia/build.gradle.kts | 11 +- gradle/libs.versions.toml | 150 +++++++++++ libs/g-services/build.gradle.kts | 11 +- .../material-color-utilities/build.gradle.kts | 11 +- libs/ms-services/build.gradle.kts | 11 +- libs/nextcloud/build.gradle.kts | 11 +- libs/owncloud/build.gradle.kts | 11 +- libs/webdav/build.gradle.kts | 11 +- plugins/sdk/build.gradle.kts | 11 +- services/accounts/build.gradle.kts | 11 +- services/backup/build.gradle.kts | 11 +- services/badges/build.gradle.kts | 11 +- services/favorites/build.gradle.kts | 11 +- services/global-actions/build.gradle.kts | 11 +- services/icons/build.gradle.kts | 11 +- services/music/build.gradle.kts | 11 +- services/search/build.gradle.kts | 11 +- services/tags/build.gradle.kts | 11 +- services/widgets/build.gradle.kts | 11 +- settings.gradle.kts | 253 +----------------- 49 files changed, 401 insertions(+), 545 deletions(-) create mode 100644 gradle/libs.versions.toml diff --git a/app/app/build.gradle.kts b/app/app/build.gradle.kts index 9b2cbd2b..b9056be0 100644 --- a/app/app/build.gradle.kts +++ b/app/app/build.gradle.kts @@ -3,8 +3,8 @@ import java.time.LocalDate import java.time.format.DateTimeFormatter plugins { - id("com.android.application") - id("kotlin-android") + alias(libs.plugins.android.application) + alias(libs.plugins.kotlin.android) } android { @@ -25,11 +25,11 @@ android { resources.excludes.add("META-INF/NOTICE.md") } - compileSdk = sdk.versions.compileSdk.get().toInt() + compileSdk = libs.versions.compileSdk.get().toInt() defaultConfig { applicationId = "de.mm20.launcher2" - minSdk = sdk.versions.minSdk.get().toInt() - targetSdk = sdk.versions.targetSdk.get().toInt() + minSdk = libs.versions.minSdk.get().toInt() + targetSdk = libs.versions.targetSdk.get().toInt() @SuppressLint("HighAppVersionCode") versionCode = System.getenv("VERSION_CODE_OVERRIDE")?.toIntOrNull() ?: 2023090800 versionName = "1.27.1" diff --git a/app/ui/build.gradle.kts b/app/ui/build.gradle.kts index 1e3a12ae..9f8f43d9 100644 --- a/app/ui/build.gradle.kts +++ b/app/ui/build.gradle.kts @@ -1,15 +1,14 @@ plugins { - id("com.android.library") - id("kotlin-android") + alias(libs.plugins.android.library) + alias(libs.plugins.kotlin.android) } android { - compileSdk = sdk.versions.compileSdk.get().toInt() + compileSdk = libs.versions.compileSdk.get().toInt() defaultConfig { - minSdk = sdk.versions.minSdk.get().toInt() - targetSdk = sdk.versions.targetSdk.get().toInt() - + minSdk = libs.versions.minSdk.get().toInt() + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles("consumer-rules.pro") signingConfig = signingConfigs.getByName("debug") diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/PullDownScaffold.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/PullDownScaffold.kt index c6f027b5..03b3fc4a 100644 --- a/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/PullDownScaffold.kt +++ b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/PullDownScaffold.kt @@ -58,6 +58,7 @@ import androidx.compose.ui.input.nestedscroll.nestedScroll import androidx.compose.ui.input.pointer.pointerInput import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.platform.LocalDensity +import androidx.compose.ui.platform.LocalHapticFeedback import androidx.compose.ui.platform.LocalLayoutDirection import androidx.compose.ui.platform.LocalSoftwareKeyboardController import androidx.compose.ui.res.stringResource @@ -286,6 +287,7 @@ fun PullDownScaffold( val keyboardController = LocalSoftwareKeyboardController.current val gestureManager = LocalGestureDetector.current + val hapticFeedback = LocalHapticFeedback.current val nestedScrollConnection = remember { object : NestedScrollConnection { diff --git a/build.gradle.kts b/build.gradle.kts index 88c84871..8fd31561 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,35 +1,10 @@ -// Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { - kotlin("plugin.serialization") version libs.versions.kotlin apply false - id("org.jetbrains.kotlin.android") version libs.versions.kotlin apply false - id("com.google.devtools.ksp") version "1.9.0-1.0.13" apply false - id("com.google.protobuf") version "0.9.4" apply false -} - -buildscript { - repositories { - google() - mavenCentral() - } - dependencies { - classpath("com.android.tools.build:gradle:8.1.2") - classpath(libs.kotlin.gradle) - // NOTE: Do not place your application dependencies here; they belong - // in the individual module build.gradle files - } -} - -allprojects { - repositories { - google() - mavenCentral() - maven(url = "https://pkgs.dev.azure.com/MicrosoftDeviceSDK/DuoSDK-Public/_packaging/Duo-SDK-Feed/maven/v1") - jcenter() // For tinypinyin - } -} - -tasks.create("clean") { - delete(rootProject.buildDir) + alias(libs.plugins.kotlin.android) apply false + alias(libs.plugins.kotlin.plugin.serialization) apply false + alias(libs.plugins.ksp) apply false + alias(libs.plugins.protobuf) apply false + alias(libs.plugins.android.application) apply false + alias(libs.plugins.android.library) apply false } apply(from = "docs/deps-graph.gradle") \ No newline at end of file diff --git a/core/base/build.gradle.kts b/core/base/build.gradle.kts index 698602fd..fbf75394 100644 --- a/core/base/build.gradle.kts +++ b/core/base/build.gradle.kts @@ -1,15 +1,14 @@ plugins { - id("com.android.library") - id("kotlin-android") + alias(libs.plugins.android.library) + alias(libs.plugins.kotlin.android) } android { - compileSdk = sdk.versions.compileSdk.get().toInt() + compileSdk = libs.versions.compileSdk.get().toInt() defaultConfig { - minSdk = sdk.versions.minSdk.get().toInt() - targetSdk = sdk.versions.targetSdk.get().toInt() - + minSdk = libs.versions.minSdk.get().toInt() + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles("consumer-rules.pro") } diff --git a/core/compat/build.gradle.kts b/core/compat/build.gradle.kts index 3ea7828c..47efd7d9 100644 --- a/core/compat/build.gradle.kts +++ b/core/compat/build.gradle.kts @@ -1,15 +1,14 @@ plugins { - id("com.android.library") - id("kotlin-android") + alias(libs.plugins.android.library) + alias(libs.plugins.kotlin.android) } android { - compileSdk = sdk.versions.compileSdk.get().toInt() + compileSdk = libs.versions.compileSdk.get().toInt() defaultConfig { - minSdk = sdk.versions.minSdk.get().toInt() - targetSdk = sdk.versions.targetSdk.get().toInt() - + minSdk = libs.versions.minSdk.get().toInt() + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles("consumer-rules.pro") } diff --git a/core/crashreporter/build.gradle.kts b/core/crashreporter/build.gradle.kts index 05145352..86fdb043 100644 --- a/core/crashreporter/build.gradle.kts +++ b/core/crashreporter/build.gradle.kts @@ -1,15 +1,14 @@ plugins { - id("com.android.library") - id("kotlin-android") + alias(libs.plugins.android.library) + alias(libs.plugins.kotlin.android) } android { - compileSdk = sdk.versions.compileSdk.get().toInt() + compileSdk = libs.versions.compileSdk.get().toInt() defaultConfig { - minSdk = sdk.versions.minSdk.get().toInt() - targetSdk = sdk.versions.targetSdk.get().toInt() - + minSdk = libs.versions.minSdk.get().toInt() + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles("consumer-rules.pro") } diff --git a/core/database/build.gradle.kts b/core/database/build.gradle.kts index 8f83f906..cf91a04f 100644 --- a/core/database/build.gradle.kts +++ b/core/database/build.gradle.kts @@ -1,16 +1,15 @@ plugins { - id("com.android.library") - id("kotlin-android") - id("com.google.devtools.ksp") + alias(libs.plugins.android.library) + alias(libs.plugins.kotlin.android) + alias(libs.plugins.ksp) } android { - compileSdk = sdk.versions.compileSdk.get().toInt() + compileSdk = libs.versions.compileSdk.get().toInt() defaultConfig { - minSdk = sdk.versions.minSdk.get().toInt() - targetSdk = sdk.versions.targetSdk.get().toInt() - + minSdk = libs.versions.minSdk.get().toInt() + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles("consumer-rules.pro") diff --git a/core/i18n/build.gradle.kts b/core/i18n/build.gradle.kts index 646c0fe7..3ebd2cc8 100644 --- a/core/i18n/build.gradle.kts +++ b/core/i18n/build.gradle.kts @@ -1,15 +1,14 @@ plugins { - id("com.android.library") - id("kotlin-android") + alias(libs.plugins.android.library) + alias(libs.plugins.kotlin.android) } android { - compileSdk = sdk.versions.compileSdk.get().toInt() + compileSdk = libs.versions.compileSdk.get().toInt() defaultConfig { - minSdk = sdk.versions.minSdk.get().toInt() - targetSdk = sdk.versions.targetSdk.get().toInt() - + minSdk = libs.versions.minSdk.get().toInt() + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles("consumer-rules.pro") } diff --git a/core/ktx/build.gradle.kts b/core/ktx/build.gradle.kts index c2285719..1881749d 100644 --- a/core/ktx/build.gradle.kts +++ b/core/ktx/build.gradle.kts @@ -1,15 +1,14 @@ plugins { - id("com.android.library") - id("kotlin-android") + alias(libs.plugins.android.library) + alias(libs.plugins.kotlin.android) } android { - compileSdk = sdk.versions.compileSdk.get().toInt() + compileSdk = libs.versions.compileSdk.get().toInt() defaultConfig { - minSdk = sdk.versions.minSdk.get().toInt() - targetSdk = sdk.versions.targetSdk.get().toInt() - + minSdk = libs.versions.minSdk.get().toInt() + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles("consumer-rules.pro") } diff --git a/core/permissions/build.gradle.kts b/core/permissions/build.gradle.kts index a861d65a..e361fd8f 100644 --- a/core/permissions/build.gradle.kts +++ b/core/permissions/build.gradle.kts @@ -1,15 +1,14 @@ plugins { - id("com.android.library") - id("kotlin-android") + alias(libs.plugins.android.library) + alias(libs.plugins.kotlin.android) } android { - compileSdk = sdk.versions.compileSdk.get().toInt() + compileSdk = libs.versions.compileSdk.get().toInt() defaultConfig { - minSdk = sdk.versions.minSdk.get().toInt() - targetSdk = sdk.versions.targetSdk.get().toInt() - + minSdk = libs.versions.minSdk.get().toInt() + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles("consumer-rules.pro") } diff --git a/core/preferences/build.gradle.kts b/core/preferences/build.gradle.kts index 5a19f3e0..3c53e0ac 100644 --- a/core/preferences/build.gradle.kts +++ b/core/preferences/build.gradle.kts @@ -1,18 +1,17 @@ import com.google.protobuf.gradle.* plugins { - id("com.android.library") - id("kotlin-android") - id("com.google.protobuf") + alias(libs.plugins.android.library) + alias(libs.plugins.kotlin.android) + alias(libs.plugins.protobuf) } android { - compileSdk = sdk.versions.compileSdk.get().toInt() + compileSdk = libs.versions.compileSdk.get().toInt() defaultConfig { - minSdk = sdk.versions.minSdk.get().toInt() - targetSdk = sdk.versions.targetSdk.get().toInt() - + minSdk = libs.versions.minSdk.get().toInt() + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles("consumer-rules.pro") } @@ -39,7 +38,7 @@ android { protobuf { protoc { - artifact = "com.google.protobuf:protoc:${libs.versions.protobuf.get()}" + artifact = libs.protobuf.protoc.get().toString() } // Generates the java Protobuf-lite code for the Protobufs in this project. See diff --git a/core/shared/build.gradle.kts b/core/shared/build.gradle.kts index 29bd48ac..168a12f2 100644 --- a/core/shared/build.gradle.kts +++ b/core/shared/build.gradle.kts @@ -1,15 +1,14 @@ plugins { - id("com.android.library") - id("kotlin-android") + alias(libs.plugins.android.library) + alias(libs.plugins.kotlin.android) } android { - compileSdk = sdk.versions.compileSdk.get().toInt() + compileSdk = libs.versions.compileSdk.get().toInt() defaultConfig { - minSdk = sdk.versions.minSdk.get().toInt() - targetSdk = sdk.versions.targetSdk.get().toInt() - + minSdk = libs.versions.minSdk.get().toInt() + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles("consumer-rules.pro") } diff --git a/data/applications/build.gradle.kts b/data/applications/build.gradle.kts index f0b51586..b1b84587 100644 --- a/data/applications/build.gradle.kts +++ b/data/applications/build.gradle.kts @@ -1,15 +1,14 @@ plugins { - id("com.android.library") - id("kotlin-android") + alias(libs.plugins.android.library) + alias(libs.plugins.kotlin.android) } android { - compileSdk = sdk.versions.compileSdk.get().toInt() + compileSdk = libs.versions.compileSdk.get().toInt() defaultConfig { - minSdk = sdk.versions.minSdk.get().toInt() - targetSdk = sdk.versions.targetSdk.get().toInt() - + minSdk = libs.versions.minSdk.get().toInt() + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles("consumer-rules.pro") } diff --git a/data/appshortcuts/build.gradle.kts b/data/appshortcuts/build.gradle.kts index 13875702..28f8709a 100644 --- a/data/appshortcuts/build.gradle.kts +++ b/data/appshortcuts/build.gradle.kts @@ -1,15 +1,14 @@ plugins { - id("com.android.library") - id("kotlin-android") + alias(libs.plugins.android.library) + alias(libs.plugins.kotlin.android) } android { - compileSdk = sdk.versions.compileSdk.get().toInt() + compileSdk = libs.versions.compileSdk.get().toInt() defaultConfig { - minSdk = sdk.versions.minSdk.get().toInt() - targetSdk = sdk.versions.targetSdk.get().toInt() - + minSdk = libs.versions.minSdk.get().toInt() + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles("consumer-rules.pro") } diff --git a/data/calculator/build.gradle.kts b/data/calculator/build.gradle.kts index 88335f95..853b419f 100644 --- a/data/calculator/build.gradle.kts +++ b/data/calculator/build.gradle.kts @@ -1,15 +1,14 @@ plugins { - id("com.android.library") - id("kotlin-android") + alias(libs.plugins.android.library) + alias(libs.plugins.kotlin.android) } android { - compileSdk = sdk.versions.compileSdk.get().toInt() + compileSdk = libs.versions.compileSdk.get().toInt() defaultConfig { - minSdk = sdk.versions.minSdk.get().toInt() - targetSdk = sdk.versions.targetSdk.get().toInt() - + minSdk = libs.versions.minSdk.get().toInt() + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles("consumer-rules.pro") } diff --git a/data/calendar/build.gradle.kts b/data/calendar/build.gradle.kts index 0c8e2380..505d60dc 100644 --- a/data/calendar/build.gradle.kts +++ b/data/calendar/build.gradle.kts @@ -1,15 +1,14 @@ plugins { - id("com.android.library") - id("kotlin-android") + alias(libs.plugins.android.library) + alias(libs.plugins.kotlin.android) } android { - compileSdk = sdk.versions.compileSdk.get().toInt() + compileSdk = libs.versions.compileSdk.get().toInt() defaultConfig { - minSdk = sdk.versions.minSdk.get().toInt() - targetSdk = sdk.versions.targetSdk.get().toInt() - + minSdk = libs.versions.minSdk.get().toInt() + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles("consumer-rules.pro") } diff --git a/data/contacts/build.gradle.kts b/data/contacts/build.gradle.kts index 4b98ae19..67dec9b9 100644 --- a/data/contacts/build.gradle.kts +++ b/data/contacts/build.gradle.kts @@ -1,15 +1,14 @@ plugins { - id("com.android.library") - id("kotlin-android") + alias(libs.plugins.android.library) + alias(libs.plugins.kotlin.android) } android { - compileSdk = sdk.versions.compileSdk.get().toInt() + compileSdk = libs.versions.compileSdk.get().toInt() defaultConfig { - minSdk = sdk.versions.minSdk.get().toInt() - targetSdk = sdk.versions.targetSdk.get().toInt() - + minSdk = libs.versions.minSdk.get().toInt() + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles("consumer-rules.pro") } diff --git a/data/currencies/build.gradle.kts b/data/currencies/build.gradle.kts index 371befac..fd41e791 100644 --- a/data/currencies/build.gradle.kts +++ b/data/currencies/build.gradle.kts @@ -1,15 +1,14 @@ plugins { - id("com.android.library") - id("kotlin-android") + alias(libs.plugins.android.library) + alias(libs.plugins.kotlin.android) } android { - compileSdk = sdk.versions.compileSdk.get().toInt() + compileSdk = libs.versions.compileSdk.get().toInt() defaultConfig { - minSdk = sdk.versions.minSdk.get().toInt() - targetSdk = sdk.versions.targetSdk.get().toInt() - + minSdk = libs.versions.minSdk.get().toInt() + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles("consumer-rules.pro") } diff --git a/data/customattrs/build.gradle.kts b/data/customattrs/build.gradle.kts index a084efae..55c8f6a8 100644 --- a/data/customattrs/build.gradle.kts +++ b/data/customattrs/build.gradle.kts @@ -1,15 +1,14 @@ plugins { - id("com.android.library") - id("kotlin-android") + alias(libs.plugins.android.library) + alias(libs.plugins.kotlin.android) } android { - compileSdk = sdk.versions.compileSdk.get().toInt() + compileSdk = libs.versions.compileSdk.get().toInt() defaultConfig { - minSdk = sdk.versions.minSdk.get().toInt() - targetSdk = sdk.versions.targetSdk.get().toInt() - + minSdk = libs.versions.minSdk.get().toInt() + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles("consumer-rules.pro") } diff --git a/data/files/build.gradle.kts b/data/files/build.gradle.kts index 0756762d..0cab5a3a 100644 --- a/data/files/build.gradle.kts +++ b/data/files/build.gradle.kts @@ -1,15 +1,14 @@ plugins { - id("com.android.library") - id("kotlin-android") + alias(libs.plugins.android.library) + alias(libs.plugins.kotlin.android) } android { - compileSdk = sdk.versions.compileSdk.get().toInt() + compileSdk = libs.versions.compileSdk.get().toInt() defaultConfig { - minSdk = sdk.versions.minSdk.get().toInt() - targetSdk = sdk.versions.targetSdk.get().toInt() - + minSdk = libs.versions.minSdk.get().toInt() + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles("consumer-rules.pro") } diff --git a/data/notifications/build.gradle.kts b/data/notifications/build.gradle.kts index d5b52090..dd2b37aa 100644 --- a/data/notifications/build.gradle.kts +++ b/data/notifications/build.gradle.kts @@ -1,15 +1,14 @@ plugins { - id("com.android.library") - id("kotlin-android") + alias(libs.plugins.android.library) + alias(libs.plugins.kotlin.android) } android { - compileSdk = sdk.versions.compileSdk.get().toInt() + compileSdk = libs.versions.compileSdk.get().toInt() defaultConfig { - minSdk = sdk.versions.minSdk.get().toInt() - targetSdk = sdk.versions.targetSdk.get().toInt() - + minSdk = libs.versions.minSdk.get().toInt() + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles("consumer-rules.pro") } diff --git a/data/search-actions/build.gradle.kts b/data/search-actions/build.gradle.kts index d16c179f..a5e59d1a 100644 --- a/data/search-actions/build.gradle.kts +++ b/data/search-actions/build.gradle.kts @@ -1,15 +1,14 @@ plugins { - id("com.android.library") - id("kotlin-android") + alias(libs.plugins.android.library) + alias(libs.plugins.kotlin.android) } android { - compileSdk = sdk.versions.compileSdk.get().toInt() + compileSdk = libs.versions.compileSdk.get().toInt() defaultConfig { - minSdk = sdk.versions.minSdk.get().toInt() - targetSdk = sdk.versions.targetSdk.get().toInt() - + minSdk = libs.versions.minSdk.get().toInt() + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles("consumer-rules.pro") } diff --git a/data/searchable/build.gradle.kts b/data/searchable/build.gradle.kts index b76b962b..ed12a6a2 100644 --- a/data/searchable/build.gradle.kts +++ b/data/searchable/build.gradle.kts @@ -1,15 +1,14 @@ plugins { - id("com.android.library") - id("kotlin-android") + alias(libs.plugins.android.library) + alias(libs.plugins.kotlin.android) } android { - compileSdk = sdk.versions.compileSdk.get().toInt() + compileSdk = libs.versions.compileSdk.get().toInt() defaultConfig { - minSdk = sdk.versions.minSdk.get().toInt() - targetSdk = sdk.versions.targetSdk.get().toInt() - + minSdk = libs.versions.minSdk.get().toInt() + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles("consumer-rules.pro") } diff --git a/data/themes/build.gradle.kts b/data/themes/build.gradle.kts index 9955d6cc..d9ea860f 100644 --- a/data/themes/build.gradle.kts +++ b/data/themes/build.gradle.kts @@ -1,16 +1,15 @@ plugins { - id("com.android.library") - id("kotlin-android") - kotlin("plugin.serialization") + alias(libs.plugins.android.library) + alias(libs.plugins.kotlin.android) + alias(libs.plugins.kotlin.plugin.serialization) } android { - compileSdk = sdk.versions.compileSdk.get().toInt() + compileSdk = libs.versions.compileSdk.get().toInt() defaultConfig { - minSdk = sdk.versions.minSdk.get().toInt() - targetSdk = sdk.versions.targetSdk.get().toInt() - + minSdk = libs.versions.minSdk.get().toInt() + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles("consumer-rules.pro") } diff --git a/data/unitconverter/build.gradle.kts b/data/unitconverter/build.gradle.kts index 1a980722..80311490 100644 --- a/data/unitconverter/build.gradle.kts +++ b/data/unitconverter/build.gradle.kts @@ -1,15 +1,14 @@ plugins { - id("com.android.library") - id("kotlin-android") + alias(libs.plugins.android.library) + alias(libs.plugins.kotlin.android) } android { - compileSdk = sdk.versions.compileSdk.get().toInt() + compileSdk = libs.versions.compileSdk.get().toInt() defaultConfig { - minSdk = sdk.versions.minSdk.get().toInt() - targetSdk = sdk.versions.targetSdk.get().toInt() - + minSdk = libs.versions.minSdk.get().toInt() + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles("consumer-rules.pro") } diff --git a/data/weather/build.gradle.kts b/data/weather/build.gradle.kts index 24255274..43d28efa 100644 --- a/data/weather/build.gradle.kts +++ b/data/weather/build.gradle.kts @@ -1,15 +1,14 @@ plugins { - id("com.android.library") - id("kotlin-android") + alias(libs.plugins.android.library) + alias(libs.plugins.kotlin.android) } android { - compileSdk = sdk.versions.compileSdk.get().toInt() + compileSdk = libs.versions.compileSdk.get().toInt() defaultConfig { - minSdk = sdk.versions.minSdk.get().toInt() - targetSdk = sdk.versions.targetSdk.get().toInt() - + minSdk = libs.versions.minSdk.get().toInt() + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles("consumer-rules.pro") } diff --git a/data/websites/build.gradle.kts b/data/websites/build.gradle.kts index 72bdc2cd..ff039d23 100644 --- a/data/websites/build.gradle.kts +++ b/data/websites/build.gradle.kts @@ -1,15 +1,14 @@ plugins { - id("com.android.library") - id("kotlin-android") + alias(libs.plugins.android.library) + alias(libs.plugins.kotlin.android) } android { - compileSdk = sdk.versions.compileSdk.get().toInt() + compileSdk = libs.versions.compileSdk.get().toInt() defaultConfig { - minSdk = sdk.versions.minSdk.get().toInt() - targetSdk = sdk.versions.targetSdk.get().toInt() - + minSdk = libs.versions.minSdk.get().toInt() + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles("consumer-rules.pro") } diff --git a/data/widgets/build.gradle.kts b/data/widgets/build.gradle.kts index f7fe9549..8160821a 100644 --- a/data/widgets/build.gradle.kts +++ b/data/widgets/build.gradle.kts @@ -1,16 +1,15 @@ plugins { - id("com.android.library") - id("kotlin-android") - kotlin("plugin.serialization") + alias(libs.plugins.android.library) + alias(libs.plugins.kotlin.android) + alias(libs.plugins.kotlin.plugin.serialization) } android { - compileSdk = sdk.versions.compileSdk.get().toInt() + compileSdk = libs.versions.compileSdk.get().toInt() defaultConfig { - minSdk = sdk.versions.minSdk.get().toInt() - targetSdk = sdk.versions.targetSdk.get().toInt() - + minSdk = libs.versions.minSdk.get().toInt() + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles("consumer-rules.pro") } diff --git a/data/wikipedia/build.gradle.kts b/data/wikipedia/build.gradle.kts index 243b16eb..c0de7174 100644 --- a/data/wikipedia/build.gradle.kts +++ b/data/wikipedia/build.gradle.kts @@ -1,15 +1,14 @@ plugins { - id("com.android.library") - id("kotlin-android") + alias(libs.plugins.android.library) + alias(libs.plugins.kotlin.android) } android { - compileSdk = sdk.versions.compileSdk.get().toInt() + compileSdk = libs.versions.compileSdk.get().toInt() defaultConfig { - minSdk = sdk.versions.minSdk.get().toInt() - targetSdk = sdk.versions.targetSdk.get().toInt() - + minSdk = libs.versions.minSdk.get().toInt() + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles("consumer-rules.pro") } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml new file mode 100644 index 00000000..e1092bae --- /dev/null +++ b/gradle/libs.versions.toml @@ -0,0 +1,150 @@ +[versions] +minSdk = "26" +compileSdk = "34" +targetSdk = "34" + +gradle = "8.1.2" +android-gradle-plugin = "8.1.2" +protobuf-gradle-plugin = "0.9.4" +ksp-gradle-plugin = "1.9.0-1.0.13" + +kotlin = "1.9.0" +kotlinx-coroutines = "1.7.3" +kotlinx-immutable = "0.3.5" +kotlinx-serialization = "1.5.1" + +jetbrains-markdown = "0.4.1" + +androidx-compose = "1.6.0-alpha04" +androidx-compose-material3 = "1.2.0-alpha06" +androidx-compose-compiler = "1.5.2" +androidx-lifecycle = "2.6.1" +androidx-core = "1.9.0" +androidx-appcompat = "1.7.0-alpha03" +androidx-activity = "1.8.0-alpha06" +androidx-work = "2.8.0-alpha04" +androidx-browser = "1.4.0" +androidx-palette = "1.0.0" +androidx-media2 = "1.2.1" +androidx-room = "2.5.0" + +accompanist = "0.31.2-alpha" +coil = "2.3.0" +koin = "3.2.0" +protobuf = "3.14.0" +retrofit = "2.9.0" +junit = "4.13" + +[libraries] +gradle = { group = "com.android.tools.build", name = "gradle", version.ref = "android-gradle-plugin" } + +kotlin-stdlib = { group = "org.jetbrains.kotlin", name = "kotlin-stdlib", version.ref = "kotlin" } +kotlin-gradle = { group = "org.jetbrains.kotlin", name = "kotlin-gradle-plugin", version.ref = "kotlin" } +kotlinx-coroutines-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version.ref = "kotlinx-coroutines" } +kotlinx-coroutines-android = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-android", version.ref = "kotlinx-coroutines" } +kotlinx-collections-immutable = { group = "org.jetbrains.kotlinx", name = "kotlinx-collections-immutable", version.ref = "kotlinx-immutable" } +kotlinx-serialization-json = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-json", version.ref = "kotlinx-serialization" } + +markdown = { group = "org.jetbrains", name = "markdown", version.ref = "jetbrains-markdown" } + +androidx-compose-runtime = { group = "androidx.compose.runtime", name = "runtime", version.ref = "androidx-compose" } +androidx-compose-foundation = { group = "androidx.compose.foundation", name = "foundation", version.ref = "androidx-compose" } +androidx-compose-foundationlayout = { group = "androidx.compose.foundation", name = "foundation-layout", version.ref = "androidx-compose" } +androidx-compose-ui = { group = "androidx.compose.ui", name = "ui", version.ref = "androidx-compose" } +androidx-compose-uitooling = { group = "androidx.compose.ui", name = "ui-tooling", version.ref = "androidx-compose" } +androidx-compose-material = { group = "androidx.compose.material", name = "material", version.ref = "androidx-compose" } +androidx-compose-materialicons = { group = "androidx.compose.material", name = "material-icons-extended", version.ref = "androidx-compose" } +androidx-compose-animation = { group = "androidx.compose.animation", name = "animation", version.ref = "androidx-compose" } +androidx-compose-animationgraphics = { group = "androidx.compose.animation", name = "animation-graphics", version.ref = "androidx-compose" } +androidx-compose-material3 = { group = "androidx.compose.material3", name = "material3", version.ref = "androidx-compose-material3" } + +androidx-lifecycle-viewmodel = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-ktx", version.ref = "androidx-lifecycle" } +androidx-lifecycle-common = { group = "androidx.lifecycle", name = "lifecycle-common-java8", version.ref = "androidx-lifecycle" } +androidx-lifecycle-runtime = { group = "androidx.lifecycle", name = "lifecycle-runtime-ktx", version.ref = "androidx-lifecycle" } +androidx-lifecycle-viewmodelcompose = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-compose", version.ref = "androidx-lifecycle" } +androidx-lifecycle-runtimecompose = { group = "androidx.lifecycle", name = "lifecycle-runtime-compose", version.ref = "androidx-lifecycle" } + + +androidx-activity = { group = "androidx.activity", name = "activity", version.ref = "androidx-activity" } +androidx-activitycompose = { group = "androidx.activity", name = "activity-compose", version.ref = "androidx-activity" } + +androidx-room = { group = "androidx.room", name = "room-ktx", version.ref = "androidx-room" } +androidx-roomruntime = { group = "androidx.room", name = "room-runtime", version.ref = "androidx-room" } +androidx-roomcompiler = { group = "androidx.room", name = "room-compiler", version.ref = "androidx-room" } + +androidx-core = { group = "androidx.core", name = "core-ktx", version.ref = "androidx-core" } +androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "androidx-appcompat" } +androidx-work = { group = "androidx.work", name = "work-runtime-ktx", version.ref = "androidx-work" } +androidx-browser = { group = "androidx.browser", name = "browser", version.ref = "androidx-browser" } +androidx-palette = { group = "androidx.palette", name = "palette", version.ref = "androidx-palette" } +androidx-media2 = { group = "androidx.media2", name = "media2-session", version.ref = "androidx-media2" } + +accompanist-insets = { group = "com.google.accompanist", name = "accompanist-insets", version.ref = "accompanist" } +accompanist-systemuicontroller = { group = "com.google.accompanist", name = "accompanist-systemuicontroller", version.ref = "accompanist" } +accompanist-pager = { group = "com.google.accompanist", name = "accompanist-pager", version.ref = "accompanist" } +accompanist-pagerindicators = { group = "com.google.accompanist", name = "accompanist-pager-indicators", version.ref = "accompanist" } +accompanist-flowlayout = { group = "com.google.accompanist", name = "accompanist-flowlayout", version.ref = "accompanist" } +accompanist-navigationanimation = { group = "com.google.accompanist", name = "accompanist-navigation-animation", version.ref = "accompanist" } + +androidx-constraintlayout = { group = "androidx.constraintlayout", name = "constraintlayout", version = "2.1.3" } +androidx-transition = { group = "androidx.transition", name = "transition", version = "1.4.1" } +androidx-exifinterface = { group = "androidx.exifinterface", name = "exifinterface", version = "1.3.3" } +androidx-securitycrypto = { group = "androidx.security", name = "security-crypto", version = "1.1.0-alpha03" } +androidx-datastore = { group = "androidx.datastore", name = "datastore", version = "1.0.0" } + +androidx-navigation-compose = { group = "androidx.navigation", name = "navigation-compose", version = "2.6.0-alpha09" } +materialcomponents-core = { group = "com.google.android.material", name = "material", version = "1.8.0-alpha01" } +okhttp = { group = "com.squareup.okhttp3", name = "okhttp", version = "4.10.0" } + +retrofit-core = { group = "com.squareup.retrofit2", name = "retrofit", version.ref = "retrofit" } +retrofit-gson = { group = "com.squareup.retrofit2", name = "converter-gson", version.ref = "retrofit" } + +coil-core = { group = "io.coil-kt", name = "coil", version.ref = "coil" } +coil-svg = { group = "io.coil-kt", name = "coil-svg", version.ref = "coil" } +coil-compose = { group = "io.coil-kt", name = "coil-compose", version.ref = "coil" } + +leakcanary = { group = "com.squareup.leakcanary", name = "leakcanary", version = "2.10" } +suncalc = { group = "org.shredzone.commons", name = "commons-suncalc", version = "3.7" } +jsoup = { group = "org.jsoup", name = "jsoup", version = "1.15.4" } +commons-text = { group = "org.apache.commons", name = "commons-text", version = "1.10.0" } + +# 4.4.2 is the last GPL compatible version, don't update to 5.x +mathparser = { group = "org.mariuszgromada.math", name = "MathParser.org-mXparser", version = "4.4.2" } + +google-auth = { group = "com.google.auth", name = "google-auth-library-oauth2-http", version = "1.14.0" } +google-apiclient = { group = "com.google.api-client", name = "google-api-client", version = "2.1.2" } +google-drive = { group = "com.google.apis", name = "google-api-services-drive", version = "v3-rev20221219-2.0.0" } +google-oauth2 = { group = "com.google.apis", name = "google-api-services-oauth2", version = "v2-rev20200213-2.0.0" } + +gson = { group = "com.google.code.gson", name = "gson", version = "2.10.1" } +guava = { group = "com.google.guava", name = "guava", version = "31.1-android" } + +microsoft-graph = { group = "com.microsoft.graph", name = "microsoft-graph", version = "5.53.0" } +microsoft-identity = { group = "com.microsoft.identity.client", name = "msal", version = "4.2.0" } + +protobuf-protoc = { group = "com.google.protobuf", name = "protoc", version.ref = "protobuf" } +protobuf-javalite = { group = "com.google.protobuf", name = "protobuf-javalite", version.ref = "protobuf" } + +koin-android = { group = "io.insert-koin", name = "koin-android", version.ref = "koin" } +koin-androidxcompose = { group = "io.insert-koin", name = "koin-androidx-compose", version.ref = "koin" } + +tinypinyin = { group = "com.github.promeg", name = "tinypinyin", version = "2.0.2" } +emoji4j = { group = "com.sigpwned", name = "emoji4j-core", version = "15.0.1" } + +junit = { group = "junit", name = "junit", version.ref = "junit" } + + + +[bundles] +kotlin = ["kotlin-stdlib", "kotlinx-coroutines-core", "kotlinx-coroutines-android", "kotlinx-collections-immutable"] +androidx-lifecycle = ["androidx-lifecycle-viewmodel", "androidx-lifecycle-common", "androidx-lifecycle-runtime", "androidx-lifecycle-viewmodelcompose", "androidx-lifecycle-runtimecompose"] +retrofit = ["retrofit-core", "retrofit-gson"] +tests = ["junit"] + +[plugins] +android-application = { id = "com.android.application", version.ref = "android-gradle-plugin" } +android-library = { id = "com.android.library", version.ref = "android-gradle-plugin" } +protobuf = { id = "com.google.protobuf", version.ref = "protobuf-gradle-plugin" } +ksp = { id = "com.google.devtools.ksp", version.ref = "ksp-gradle-plugin" } +kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } +kotlin-plugin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" } \ No newline at end of file diff --git a/libs/g-services/build.gradle.kts b/libs/g-services/build.gradle.kts index 212b3f7d..ca98d6ab 100644 --- a/libs/g-services/build.gradle.kts +++ b/libs/g-services/build.gradle.kts @@ -1,15 +1,14 @@ plugins { - id("com.android.library") - id("kotlin-android") + alias(libs.plugins.android.library) + alias(libs.plugins.kotlin.android) } android { - compileSdk = sdk.versions.compileSdk.get().toInt() + compileSdk = libs.versions.compileSdk.get().toInt() defaultConfig { - minSdk = sdk.versions.minSdk.get().toInt() - targetSdk = sdk.versions.targetSdk.get().toInt() - + minSdk = libs.versions.minSdk.get().toInt() + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles("consumer-rules.pro") } diff --git a/libs/material-color-utilities/build.gradle.kts b/libs/material-color-utilities/build.gradle.kts index 19a3d303..a790c26f 100644 --- a/libs/material-color-utilities/build.gradle.kts +++ b/libs/material-color-utilities/build.gradle.kts @@ -1,15 +1,14 @@ plugins { - id("com.android.library") - id("kotlin-android") + alias(libs.plugins.android.library) + alias(libs.plugins.kotlin.android) } android { - compileSdk = sdk.versions.compileSdk.get().toInt() + compileSdk = libs.versions.compileSdk.get().toInt() defaultConfig { - minSdk = sdk.versions.minSdk.get().toInt() - targetSdk = sdk.versions.targetSdk.get().toInt() - + minSdk = libs.versions.minSdk.get().toInt() + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles("consumer-rules.pro") } diff --git a/libs/ms-services/build.gradle.kts b/libs/ms-services/build.gradle.kts index 814acd1a..098a6923 100644 --- a/libs/ms-services/build.gradle.kts +++ b/libs/ms-services/build.gradle.kts @@ -1,15 +1,14 @@ plugins { - id("com.android.library") - id("kotlin-android") + alias(libs.plugins.android.library) + alias(libs.plugins.kotlin.android) } android { - compileSdk = sdk.versions.compileSdk.get().toInt() + compileSdk = libs.versions.compileSdk.get().toInt() defaultConfig { - minSdk = sdk.versions.minSdk.get().toInt() - targetSdk = sdk.versions.targetSdk.get().toInt() - + minSdk = libs.versions.minSdk.get().toInt() + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles("consumer-rules.pro") } diff --git a/libs/nextcloud/build.gradle.kts b/libs/nextcloud/build.gradle.kts index 36c588ac..e9e7d2ac 100644 --- a/libs/nextcloud/build.gradle.kts +++ b/libs/nextcloud/build.gradle.kts @@ -1,15 +1,14 @@ plugins { - id("com.android.library") - id("kotlin-android") + alias(libs.plugins.android.library) + alias(libs.plugins.kotlin.android) } android { - compileSdk = sdk.versions.compileSdk.get().toInt() + compileSdk = libs.versions.compileSdk.get().toInt() defaultConfig { - minSdk = sdk.versions.minSdk.get().toInt() - targetSdk = sdk.versions.targetSdk.get().toInt() - + minSdk = libs.versions.minSdk.get().toInt() + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles("consumer-rules.pro") } diff --git a/libs/owncloud/build.gradle.kts b/libs/owncloud/build.gradle.kts index d298fa18..97895c18 100644 --- a/libs/owncloud/build.gradle.kts +++ b/libs/owncloud/build.gradle.kts @@ -1,15 +1,14 @@ plugins { - id("com.android.library") - id("kotlin-android") + alias(libs.plugins.android.library) + alias(libs.plugins.kotlin.android) } android { - compileSdk = sdk.versions.compileSdk.get().toInt() + compileSdk = libs.versions.compileSdk.get().toInt() defaultConfig { - minSdk = sdk.versions.minSdk.get().toInt() - targetSdk = sdk.versions.targetSdk.get().toInt() - + minSdk = libs.versions.minSdk.get().toInt() + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles("consumer-rules.pro") } diff --git a/libs/webdav/build.gradle.kts b/libs/webdav/build.gradle.kts index ce8f93d8..2102c9f7 100644 --- a/libs/webdav/build.gradle.kts +++ b/libs/webdav/build.gradle.kts @@ -1,15 +1,14 @@ plugins { - id("com.android.library") - id("kotlin-android") + alias(libs.plugins.android.library) + alias(libs.plugins.kotlin.android) } android { - compileSdk = sdk.versions.compileSdk.get().toInt() + compileSdk = libs.versions.compileSdk.get().toInt() defaultConfig { - minSdk = sdk.versions.minSdk.get().toInt() - targetSdk = sdk.versions.targetSdk.get().toInt() - + minSdk = libs.versions.minSdk.get().toInt() + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles("consumer-rules.pro") } diff --git a/plugins/sdk/build.gradle.kts b/plugins/sdk/build.gradle.kts index 1a87eb2a..01819053 100644 --- a/plugins/sdk/build.gradle.kts +++ b/plugins/sdk/build.gradle.kts @@ -1,15 +1,14 @@ plugins { - id("com.android.library") - id("kotlin-android") + alias(libs.plugins.android.library) + alias(libs.plugins.kotlin.android) } android { - compileSdk = sdk.versions.compileSdk.get().toInt() + compileSdk = libs.versions.compileSdk.get().toInt() defaultConfig { - minSdk = sdk.versions.minSdk.get().toInt() - targetSdk = sdk.versions.targetSdk.get().toInt() - + minSdk = libs.versions.minSdk.get().toInt() + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles("consumer-rules.pro") } diff --git a/services/accounts/build.gradle.kts b/services/accounts/build.gradle.kts index a4b614f2..eddd8d09 100644 --- a/services/accounts/build.gradle.kts +++ b/services/accounts/build.gradle.kts @@ -1,15 +1,14 @@ plugins { - id("com.android.library") - id("kotlin-android") + alias(libs.plugins.android.library) + alias(libs.plugins.kotlin.android) } android { - compileSdk = sdk.versions.compileSdk.get().toInt() + compileSdk = libs.versions.compileSdk.get().toInt() defaultConfig { - minSdk = sdk.versions.minSdk.get().toInt() - targetSdk = sdk.versions.targetSdk.get().toInt() - + minSdk = libs.versions.minSdk.get().toInt() + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles("consumer-rules.pro") } diff --git a/services/backup/build.gradle.kts b/services/backup/build.gradle.kts index 61f6ad78..bbca8af7 100644 --- a/services/backup/build.gradle.kts +++ b/services/backup/build.gradle.kts @@ -1,15 +1,14 @@ plugins { - id("com.android.library") - id("kotlin-android") + alias(libs.plugins.android.library) + alias(libs.plugins.kotlin.android) } android { - compileSdk = sdk.versions.compileSdk.get().toInt() + compileSdk = libs.versions.compileSdk.get().toInt() defaultConfig { - minSdk = sdk.versions.minSdk.get().toInt() - targetSdk = sdk.versions.targetSdk.get().toInt() - + minSdk = libs.versions.minSdk.get().toInt() + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles("consumer-rules.pro") } diff --git a/services/badges/build.gradle.kts b/services/badges/build.gradle.kts index 6b8a4102..682bc43a 100644 --- a/services/badges/build.gradle.kts +++ b/services/badges/build.gradle.kts @@ -1,15 +1,14 @@ plugins { - id("com.android.library") - id("kotlin-android") + alias(libs.plugins.android.library) + alias(libs.plugins.kotlin.android) } android { - compileSdk = sdk.versions.compileSdk.get().toInt() + compileSdk = libs.versions.compileSdk.get().toInt() defaultConfig { - minSdk = sdk.versions.minSdk.get().toInt() - targetSdk = sdk.versions.targetSdk.get().toInt() - + minSdk = libs.versions.minSdk.get().toInt() + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles("consumer-rules.pro") } diff --git a/services/favorites/build.gradle.kts b/services/favorites/build.gradle.kts index ed7b0b15..4e772398 100644 --- a/services/favorites/build.gradle.kts +++ b/services/favorites/build.gradle.kts @@ -1,15 +1,14 @@ plugins { - id("com.android.library") - id("kotlin-android") + alias(libs.plugins.android.library) + alias(libs.plugins.kotlin.android) } android { - compileSdk = sdk.versions.compileSdk.get().toInt() + compileSdk = libs.versions.compileSdk.get().toInt() defaultConfig { - minSdk = sdk.versions.minSdk.get().toInt() - targetSdk = sdk.versions.targetSdk.get().toInt() - + minSdk = libs.versions.minSdk.get().toInt() + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles("consumer-rules.pro") } diff --git a/services/global-actions/build.gradle.kts b/services/global-actions/build.gradle.kts index 6d757791..91ca810a 100644 --- a/services/global-actions/build.gradle.kts +++ b/services/global-actions/build.gradle.kts @@ -1,15 +1,14 @@ plugins { - id("com.android.library") - id("kotlin-android") + alias(libs.plugins.android.library) + alias(libs.plugins.kotlin.android) } android { - compileSdk = sdk.versions.compileSdk.get().toInt() + compileSdk = libs.versions.compileSdk.get().toInt() defaultConfig { - minSdk = sdk.versions.minSdk.get().toInt() - targetSdk = sdk.versions.targetSdk.get().toInt() - + minSdk = libs.versions.minSdk.get().toInt() + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles("consumer-rules.pro") } diff --git a/services/icons/build.gradle.kts b/services/icons/build.gradle.kts index df608e4e..8e7b25d2 100644 --- a/services/icons/build.gradle.kts +++ b/services/icons/build.gradle.kts @@ -1,15 +1,14 @@ plugins { - id("com.android.library") - id("kotlin-android") + alias(libs.plugins.android.library) + alias(libs.plugins.kotlin.android) } android { - compileSdk = sdk.versions.compileSdk.get().toInt() + compileSdk = libs.versions.compileSdk.get().toInt() defaultConfig { - minSdk = sdk.versions.minSdk.get().toInt() - targetSdk = sdk.versions.targetSdk.get().toInt() - + minSdk = libs.versions.minSdk.get().toInt() + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles("consumer-rules.pro") } diff --git a/services/music/build.gradle.kts b/services/music/build.gradle.kts index 7876064d..1b1f72df 100644 --- a/services/music/build.gradle.kts +++ b/services/music/build.gradle.kts @@ -1,15 +1,14 @@ plugins { - id("com.android.library") - id("kotlin-android") + alias(libs.plugins.android.library) + alias(libs.plugins.kotlin.android) } android { - compileSdk = sdk.versions.compileSdk.get().toInt() + compileSdk = libs.versions.compileSdk.get().toInt() defaultConfig { - minSdk = sdk.versions.minSdk.get().toInt() - targetSdk = sdk.versions.targetSdk.get().toInt() - + minSdk = libs.versions.minSdk.get().toInt() + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles("consumer-rules.pro") } diff --git a/services/search/build.gradle.kts b/services/search/build.gradle.kts index 3f8b8d3c..591be120 100644 --- a/services/search/build.gradle.kts +++ b/services/search/build.gradle.kts @@ -1,15 +1,14 @@ plugins { - id("com.android.library") - id("kotlin-android") + alias(libs.plugins.android.library) + alias(libs.plugins.kotlin.android) } android { - compileSdk = sdk.versions.compileSdk.get().toInt() + compileSdk = libs.versions.compileSdk.get().toInt() defaultConfig { - minSdk = sdk.versions.minSdk.get().toInt() - targetSdk = sdk.versions.targetSdk.get().toInt() - + minSdk = libs.versions.minSdk.get().toInt() + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles("consumer-rules.pro") } diff --git a/services/tags/build.gradle.kts b/services/tags/build.gradle.kts index 9f80594b..2e48ad6c 100644 --- a/services/tags/build.gradle.kts +++ b/services/tags/build.gradle.kts @@ -1,15 +1,14 @@ plugins { - id("com.android.library") - id("org.jetbrains.kotlin.android") + alias(libs.plugins.android.library) + alias(libs.plugins.kotlin.android) } android { - compileSdk = sdk.versions.compileSdk.get().toInt() + compileSdk = libs.versions.compileSdk.get().toInt() defaultConfig { - minSdk = sdk.versions.minSdk.get().toInt() - targetSdk = sdk.versions.targetSdk.get().toInt() - + minSdk = libs.versions.minSdk.get().toInt() + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles("consumer-rules.pro") } diff --git a/services/widgets/build.gradle.kts b/services/widgets/build.gradle.kts index dfc5a2c8..253d3ee1 100644 --- a/services/widgets/build.gradle.kts +++ b/services/widgets/build.gradle.kts @@ -1,15 +1,14 @@ plugins { - id("com.android.library") - id("kotlin-android") + alias(libs.plugins.android.library) + alias(libs.plugins.kotlin.android) } android { - compileSdk = sdk.versions.compileSdk.get().toInt() + compileSdk = libs.versions.compileSdk.get().toInt() defaultConfig { - minSdk = sdk.versions.minSdk.get().toInt() - targetSdk = sdk.versions.targetSdk.get().toInt() - + minSdk = libs.versions.minSdk.get().toInt() + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles("consumer-rules.pro") } diff --git a/settings.gradle.kts b/settings.gradle.kts index ff92bab2..aa777fad 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,244 +1,17 @@ +pluginManagement { + repositories { + google() + mavenCentral() + gradlePluginPortal() + } +} + dependencyResolutionManagement { - versionCatalogs { - create("sdk") { - version("minSdk", "26") - version("compileSdk", "34") - version("targetSdk", "34") - } - create("libs") { - version("kotlin", "1.9.0") - version("kotlinx.coroutines", "1.7.3") - library("kotlin.stdlib", "org.jetbrains.kotlin", "kotlin-stdlib") - .versionRef("kotlin") - library("kotlin.gradle", "org.jetbrains.kotlin", "kotlin-gradle-plugin") - .versionRef("kotlin") - library("kotlinx.coroutines.core", "org.jetbrains.kotlinx", "kotlinx-coroutines-core") - .versionRef("kotlinx.coroutines") - library("kotlinx.coroutines.android", "org.jetbrains.kotlinx", "kotlinx-coroutines-android") - .versionRef("kotlinx.coroutines") - library("kotlinx.collections.immutable", "org.jetbrains.kotlinx", "kotlinx-collections-immutable") - .version("0.3.5") - bundle( - "kotlin", - listOf( - "kotlin.stdlib", - "kotlinx.coroutines.core", - "kotlinx.coroutines.android", - "kotlinx.collections.immutable" - ) - ) - version("kotlinx.serialization", "1.5.1") - library("kotlinx.serialization.json", "org.jetbrains.kotlinx", "kotlinx-serialization-json") - .versionRef("kotlinx.serialization") - - library("markdown", "org.jetbrains", "markdown") - .version("0.4.1") - - version("androidx.compose.compiler", "1.5.2") - library("androidx.compose.runtime", "androidx.compose.runtime", "runtime") - .version("1.6.0-alpha04") - library("androidx.compose.foundation", "androidx.compose.foundation", "foundation") - .version("1.6.0-alpha04") - library("androidx.compose.foundationlayout", "androidx.compose.foundation", "foundation-layout") - .version("1.6.0-alpha04") - library("androidx.compose.ui", "androidx.compose.ui", "ui") - .version("1.6.0-alpha04") - library("androidx.compose.uitooling", "androidx.compose.ui", "ui-tooling") - .version("1.6.0-alpha04") - library("androidx.compose.material", "androidx.compose.material", "material") - .version("1.6.0-alpha04") - library("androidx.compose.materialicons", "androidx.compose.material", "material-icons-extended") - .version("1.6.0-alpha04") - library("androidx.compose.animation", "androidx.compose.animation", "animation") - .version("1.6.0-alpha04") - library("androidx.compose.animationgraphics", "androidx.compose.animation", "animation-graphics") - .version("1.6.0-alpha04") - library("androidx.compose.material3", "androidx.compose.material3", "material3") - .version("1.2.0-alpha06") - - version("androidx.lifecycle", "2.6.1") - library("androidx.lifecycle.viewmodel", "androidx.lifecycle", "lifecycle-viewmodel-ktx") - .versionRef("androidx.lifecycle") - library("androidx.lifecycle.common", "androidx.lifecycle", "lifecycle-common-java8") - .versionRef("androidx.lifecycle") - library("androidx.lifecycle.runtime", "androidx.lifecycle", "lifecycle-runtime-ktx") - .versionRef("androidx.lifecycle") - library("androidx.lifecycle.viewmodelcompose", "androidx.lifecycle", "lifecycle-viewmodel-compose") - .versionRef("androidx.lifecycle") - library("androidx.lifecycle.runtimecompose", "androidx.lifecycle", "lifecycle-runtime-compose") - .versionRef("androidx.lifecycle") - bundle( - "androidx.lifecycle", - listOf( - "androidx.lifecycle.viewmodel", - "androidx.lifecycle.common", - "androidx.lifecycle.runtime" - ) - ) - - version("accompanist", "0.31.2-alpha") - library("accompanist.insets", "com.google.accompanist", "accompanist-insets") - .versionRef("accompanist") - library("accompanist.systemuicontroller", "com.google.accompanist", "accompanist-systemuicontroller") - .versionRef("accompanist") - library("accompanist.pager", "com.google.accompanist", "accompanist-pager") - .versionRef("accompanist") - library("accompanist.pagerindicators", "com.google.accompanist", "accompanist-pager-indicators") - .versionRef("accompanist") - library("accompanist.flowlayout", "com.google.accompanist", "accompanist-flowlayout") - .versionRef("accompanist") - library("accompanist.navigationanimation", "com.google.accompanist", "accompanist-navigation-animation") - .versionRef("accompanist") - - library("androidx.core", "androidx.core", "core-ktx") - .version("1.9.0") - - version("androidx.appcompat", "1.7.0-alpha03") - library("androidx.appcompat", "androidx.appcompat", "appcompat") - .versionRef("androidx.appcompat") - - version("androidx.activity", "1.8.0-alpha06") - library("androidx.activity", "androidx.activity", "activity-ktx") - .versionRef("androidx.activity") - library("androidx.activitycompose", "androidx.activity", "activity-compose") - .versionRef("androidx.activity") - - library("androidx.work", "androidx.work", "work-runtime-ktx") - .version("2.8.0-alpha04") - - library("androidx.browser", "androidx.browser", "browser") - .version("1.4.0") - - library("androidx.palette", "androidx.palette", "palette") - .version("1.0.0") - - library("androidx.media2", "androidx.media2", "media2-session") - .version("1.2.1") - - library("androidx.constraintlayout", "androidx.constraintlayout", "constraintlayout") - .version("2.1.3") - - library("androidx.transition", "androidx.transition", "transition") - .version("1.4.1") - - library("androidx.exifinterface", "androidx.exifinterface", "exifinterface") - .version("1.3.3") - - library("androidx.securitycrypto", "androidx.security", "security-crypto") - .version("1.1.0-alpha03") - - library("androidx.datastore", "androidx.datastore", "datastore") - .version("1.0.0") - - version("androidx.room", "2.5.0") - library("androidx.roomruntime", "androidx.room", "room-runtime") - .versionRef("androidx.room") - library("androidx.roomcompiler", "androidx.room", "room-compiler") - .versionRef("androidx.room") - library("androidx.room", "androidx.room", "room-ktx") - .versionRef("androidx.room") - - version("androidx.appsearch", "1.1.0-alpha02") - library("androidx.appsearch", "androidx.appsearch", "appsearch") - .versionRef("androidx.appsearch") - library("androidx.appsearchcompiler", "androidx.appsearch", "appsearch-compiler") - .versionRef("androidx.appsearch") - library("androidx.appsearchstorage", "androidx.appsearch", "appsearch-platform-storage") - .versionRef("androidx.appsearch") - bundle( - "androidx.appsearch", listOf( - "androidx.appsearch", - "androidx.appsearchstorage" - ) - ) - - library("androidx.navigation.compose", "androidx.navigation", "navigation-compose") - .version("2.6.0-alpha09") - - library("materialcomponents.core", "com.google.android.material", "material") - .version("1.8.0-alpha01") - - library("okhttp", "com.squareup.okhttp3", "okhttp") - .version("4.10.0") - - library("retrofit.core", "com.squareup.retrofit2", "retrofit") - .version("2.9.0") - library("retrofit.gson", "com.squareup.retrofit2", "converter-gson") - .version("2.9.0") - bundle( - "retrofit", - listOf( - "retrofit.core", - "retrofit.gson" - ) - ) - - version("coil", "2.3.0") - library("coil.core", "io.coil-kt", "coil") - .versionRef("coil") - library("coil.svg", "io.coil-kt", "coil-svg") - .versionRef("coil") - library("coil.compose", "io.coil-kt", "coil-compose") - .versionRef("coil") - - library("leakcanary", "com.squareup.leakcanary", "leakcanary-android") - .version("2.10") - - library("suncalc", "org.shredzone.commons", "commons-suncalc") - .version("3.7") - - library("jsoup", "org.jsoup", "jsoup") - .version("1.15.4") - - library("commons.text", "org.apache.commons", "commons-text") - .version("1.10.0") - - // 4.4.2 is the last GPL compatible version, don't update to 5.x - library("mathparser", "org.mariuszgromada.math", "MathParser.org-mXparser") - .version("4.4.2") - - library("google.auth", "com.google.auth", "google-auth-library-oauth2-http") - .version("1.14.0") - library("google.apiclient", "com.google.api-client", "google-api-client") - .version("2.1.2") - library("google.drive", "com.google.apis", "google-api-services-drive") - .version("v3-rev20221219-2.0.0") - library("google.oauth2", "com.google.apis", "google-api-services-oauth2") - .version("v2-rev20200213-2.0.0") - - library("gson", "com.google.code.gson", "gson") - .version("2.10.1") - - library("guava", "com.google.guava", "guava") - .version("31.1-android") - - library("microsoft.graph", "com.microsoft.graph", "microsoft-graph") - .version("5.53.0") - library("microsoft.identity", "com.microsoft.identity.client", "msal") - .version("4.2.0") - - version("protobuf", "3.14.0") - library("protobuf.protoc", "com.google.protobuf", "protoc") - .versionRef("protobuf") - library("protobuf.javalite", "com.google.protobuf", "protobuf-javalite") - .versionRef("protobuf") - - version("koin", "3.2.0") - library("koin.android", "io.insert-koin", "koin-android") - .versionRef("koin") - library("koin.androidxcompose", "io.insert-koin", "koin-androidx-compose") - .versionRef("koin") - - library("tinypinyin", "com.github.promeg", "tinypinyin") - .version("2.0.2") - - library("emoji4j", "com.sigpwned", "emoji4j-core") - .version("15.0.1") - - version("junit", "4.13") - library("junit", "junit", "junit").versionRef("junit") - bundle("tests", listOf("junit")) - } + repositories { + google() + mavenCentral() + maven(url = "https://pkgs.dev.azure.com/MicrosoftDeviceSDK/DuoSDK-Public/_packaging/Duo-SDK-Feed/maven/v1") + jcenter() // For tinypinyin } }