diff --git a/AnkiDroid/build.gradle b/AnkiDroid/build.gradle index 8a4a04fd5e..5487f9db74 100644 --- a/AnkiDroid/build.gradle +++ b/AnkiDroid/build.gradle @@ -35,7 +35,7 @@ static def gitCommitHash() { android { namespace "com.ichi2.anki" - compileSdk 34 // change api compileSdk at the same time + compileSdk libs.versions.compileSdk.get().toInteger() buildFeatures { buildConfig = true @@ -76,9 +76,9 @@ android { // needed for upgrades to be offered correctly. versionCode=21900104 versionName="2.19alpha4" - minSdk 23 // also in testlib/build.gradle.kts + minSdk libs.versions.minSdk.get().toInteger() // After #13695: change .tests_emulator.yml - targetSdk 33 // also in [api|testlib]/build.gradle.kts and ../robolectricDownloader.gradle + targetSdk libs.versions.targetSdk.get().toInteger() testApplicationId "com.ichi2.anki.tests" vectorDrawables.useSupportLibrary = true testInstrumentationRunner 'com.ichi2.testutils.NewCollectionPathTestRunner' diff --git a/api/build.gradle.kts b/api/build.gradle.kts index 35408a5bac..b7508fe0a4 100644 --- a/api/build.gradle.kts +++ b/api/build.gradle.kts @@ -16,14 +16,14 @@ kotlin { android { namespace = "com.ichi2.anki.api" - compileSdk = 34 + compileSdk = libs.versions.compileSdk.get().toInt() buildFeatures { buildConfig = true } defaultConfig { - minSdk = 16 + minSdk = libs.versions.minSdk.get().toInt() buildConfigField( "String", "READ_WRITE_PERMISSION", diff --git a/common/build.gradle.kts b/common/build.gradle.kts index f17ac924a2..90d195acdf 100644 --- a/common/build.gradle.kts +++ b/common/build.gradle.kts @@ -8,10 +8,10 @@ android { // but we can define files in 'com.ichi2.anki' inside 'common' // even with this namespace namespace = "com.ichi2.anki.common" - compileSdk = 34 + compileSdk = libs.versions.compileSdk.get().toInt() defaultConfig { - minSdk = 23 + 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 index 44b191042d..20eadb8407 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,4 +1,7 @@ [versions] +compileSdk = "34" +minSdk = "23" # also in testlib/build.gradle.kts +targetSdk = "33" # also in ../robolectricDownloader.gradle acra = '5.11.3' amazonappstorepublisher = "0.1.0" androidGradlePlugin = "8.4.1" diff --git a/testlib/build.gradle.kts b/testlib/build.gradle.kts index b205abed06..ddb7a47919 100644 --- a/testlib/build.gradle.kts +++ b/testlib/build.gradle.kts @@ -5,10 +5,10 @@ plugins { android { namespace = "com.ichi2.anki.testlib" - compileSdk = 34 + compileSdk = libs.versions.compileSdk.get().toInt() defaultConfig { - minSdk = 23 + minSdk = libs.versions.minSdk.get().toInt() } flavorDimensions += "appStore"