Update Kotlin (Kotlin#2902)

* Update Kotlin to 1.5.30 * Add new M1 targets
pablobaxter · Sep 14, 2022 · 94d9854 · 94d9854
1 parent 5a0d26c
commit 94d9854
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 4 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -5,12 +5,12 @@
 # Kotlin
 version=1.5.1-SNAPSHOT
 group=org.jetbrains.kotlinx
-kotlin_version=1.5.20
+kotlin_version=1.5.30
 
 # Dependencies
 junit_version=4.12
 junit5_version=5.7.0
-atomicfu_version=0.16.2
+atomicfu_version=0.16.3
 knit_version=0.3.0
 html_version=0.7.2
 lincheck_version=2.14

diff --git a/gradle/compile-native-multiplatform.gradle b/gradle/compile-native-multiplatform.gradle
@@ -25,6 +25,10 @@ kotlin {
         addTarget(presets.watchosArm64)
         addTarget(presets.watchosX86)
         addTarget(presets.watchosX64)
+        addTarget(presets.iosSimulatorArm64)
+        addTarget(presets.watchosSimulatorArm64)
+        addTarget(presets.tvosSimulatorArm64)
+        addTarget(presets.macosArm64)
     }
 
     sourceSets {

diff --git a/kotlinx-coroutines-core/common/test/CoroutineDispatcherOperatorFunInvokeTest.kt b/kotlinx-coroutines-core/common/test/CoroutineDispatcherOperatorFunInvokeTest.kt
@@ -65,7 +65,6 @@ class CoroutineDispatcherOperatorFunInvokeTest : TestBase() {
             dispatcher.dispatch(context, block)
         }
 
-        @ExperimentalCoroutinesApi
         override fun isDispatchNeeded(context: CoroutineContext): Boolean {
             return dispatcher.isDispatchNeeded(context)
         }

diff --git a/kotlinx-coroutines-core/common/test/flow/VirtualTime.kt b/kotlinx-coroutines-core/common/test/flow/VirtualTime.kt
@@ -48,7 +48,6 @@ internal class VirtualTimeDispatcher(enclosingScope: CoroutineScope) : Coroutine
         originalDispatcher.dispatch(context, block)
     }
 
-    @ExperimentalCoroutinesApi
     override fun isDispatchNeeded(context: CoroutineContext): Boolean = originalDispatcher.isDispatchNeeded(context)
 
     override fun invokeOnTimeout(timeMillis: Long, block: Runnable, context: CoroutineContext): DisposableHandle {

diff --git a/kotlinx-coroutines-core/jvm/test/FieldWalker.kt b/kotlinx-coroutines-core/jvm/test/FieldWalker.kt
@@ -89,6 +89,7 @@ object FieldWalker {
                     cur = ref.parent
                     path += "[${ref.index}]"
                 }
+                else -> error("Should not be reached")
             }
         }
         path.reverse()