Merge pull request #627 from kizitonwose/compose_1.9

Author: kizitonwose

.github/workflows/gradle-wrapper.yaml

@@ -138,6 +138,7 @@ For the compose calendar library, ensure that you are using the library version
 |   1.6.x    |          2.5.x           |             2.5.x              |
 |   1.7.x    |          2.6.x           |             2.6.x              |
 |   1.8.x    |      2.7.x - 2.8.x       |         2.7.x - 2.8.x          |
+|   1.9.x    |          2.9.x           |             2.9.x              |
 
 ## Usage
 

README.md

@@ -1,8 +1,8 @@
 
 import com.kizitonwose.calendar.buildsrc.Version
 import com.kizitonwose.calendar.buildsrc.Version.isNoPublish
-import com.kizitonwose.calendar.buildsrc.androidProjects
-import com.kizitonwose.calendar.buildsrc.multiplatformProjects
+import com.kizitonwose.calendar.buildsrc.androidLibProjects
+import com.kizitonwose.calendar.buildsrc.multiplatformLibProjects
 import org.jetbrains.kotlin.gradle.dsl.KotlinProjectExtension
 import org.jetbrains.kotlin.gradle.plugin.KotlinBasePlugin
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
@@ -45,8 +45,8 @@ allprojects {
     afterEvaluate {
         // Android and Multiplatform libraries are published separately
         // See https://github.com/kizitonwose/Calendar/pull/561
-        disableMavenPublicationsIfNeeded(multiplatformProjects, Version.multiplatform)
-        disableMavenPublicationsIfNeeded(androidProjects, Version.android)
+        disableMavenPublicationsIfNeeded(multiplatformLibProjects, Version.multiplatform)
+        disableMavenPublicationsIfNeeded(androidLibProjects, Version.android)
     }
 }
 

build.gradle.kts

@@ -11,8 +11,8 @@ object Config {
 }
 
 object Version {
-    const val android = "2.8.1-SNAPSHOT"
-    const val multiplatform = "2.8.1-SNAPSHOT"
+    const val android = "2.9.1-SNAPSHOT"
+    const val multiplatform = "2.9.1-SNAPSHOT"
 
     fun String.isNoPublish() = this == VERSION_NO_PUBLISH
 }
@@ -21,9 +21,9 @@ private const val VERSION_NO_PUBLISH = "NO_PUBLISH"
 
 object Android {
     const val minSdk = 21
-    const val targetSdk = 35
-    const val compileSdk = 35
+    const val targetSdk = 36
+    const val compileSdk = 36
 }
 
-val multiplatformProjects = listOf("library")
-val androidProjects = listOf("core", "data", "view", "compose")
+val multiplatformLibProjects = listOf("library")
+val androidLibProjects = listOf("core", "data", "view", "compose")

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

@@ -47,8 +47,7 @@ kotlin {
 
     sourceSets {
         val commonMain by getting
-        val jsMain by getting
-        val wasmJsMain by getting
+        val webMain by getting
         val nativeMain by getting
         val desktopMain by getting
         val androidMain by getting
@@ -66,16 +65,10 @@ kotlin {
             implementation(compose.components.resources)
             implementation(compose.components.uiToolingPreview)
             implementation(libs.androidx.annotation)
-            compileOnly(libs.kotlinx.serialization.core)
+            implementation(libs.kotlinx.serialization.core)
             api(libs.kotlinx.datetime)
         }
 
-        val webMain by creating {
-            dependsOn(commonMain)
-            jsMain.dependsOn(this)
-            wasmJsMain.dependsOn(this)
-        }
-
         val nonJvmMain by creating {
             dependsOn(commonMain)
             nativeMain.dependsOn(this)

compose-multiplatform/library/api/library.klib.api

@@ -67,11 +67,10 @@ kotlin {
 
     sourceSets {
         val commonMain by getting
-        val jsMain by getting
-        val wasmJsMain by getting
         val nativeMain by getting
         val desktopMain by getting
         val androidMain by getting
+        val webMain by getting
         val jvmMain by creating {
             dependsOn(commonMain)
         }
@@ -91,11 +90,6 @@ kotlin {
             implementation(libs.jetbrains.compose.navigation)
             implementation(libs.jetbrains.material.icons)
         }
-        val webMain by creating {
-            dependsOn(commonMain)
-            jsMain.dependsOn(this)
-            wasmJsMain.dependsOn(this)
-        }
         val nonJvmMain by creating {
             dependsOn(commonMain)
             nativeMain.dependsOn(this)

compose-multiplatform/library/build.gradle.kts

@@ -1,10 +1,10 @@
 [versions]
-agp = "8.11.1"
-kotlin = "2.2.0"
-composeAndroid = "1.8.3"
-composeMultiplatform = "1.8.2"
-espresso = "3.6.1"
-junit5 = "5.13.3"
+agp = "8.13.0"
+kotlin = "2.2.20"
+composeAndroid = "1.9.1"
+composeMultiplatform = "1.9.0"
+espresso = "3.7.0"
+junit5 = "5.13.4"
 kotlinxSerialization = "1.9.0"
 
 [libraries]
@@ -17,17 +17,17 @@ desugar = { module = "com.android.tools:desugar_jdk_libs", version = "2.1.5" }
 
 androidx-annotation = { module = "androidx.annotation:annotation", version = "1.9.1" }
 androidx-appcompat = { module = "androidx.appcompat:appcompat", version = "1.7.1" }
-androidx-core-ktx = { module = "androidx.core:core-ktx", version = "1.16.0" }
+androidx-core-ktx = { module = "androidx.core:core-ktx", version = "1.17.0" }
 androidx-constraintlayout = { module = "androidx.constraintlayout:constraintlayout", version = "2.2.1" }
 androidx-recyclerview = { module = "androidx.recyclerview:recyclerview", version = "1.4.0" }
 androidx-cardview = { module = "androidx.cardview:cardview", version = "1.0.0" }
-material-view = { module = "com.google.android.material:material", version = "1.12.0" }
+material-view = { module = "com.google.android.material:material", version = "1.13.0" }
 
 androidx-test-espresso-core = { module = "androidx.test.espresso:espresso-core", version.ref = "espresso" }
 androidx-test-espresso-contrib = { module = "androidx.test.espresso:espresso-contrib", version.ref = "espresso" }
-androidx-test-runner = { module = "androidx.test:runner", version = "1.6.2" }
-androidx-test-rules = { module = "androidx.test:rules", version = "1.6.1" }
-androidx-test-junit = { module = "androidx.test.ext:junit", version = "1.2.1" }
+androidx-test-runner = { module = "androidx.test:runner", version = "1.7.0" }
+androidx-test-rules = { module = "androidx.test:rules", version = "1.7.0" }
+androidx-test-junit = { module = "androidx.test.ext:junit", version = "1.3.0" }
 test-junit4 = { module = "junit:junit", version = "4.13.2" }
 test-junit5-bom = { group = "org.junit", name = "junit-bom", version.ref = "junit5" }
 test-junit5-api = { group = "org.junit.jupiter", name = "junit-jupiter-api" }
@@ -39,13 +39,13 @@ compose-foundation = { module = "androidx.compose.foundation:foundation", versio
 compose-ui-tooling = { module = "androidx.compose.ui:ui-tooling", version.ref = "composeAndroid" }
 compose-runtime = { module = "androidx.compose.runtime:runtime", version.ref = "composeAndroid" }
 compose-material3 = { module = "androidx.compose.material3:material3", version = "1.3.2" }
-compose-activity = { module = "androidx.activity:activity-compose", version = "1.10.1" }
-compose-navigation = { module = "androidx.navigation:navigation-compose", version = "2.9.1" }
+compose-activity = { module = "androidx.activity:activity-compose", version = "1.11.0" }
+compose-navigation = { module = "androidx.navigation:navigation-compose", version = "2.9.4" }
 
 compose-ui-test-junit4 = { module = "androidx.compose.ui:ui-test-junit4", version.ref = "composeAndroid" }
 compose-ui-test-manifest = { module = "androidx.compose.ui:ui-test-manifest", version.ref = "composeAndroid" }
 
-jetbrains-compose-navigation = { module = "org.jetbrains.androidx.navigation:navigation-compose", version = "2.9.0-beta03" }
+jetbrains-compose-navigation = { module = "org.jetbrains.androidx.navigation:navigation-compose", version = "2.9.0" }
 jetbrains-material-icons = { module = "org.jetbrains.compose.material:material-icons-core", version = "1.7.3" }
 
 [plugins]
@@ -54,8 +54,8 @@ androidLibrary = { id = "com.android.library", version.ref = "agp" }
 composeCompiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
 kotlinJvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
 kotlinAndroid = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
-kotlinter = { id = "org.jmailen.kotlinter", version = "5.1.1" }
-mavenPublish = { id = "com.vanniktech.maven.publish", version = "0.33.0" }
+kotlinter = { id = "org.jmailen.kotlinter", version = "5.2.0" }
+mavenPublish = { id = "com.vanniktech.maven.publish", version = "0.34.0" }
 versionCheck = { id = "com.github.ben-manes.versions", version = "0.52.0" }
 bcv = "org.jetbrains.kotlinx.binary-compatibility-validator:0.18.1"
 

compose-multiplatform/sample/build.gradle.kts

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME