Update to Kotlin 1.9.20 (#473)

Foso · Nov 5, 2023 · dfb6795 · dfb6795
1 parent ed85b7d
commit dfb6795
Show file tree

Hide file tree

Showing 8 changed files with 90 additions and 53 deletions.
diff --git a/example/MultiplatformExample/build.gradle.kts b/example/MultiplatformExample/build.gradle.kts
@@ -9,7 +9,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.0")
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.20")
         classpath("com.android.tools.build:gradle:7.3.1")
         classpath("org.jetbrains.kotlin:kotlin-serialization:1.9.10")
 

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -6,9 +6,9 @@ coroutines = "1.7.3"
 detekt = "1.23.1"
 junit = "4.13.2"
 kctfork = "0.3.2"
-kotlin = "1.9.10"
+kotlin = "1.9.20"
 kotlinPoet = "1.14.2"
-kspVersion = "1.9.10-1.0.13"
+kspVersion = "1.9.20-1.0.13"
 ktorfit = "1.9.1"
 ktorfitGradlePlugin = "1.8.1"
 ktorVersion = "2.3.4"

diff --git a/ktorfit-annotations/build.gradle.kts b/ktorfit-annotations/build.gradle.kts
@@ -38,7 +38,6 @@ kotlin {
     iosArm64()
     iosX64()
     iosSimulatorArm64()
-
     watchosArm32()
     watchosArm64()
     watchosX64()
@@ -54,25 +53,30 @@ kotlin {
         }
     }
 
-    ios("ios") {
-        binaries {
-            framework {
-                baseName = "library"
-            }
+    listOf(
+        iosX64(),
+        iosArm64(),
+        iosSimulatorArm64(),
+        watchosArm32(),
+        watchosArm64(),
+        watchosSimulatorArm64(),
+        tvosArm64(),
+        tvosX64(),
+        tvosSimulatorArm64()
+    ).forEach {
+        it.binaries.framework {
+            baseName = "library"
         }
     }
+
     mingwX64()
+    applyDefaultHierarchyTemplate()
     sourceSets {
-        val commonMain by getting
-        val linuxX64Main by getting
-        val androidMain by getting
-        val jvmMain by getting
         val iosX64Main by getting
         val iosArm64Main by getting
         val iosSimulatorArm64Main by getting
-        val jsMain by getting
         val iosMain by getting {
-            dependsOn(commonMain)
+            dependsOn(commonMain.get())
             iosX64Main.dependsOn(this)
             iosArm64Main.dependsOn(this)
             iosSimulatorArm64Main.dependsOn(this)
@@ -85,11 +89,11 @@ val javadocJar by tasks.registering(Jar::class) {
 }
 
 android {
-    compileSdk = 33
+    compileSdk = 34
     sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
     defaultConfig {
         minSdk = 21
-        targetSdk = 33
+        targetSdk = 34
     }
     namespace = "de.jensklingenberg.ktorfit.annotations"
 }

diff --git a/ktorfit-converters/call/build.gradle.kts b/ktorfit-converters/call/build.gradle.kts
@@ -66,14 +66,23 @@ kotlin {
         }
     }
 
-    ios("ios") {
-        binaries {
-            framework {
-                baseName = "library"
-            }
+    listOf(
+        iosX64(),
+        iosArm64(),
+        iosSimulatorArm64(),
+        watchosArm32(),
+        watchosArm64(),
+        watchosSimulatorArm64(),
+        tvosArm64(),
+        tvosX64(),
+        tvosSimulatorArm64()
+    ).forEach {
+        it.binaries.framework {
+            baseName = "library"
         }
     }
     mingwX64()
+    applyDefaultHierarchyTemplate()
     sourceSets {
         val commonMain by getting {
             dependencies {
@@ -85,9 +94,7 @@ kotlin {
                 implementation(libs.kotlin.test)
             }
         }
-        val linuxX64Main by getting
-        val mingwX64Main by getting
-        val androidMain by getting
+
         val jvmMain by getting
         val jvmTest by getting {
             dependencies {
@@ -116,11 +123,11 @@ val javadocJar by tasks.registering(Jar::class) {
 }
 
 android {
-    compileSdk = 33
+    compileSdk = 34
     sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
     defaultConfig {
         minSdk = 21
-        targetSdk = 33
+        targetSdk = 34
     }
     namespace = "de.jensklingenberg.ktorfit.converters.call"
 }

diff --git a/ktorfit-converters/flow/build.gradle.kts b/ktorfit-converters/flow/build.gradle.kts
@@ -66,14 +66,23 @@ kotlin {
         }
     }
 
-    ios("ios") {
-        binaries {
-            framework {
-                baseName = "library"
-            }
+    listOf(
+        iosX64(),
+        iosArm64(),
+        iosSimulatorArm64(),
+        watchosArm32(),
+        watchosArm64(),
+        watchosSimulatorArm64(),
+        tvosArm64(),
+        tvosX64(),
+        tvosSimulatorArm64()
+    ).forEach {
+        it.binaries.framework {
+            baseName = "library"
         }
     }
     mingwX64()
+    applyDefaultHierarchyTemplate()
     sourceSets {
         val commonMain by getting {
             dependencies {
@@ -104,11 +113,11 @@ val javadocJar by tasks.registering(Jar::class) {
 }
 
 android {
-    compileSdk = 33
+    compileSdk = 34
     sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
     defaultConfig {
         minSdk = 21
-        targetSdk = 33
+        targetSdk = 34
     }
     namespace = "de.jensklingenberg.ktorfit.converters.flow"
 }

diff --git a/ktorfit-lib-core/build.gradle.kts b/ktorfit-lib-core/build.gradle.kts
@@ -87,14 +87,23 @@ kotlin {
         }
     }
 
-    ios("ios") {
-        binaries {
-            framework {
-                baseName = "library"
-            }
+    listOf(
+        iosX64(),
+        iosArm64(),
+        iosSimulatorArm64(),
+        watchosArm32(),
+        watchosArm64(),
+        watchosSimulatorArm64(),
+        tvosArm64(),
+        tvosX64(),
+        tvosSimulatorArm64()
+    ).forEach {
+        it.binaries.framework {
+            baseName = "library"
         }
     }
     mingwX64()
+    applyDefaultHierarchyTemplate()
 
     sourceSets {
         val commonMain by getting {
@@ -108,9 +117,7 @@ kotlin {
                 implementation(libs.kotlin.test)
             }
         }
-        val linuxX64Main by getting
-        val mingwX64Main by getting
-        val androidMain by getting
+
         val jvmMain by getting
         val jvmTest by getting {
             dependencies {
@@ -142,11 +149,11 @@ val javadocJar by tasks.registering(Jar::class) {
 }
 
 android {
-    compileSdk = 33
+    compileSdk = 34
     sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
     defaultConfig {
         minSdk = 21
-        targetSdk = 33
+        targetSdk = 34
     }
     namespace = "de.jensklingenberg.ktorfit.common"
 }

diff --git a/ktorfit-lib/build.gradle.kts b/ktorfit-lib/build.gradle.kts
@@ -66,14 +66,23 @@ kotlin {
         }
     }
 
-    ios("ios") {
-        binaries {
-            framework {
-                baseName = "library"
-            }
+    listOf(
+        iosX64(),
+        iosArm64(),
+        iosSimulatorArm64(),
+        watchosArm32(),
+        watchosArm64(),
+        watchosSimulatorArm64(),
+        tvosArm64(),
+        tvosX64(),
+        tvosSimulatorArm64()
+    ).forEach {
+        it.binaries.framework {
+            baseName = "library"
         }
     }
     mingwX64()
+    applyDefaultHierarchyTemplate()
     sourceSets {
         val commonMain by getting {
             dependencies {
@@ -127,11 +136,11 @@ val javadocJar by tasks.registering(Jar::class) {
 }
 
 android {
-    compileSdk = 33
+    compileSdk = 34
     sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
     defaultConfig {
         minSdk = 21
-        targetSdk = 33
+        targetSdk = 34
     }
     namespace = "de.jensklingenberg.ktorfit"
 }

diff --git a/sandbox/build.gradle.kts b/sandbox/build.gradle.kts
@@ -50,8 +50,9 @@ kotlin {
         }
     }
 
-    macosX64("macOS")
+   // macosX64()
     mingwX64()
+    applyDefaultHierarchyTemplate()
     sourceSets {
         val commonMain by getting {
 
@@ -116,7 +117,7 @@ kotlin {
         }
         val iosX64Main by getting
         val iosArm64Main by getting
-        val iosMain by creating {
+        val iosMain by getting {
             dependsOn(commonMain)
             iosX64Main.dependsOn(this)
             iosArm64Main.dependsOn(this)