multiplatform: Kotlin 2.0 & Compose 1.6.10

apps/multiplatform/android/build.gradle.kts

@@ -3,6 +3,7 @@
 plugins {
     id("com.android.application")
     id("org.jetbrains.compose")
+    id("org.jetbrains.kotlin.plugin.compose")
     kotlin("android")
     id("org.jetbrains.kotlin.plugin.serialization")
 }

apps/multiplatform/android/src/main/res/values/colors.xml

@@ -2,6 +2,5 @@
 <resources>
   <color name="black">#FF000000</color>
   <color name="white">#FFFFFFFF</color>
-  <color name="highOrLowLight">#8b8786</color>
   <color name="window_background_dark">#121212</color>
 </resources>

apps/multiplatform/build.gradle.kts

@@ -80,6 +80,7 @@ plugins {
     id("com.android.application") apply false
     id("com.android.library") apply false
     id("org.jetbrains.compose") apply false
+    id("org.jetbrains.kotlin.plugin.compose") apply false
     id("org.jetbrains.kotlin.plugin.serialization") apply false
 }
 

apps/multiplatform/common/build.gradle.kts

@@ -1,6 +1,7 @@
 plugins {
   kotlin("multiplatform")
   id("org.jetbrains.compose")
+  id("org.jetbrains.kotlin.plugin.compose")
   id("com.android.library")
   id("org.jetbrains.kotlin.plugin.serialization")
   id("dev.icerock.mobile.multiplatform-resources")

apps/multiplatform/common/src/androidMain/res/drawable/edit_text_cursor.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle" >
-  <solid android:color="@color/highOrLowLight" />
+  <solid android:color="#8b8786" />
   <size android:width="1dp" />
 </shape>

apps/multiplatform/desktop/build.gradle.kts

@@ -4,6 +4,7 @@ import org.jetbrains.kotlin.util.capitalizeDecapitalize.toLowerCaseAsciiOnly
 plugins {
   kotlin("multiplatform")
   id("org.jetbrains.compose")
+  id("org.jetbrains.kotlin.plugin.compose")
   id("io.github.tomtzook.gradle-cmake") version "1.2.2"
 }
 

apps/multiplatform/gradle.properties

@@ -21,8 +21,6 @@ kotlin.code.style=official
 # resources declared in the library itself and none from the library's dependencies,
 # thereby reducing the size of the R class for that library
 android.nonTransitiveRClass=true
-# Automatically convert third-party libraries to use AndroidX
-android.enableJetifier=true
 kotlin.mpp.androidSourceSetLayoutVersion=2
 kotlin.jvm.target=11
 
@@ -32,6 +30,6 @@ android.version_code=218
 desktop.version_name=5.8-beta.5
 desktop.version_code=52
 
-kotlin.version=1.9.23
+kotlin.version=2.0.0
 gradle.plugin.version=8.2.0
-compose.version=1.6.1
+compose.version=1.6.10

apps/multiplatform/settings.gradle.kts

@@ -12,6 +12,7 @@ pluginManagement {
         id("com.android.application").version(extra["gradle.plugin.version"] as String)
         id("com.android.library").version(extra["gradle.plugin.version"] as String)
         id("org.jetbrains.compose").version(extra["compose.version"] as String)
+        id("org.jetbrains.kotlin.plugin.compose").version(extra["kotlin.version"] as String)
         id("org.jetbrains.kotlin.plugin.serialization").version(extra["kotlin.version"] as String)
     }
 }