Update Kotlin to 1.9.20-Beta2

terrakok · terrakok · commit d40d70d0c846 · 2023-10-12T13:59:20.000+02:00
diff --git a/step2/androidApp/build.gradle.kts b/step2/androidApp/build.gradle.kts
@@ -8,7 +8,7 @@ android {
     compileSdk = 34
     defaultConfig {
         applicationId = "com.jetbrains.simplelogin.kotlinmultiplatformsandbox"
-        minSdk = 24
+        minSdk = 26
         targetSdk = 34
         versionCode = 1
         versionName = "1.0"
diff --git a/step2/gradle.properties b/step2/gradle.properties
@@ -1,5 +1,7 @@
 #Gradle
 org.gradle.jvmargs=-Xmx2048M -Dfile.encoding=UTF-8 -Dkotlin.daemon.jvm.options\="-Xmx2048M"
+org.gradle.caching=true
+org.gradle.configuration-cache=true
 
 #Kotlin
 kotlin.code.style=official
@@ -9,5 +11,4 @@ android.useAndroidX=true
 android.nonTransitiveRClass=true
 
 #MPP
-kotlin.mpp.enableCInteropCommonization=true
-kotlin.mpp.androidSourceSetLayoutVersion=2
+kotlin.mpp.enableCInteropCommonization=true
diff --git a/step2/settings.gradle.kts b/step2/settings.gradle.kts
@@ -3,14 +3,14 @@ pluginManagement {
         google()
         gradlePluginPortal()
         mavenCentral()
-        maven("https://androidx.dev/storage/compose-compiler/repository/")
     }
 }
 
 dependencyResolutionManagement {
     repositories {
         google()
         mavenCentral()
+        maven("https://androidx.dev/storage/compose-compiler/repository/")
     }
 }
 
diff --git a/step2/shared/build.gradle.kts b/step2/shared/build.gradle.kts
@@ -38,8 +38,8 @@ kotlin {
 
 android {
     namespace = "com.jetbrains.simplelogin.kotlinmultiplatformsandbox"
-    compileSdk = 33
+    compileSdk = 34
     defaultConfig {
-        minSdk = 24
+        minSdk = 26
     }
 }
diff --git a/step3/androidApp/build.gradle.kts b/step3/androidApp/build.gradle.kts
@@ -5,19 +5,19 @@ plugins {
 
 android {
     namespace = "com.jetbrains.simplelogin.kotlinmultiplatformsandbox"
-    compileSdk = 33
+    compileSdk = 34
     defaultConfig {
         applicationId = "com.jetbrains.simplelogin.kotlinmultiplatformsandbox"
-        minSdk = 21
-        targetSdk = 33
+        minSdk = 26
+        targetSdk = 34
         versionCode = 1
         versionName = "1.0"
     }
     buildFeatures {
         compose = true
     }
     composeOptions {
-        kotlinCompilerExtensionVersion = "1.4.7"
+        kotlinCompilerExtensionVersion = "1.5.4-dev-k1.9.20-Beta2-ac5f960bdaf"
     }
     packaging {
         resources {
@@ -30,20 +30,20 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = "17"
     }
 }
 
 dependencies {
     implementation(project(":shared"))
-    implementation("androidx.compose.ui:ui:1.4.3")
-    implementation("androidx.compose.ui:ui-tooling:1.4.3")
-    implementation("androidx.compose.ui:ui-tooling-preview:1.4.3")
-    implementation("androidx.compose.foundation:foundation:1.4.3")
-    implementation("androidx.compose.material:material:1.4.3")
-    implementation("androidx.activity:activity-compose:1.7.1")
+    implementation("androidx.compose.ui:ui:1.5.3")
+    implementation("androidx.compose.ui:ui-tooling:1.5.3")
+    implementation("androidx.compose.ui:ui-tooling-preview:1.5.3")
+    implementation("androidx.compose.foundation:foundation:1.5.3")
+    implementation("androidx.compose.material:material:1.5.3")
+    implementation("androidx.activity:activity-compose:1.8.0")
 }
diff --git a/step3/build.gradle.kts b/step3/build.gradle.kts
@@ -1,11 +1,7 @@
 plugins {
     //trick: for the same plugin versions in all sub-modules
-    id("com.android.application").version("8.0.2").apply(false)
-    id("com.android.library").version("8.0.2").apply(false)
-    kotlin("android").version("1.8.21").apply(false)
-    kotlin("multiplatform").version("1.8.21").apply(false)
-}
-
-tasks.register("clean", Delete::class) {
-    delete(rootProject.buildDir)
-}
+    id("com.android.application").version("8.1.2").apply(false)
+    id("com.android.library").version("8.1.2").apply(false)
+    kotlin("android").version("1.9.20-Beta2").apply(false)
+    kotlin("multiplatform").version("1.9.20-Beta2").apply(false)
+}
diff --git a/step3/gradle.properties b/step3/gradle.properties
@@ -1,5 +1,7 @@
 #Gradle
 org.gradle.jvmargs=-Xmx2048M -Dfile.encoding=UTF-8 -Dkotlin.daemon.jvm.options\="-Xmx2048M"
+org.gradle.caching=true
+org.gradle.configuration-cache=true
 
 #Kotlin
 kotlin.code.style=official
@@ -9,5 +11,4 @@ android.useAndroidX=true
 android.nonTransitiveRClass=true
 
 #MPP
-kotlin.mpp.enableCInteropCommonization=true
-kotlin.mpp.androidSourceSetLayoutVersion=2
+kotlin.mpp.enableCInteropCommonization=true
diff --git a/step3/settings.gradle.kts b/step3/settings.gradle.kts
@@ -10,6 +10,7 @@ dependencyResolutionManagement {
     repositories {
         google()
         mavenCentral()
+        maven("https://androidx.dev/storage/compose-compiler/repository/")
     }
 }
 
diff --git a/step3/shared/build.gradle.kts b/step3/shared/build.gradle.kts
@@ -3,14 +3,11 @@ plugins {
     id("com.android.library")
 }
 
-@OptIn(org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi::class)
 kotlin {
-    targetHierarchy.default()
-
-    android {
+    androidTarget {
         compilations.all {
             kotlinOptions {
-                jvmTarget = "1.8"
+                jvmTarget = "17"
             }
         }
     }
@@ -26,12 +23,12 @@ kotlin {
     }
 
     sourceSets {
-        val commonMain by getting {
+        commonMain {
             dependencies {
-                implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.4.0")
+                implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.4.1")
             }
         }
-        val commonTest by getting {
+        commonTest {
             dependencies {
                 implementation(kotlin("test"))
             }
@@ -41,8 +38,12 @@ kotlin {
 
 android {
     namespace = "com.jetbrains.simplelogin.kotlinmultiplatformsandbox"
-    compileSdk = 33
+    compileSdk = 34
     defaultConfig {
-        minSdk = 21
+        minSdk = 26
+    }
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
 }
diff --git a/step4/androidApp/build.gradle.kts b/step4/androidApp/build.gradle.kts
@@ -5,23 +5,23 @@ plugins {
 
 android {
     namespace = "com.jetbrains.simplelogin.kotlinmultiplatformsandbox"
-    compileSdk = 33
+    compileSdk = 34
     defaultConfig {
         applicationId = "com.jetbrains.simplelogin.kotlinmultiplatformsandbox"
-        minSdk = 21
-        targetSdk = 33
+        minSdk = 26
+        targetSdk = 34
         versionCode = 1
         versionName = "1.0"
     }
     buildFeatures {
         compose = true
     }
     composeOptions {
-        kotlinCompilerExtensionVersion = "1.4.7"
+        kotlinCompilerExtensionVersion = "1.5.4-dev-k1.9.20-Beta2-ac5f960bdaf"
     }
     packaging {
         resources {
-            excludes += "/META-INF/{AL2.0,LGPL2.1}"
+            excludes += "/META-INF/**"
         }
     }
     buildTypes {
@@ -30,20 +30,20 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = "17"
     }
 }
 
 dependencies {
     implementation(project(":shared"))
-    implementation("androidx.compose.ui:ui:1.4.3")
-    implementation("androidx.compose.ui:ui-tooling:1.4.3")
-    implementation("androidx.compose.ui:ui-tooling-preview:1.4.3")
-    implementation("androidx.compose.foundation:foundation:1.4.3")
-    implementation("androidx.compose.material:material:1.4.3")
-    implementation("androidx.activity:activity-compose:1.7.1")
+    implementation("androidx.compose.ui:ui:1.5.3")
+    implementation("androidx.compose.ui:ui-tooling:1.5.3")
+    implementation("androidx.compose.ui:ui-tooling-preview:1.5.3")
+    implementation("androidx.compose.foundation:foundation:1.5.3")
+    implementation("androidx.compose.material:material:1.5.3")
+    implementation("androidx.activity:activity-compose:1.8.0")
 }
diff --git a/step4/build.gradle.kts b/step4/build.gradle.kts
@@ -1,11 +1,7 @@
 plugins {
     //trick: for the same plugin versions in all sub-modules
-    id("com.android.application").version("8.0.2").apply(false)
-    id("com.android.library").version("8.0.2").apply(false)
-    kotlin("android").version("1.8.21").apply(false)
-    kotlin("multiplatform").version("1.8.21").apply(false)
-}
-
-tasks.register("clean", Delete::class) {
-    delete(rootProject.buildDir)
-}
+    id("com.android.application").version("8.1.2").apply(false)
+    id("com.android.library").version("8.1.2").apply(false)
+    kotlin("android").version("1.9.20-Beta2").apply(false)
+    kotlin("multiplatform").version("1.9.20-Beta2").apply(false)
+}
diff --git a/step4/gradle.properties b/step4/gradle.properties
@@ -1,5 +1,7 @@
 #Gradle
 org.gradle.jvmargs=-Xmx2048M -Dfile.encoding=UTF-8 -Dkotlin.daemon.jvm.options\="-Xmx2048M"
+org.gradle.caching=true
+org.gradle.configuration-cache=true
 
 #Kotlin
 kotlin.code.style=official
diff --git a/step4/iosApp/iosApp/iOSApp.swift b/step4/iosApp/iosApp/iOSApp.swift
@@ -1,3 +1,5 @@
+import SwiftUI
+
 @main
 struct iOSApp: App {
     var body: some Scene {
diff --git a/step4/settings.gradle.kts b/step4/settings.gradle.kts
@@ -10,6 +10,7 @@ dependencyResolutionManagement {
     repositories {
         google()
         mavenCentral()
+        maven("https://androidx.dev/storage/compose-compiler/repository/")
     }
 }
 
diff --git a/step4/shared/build.gradle.kts b/step4/shared/build.gradle.kts
@@ -1,17 +1,14 @@
 plugins {
     kotlin("multiplatform")
     id("com.android.library")
-    kotlin("plugin.serialization") version "1.8.20"
+    kotlin("plugin.serialization") version "1.9.20-Beta2"
 }
 
-@OptIn(org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi::class)
 kotlin {
-    targetHierarchy.default()
-
-    android {
+    androidTarget {
         compilations.all {
             kotlinOptions {
-                jvmTarget = "1.8"
+                jvmTarget = "17"
             }
         }
     }
@@ -26,29 +23,29 @@ kotlin {
         }
     }
 
-    val ktorVersion = "2.3.2"
+    val ktorVersion = "2.3.5"
 
     sourceSets {
-        val commonMain by getting {
+        commonMain {
             dependencies {
-                implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.4.0")
-                implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.1")
+                implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.4.1")
+                implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3")
                 implementation("io.ktor:ktor-client-core:$ktorVersion")
                 implementation("io.ktor:ktor-client-content-negotiation:$ktorVersion")
                 implementation("io.ktor:ktor-serialization-kotlinx-json:$ktorVersion")
             }
         }
-        val commonTest by getting {
+        commonTest {
             dependencies {
                 implementation(kotlin("test"))
             }
         }
-        val androidMain by getting {
+        androidMain {
             dependencies {
                 implementation("io.ktor:ktor-client-android:$ktorVersion")
             }
         }
-        val iosMain by getting {
+        iosMain {
             dependencies {
                 implementation("io.ktor:ktor-client-darwin:$ktorVersion")
             }
@@ -58,8 +55,12 @@ kotlin {
 
 android {
     namespace = "com.jetbrains.simplelogin.kotlinmultiplatformsandbox"
-    compileSdk = 33
+    compileSdk = 34
     defaultConfig {
-        minSdk = 21
+        minSdk = 26
+    }
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -3,14 +3,14 @@ pluginManagement {`
`3`	`3`	`google()`
`4`	`4`	`gradlePluginPortal()`
`5`	`5`	`mavenCentral()`
`6`		`- maven("https://androidx.dev/storage/compose-compiler/repository/")`
`7`	`6`	`}`
`8`	`7`	`}`
`9`	`8`
`10`	`9`	`dependencyResolutionManagement {`
`11`	`10`	`repositories {`
`12`	`11`	`google()`
`13`	`12`	`mavenCentral()`
	`13`	`+ maven("https://androidx.dev/storage/compose-compiler/repository/")`
`14`	`14`	`}`
`15`	`15`	`}`
`16`	`16`
Original file line number	Diff line number	Diff line change
`@@ -38,8 +38,8 @@ kotlin {`
`38`	`38`
`39`	`39`	`android {`
`40`	`40`	`namespace = "com.jetbrains.simplelogin.kotlinmultiplatformsandbox"`
`41`		`- compileSdk = 33`
	`41`	`+ compileSdk = 34`
`42`	`42`	`defaultConfig {`
`43`		`- minSdk = 24`
	`43`	`+ minSdk = 26`
`44`	`44`	`}`
`45`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@ dependencyResolutionManagement {`
`10`	`10`	`repositories {`
`11`	`11`	`google()`
`12`	`12`	`mavenCentral()`
	`13`	`+ maven("https://androidx.dev/storage/compose-compiler/repository/")`
`13`	`14`	`}`
`14`	`15`	`}`
`15`	`16`
Original file line number	Diff line number	Diff line change
`@@ -3,14 +3,11 @@ plugins {`
`3`	`3`	`id("com.android.library")`
`4`	`4`	`}`
`5`	`5`
`6`		`-@OptIn(org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi::class)`
`7`	`6`	`kotlin {`
`8`		`- targetHierarchy.default()`
`9`		`-`
`10`		`- android {`
	`7`	`+ androidTarget {`
`11`	`8`	`compilations.all {`
`12`	`9`	`kotlinOptions {`
`13`		`- jvmTarget = "1.8"`
	`10`	`+ jvmTarget = "17"`
`14`	`11`	`}`
`15`	`12`	`}`
`16`	`13`	`}`
`@@ -26,12 +23,12 @@ kotlin {`
`26`	`23`	`}`
`27`	`24`
`28`	`25`	`sourceSets {`
`29`		`- val commonMain by getting {`
	`26`	`+ commonMain {`
`30`	`27`	`dependencies {`
`31`		`- implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.4.0")`
	`28`	`+ implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.4.1")`
`32`	`29`	`}`
`33`	`30`	`}`
`34`		`- val commonTest by getting {`
	`31`	`+ commonTest {`
`35`	`32`	`dependencies {`
`36`	`33`	`implementation(kotlin("test"))`
`37`	`34`	`}`
`@@ -41,8 +38,12 @@ kotlin {`
`41`	`38`
`42`	`39`	`android {`
`43`	`40`	`namespace = "com.jetbrains.simplelogin.kotlinmultiplatformsandbox"`
`44`		`- compileSdk = 33`
	`41`	`+ compileSdk = 34`
`45`	`42`	`defaultConfig {`
`46`		`- minSdk = 21`
	`43`	`+ minSdk = 26`
	`44`	`+ }`
	`45`	`+ compileOptions {`
	`46`	`+ sourceCompatibility = JavaVersion.VERSION_17`
	`47`	`+ targetCompatibility = JavaVersion.VERSION_17`
`47`	`48`	`}`
`48`	`49`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,23 +5,23 @@ plugins {`
`5`	`5`
`6`	`6`	`android {`
`7`	`7`	`namespace = "com.jetbrains.simplelogin.kotlinmultiplatformsandbox"`
`8`		`- compileSdk = 33`
	`8`	`+ compileSdk = 34`
`9`	`9`	`defaultConfig {`
`10`	`10`	`applicationId = "com.jetbrains.simplelogin.kotlinmultiplatformsandbox"`
`11`		`- minSdk = 21`
`12`		`- targetSdk = 33`
	`11`	`+ minSdk = 26`
	`12`	`+ targetSdk = 34`
`13`	`13`	`versionCode = 1`
`14`	`14`	`versionName = "1.0"`
`15`	`15`	`}`
`16`	`16`	`buildFeatures {`
`17`	`17`	`compose = true`
`18`	`18`	`}`
`19`	`19`	`composeOptions {`
`20`		`- kotlinCompilerExtensionVersion = "1.4.7"`
	`20`	`+ kotlinCompilerExtensionVersion = "1.5.4-dev-k1.9.20-Beta2-ac5f960bdaf"`
`21`	`21`	`}`
`22`	`22`	`packaging {`
`23`	`23`	`resources {`
`24`		`- excludes += "/META-INF/{AL2.0,LGPL2.1}"`
	`24`	`+ excludes += "/META-INF/**"`
`25`	`25`	`}`
`26`	`26`	`}`
`27`	`27`	`buildTypes {`
`@@ -30,20 +30,20 @@ android {`
`30`	`30`	`}`
`31`	`31`	`}`
`32`	`32`	`compileOptions {`
`33`		`- sourceCompatibility = JavaVersion.VERSION_1_8`
`34`		`- targetCompatibility = JavaVersion.VERSION_1_8`
	`33`	`+ sourceCompatibility = JavaVersion.VERSION_17`
	`34`	`+ targetCompatibility = JavaVersion.VERSION_17`
`35`	`35`	`}`
`36`	`36`	`kotlinOptions {`
`37`		`- jvmTarget = "1.8"`
	`37`	`+ jvmTarget = "17"`
`38`	`38`	`}`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`dependencies {`
`42`	`42`	`implementation(project(":shared"))`
`43`		`- implementation("androidx.compose.ui:ui:1.4.3")`
`44`		`- implementation("androidx.compose.ui:ui-tooling:1.4.3")`
`45`		`- implementation("androidx.compose.ui:ui-tooling-preview:1.4.3")`
`46`		`- implementation("androidx.compose.foundation:foundation:1.4.3")`
`47`		`- implementation("androidx.compose.material:material:1.4.3")`
`48`		`- implementation("androidx.activity:activity-compose:1.7.1")`
	`43`	`+ implementation("androidx.compose.ui:ui:1.5.3")`
	`44`	`+ implementation("androidx.compose.ui:ui-tooling:1.5.3")`
	`45`	`+ implementation("androidx.compose.ui:ui-tooling-preview:1.5.3")`
	`46`	`+ implementation("androidx.compose.foundation:foundation:1.5.3")`
	`47`	`+ implementation("androidx.compose.material:material:1.5.3")`
	`48`	`+ implementation("androidx.activity:activity-compose:1.8.0")`
`49`	`49`	`}`