Update Kotlin/Multiplatform plugin to 1.9.23

Adjust project configuration accordingly.
saschpe · Mar 23, 2024 · c394ad6 · c394ad6
1 parent 53dcd11
commit c394ad6
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 22 deletions.
diff --git a/log4k-slf4j/build.gradle.kts b/log4k-slf4j/build.gradle.kts
@@ -7,7 +7,7 @@ plugins {
 
 kotlin {
     androidTarget { publishAllLibraryVariants() }
-    ios()
+    iosArm64()
     iosSimulatorArm64()
     js {
         nodejs()
@@ -18,19 +18,13 @@ kotlin {
     }
     jvm { testRuns["test"].executionTask.configure { useJUnitPlatform() } }
 
-    sourceSets["androidMain"].dependencies {
-        implementation("org.slf4j:slf4j-api:1.7.36")
-    }
-    sourceSets["commonMain"].dependencies {
-        implementation(project(":log4k"))
-    }
-    sourceSets["commonTest"].dependencies {
-        implementation(kotlin("test"))
-    }
-    sourceSets["iosSimulatorArm64Main"].dependsOn(sourceSets["iosMain"])
-    sourceSets["iosSimulatorArm64Test"].dependsOn(sourceSets["iosTest"])
-    sourceSets["jvmMain"].dependencies {
-        implementation("org.slf4j:slf4j-api:1.7.36")
+    applyDefaultHierarchyTemplate()
+
+    sourceSets {
+        commonMain.dependencies { implementation(project(":log4k")) }
+        commonTest.dependencies { implementation(kotlin("test")) }
+        androidMain.dependencies { implementation("org.slf4j:slf4j-api:1.7.36") }
+        jvmMain.dependencies { implementation("org.slf4j:slf4j-api:1.7.36") }
     }
 }
 
@@ -98,4 +92,4 @@ signing {
         else -> useInMemoryPgpKeys(sonatypeGpgKey, sonatypeGpgKeyPassword)
     }
     sign(publishing.publications)
-}
+}
diff --git a/log4k/build.gradle.kts b/log4k/build.gradle.kts
@@ -7,7 +7,7 @@ plugins {
 
 kotlin {
     androidTarget { publishAllLibraryVariants() }
-    ios()
+    iosArm64()
     iosSimulatorArm64()
     js {
         nodejs()
@@ -18,11 +18,11 @@ kotlin {
     }
     jvm { testRuns["test"].executionTask.configure { useJUnitPlatform() } }
 
-    sourceSets["commonTest"].dependencies {
-        implementation(kotlin("test"))
+    applyDefaultHierarchyTemplate()
+
+    sourceSets {
+        commonTest.dependencies { implementation(kotlin("test")) }
     }
-    sourceSets["iosSimulatorArm64Main"].dependsOn(sourceSets["iosMain"])
-    sourceSets["iosSimulatorArm64Test"].dependsOn(sourceSets["iosTest"])
 }
 
 java.toolchain.languageVersion.set(JavaLanguageVersion.of(17))
@@ -89,4 +89,4 @@ signing {
         else -> useInMemoryPgpKeys(sonatypeGpgKey, sonatypeGpgKeyPassword)
     }
     sign(publishing.publications)
-}
+}
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -5,7 +5,7 @@ pluginManagement {
     }
 
     plugins {
-        kotlin("multiplatform") version "1.9.10"
+        kotlin("multiplatform") version "1.9.23"
         id("com.android.library") version "8.2.2"
     }
 }