Skip to content

Commit 5790654

Browse files
authored
Upgrade dependencies (#39)
* Upgrade dependencies Signed-off-by: Arnau Mora Gras <[email protected]> * Using new Compose Compiler plugin Signed-off-by: Arnau Mora Gras <[email protected]> * Upgrade AGP Signed-off-by: Arnau Mora Gras <[email protected]> --------- Signed-off-by: Arnau Mora Gras <[email protected]>
1 parent f1cc9b9 commit 5790654

File tree

4 files changed

+15
-20
lines changed

4 files changed

+15
-20
lines changed

build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
plugins {
33
alias(libs.plugins.android.application) apply false
44
alias(libs.plugins.android.library) apply false
5+
alias(libs.plugins.compose.compiler) apply false
56
alias(libs.plugins.dokka) apply false
67
alias(libs.plugins.kotlin.android) apply false
78
}

gradle/libs.versions.toml

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,18 @@
11
[versions]
2-
agp = "8.3.1"
3-
androidx-activityCompose = "1.8.2"
4-
androidx-appcompat = "1.6.1"
5-
androidx-core = "1.12.0"
6-
androidx-lifecycle = "2.7.0"
7-
androidx-test-core = "1.5.0"
8-
androidx-test-runner = "1.5.2"
9-
androidx-test-rules = "1.5.0"
2+
agp = "8.6.0"
3+
androidx-activityCompose = "1.9.2"
4+
androidx-appcompat = "1.7.0"
5+
androidx-core = "1.13.1"
6+
androidx-lifecycle = "2.8.5"
7+
androidx-test-core = "1.6.1"
8+
androidx-test-runner = "1.6.2"
9+
androidx-test-rules = "1.6.1"
1010
conscrypt = "2.5.2"
11-
compose-bom = "2024.03.00"
12-
# https://developer.android.com/jetpack/androidx/releases/compose-kotlin
13-
compose-compiler = "1.5.11"
11+
compose-bom = "2024.09.01"
1412
dokka = "1.9.10"
1513
junit = "4.13.2"
16-
kotlin = "1.9.23"
17-
mockk = "1.13.10"
14+
kotlin = "2.0.20"
15+
mockk = "1.13.12"
1816
okhttp3 = "4.12.0"
1917

2018
[libraries]
@@ -43,5 +41,6 @@ okttp3-mockwebserver = { module = "com.squareup.okhttp3:mockwebserver", version.
4341
[plugins]
4442
android-application = { id = "com.android.application", version.ref = "agp" }
4543
android-library = { id = "com.android.library", version.ref = "agp" }
44+
compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
4645
kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
4746
dokka = { id = "org.jetbrains.dokka", version.ref = "dokka" }

lib/build.gradle.kts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
plugins {
22
alias(libs.plugins.android.library)
3+
alias(libs.plugins.compose.compiler)
34
alias(libs.plugins.dokka)
45
alias(libs.plugins.kotlin.android)
56
`maven-publish`
@@ -33,10 +34,6 @@ android {
3334
compose = true
3435
}
3536

36-
composeOptions {
37-
kotlinCompilerExtensionVersion = libs.versions.compose.compiler.get()
38-
}
39-
4037
lint {
4138
disable += listOf("MissingTranslation", "ExtraTranslation")
4239
}

sample-app/build.gradle.kts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
plugins {
22
alias(libs.plugins.android.application)
3+
alias(libs.plugins.compose.compiler)
34
alias(libs.plugins.kotlin.android)
45
}
56

@@ -37,9 +38,6 @@ android {
3738
buildFeatures {
3839
compose = true
3940
}
40-
composeOptions {
41-
kotlinCompilerExtensionVersion = libs.versions.compose.compiler.get() // keep in sync with Kotlin version in top-level build.gradle
42-
}
4341
packaging {
4442
resources {
4543
excludes.add("/META-INF/{AL2.0,LGPL2.1}")

0 commit comments

Comments
 (0)