Update Kotlin to 1.9.20-Beta

MohamedRejeb · Sep 23, 2023 · 07e5beb · 07e5beb
1 parent fcf1ae1
commit 07e5beb
Show file tree

Hide file tree

Showing 15 changed files with 39 additions and 47 deletions.
diff --git a/calf-file-picker/build.gradle.kts b/calf-file-picker/build.gradle.kts
@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
+
 plugins {
     alias(libs.plugins.kotlinMultiplatform)
     alias(libs.plugins.composeMultiplatform)
@@ -6,17 +8,17 @@ plugins {
 }
 
 kotlin {
-    targetHierarchy.default()
+    kotlin.applyDefaultHierarchyTemplate()
     androidTarget {
         publishLibraryVariants("release")
         compilations.all {
             kotlinOptions {
-                jvmTarget = "1.8"
+                jvmTarget = "11"
             }
         }
     }
     jvm("desktop") {
-        jvmToolchain(17)
+        jvmToolchain(11)
     }
     js(IR) {
         browser()

diff --git a/calf-io/build.gradle.kts b/calf-io/build.gradle.kts
@@ -5,12 +5,12 @@ plugins {
 }
 
 kotlin {
-    targetHierarchy.default()
+    kotlin.applyDefaultHierarchyTemplate()
     androidTarget {
         publishLibraryVariants("release")
         compilations.all {
             kotlinOptions {
-                jvmTarget = "1.8"
+                jvmTarget = "11"
             }
         }
     }

diff --git a/calf-maps/build.gradle.kts b/calf-maps/build.gradle.kts
@@ -6,12 +6,12 @@ plugins {
 }
 
 kotlin {
-    targetHierarchy.default()
+    kotlin.applyDefaultHierarchyTemplate()
     androidTarget {
         publishLibraryVariants("release")
         compilations.all {
             kotlinOptions {
-                jvmTarget = "1.8"
+                jvmTarget = "11"
             }
         }
     }

diff --git a/calf-media/build.gradle.kts b/calf-media/build.gradle.kts
@@ -6,12 +6,12 @@ plugins {
 }
 
 kotlin {
-    targetHierarchy.default()
+    kotlin.applyDefaultHierarchyTemplate()
     androidTarget {
         publishLibraryVariants("release")
         compilations.all {
             kotlinOptions {
-                jvmTarget = "1.8"
+                jvmTarget = "11"
             }
         }
     }

diff --git a/calf-navigation/build.gradle.kts b/calf-navigation/build.gradle.kts
@@ -7,12 +7,12 @@ plugins {
 }
 
 kotlin {
-    targetHierarchy.default()
+    kotlin.applyDefaultHierarchyTemplate()
     androidTarget {
         publishLibraryVariants("release")
         compilations.all {
             kotlinOptions {
-                jvmTarget = "1.8"
+                jvmTarget = "11"
             }
         }
     }

diff --git a/calf-notifications/build.gradle.kts b/calf-notifications/build.gradle.kts
@@ -6,12 +6,12 @@ plugins {
 }
 
 kotlin {
-    targetHierarchy.default()
+    kotlin.applyDefaultHierarchyTemplate()
     androidTarget {
         publishLibraryVariants("release")
         compilations.all {
             kotlinOptions {
-                jvmTarget = "1.8"
+                jvmTarget = "11"
             }
         }
     }

diff --git a/calf-permissions/build.gradle.kts b/calf-permissions/build.gradle.kts
@@ -6,12 +6,12 @@ plugins {
 }
 
 kotlin {
-    targetHierarchy.default()
+    kotlin.applyDefaultHierarchyTemplate()
     androidTarget {
         publishLibraryVariants("release")
         compilations.all {
             kotlinOptions {
-                jvmTarget = "1.8"
+                jvmTarget = "11"
             }
         }
     }

diff --git a/calf-sf-symbols/build.gradle.kts b/calf-sf-symbols/build.gradle.kts
@@ -6,12 +6,12 @@ plugins {
 }
 
 kotlin {
-    targetHierarchy.default()
+    kotlin.applyDefaultHierarchyTemplate()
     androidTarget {
         publishLibraryVariants("release")
         compilations.all {
             kotlinOptions {
-                jvmTarget = "1.8"
+                jvmTarget = "11"
             }
         }
     }

diff --git a/calf-ui/build.gradle.kts b/calf-ui/build.gradle.kts
@@ -6,12 +6,12 @@ plugins {
 }
 
 kotlin {
-    targetHierarchy.default()
+    kotlin.applyDefaultHierarchyTemplate()
     androidTarget {
         publishLibraryVariants("release")
         compilations.all {
             kotlinOptions {
-                jvmTarget = "1.8"
+                jvmTarget = "11"
             }
         }
     }

diff --git a/gradle.properties b/gradle.properties
@@ -7,6 +7,7 @@ kotlin.code.style=official
 
 #MPP
 kotlin.mpp.androidSourceSetLayoutVersion=2
+kotlin.mpp.androidGradlePluginCompatibility.nowarn=true
 kotlin.mpp.enableCInteropCommonization=true
 
 #Android

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,12 +1,12 @@
 [versions]
-agp = "7.4.2"
-kotlin = "1.9.10"
+agp = "8.3.0-alpha02"
+kotlin = "1.9.20-Beta"
 compose = "1.5.10-beta01"
 kotlinx-serialization-json = "1.6.0-RC"
 nexus-publish = "2.0.0-rc-1"
 
 # For sample
-compose-compiler = "1.5.0"
+compose-compiler = "1.5.3"
 activity-compose = "1.7.2"
 navigation-compose = "2.7.3"
 android-minSdk = "24"

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/sample/android/build.gradle.kts b/sample/android/build.gradle.kts
@@ -24,13 +24,13 @@ android {
         kotlinCompilerExtensionVersion = libs.versions.compose.compiler.get()
     }
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
     }
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = "11"
     }
-    packagingOptions {
+    packaging {
         resources {
             excludes += "/META-INF/{AL2.0,LGPL2.1}"
         }

diff --git a/sample/common/build.gradle.kts b/sample/common/build.gradle.kts
@@ -5,10 +5,11 @@ plugins {
 }
 
 kotlin {
+    kotlin.applyDefaultHierarchyTemplate()
     androidTarget {
         compilations.all {
             kotlinOptions {
-                jvmTarget = "1.8"
+                jvmTarget = "11"
             }
         }
     }
@@ -58,27 +59,15 @@ kotlin {
             }
         }
 
-        val androidMain by getting {
-            dependencies {}
-        }
+        val androidMain by getting
 
-        val desktopMain by getting {
-            dependencies {}
-        }
+        val desktopMain by getting
 
 //        val jsMain by getting {
 //            dependencies {}
 //        }
 
-        val iosX64Main by getting
-        val iosArm64Main by getting
-        val iosSimulatorArm64Main by getting
-        val iosMain by creating {
-            dependsOn(commonMain)
-            iosX64Main.dependsOn(this)
-            iosArm64Main.dependsOn(this)
-            iosSimulatorArm64Main.dependsOn(this)
-        }
+        val iosMain by getting
     }
 }
 
@@ -92,10 +81,10 @@ android {
         minSdk = libs.versions.android.minSdk.get().toInt()
     }
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
     }
     kotlin {
-        jvmToolchain(8)
+        jvmToolchain(11)
     }
 }
diff --git a/sample/common/src/commonMain/kotlin/com.mohamedrejeb.calf.sample/HomeScreen.kt b/sample/common/src/commonMain/kotlin/com.mohamedrejeb.calf.sample/HomeScreen.kt
@@ -148,7 +148,7 @@ fun ListItem(
             .fillMaxWidth()
             .clip(CircleShape)
             .background(
-                color = MaterialTheme.colorScheme.primary.copy(.2f)
+                color = MaterialTheme.colorScheme.primary
             )
             .clickable {
                 onClick()