Skip to content

Commit bc51f17

Browse files
committed
chore: Update dependencies and Gradle version
- **Dependency Updates**: - Upgrade Android Gradle Plugin (AGP) from `9.0.0-rc02` to `9.0.0`. - Upgrade Gradle Wrapper from `9.2.1` to `9.3.0`. - Upgrade Compose Multiplatform to `1.10.0` and related UI tooling/testing libraries to `1.10.1`. - Upgrade Firebase BOM to `34.8.0`. - Upgrade `jdbcSQLite` to `3.51.2.0`. - Update various AndroidX libraries including Paging (`3.4.0-rc01`) and Navigation. - **Build Configuration**: - **Android**: Implement a resolution strategy in `app/android/build.gradle.kts` to force consistent versions for `androidx.lifecycle`, `androidx.savedstate`, and other transitive dependencies to resolve version conflicts. - **Android**: Update `packagingOptions` to the modern `packaging` DSL for resource exclusions. - **Web**: Remove experimental `web.application` configuration from `core/presentation`. - **Project Metadata**: Update IDE-specific user interface state for the iOS project.
1 parent 37fb8e7 commit bc51f17

File tree

5 files changed

+26
-14
lines changed

5 files changed

+26
-14
lines changed

app/android/build.gradle.kts

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ android {
5959
buildConfig = true
6060
compose = true
6161
}
62-
packagingOptions.resources.excludes.add("/META-INF/{AL2.0,LGPL2.1}")
62+
packaging.resources.excludes.add("/META-INF/{AL2.0,LGPL2.1}")
6363
testOptions {
6464
execution = "ANDROIDX_TEST_ORCHESTRATOR"
6565
emulatorControl.enable = true
@@ -116,3 +116,19 @@ dependencies {
116116
tasks.withType<UploadMappingFileTask> {
117117
dependsOn("processDebugGoogleServices")
118118
}
119+
120+
configurations.all {
121+
resolutionStrategy {
122+
sequenceOf(
123+
"common", "common-java8", "runtime", "runtime-ktx", "runtime-compose", "viewmodel", "viewmodel-ktx", "viewmodel-compose", "viewmodel-savedstate", "livedata", "livedata-core", "livedata-core-ktx", "process"
124+
).forEach { depName: String ->
125+
force("androidx.lifecycle:lifecycle-$depName:${libs.versions.androidxLifecycle.get()}")
126+
}
127+
force("androidx.savedstate:savedstate:1.4.0")
128+
force("androidx.savedstate:savedstate-ktx:1.4.0")
129+
force("androidx.savedstate:savedstate-compose:1.4.0")
130+
131+
force("androidx.concurrent:concurrent-futures:1.2.0")
132+
force("com.google.errorprone:error_prone_annotations:2.30.0")
133+
}
134+
}
Binary file not shown.

core/presentation/build.gradle.kts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,3 @@ kotlin {
7373
dependencies {
7474
coreLibraryDesugaring(libs.desugar)
7575
}
76-
77-
compose.experimental {
78-
web.application {}
79-
}

gradle/libs.versions.toml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,18 @@ minSdk = "23"
55
jdk = "17"
66
kotlin = "2.3.0"
77
ksp = "2.3.2"
8-
agp = "9.0.0-rc02"
8+
agp = "9.0.0"
99
gms = "4.4.4"
1010
crashlytics = "3.0.6"
11-
compose = "1.9.3"
11+
compose = "1.10.0"
1212
coroutines = "1.10.2"
1313
sqlDelight = "2.2.1"
1414
room = "2.8.4"
1515
androidxSqlite = "2.6.2"
1616
saferoom = "1.4.0"
1717
androidSqlCipher = "4.12.0"
1818
iosSqlCipher = "4.9.0"
19-
jdbcSQLite = "3.50.1.0"
19+
jdbcSQLite = "3.51.2.0"
2020
koin-bom = "4.1.1"
2121
kotlinx-serialization = "1.9.0"
2222
kotlinx-datetime = "0.7.1"
@@ -28,16 +28,16 @@ androidxAppcompat = "1.7.1"
2828
androidxViewModel = "2.9.6"
2929
androidxNavigation = "2.9.1"
3030
androidxActivityCompose = "1.12.2"
31-
androidxComposeTest = "1.10.0"
31+
androidxComposeTest = "1.10.1"
3232
androidxCoreSplashscreen = "1.2.0"
3333
androidxTracing = "1.3.0"
3434
androidxLifecycle = "2.10.0"
3535
androidxArch = "2.2.0"
36-
androidxPaging = "3.4.0-beta01"
36+
androidxPaging = "3.4.0-rc01"
3737
androidxTestExt = "1.3.0"
3838
androidxTest = "1.7.0"
3939
androidxTestOrchestrator = "1.6.1"
40-
firebase = "34.7.0"
40+
firebase = "34.8.0"
4141
leakCanary = "2.14"
4242
junit = "4.13.2"
4343
mockito = "5.21.0"
@@ -46,7 +46,7 @@ espresso = "3.7.0"
4646
desugar = "2.1.5"
4747
androidSecurityLint = "1.0.4"
4848
appdirs = "1.5.0"
49-
uiTooling = "1.10.0"
49+
uiTooling = "1.10.1"
5050
download = "5.6.0"
5151
okio = "3.16.4"
5252
accompanist-permissions = "0.37.3"

gradle/wrapper/gradle-wrapper.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
#Sun Nov 30 01:01:08 GET 2025
1+
#Mon Jan 19 22:19:31 GET 2026
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-all.zip
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.0-all.zip
55
networkTimeout=10000
66
validateDistributionUrl=true
77
zipStoreBase=GRADLE_USER_HOME

0 commit comments

Comments
 (0)