Merge pull request #31 from luca992/kotlin-2.0

Kotlin 2.0

.github/workflows/compilation-check.yml

@@ -14,10 +14,10 @@ jobs:
         os: [macos-latest, windows-latest, ubuntu-latest]
     steps:
       - uses: actions/checkout@v1
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v1
         with:
-          java-version: 11
+          java-version: 17
       - name: Check build
         run: ./gradlew detektWithoutTests build publishToMavenLocal
       - name: Install pods

.github/workflows/publish.yml

@@ -22,10 +22,10 @@ jobs:
         os: [macos-latest, windows-latest, ubuntu-latest]
     steps:
       - uses: actions/checkout@v1
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v1
         with:
-          java-version: 11
+          java-version: 17
       - name: Publish
         run: ./gradlew publish -DIS_MAIN_HOST=${{ matrix.os == 'ubuntu-latest' }}
   release:

.gitignore

@@ -10,4 +10,5 @@ Pods
 xcuserdata
 local.properties
 local.gradle
-kotlin-js-store/
+kotlin-js-store/
+.kotlin

build.gradle.kts

@@ -1,3 +1,6 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+
 /*
  * Copyright 2019 IceRock MAG Inc. Use of this source code is governed by the Apache 2.0 license.
  */
@@ -17,9 +20,7 @@ allprojects {
         group = "dev.icerock.moko"
         version = libs.versions.mokoGraphicsVersion.get()
     }
-}
-
-// temporary fix for Apple Silicon (remove after 1.6.20 update)
-rootProject.plugins.withType<org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootPlugin> {
-    rootProject.the<org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension>().nodeVersion = "16.0.0"
+    tasks.withType<KotlinCompile> {
+        compilerOptions.jvmTarget = JvmTarget.JVM_1_8
+    }
 }

gradle.properties

@@ -5,8 +5,6 @@ org.gradle.parallel=true
 kotlin.code.style=official
 
 kotlin.mpp.stability.nowarn=true
-kotlin.mpp.enableGranularSourceSetsMetadata=true
-kotlin.mpp.enableCompatibilityMetadataVariant=true
-kotlin.native.enableDependencyPropagation=false
+kotlin.js.yarn=false
 
 android.useAndroidX=true

gradle/libs.versions.toml

@@ -1,10 +1,10 @@
 [versions]
-androidAppCompatVersion = "1.2.0"
-androidAnnotationVersion = "1.1.0"
-mokoGraphicsVersion = "0.9.0"
+androidAppCompatVersion = "1.6.1"
+androidAnnotationVersion = "1.8.0"
+mokoGraphicsVersion = "0.10.0"
 
 [libraries]
 appCompat = { module = "androidx.appcompat:appcompat", version.ref = "androidAppCompatVersion" }
-annotation = { module = "androidx.annotation:annotation", version.ref = "androidAppCompatVersion" }
+annotation = { module = "androidx.annotation:annotation", version.ref = "androidAnnotationVersion" }
 mokoGraphics = { module = "dev.icerock.moko:graphics", version.ref = "mokoGraphicsVersion" }
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists