Update Kotlin & Compose (JetBrains#148)

This requires migration to the new Compose compiler plugin. Parcelize shouldn't be an expect/actual annotation anymore as well.

Author: kropp

.gitignore

@@ -23,6 +23,7 @@ Pods/
 .settings
 .classpath
 .gradletasknamecache
+.kotlin
 
 *.db
 androidApp/src/main/res/values/strings.xml

androidApp/build.gradle.kts

@@ -1,6 +1,7 @@
 plugins {
     alias(libs.plugins.kotlinMultiplatform)
     alias(libs.plugins.jetbrainsCompose)
+    alias(libs.plugins.compose.compiler)
     alias(libs.plugins.androidApplication)
 }
 

build.gradle.kts

@@ -10,9 +10,11 @@ plugins {
     alias(libs.plugins.androidApplication) apply false
     alias(libs.plugins.androidLibrary) apply false
     alias(libs.plugins.jetbrainsCompose) apply false
+    alias(libs.plugins.kotlinParcelize) apply false
     alias(libs.plugins.kotlinMultiplatform) apply false
     alias(libs.plugins.kotlinSerialization) apply false
     alias(libs.plugins.kotlinJvm) apply false
+    alias(libs.plugins.compose.compiler) apply false
 }
 
 tasks.wrapper {

gradle.properties

@@ -1,5 +1,6 @@
 #Gradle
-org.gradle.jvmargs=-Xmx2048M -Dfile.encoding=UTF-8 -Dkotlin.daemon.jvm.options\="-Xmx2048M"
+org.gradle.jvmargs=-Xmx2048M -Dfile.encoding=UTF-8
+kotlin.daemon.jvmargs=-Xmx4G
 
 #Kotlin
 kotlin.code.style=official
@@ -15,6 +16,7 @@ development=true
 kotlin.mpp.stability.nowarn=true
 kotlin.mpp.enableCInteropCommonization=true
 kotlin.mpp.androidSourceSetLayoutVersion=2
+kotlin.mpp.androidGradlePluginCompatibility.nowarn=true
 
 # Compose Multiplatform
 compose.resources.always.generate.accessors=true

gradle/libs.versions.toml

@@ -10,10 +10,10 @@ androidx-test-junit = "1.1.5"
 androidx-work-runtime = "2.9.0"
 androidx-preference = "1.2.1"
 
-kotlin = "1.9.23"
+kotlin = "2.0.21"
 
-compose-android = "1.6.4"
-compose-multiplatform = "1.6.10"
+compose-android = "1.7.1"
+compose-multiplatform = "1.7.0"
 
 exposed = "0.47.0"
 h2 = "2.2.220"
@@ -27,7 +27,7 @@ logbackClassic = "1.4.14"
 markdown = "0.14.0"
 material3 = "1.6.0"
 postgresql = "42.6.0"
-androidx-navigation = "2.7.0-alpha04"
+androidx-navigation = "2.8.0-alpha10"
 
 [libraries]
 
@@ -100,4 +100,6 @@ androidLibrary = { id = "com.android.library", version.ref = "agp" }
 jetbrainsCompose = { id = "org.jetbrains.compose", version.ref = "compose-multiplatform" }
 kotlinMultiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
 kotlinSerialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
+kotlinParcelize = { id = "org.jetbrains.kotlin.plugin.parcelize", version.ref = "kotlin" }
 kotlinJvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
+compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }

kotlin-js-store/yarn.lock

@@ -1,17 +1,20 @@
-@file:OptIn(ExperimentalWasmDsl::class)
-
-import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
-
 plugins {
     alias(libs.plugins.androidLibrary)
     alias(libs.plugins.jetbrainsCompose)
+    alias(libs.plugins.kotlinParcelize)
+    alias(libs.plugins.compose.compiler)
     alias(libs.plugins.kotlinMultiplatform)
     alias(libs.plugins.kotlinSerialization)
     id("kotlin-parcelize")
 }
 
 kotlin {
-    androidTarget()
+    androidTarget {
+        compilerOptions {
+            freeCompilerArgs.addAll("-P", "plugin:org.jetbrains.kotlin.parcelize:additionalAnnotation=org.jetbrains.kotlinconf.ui.components.zoomable.internal.AndroidParcelize")
+        }
+    }
+
     jvm()
 
     wasmJs {

shared/build.gradle.kts

@@ -1,8 +1,5 @@
 package org.jetbrains.kotlinconf.ui.components.zoomable.internal
 
 import android.os.Parcelable
-import kotlinx.parcelize.Parcelize
 
 internal actual typealias AndroidParcelable = Parcelable
-
-internal actual typealias AndroidParcelize = Parcelize

shared/src/androidMain/kotlin/org/jetbrains/kotlinconf/ui/components/zoomable/internal/parcelable.android.kt

@@ -1,10 +1,8 @@
 package org.jetbrains.kotlinconf.ui.components.zoomable.internal
 
-@OptIn(ExperimentalMultiplatform::class)
-@OptionalExpectation
 @Target(AnnotationTarget.CLASS)
 @Retention(AnnotationRetention.BINARY)
-expect annotation class AndroidParcelize()
+annotation class AndroidParcelize
 
 expect interface AndroidParcelable