Merge pull request #790 from arkivanov/kotlin-2.1.21

Updated Kotlin to 2.1.21

Author: CherryPerry

coroutines-interop/src/commonTest/kotlin/com/badoo/reaktive/coroutinesinterop/SchedulerCoroutineDispatcherTest.kt

@@ -56,7 +56,8 @@ class SchedulerCoroutineDispatcherTest {
             }
         }
 
-        assertTrue(endTime.value - startTime >= 500.milliseconds)
+        val duration = endTime.value - startTime
+        assertTrue(actual = duration >= 500.milliseconds, message = "Expected duration>=500ms: $duration")
     }
 
     private class TestRunnable : Runnable {

gradle/libs.versions.toml

@@ -1,6 +1,7 @@
 [versions]
-kotlin = "2.0.0"
-kotlinx-coroutines = "1.8.1"
+kotlin = "2.1.21"
+kotlinx-coroutines = "1.10.2"
+kotlinx-browser = "0.3"
 detekt = "1.23.6"
 
 [libraries]
@@ -10,6 +11,7 @@ kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "
 kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotlin" }
 kotlin-test-annotations = { module = "org.jetbrains.kotlin:kotlin-test-annotations", version.ref = "kotlin" }
 
+kotlinx-browser = { group = "org.jetbrains.kotlinx", name = "kotlinx-browser", version.ref = "kotlinx-browser" }
 kotlinx-compatibility = "org.jetbrains.kotlinx:binary-compatibility-validator:0.17.0"
 kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlinx-coroutines" }
 kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "kotlinx-coroutines" }

includedBuild/gradleConfiguration/src/main/kotlin/com/badoo/reaktive/configuration/MppConfigurationPlugin.kt

@@ -9,9 +9,9 @@ import org.gradle.api.Project
 import org.gradle.kotlin.dsl.apply
 import org.gradle.kotlin.dsl.invoke
 import org.gradle.kotlin.dsl.withType
+import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
-import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 class MppConfigurationPlugin : Plugin<Project> {

kotlin-js-store/yarn.lock

@@ -22,5 +22,11 @@ kotlin {
                 implementation project(':reaktive-testing')
             }
         }
+
+        wasmJsMain {
+            dependencies {
+                implementation libs.kotlinx.browser
+            }
+        }
     }
 }

reaktive/build.gradle

@@ -48,12 +48,12 @@ class MainSchedulerTest {
         var counter = 0
         val items = mutableListOf<Int>()
 
-        executor.submit(period = 100.milliseconds) {
+        executor.submit(period = 256.milliseconds) {
             items.add(counter++)
         }
 
         val checkTicks =
-            observableOf(50.milliseconds, 150.milliseconds, 250.milliseconds, 350.milliseconds, 450.milliseconds)
+            observableOf(128.milliseconds, 384.milliseconds, 640.milliseconds, 896.milliseconds, 1152.milliseconds)
                 .flatMapSingle { timeout ->
                     singleTimer(timeout, scheduler = scheduler)
                         .map { items.toList() }

reaktive/src/jsCommonTest/kotlin/com/badoo/reaktive/scheduler/MainSchedulerTest.kt

@@ -1,5 +1,3 @@
 package com.badoo.reaktive.scheduler
 
-// Required until Kotlin 2.0.0 https://youtrack.jetbrains.com/issue/KT-37316
-@Suppress("ACTUAL_WITHOUT_EXPECT")
 internal actual typealias TimeoutId = Int

reaktive/src/wasmJsMain/kotlin/com/badoo/reaktive/scheduler/TimeoutId.kt

@@ -1,11 +1,12 @@
+import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
+
 /*
  * Use the following Gradle tasks to run your application:
  * :jsBrowserProductionRun - release mode JS
  * :jsBrowserDevelopmentRun - debug mode JS
  * :wasmJsBrowserProductionRun - release mode WASM-JS
  * :wasmJsBrowserDevelopmentRun - debug mode WASM-JS
  */
-import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
 
 plugins {
     id("kotlin-multiplatform")
@@ -16,6 +17,7 @@ kotlin {
         browser()
         binaries.executable()
     }
+
     @OptIn(ExperimentalWasmDsl::class)
     wasmJs {
         binaries.executable()
@@ -27,5 +29,9 @@ kotlin {
             implementation(project(":reaktive"))
             implementation(project(":sample-mpp-module"))
         }
+
+        wasmJsMain.dependencies {
+            implementation(libs.kotlinx.browser)
+        }
     }
 }