Skip to content

Commit aeb2a45

Browse files
committed
Bump compose (Android) to 1.9.0
1 parent 33c89d6 commit aeb2a45

File tree

3 files changed

+21
-21
lines changed

3 files changed

+21
-21
lines changed

build.gradle.kts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11

22
import com.kizitonwose.calendar.buildsrc.Version
33
import com.kizitonwose.calendar.buildsrc.Version.isNoPublish
4-
import com.kizitonwose.calendar.buildsrc.androidProjects
5-
import com.kizitonwose.calendar.buildsrc.multiplatformProjects
4+
import com.kizitonwose.calendar.buildsrc.androidLibProjects
5+
import com.kizitonwose.calendar.buildsrc.multiplatformLibProjects
66
import org.jetbrains.kotlin.gradle.dsl.KotlinProjectExtension
77
import org.jetbrains.kotlin.gradle.plugin.KotlinBasePlugin
88
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
@@ -45,8 +45,8 @@ allprojects {
4545
afterEvaluate {
4646
// Android and Multiplatform libraries are published separately
4747
// See https://github.com/kizitonwose/Calendar/pull/561
48-
disableMavenPublicationsIfNeeded(multiplatformProjects, Version.multiplatform)
49-
disableMavenPublicationsIfNeeded(androidProjects, Version.android)
48+
disableMavenPublicationsIfNeeded(multiplatformLibProjects, Version.multiplatform)
49+
disableMavenPublicationsIfNeeded(androidLibProjects, Version.android)
5050
}
5151
}
5252

buildSrc/src/main/java/com/kizitonwose/calendar/buildsrc/Build.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ private const val VERSION_NO_PUBLISH = "NO_PUBLISH"
2121

2222
object Android {
2323
const val minSdk = 21
24-
const val targetSdk = 35
25-
const val compileSdk = 35
24+
const val targetSdk = 36
25+
const val compileSdk = 36
2626
}
2727

28-
val multiplatformProjects = listOf("library")
29-
val androidProjects = listOf("core", "data", "view", "compose")
28+
val multiplatformLibProjects = listOf("library")
29+
val androidLibProjects = listOf("core", "data", "view", "compose")

gradle/libs.versions.toml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
[versions]
2-
agp = "8.11.1"
3-
kotlin = "2.2.0"
4-
composeAndroid = "1.8.3"
2+
agp = "8.12.0"
3+
kotlin = "2.2.10"
4+
composeAndroid = "1.9.0"
55
composeMultiplatform = "1.8.2"
6-
espresso = "3.6.1"
7-
junit5 = "5.13.3"
6+
espresso = "3.7.0"
7+
junit5 = "5.13.4"
88
kotlinxSerialization = "1.9.0"
99

1010
[libraries]
@@ -17,17 +17,17 @@ desugar = { module = "com.android.tools:desugar_jdk_libs", version = "2.1.5" }
1717

1818
androidx-annotation = { module = "androidx.annotation:annotation", version = "1.9.1" }
1919
androidx-appcompat = { module = "androidx.appcompat:appcompat", version = "1.7.1" }
20-
androidx-core-ktx = { module = "androidx.core:core-ktx", version = "1.16.0" }
20+
androidx-core-ktx = { module = "androidx.core:core-ktx", version = "1.17.0" }
2121
androidx-constraintlayout = { module = "androidx.constraintlayout:constraintlayout", version = "2.2.1" }
2222
androidx-recyclerview = { module = "androidx.recyclerview:recyclerview", version = "1.4.0" }
2323
androidx-cardview = { module = "androidx.cardview:cardview", version = "1.0.0" }
2424
material-view = { module = "com.google.android.material:material", version = "1.12.0" }
2525

2626
androidx-test-espresso-core = { module = "androidx.test.espresso:espresso-core", version.ref = "espresso" }
2727
androidx-test-espresso-contrib = { module = "androidx.test.espresso:espresso-contrib", version.ref = "espresso" }
28-
androidx-test-runner = { module = "androidx.test:runner", version = "1.6.2" }
29-
androidx-test-rules = { module = "androidx.test:rules", version = "1.6.1" }
30-
androidx-test-junit = { module = "androidx.test.ext:junit", version = "1.2.1" }
28+
androidx-test-runner = { module = "androidx.test:runner", version = "1.7.0" }
29+
androidx-test-rules = { module = "androidx.test:rules", version = "1.7.0" }
30+
androidx-test-junit = { module = "androidx.test.ext:junit", version = "1.3.0" }
3131
test-junit4 = { module = "junit:junit", version = "4.13.2" }
3232
test-junit5-bom = { group = "org.junit", name = "junit-bom", version.ref = "junit5" }
3333
test-junit5-api = { group = "org.junit.jupiter", name = "junit-jupiter-api" }
@@ -40,12 +40,12 @@ compose-ui-tooling = { module = "androidx.compose.ui:ui-tooling", version.ref =
4040
compose-runtime = { module = "androidx.compose.runtime:runtime", version.ref = "composeAndroid" }
4141
compose-material3 = { module = "androidx.compose.material3:material3", version = "1.3.2" }
4242
compose-activity = { module = "androidx.activity:activity-compose", version = "1.10.1" }
43-
compose-navigation = { module = "androidx.navigation:navigation-compose", version = "2.9.1" }
43+
compose-navigation = { module = "androidx.navigation:navigation-compose", version = "2.9.3" }
4444

4545
compose-ui-test-junit4 = { module = "androidx.compose.ui:ui-test-junit4", version.ref = "composeAndroid" }
4646
compose-ui-test-manifest = { module = "androidx.compose.ui:ui-test-manifest", version.ref = "composeAndroid" }
4747

48-
jetbrains-compose-navigation = { module = "org.jetbrains.androidx.navigation:navigation-compose", version = "2.9.0-beta03" }
48+
jetbrains-compose-navigation = { module = "org.jetbrains.androidx.navigation:navigation-compose", version = "2.9.0-beta05" }
4949
jetbrains-material-icons = { module = "org.jetbrains.compose.material:material-icons-core", version = "1.7.3" }
5050

5151
[plugins]
@@ -54,8 +54,8 @@ androidLibrary = { id = "com.android.library", version.ref = "agp" }
5454
composeCompiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
5555
kotlinJvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
5656
kotlinAndroid = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
57-
kotlinter = { id = "org.jmailen.kotlinter", version = "5.1.1" }
58-
mavenPublish = { id = "com.vanniktech.maven.publish", version = "0.33.0" }
57+
kotlinter = { id = "org.jmailen.kotlinter", version = "5.2.0" }
58+
mavenPublish = { id = "com.vanniktech.maven.publish", version = "0.34.0" }
5959
versionCheck = { id = "com.github.ben-manes.versions", version = "0.52.0" }
6060
bcv = "org.jetbrains.kotlinx.binary-compatibility-validator:0.18.1"
6161

0 commit comments

Comments
 (0)