Update Kotlin to 1.9.20 (#47)

ajalt · Nov 4, 2023 · 1e01ebe · 1e01ebe
1 parent f04bde2
commit 1e01ebe
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 36 deletions.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -12,7 +12,7 @@ jobs:
   linux-tests:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: actions/setup-java@v3
         with:
           distribution: 'zulu'
@@ -40,7 +40,7 @@ jobs:
   macos-tests:
     runs-on: macos-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: actions/setup-java@v3
         with:
           distribution: 'zulu'
@@ -59,7 +59,7 @@ jobs:
   windows-tests:
     runs-on: windows-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: actions/setup-java@v3
         with:
           distribution: 'zulu'
@@ -72,7 +72,7 @@ jobs:
     needs: [ linux-tests, macos-tests, windows-tests ]
     runs-on: macos-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: actions/setup-java@v3
         with:
           distribution: 'zulu'

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -10,7 +10,7 @@ jobs:
   linux-tests:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: actions/setup-java@v3
         with:
           distribution: 'zulu'
@@ -37,7 +37,7 @@ jobs:
   macos-tests:
     runs-on: macos-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: actions/setup-java@v3
         with:
           distribution: 'zulu'
@@ -53,7 +53,7 @@ jobs:
   windows-tests:
     runs-on: windows-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: actions/setup-java@v3
         with:
           distribution: 'zulu'

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -3,7 +3,6 @@ import org.jetbrains.dokka.gradle.DokkaTask
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile
 import java.io.ByteArrayOutputStream
-import java.net.URL
 
 plugins {
     kotlin("multiplatform").version(libs.versions.kotlin).apply(false)

diff --git a/colormath/build.gradle.kts b/colormath/build.gradle.kts
@@ -18,36 +18,17 @@ kotlin {
     mingwX64()
     macosX64()
     macosArm64()
-
-    ios()
+    iosX64()
+    iosArm64()
     iosSimulatorArm64()
-    tvos()
+    tvosX64()
+    tvosArm64()
     tvosSimulatorArm64()
-    watchos()
+    watchosX64()
+    watchosArm64()
     watchosSimulatorArm64()
 
     sourceSets {
-        val commonMain by getting
-
-        val nativeMain by creating {
-            dependsOn(commonMain)
-        }
-
-        listOf(
-            "macosX64",
-            "macosArm64",
-            "linuxX64",
-            "mingwX64",
-            "ios",
-            "iosSimulatorArm64",
-            "tvos",
-            "tvosSimulatorArm64",
-            "watchos",
-            "watchosSimulatorArm64"
-        ).forEach { target ->
-            getByName(target + "Main").dependsOn(nativeMain)
-        }
-
         val commonTest by getting {
             dependencies {
                 implementation(kotlin("test"))

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,6 +1,6 @@
 [versions]
-kotlin = "1.9.10"
-jbCompose = "1.5.1"
+kotlin = "1.9.20"
+jbCompose = "1.5.10"
 
 [libraries]
 # used in tests
@@ -11,7 +11,7 @@ junit =  "junit:junit:4.13.2"
 robolectric =  "org.robolectric:robolectric:4.10"
 
 [plugins]
-dokka = "org.jetbrains.dokka:1.9.0"
+dokka = "org.jetbrains.dokka:1.9.10"
 publish = "com.vanniktech.maven.publish:0.25.3"
 # used in extensions
 android-library = "com.android.library:7.4.0"