diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 49ef41433..2e326db55 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -4,35 +4,18 @@ import com.google.firebase.crashlytics.buildtools.gradle.CrashlyticsExtension import org.jetbrains.kotlin.gradle.dsl.JvmTarget plugins { - id("com.android.application") + alias(libs.plugins.android.application) id("com.google.gms.google-services") id("com.google.firebase.crashlytics") kotlin("android") id("dagger.hilt.android.plugin") id("com.google.android.gms.oss-licenses-plugin") - id("kotlin-parcelize") + alias(libs.plugins.kotlin.parcelize) alias(libs.plugins.ksp) alias(libs.plugins.kotlin.serialization) alias(libs.plugins.kotlin.compose.compiler) } -repositories { - mavenCentral() - google() - maven { - url = uri("https://jitpack.io") - content { - includeGroup("com.github.tasks") - includeModule("com.github.bitfireAT", "cert4android") - includeModule("com.github.bitfireAT", "dav4jvm") - includeModule("com.github.tasks.opentasks", "opentasks-provider") - includeModule("com.github.QuadFlask", "colorpicker") - includeModule("com.github.twofortyfouram", "android-plugin-api-for-locale") - includeModule("com.github.franmontiel", "PersistentCookieJar") - } - } -} - kotlin { compilerOptions { jvmTarget.set(JvmTarget.JVM_17) @@ -66,15 +49,15 @@ android { textReport = true } - compileSdk = 34 + compileSdk = libs.versions.android.compileSdk.get().toInt() defaultConfig { testApplicationId = "org.tasks.test" applicationId = "org.tasks" versionCode = 130907 versionName = "13.9.7" - targetSdk = 33 - minSdk = 24 + targetSdk = libs.versions.android.targetSdk.get().toInt() + minSdk = libs.versions.android.minSdk.get().toInt() testInstrumentationRunner = "org.tasks.TestRunner" } diff --git a/build.gradle.kts b/build.gradle.kts index dca1bac6e..5a852bf72 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,16 +1,13 @@ plugins { - alias(libs.plugins.ksp).apply(false) - alias(libs.plugins.androidLibrary).apply(false) - alias(libs.plugins.kotlinMultiplatform).apply(false) - alias(libs.plugins.jetbrains.kotlin.jvm) apply false + alias(libs.plugins.android.application) apply false + alias(libs.plugins.android.library) apply false + alias(libs.plugins.kotlin.multiplatform) apply false + alias(libs.plugins.kotlin.parcelize) apply false + alias(libs.plugins.kotlin.serialization) apply false + alias(libs.plugins.ksp) apply false } buildscript { - repositories { - mavenCentral() - google() - } - dependencies { classpath(libs.gradle) classpath(libs.google.services) diff --git a/data/build.gradle.kts b/data/build.gradle.kts index ea9960a81..2aac7b6dd 100644 --- a/data/build.gradle.kts +++ b/data/build.gradle.kts @@ -3,16 +3,11 @@ import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi plugins { - alias(libs.plugins.kotlinMultiplatform) - alias(libs.plugins.androidLibrary) - alias(libs.plugins.ksp) - id("kotlin-parcelize") + alias(libs.plugins.android.library) + alias(libs.plugins.kotlin.multiplatform) + alias(libs.plugins.kotlin.parcelize) alias(libs.plugins.kotlin.serialization) -} - -repositories { - mavenCentral() - google() + alias(libs.plugins.ksp) } kotlin { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 780b2d3dd..7566692ce 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,4 +1,7 @@ [versions] +android-compileSdk = "34" +android-minSdk = "24" +android-targetSdk = "33" accompanist = "0.32.0" activity-compose = "1.9.0" appauth = "0.11.1" @@ -159,9 +162,11 @@ timber = { module = "com.jakewharton.timber:timber", version.ref = "timber" } xpp3 = { module = "org.ogce:xpp3", version.ref = "xpp3" } [plugins] -androidLibrary = { id = "com.android.library", version.ref = "agp" } -kotlinMultiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" } +android-application = { id = "com.android.application", version.ref = "agp" } +android-library = { id = "com.android.library", version.ref = "agp" } kotlin-compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" } +kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" } +kotlin-parcelize = { id = "org.jetbrains.kotlin.plugin.parcelize", version.ref = "kotlin" } kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" } ksp = { id = "com.google.devtools.ksp", version = "2.0.0-1.0.21" } jetbrains-kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" } diff --git a/settings.gradle.kts b/settings.gradle.kts index cbd7e9214..9840a8e42 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,6 +1,12 @@ pluginManagement { repositories { - google() + google { + mavenContent { + includeGroupAndSubgroups("androidx") + includeGroupAndSubgroups("com.android") + includeGroupAndSubgroups("com.google") + } + } mavenCentral() gradlePluginPortal() } @@ -8,8 +14,26 @@ pluginManagement { dependencyResolutionManagement { repositories { - google() + google { + mavenContent { + includeGroupAndSubgroups("androidx") + includeGroupAndSubgroups("com.android") + includeGroupAndSubgroups("com.google") + } + } mavenCentral() + maven { + url = uri("https://jitpack.io") + content { + includeGroup("com.github.tasks") + includeModule("com.github.bitfireAT", "cert4android") + includeModule("com.github.bitfireAT", "dav4jvm") + includeModule("com.github.tasks.opentasks", "opentasks-provider") + includeModule("com.github.QuadFlask", "colorpicker") + includeModule("com.github.twofortyfouram", "android-plugin-api-for-locale") + includeModule("com.github.franmontiel", "PersistentCookieJar") + } + } } }