Update to v2

pahill · pahill · commit 7e03b1ac229a · 2024-07-01T16:50:02.000+02:00
diff --git a/step2/build.gradle.kts b/step2/build.gradle.kts
@@ -5,4 +5,5 @@ plugins {
     alias(libs.plugins.androidLibrary) apply false
     alias(libs.plugins.jetbrainsCompose) apply false
     alias(libs.plugins.kotlinMultiplatform) apply false
+    alias(libs.plugins.compose.compiler) apply false
 }
diff --git a/step2/composeApp/build.gradle.kts b/step2/composeApp/build.gradle.kts
@@ -1,18 +1,19 @@
-import org.jetbrains.compose.ExperimentalComposeLibrary
 import org.jetbrains.compose.desktop.application.dsl.TargetFormat
+import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     alias(libs.plugins.kotlinMultiplatform)
     alias(libs.plugins.androidApplication)
     alias(libs.plugins.jetbrainsCompose)
+    alias(libs.plugins.compose.compiler)
 }
 
 kotlin {
     androidTarget {
-        compilations.all {
-            kotlinOptions {
-                jvmTarget = "1.8"
-            }
+        @OptIn(ExperimentalKotlinGradlePluginApi::class)
+        compilerOptions {
+            jvmTarget.set(JvmTarget.JVM_11)
         }
     }
     
@@ -60,8 +61,8 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
     }
     dependencies {
         debugImplementation(libs.compose.ui.tooling)
diff --git a/step2/gradle/libs.versions.toml b/step2/gradle/libs.versions.toml
@@ -1,20 +1,19 @@
 [versions]
-agp = "8.1.4"
+agp = "8.2.2"
 android-compileSdk = "34"
 android-minSdk = "24"
 android-targetSdk = "34"
-androidx-activityCompose = "1.8.2"
-androidx-appcompat = "1.6.1"
+androidx-activityCompose = "1.9.0"
+androidx-appcompat = "1.7.0"
 androidx-constraintlayout = "2.1.4"
-androidx-core-ktx = "1.12.0"
-androidx-espresso-core = "3.5.1"
-androidx-material = "1.10.0"
-androidx-test-junit = "1.1.5"
-compose = "1.5.4"
-compose-compiler = "1.5.6"
-compose-plugin = "1.5.11"
+androidx-core-ktx = "1.13.1"
+androidx-espresso-core = "3.6.1"
+androidx-material = "1.12.0"
+androidx-test-junit = "1.2.1"
+compose = "1.6.8"
+compose-plugin = "1.6.11"
 junit = "4.13.2"
-kotlin = "1.9.21"
+kotlin = "2.0.0"
 
 [libraries]
 kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotlin" }
@@ -27,14 +26,12 @@ androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version
 androidx-material = { group = "com.google.android.material", name = "material", version.ref = "androidx-material" }
 androidx-constraintlayout = { group = "androidx.constraintlayout", name = "constraintlayout", version.ref = "androidx-constraintlayout" }
 androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidx-activityCompose" }
-compose-ui = { module = "androidx.compose.ui:ui", version.ref = "compose" }
 compose-ui-tooling = { module = "androidx.compose.ui:ui-tooling", version.ref = "compose" }
 compose-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview", version.ref = "compose" }
-compose-foundation = { module = "androidx.compose.foundation:foundation", version.ref = "compose" }
-compose-material = { module = "androidx.compose.material:material", version.ref = "compose" }
 
 [plugins]
 androidApplication = { id = "com.android.application", version.ref = "agp" }
 androidLibrary = { id = "com.android.library", version.ref = "agp" }
 jetbrainsCompose = { id = "org.jetbrains.compose", version.ref = "compose-plugin" }
-kotlinMultiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
+kotlinMultiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
+compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
diff --git a/step2/gradle/wrapper/gradle-wrapper.properties b/step2/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/step3/build.gradle.kts b/step3/build.gradle.kts
@@ -5,4 +5,5 @@ plugins {
     alias(libs.plugins.androidLibrary) apply false
     alias(libs.plugins.jetbrainsCompose) apply false
     alias(libs.plugins.kotlinMultiplatform) apply false
+    alias(libs.plugins.compose.compiler) apply false
 }
diff --git a/step3/composeApp/build.gradle.kts b/step3/composeApp/build.gradle.kts
@@ -1,18 +1,19 @@
-import org.jetbrains.compose.ExperimentalComposeLibrary
 import org.jetbrains.compose.desktop.application.dsl.TargetFormat
+import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     alias(libs.plugins.kotlinMultiplatform)
     alias(libs.plugins.androidApplication)
     alias(libs.plugins.jetbrainsCompose)
+    alias(libs.plugins.compose.compiler)
 }
 
 kotlin {
     androidTarget {
-        compilations.all {
-            kotlinOptions {
-                jvmTarget = "1.8"
-            }
+        @OptIn(ExperimentalKotlinGradlePluginApi::class)
+        compilerOptions {
+            jvmTarget.set(JvmTarget.JVM_11)
         }
     }
     
@@ -27,7 +28,6 @@ kotlin {
             implementation(compose.foundation)
             implementation(compose.material)
             implementation(compose.ui)
-            @OptIn(ExperimentalComposeLibrary::class)
             implementation(compose.components.resources)
             implementation(projects.shared)
         }
@@ -60,8 +60,8 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
     }
     dependencies {
         debugImplementation(libs.compose.ui.tooling)
diff --git a/step3/gradle/libs.versions.toml b/step3/gradle/libs.versions.toml
@@ -1,20 +1,19 @@
 [versions]
-agp = "8.1.4"
+agp = "8.2.2"
 android-compileSdk = "34"
 android-minSdk = "24"
 android-targetSdk = "34"
-androidx-activityCompose = "1.8.2"
-androidx-appcompat = "1.6.1"
+androidx-activityCompose = "1.9.0"
+androidx-appcompat = "1.7.0"
 androidx-constraintlayout = "2.1.4"
-androidx-core-ktx = "1.12.0"
-androidx-espresso-core = "3.5.1"
-androidx-material = "1.10.0"
-androidx-test-junit = "1.1.5"
-compose = "1.5.4"
-compose-compiler = "1.5.6"
-compose-plugin = "1.5.11"
+androidx-core-ktx = "1.13.1"
+androidx-espresso-core = "3.6.1"
+androidx-material = "1.12.0"
+androidx-test-junit = "1.2.1"
+compose = "1.6.8"
+compose-plugin = "1.6.11"
 junit = "4.13.2"
-kotlin = "1.9.21"
+kotlin = "2.0.0"
 
 [libraries]
 kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotlin" }
@@ -27,14 +26,12 @@ androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version
 androidx-material = { group = "com.google.android.material", name = "material", version.ref = "androidx-material" }
 androidx-constraintlayout = { group = "androidx.constraintlayout", name = "constraintlayout", version.ref = "androidx-constraintlayout" }
 androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidx-activityCompose" }
-compose-ui = { module = "androidx.compose.ui:ui", version.ref = "compose" }
 compose-ui-tooling = { module = "androidx.compose.ui:ui-tooling", version.ref = "compose" }
 compose-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview", version.ref = "compose" }
-compose-foundation = { module = "androidx.compose.foundation:foundation", version.ref = "compose" }
-compose-material = { module = "androidx.compose.material:material", version.ref = "compose" }
 
 [plugins]
 androidApplication = { id = "com.android.application", version.ref = "agp" }
 androidLibrary = { id = "com.android.library", version.ref = "agp" }
 jetbrainsCompose = { id = "org.jetbrains.compose", version.ref = "compose-plugin" }
-kotlinMultiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
+kotlinMultiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
+compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
diff --git a/step4/build.gradle.kts b/step4/build.gradle.kts
@@ -5,4 +5,5 @@ plugins {
     alias(libs.plugins.androidLibrary) apply false
     alias(libs.plugins.jetbrainsCompose) apply false
     alias(libs.plugins.kotlinMultiplatform) apply false
+    alias(libs.plugins.compose.compiler) apply false
 }
diff --git a/step4/composeApp/build.gradle.kts b/step4/composeApp/build.gradle.kts
@@ -1,18 +1,20 @@
 import org.jetbrains.compose.ExperimentalComposeLibrary
 import org.jetbrains.compose.desktop.application.dsl.TargetFormat
+import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     alias(libs.plugins.kotlinMultiplatform)
     alias(libs.plugins.androidApplication)
     alias(libs.plugins.jetbrainsCompose)
+    alias(libs.plugins.compose.compiler)
 }
 
 kotlin {
     androidTarget {
-        compilations.all {
-            kotlinOptions {
-                jvmTarget = "1.8"
-            }
+        @OptIn(ExperimentalKotlinGradlePluginApi::class)
+        compilerOptions {
+            jvmTarget.set(JvmTarget.JVM_11)
         }
     }
     
@@ -60,8 +62,8 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
     }
     dependencies {
         debugImplementation(libs.compose.ui.tooling)
diff --git a/step4/gradle/libs.versions.toml b/step4/gradle/libs.versions.toml
@@ -3,18 +3,19 @@ agp = "8.1.4"
 android-compileSdk = "34"
 android-minSdk = "24"
 android-targetSdk = "34"
-androidx-activityCompose = "1.8.2"
-androidx-appcompat = "1.6.1"
+androidx-activityCompose = "1.9.0"
+androidx-appcompat = "1.7.0"
 androidx-constraintlayout = "2.1.4"
-androidx-core-ktx = "1.12.0"
-androidx-espresso-core = "3.5.1"
-androidx-material = "1.10.0"
-androidx-test-junit = "1.1.5"
-compose = "1.5.4"
+androidx-core-ktx = "1.13.1"
+androidx-espresso-core = "3.6.1"
+androidx-material = "1.12.0"
+androidx-test-junit = "1.2.1"
+compose = "1.6.8"
 compose-compiler = "1.5.6"
-compose-plugin = "1.5.11"
+compose-plugin = "1.6.11"
 junit = "4.13.2"
-kotlin = "1.9.21"
+kotlin = "2.0.0"
+kotlinxDatetime = "0.6.0"
 
 [libraries]
 kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotlin" }
@@ -32,9 +33,11 @@ compose-ui-tooling = { module = "androidx.compose.ui:ui-tooling", version.ref =
 compose-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview", version.ref = "compose" }
 compose-foundation = { module = "androidx.compose.foundation:foundation", version.ref = "compose" }
 compose-material = { module = "androidx.compose.material:material", version.ref = "compose" }
+kotlinx-datetime = { module = "org.jetbrains.kotlinx:kotlinx-datetime", version.ref = "kotlinxDatetime" }
 
 [plugins]
 androidApplication = { id = "com.android.application", version.ref = "agp" }
 androidLibrary = { id = "com.android.library", version.ref = "agp" }
 jetbrainsCompose = { id = "org.jetbrains.compose", version.ref = "compose-plugin" }
-kotlinMultiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
+kotlinMultiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
+compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
diff --git a/step4/gradle/wrapper/gradle-wrapper.properties b/step4/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/step4/shared/build.gradle.kts b/step4/shared/build.gradle.kts
@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     alias(libs.plugins.kotlinMultiplatform)
@@ -6,10 +8,9 @@ plugins {
 
 kotlin {
     androidTarget {
-        compilations.all {
-            kotlinOptions {
-                jvmTarget = "1.8"
-            }
+        @OptIn(ExperimentalKotlinGradlePluginApi::class)
+        compilerOptions {
+            jvmTarget.set(JvmTarget.JVM_11)
         }
     }
     
@@ -27,7 +28,7 @@ kotlin {
     kotlin {
         sourceSets {
             commonMain.dependencies {
-                implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.4.0")
+                implementation(libs.kotlinx.datetime)
             }
         }
     }
diff --git a/step5/build.gradle.kts b/step5/build.gradle.kts
@@ -4,7 +4,9 @@ plugins {
     alias(libs.plugins.androidApplication) apply false
     alias(libs.plugins.androidLibrary) apply false
     alias(libs.plugins.jetbrainsCompose) apply false
+    alias(libs.plugins.compose.compiler) apply false
     alias(libs.plugins.kotlinMultiplatform) apply false
-    id("com.google.devtools.ksp").version("1.9.21-1.0.16").apply(false)
-    id("com.rickclephas.kmp.nativecoroutines").version("1.0.0-ALPHA-23").apply(false)
+    alias(libs.plugins.kotlinSerialization) apply false
+    alias(libs.plugins.ksp) apply false
+    alias(libs.plugins.kmpNc) apply false
 }
diff --git a/step5/composeApp/build.gradle.kts b/step5/composeApp/build.gradle.kts
@@ -1,18 +1,20 @@
 import org.jetbrains.compose.ExperimentalComposeLibrary
 import org.jetbrains.compose.desktop.application.dsl.TargetFormat
+import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     alias(libs.plugins.kotlinMultiplatform)
     alias(libs.plugins.androidApplication)
     alias(libs.plugins.jetbrainsCompose)
+    alias(libs.plugins.compose.compiler)
 }
 
 kotlin {
     androidTarget {
-        compilations.all {
-            kotlinOptions {
-                jvmTarget = "1.8"
-            }
+        @OptIn(ExperimentalKotlinGradlePluginApi::class)
+        compilerOptions {
+            jvmTarget.set(JvmTarget.JVM_11)
         }
     }
     
@@ -21,8 +23,8 @@ kotlin {
         androidMain.dependencies {
             implementation(libs.compose.ui.tooling.preview)
             implementation(libs.androidx.activity.compose)
-            implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.2")
-            implementation("androidx.lifecycle:lifecycle-runtime-compose:2.6.2")
+            implementation(libs.androidx.lifecycle.viewmodel.ktx)
+            implementation(libs.androidx.lifecycle.runtime.compose)
             implementation(libs.androidx.lifecycle.viewmodel.compose)
         }
         commonMain.dependencies {
@@ -63,8 +65,8 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
     }
     dependencies {
         debugImplementation(libs.compose.ui.tooling)
diff --git a/step5/gradle/libs.versions.toml b/step5/gradle/libs.versions.toml
diff --git a/step5/gradle/wrapper/gradle-wrapper.properties b/step5/gradle/wrapper/gradle-wrapper.properties
diff --git a/step5/shared/build.gradle.kts b/step5/shared/build.gradle.kts
diff --git a/step5skie/build.gradle.kts b/step5skie/build.gradle.kts
diff --git a/step5skie/composeApp/build.gradle.kts b/step5skie/composeApp/build.gradle.kts
diff --git a/step5skie/gradle/libs.versions.toml b/step5skie/gradle/libs.versions.toml
diff --git a/step5skie/shared/build.gradle.kts b/step5skie/shared/build.gradle.kts

Original file line number	Diff line number	Diff line change
`@@ -5,4 +5,5 @@ plugins {`
`5`	`5`	`alias(libs.plugins.androidLibrary) apply false`
`6`	`6`	`alias(libs.plugins.jetbrainsCompose) apply false`
`7`	`7`	`alias(libs.plugins.kotlinMultiplatform) apply false`
	`8`	`+ alias(libs.plugins.compose.compiler) apply false`
`8`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,18 +1,19 @@`
`1`		`-import org.jetbrains.compose.ExperimentalComposeLibrary`
`2`	`1`	`import org.jetbrains.compose.desktop.application.dsl.TargetFormat`
	`2`	`+import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi`
	`3`	`+import org.jetbrains.kotlin.gradle.dsl.JvmTarget`
`3`	`4`
`4`	`5`	`plugins {`
`5`	`6`	`alias(libs.plugins.kotlinMultiplatform)`
`6`	`7`	`alias(libs.plugins.androidApplication)`
`7`	`8`	`alias(libs.plugins.jetbrainsCompose)`
	`9`	`+ alias(libs.plugins.compose.compiler)`
`8`	`10`	`}`
`9`	`11`
`10`	`12`	`kotlin {`
`11`	`13`	`androidTarget {`
`12`		`- compilations.all {`
`13`		`- kotlinOptions {`
`14`		`- jvmTarget = "1.8"`
`15`		`- }`
	`14`	`+ @OptIn(ExperimentalKotlinGradlePluginApi::class)`
	`15`	`+ compilerOptions {`
	`16`	`+ jvmTarget.set(JvmTarget.JVM_11)`
`16`	`17`	`}`
`17`	`18`	`}`
`18`	`19`
`@@ -60,8 +61,8 @@ android {`
`60`	`61`	`}`
`61`	`62`	`}`
`62`	`63`	`compileOptions {`
`63`		`- sourceCompatibility = JavaVersion.VERSION_1_8`
`64`		`- targetCompatibility = JavaVersion.VERSION_1_8`
	`64`	`+ sourceCompatibility = JavaVersion.VERSION_11`
	`65`	`+ targetCompatibility = JavaVersion.VERSION_11`
`65`	`66`	`}`
`66`	`67`	`dependencies {`
`67`	`68`	`debugImplementation(libs.compose.ui.tooling)`
Original file line number	Diff line number	Diff line change
`@@ -1,18 +1,20 @@`
`1`	`1`	`import org.jetbrains.compose.ExperimentalComposeLibrary`
`2`	`2`	`import org.jetbrains.compose.desktop.application.dsl.TargetFormat`
	`3`	`+import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi`
	`4`	`+import org.jetbrains.kotlin.gradle.dsl.JvmTarget`
`3`	`5`
`4`	`6`	`plugins {`
`5`	`7`	`alias(libs.plugins.kotlinMultiplatform)`
`6`	`8`	`alias(libs.plugins.androidApplication)`
`7`	`9`	`alias(libs.plugins.jetbrainsCompose)`
	`10`	`+ alias(libs.plugins.compose.compiler)`
`8`	`11`	`}`
`9`	`12`
`10`	`13`	`kotlin {`
`11`	`14`	`androidTarget {`
`12`		`- compilations.all {`
`13`		`- kotlinOptions {`
`14`		`- jvmTarget = "1.8"`
`15`		`- }`
	`15`	`+ @OptIn(ExperimentalKotlinGradlePluginApi::class)`
	`16`	`+ compilerOptions {`
	`17`	`+ jvmTarget.set(JvmTarget.JVM_11)`
`16`	`18`	`}`
`17`	`19`	`}`
`18`	`20`
`@@ -60,8 +62,8 @@ android {`
`60`	`62`	`}`
`61`	`63`	`}`
`62`	`64`	`compileOptions {`
`63`		`- sourceCompatibility = JavaVersion.VERSION_1_8`
`64`		`- targetCompatibility = JavaVersion.VERSION_1_8`
	`65`	`+ sourceCompatibility = JavaVersion.VERSION_11`
	`66`	`+ targetCompatibility = JavaVersion.VERSION_11`
`65`	`67`	`}`
`66`	`68`	`dependencies {`
`67`	`69`	`debugImplementation(libs.compose.ui.tooling)`