Skip to content

Commit 3a2dd08

Browse files
DanneD-WisemenDanneD-Wisemen
committed
Upgrade SDK versions and dependencies
- Updates `compileSdk` to 35 and `minSdk` to 26 across all modules. - Updates `kotlin` to 2.1.0. - Updates `ksp` to 2.1.0-1.0.29. - Updates `ktx` to 2.8.6. - Updates `gradle` to 8.8.0. - Updates `joda-time` to 2.12.7. - Updates `junit-ext` to 1.2.1. - Updates `material3` to 1.3.1. - Updates `mockk` to 1.13.12. - Updates `mockwebserver` to 4.12.0. - Updates `room` to 2.6.1. - Updates `gson` to 2.11.0. - Updates `retrofit` to 2.11.0. - Updates `okhttp` to 4.12.0. - Updates `core-ktx` to 1.15.0. - Updates `material` to 1.12.0. - Updates `lifecycle` to 2.8.7. - Updates `appcompat` to 1.7.0. - Updates `startup-runtime` to 1.2.0. - Updates `test-runner` to 1.6.2. - Updates `espresso-core` to 3.6.1. - Updates `constraintlayout` to 2.2.0. - Updates `paging-runtime` to 3.3.5. - Updates `navigation` to 2.8.6. - Updates `glide` to 4.16.0. - Updates `androidx.compose:compose-bom` to 2025.01.01 - Updates `androidx.core:core-ktx`, `androidx.appcompat:appcompat`, `com.google.android.material:material` and all compose dependencies with the ones that use the `libs` convention.
1 parent fa6df2e commit 3a2dd08

File tree

8 files changed

+72
-62
lines changed

8 files changed

+72
-62
lines changed

‎core-compose/build.gradle.kts‎

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -34,25 +34,22 @@ android {
3434
buildFeatures {
3535
compose = true
3636
}
37-
composeOptions {
38-
kotlinCompilerExtensionVersion = "1.4.2"
39-
}
4037
}
4138

4239
dependencies {
4340
implementation(project(":core"))
4441

45-
implementation("androidx.core:core-ktx:1.12.0")
46-
implementation("androidx.appcompat:appcompat:1.6.1")
47-
implementation("com.google.android.material:material:1.11.0")
42+
implementation(libs.core.ktx)
43+
implementation(libs.appcompat)
44+
implementation(libs.material)
4845

49-
implementation("androidx.compose.material3:material3:1.1.2")
46+
implementation(libs.material3)
5047

51-
implementation(platform("androidx.compose:compose-bom:2023.10.01"))
52-
implementation("androidx.compose.ui:ui")
53-
implementation("androidx.compose.ui:ui-graphics")
54-
implementation("androidx.compose.ui:ui-tooling")
55-
implementation("androidx.compose.ui:ui-tooling-preview")
56-
debugImplementation("androidx.compose.ui:ui-test-manifest")
57-
implementation("androidx.compose.ui:ui-test-junit4")
48+
implementation(platform(libs.compose.bom))
49+
implementation(libs.ui)
50+
implementation(libs.ui.graphics)
51+
implementation(libs.ui.tooling)
52+
implementation(libs.ui.tooling.preview)
53+
debugImplementation(libs.ui.test.manifest)
54+
implementation(libs.ui.test.junit4)
5855
}

‎core/build.gradle.kts‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ plugins {
88
}
99

1010
android {
11-
compileSdk = 34
11+
compileSdk = 35
1212

1313
defaultConfig {
14-
minSdk = 21
14+
minSdk = 26
1515

1616
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
1717
consumerProguardFiles("consumer-rules.pro")
@@ -44,11 +44,9 @@ android {
4444
dependencies {
4545
implementation(libs.startup.runtime)
4646

47-
testImplementation(libs.mockk)
48-
testImplementation(libs.junit)
49-
androidTestImplementation(libs.junit.ext)
50-
androidTestImplementation(libs.test.runner)
51-
androidTestImplementation(libs.espresso.core)
47+
// https://github.com/Ereza/CustomActivityOnCrash
48+
implementation(libs.customactivityoncrash)
49+
5250
api(libs.core.ktx)
5351

5452
api(libs.multidex)
@@ -98,8 +96,11 @@ dependencies {
9896
// Time manipulation for Java 7
9997
api(libs.joda.time)
10098

101-
// https://github.com/Ereza/CustomActivityOnCrash
102-
implementation(libs.customactivityoncrash)
99+
testImplementation(libs.mockk)
100+
testImplementation(libs.junit)
101+
androidTestImplementation(libs.junit.ext)
102+
androidTestImplementation(libs.test.runner)
103+
androidTestImplementation(libs.espresso.core)
103104
}
104105

105106
val sourceJar: Task by tasks.creating(Jar::class) {

‎data/networking/build.gradle.kts‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ plugins {
66
}
77

88
android {
9-
compileSdk = 34
9+
compileSdk = 35
1010

1111
defaultConfig {
12-
minSdk = 21
12+
minSdk = 26
1313

1414
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
1515
consumerProguardFiles("consumer-rules.pro")
@@ -38,11 +38,6 @@ dependencies {
3838
implementation(project(":core"))
3939
implementation(project(":data:networking:proxyman"))
4040

41-
implementation(libs.kotlin.stdlib)
42-
testImplementation(libs.junit)
43-
androidTestImplementation(libs.junit.ext)
44-
androidTestImplementation(libs.espresso.core)
45-
4641
//compress images for uploads
4742
implementation(libs.zelory.compressor)
4843

@@ -53,6 +48,11 @@ dependencies {
5348

5449
api(libs.okhttp)
5550
api(libs.okhttp.logging.interceptor)
51+
52+
implementation(libs.kotlin.stdlib)
53+
testImplementation(libs.junit)
54+
androidTestImplementation(libs.junit.ext)
55+
androidTestImplementation(libs.espresso.core)
5656
}
5757

5858
val sourceJar: Task by tasks.creating(Jar::class) {

‎data/networking/proxyman/build.gradle.kts‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ plugins {
55
}
66

77
android {
8-
compileSdk = 34
8+
compileSdk = 35
99

1010
defaultConfig {
11-
minSdk = 21
11+
minSdk = 26
1212

1313
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
1414
consumerProguardFiles("consumer-rules.pro")
@@ -36,11 +36,6 @@ android {
3636
dependencies {
3737
implementation(project(":core"))
3838

39-
implementation(libs.kotlin.stdlib)
40-
testImplementation(libs.junit)
41-
androidTestImplementation(libs.junit.ext)
42-
androidTestImplementation(libs.espresso.core)
43-
4439
//compress images for uploads
4540
implementation(libs.zelory.compressor)
4641

@@ -51,4 +46,9 @@ dependencies {
5146

5247
implementation(libs.okhttp)
5348
implementation(libs.okhttp.logging.interceptor)
49+
50+
implementation(libs.kotlin.stdlib)
51+
testImplementation(libs.junit)
52+
androidTestImplementation(libs.junit.ext)
53+
androidTestImplementation(libs.espresso.core)
5454
}

‎data/paging/build.gradle.kts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ plugins {
99
group = "com.github.appwise-labs"
1010

1111
android {
12-
compileSdk = 34
12+
compileSdk = 35
1313

1414
defaultConfig {
15-
minSdk = 21
15+
minSdk = 26
1616

1717
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
1818
consumerProguardFiles("consumer-rules.pro")

‎data/room/build.gradle.kts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ plugins {
1010
group = "com.github.appwise-labs"
1111

1212
android {
13-
compileSdk = 34
13+
compileSdk = 35
1414

1515
defaultConfig {
16-
minSdk = 21
16+
minSdk = 26
1717

1818
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
1919
consumerProguardFiles("consumer-rules.pro")

‎gradle/libs.versions.toml‎

Lines changed: 31 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,55 @@
11
[versions]
2+
compose-bom = "2025.01.01"
23
kotlin = "2.1.0"
34
ksp = "2.1.0-1.0.29"
45
ktx = "2.8.6"
56
gradle = "8.8.0"
67
hawk = "2.0.1"
7-
joda-time = "2.12.2"
8+
joda-time = "2.12.7"
89

910
junit = "4.13.2"
10-
junit-ext = "1.1.5"
11+
junit-ext = "1.2.1"
1112

1213
logger = "2.2.0"
14+
material3 = "1.3.1"
1315
mockinizer = "1.6.0"
14-
mockk = "1.13.4"
15-
mockwebserver = "4.10.0"
16+
mockk = "1.13.12"
17+
mockwebserver = "4.12.0"
1618
multidex = "2.0.1"
1719

18-
room = "2.6.0"
19-
gson = "2.10.1"
20-
retrofit = "2.9.0"
21-
okhttp = "4.10.0"
22-
core-ktx = "1.12.0"
23-
material = "1.10.0"
24-
lifecycle = "2.6.2"
25-
appcompat = "1.6.1"
20+
room = "2.6.1"
21+
gson = "2.11.0"
22+
retrofit = "2.11.0"
23+
okhttp = "4.12.0"
24+
core-ktx = "1.15.0"
25+
material = "1.12.0"
26+
lifecycle = "2.8.7"
27+
appcompat = "1.7.0"
2628

27-
startup-runtime = "1.1.1"
29+
startup-runtime = "1.2.0"
2830
swiperefreshlayout = "1.1.0"
29-
test-runner = "1.5.2"
30-
espresso-core = "3.5.1"
31+
test-runner = "1.6.2"
32+
espresso-core = "3.6.1"
3133

32-
constraintlayout = "2.1.4"
33-
paging-runtime = "3.2.1"
34+
constraintlayout = "2.2.0"
35+
paging-runtime = "3.3.5"
3436
easyimage = "3.2.0"
3537
customactivityoncrash = "2.4.0"
36-
navigation = "2.7.4"
37-
glide = "4.15.1"
38+
navigation = "2.8.6"
39+
glide = "4.16.0"
3840
material-dialogs = "3.3.0"
3941
zelory-compressor = "3.0.1"
4042

4143
[libraries]
44+
compose-bom = { module = "androidx.compose:compose-bom", version.ref = "compose-bom" }
4245
hawk = { module = "com.orhanobut:hawk", version.ref = "hawk" }
4346
joda-time = { module = "joda-time:joda-time", version.ref = "joda-time" }
4447

4548
junit = { module = "junit:junit", version.ref = "junit" }
4649
junit-ext = { module = "androidx.test.ext:junit", version.ref = "junit-ext" }
4750

4851
logger = { module = "com.orhanobut:logger", version.ref = "logger" }
52+
material3 = { module = "androidx.compose.material3:material3", version.ref = "material3" }
4953
mockinizer = { module = "com.github.donfuxx:Mockinizer", version.ref = "mockinizer" }
5054
mockk = { module = "io.mockk:mockk", version.ref = "mockk" }
5155
mockwebserver = { module = "com.squareup.okhttp3:mockwebserver", version.ref = "mockwebserver" }
@@ -92,6 +96,14 @@ constraintlayout = { module = "androidx.constraintlayout:constraintlayout", vers
9296
paging-runtime = { module = "androidx.paging:paging-runtime", version.ref = "paging-runtime" }
9397
easyimage = { module = "com.github.jkwiecien:EasyImage", version.ref = "easyimage" }
9498
customactivityoncrash = { module = "cat.ereza:customactivityoncrash", version.ref = "customactivityoncrash" }
99+
100+
ui = { module = "androidx.compose.ui:ui" }
101+
ui-graphics = { module = "androidx.compose.ui:ui-graphics" }
102+
ui-test-junit4 = { module = "androidx.compose.ui:ui-test-junit4" }
103+
ui-test-manifest = { module = "androidx.compose.ui:ui-test-manifest" }
104+
ui-tooling = { module = "androidx.compose.ui:ui-tooling" }
105+
ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview" }
106+
95107
zelory-compressor = { module = "id.zelory:compressor", version.ref = "zelory-compressor" }
96108

97109

‎list/emptyRecyclerView/build.gradle.kts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ plugins {
88
group = "com.github.appwise-labs"
99

1010
android {
11-
compileSdk = 34
11+
compileSdk = 35
1212

1313
defaultConfig {
14-
minSdk = 21
14+
minSdk = 26
1515

1616
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
1717
consumerProguardFiles("consumer-rules.pro")

0 commit comments

Comments
 (0)