Skip to content

Commit b740e18

Browse files
committed
use version catalog for SDK and Java versions
This commit refactors the build scripts to use the version catalog (`libs.versions.toml`) for managing SDK and Java versions. The following versions were updated in `gradle/libs.versions.toml`: - `compile-sdk` set to "36" - `min-sdk` set to "21" - `target-sdk` set to "36" - `jvm` set to "17" - `java` set to "17" - `gradle` from "8.0.2" to "8.13.0" - `kotlin` from "2.1.10" to "2.2.0" - `androidxCore` from "1.15.0" to "1.17.0" - `androidxAppCompat` from "1.7.0" to "1.7.1" - `material` from "1.12.0" to "1.13.0" - `androidxTestCore` from "1.6.1" to "1.7.0" - `androidxTestExtJunit` from "1.2.1" to "1.3.0" - `mockito` from "5.1.1" to "5.19.0" - `mockk` from "1.14.2" to "1.14.5" The `app/build.gradle` and `library/build.gradle` files were updated to reference these versions from the catalog.
1 parent 83fb7cd commit b740e18

3 files changed

Lines changed: 26 additions & 21 deletions

File tree

app/build.gradle

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ plugins {
55

66
android {
77
namespace = "com.iamageo.another_read_more"
8-
compileSdkVersion 35
8+
compileSdkVersion libs.versions.compile.sdk.get().toInteger()
99

1010
defaultConfig {
1111
applicationId "com.iamageo.another_read_more"
12-
minSdkVersion 21
13-
targetSdkVersion 35
12+
minSdkVersion libs.versions.min.sdk.get().toInteger()
13+
targetSdkVersion libs.versions.target.sdk.get().toInteger()
1414
versionCode 1
1515
versionName "1.0"
1616

@@ -25,12 +25,12 @@ android {
2525
}
2626

2727
compileOptions {
28-
sourceCompatibility JavaVersion.VERSION_17
29-
targetCompatibility JavaVersion.VERSION_17
28+
sourceCompatibility JavaVersion.toVersion(libs.versions.java.get())
29+
targetCompatibility JavaVersion.toVersion(libs.versions.java.get())
3030
}
3131

3232
kotlinOptions {
33-
jvmTarget = '17'
33+
jvmTarget = libs.versions.jvm.get()
3434
}
3535

3636
viewBinding {

gradle/libs.versions.toml

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,20 @@
11
[versions]
22
android = "8.13.0"
3-
gradle = "8.0.2"
4-
kotlin = "2.1.10"
5-
androidxCore = "1.15.0"
6-
androidxAppCompat = "1.7.0"
7-
material = "1.12.0"
8-
androidxTestCore = "1.6.1"
3+
compile-sdk = "36"
4+
min-sdk = "21"
5+
target-sdk = "36"
6+
jvm = "17"
7+
java = "17"
8+
gradle = "8.13.0"
9+
kotlin = "2.2.0"
10+
androidxCore = "1.17.0"
11+
androidxAppCompat = "1.7.1"
12+
material = "1.13.0"
13+
androidxTestCore = "1.7.0"
914
junit = "4.13.2"
10-
androidxTestExtJunit = "1.2.1"
11-
mockito = "5.1.1"
12-
mockk = "1.14.2"
15+
androidxTestExtJunit = "1.3.0"
16+
mockito = "5.19.0"
17+
mockk = "1.14.5"
1318

1419
[plugins]
1520
android-application = { id = "com.android.application", version.ref = "android" }

library/build.gradle

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ version = '1.0.6'
99

1010
android {
1111
namespace 'com.iamageo.library'
12-
compileSdkVersion 35
12+
compileSdkVersion libs.versions.compile.sdk.get().toInteger()
1313

1414
defaultConfig {
15-
minSdkVersion 21
16-
targetSdkVersion 35
15+
minSdkVersion libs.versions.min.sdk.get().toInteger()
16+
targetSdkVersion libs.versions.target.sdk.get().toInteger()
1717

1818
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
1919
consumerProguardFiles "consumer-rules.pro"
@@ -26,11 +26,11 @@ android {
2626
}
2727
}
2828
compileOptions {
29-
sourceCompatibility JavaVersion.VERSION_17
30-
targetCompatibility JavaVersion.VERSION_17
29+
sourceCompatibility JavaVersion.toVersion(libs.versions.java.get())
30+
targetCompatibility JavaVersion.toVersion(libs.versions.java.get())
3131
}
3232
kotlinOptions {
33-
jvmTarget = '17'
33+
jvmTarget = libs.versions.jvm.get()
3434
}
3535
}
3636

0 commit comments

Comments
 (0)