Update dependencies, use concurrent memory manager and remove freezing

mockative · Oct 11, 2022 · c3d5421 · c3d5421
1 parent 5e93846
commit c3d5421
Show file tree

Hide file tree

Showing 14 changed files with 14 additions and 28 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -7,6 +7,7 @@ kotlin.mpp.stability.nowarn=true
 #kotlin.mpp.enableGranularSourceSetsMetadata=true
 kotlin.mpp.enableCompatibilityMetadataVariant=true
 #kotlin.native.enableDependencyPropagation=false
+kotlin.native.binary.memoryModel=experimental
 
 #Android
 android.useAndroidX=true

diff --git a/kontinuity-core/build.gradle.kts b/kontinuity-core/build.gradle.kts
@@ -12,6 +12,7 @@ kotlin {
         val commonMain by getting {
             dependencies {
                 implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4")
+                implementation("org.jetbrains.kotlinx:atomicfu:0.18.4")
             }
         }
 

diff --git a/kontinuity-core/src/commonMain/kotlin/io/mockative/kontinuity/internal/Freeze.kt b/kontinuity-core/src/commonMain/kotlin/io/mockative/kontinuity/internal/Freeze.kt
diff --git a/kontinuity-core/src/commonMain/kotlin/io/mockative/kontinuity/internal/KontinuityCallback.kt b/kontinuity-core/src/commonMain/kotlin/io/mockative/kontinuity/internal/KontinuityCallback.kt
@@ -3,4 +3,4 @@ package io.mockative.kontinuity.internal
 typealias KontinuityCallback<T> = (T, Unit) -> Unit
 
 @Suppress("NOTHING_TO_INLINE")
-internal inline operator fun <T> KontinuityCallback<T>.invoke(value: T) = invoke(value.freeze(), Unit)
+internal inline operator fun <T> KontinuityCallback<T>.invoke(value: T) = invoke(value, Unit)
diff --git a/...uity-core/src/commonMain/kotlin/io/mockative/kontinuity/internal/KontinuityCancellable.kt b/...uity-core/src/commonMain/kotlin/io/mockative/kontinuity/internal/KontinuityCancellable.kt
@@ -5,4 +5,4 @@ import kotlinx.coroutines.Job
 typealias KontinuityCancellable = () -> Unit
 
 @Suppress("NOTHING_TO_INLINE")
-internal inline fun Job.asNativeCancellable(): KontinuityCancellable = { cancel() }.freeze()
+internal inline fun Job.asNativeCancellable(): KontinuityCancellable = { cancel() }
diff --git a/kontinuity-core/src/commonMain/kotlin/io/mockative/kontinuity/internal/KontinuityFlow.kt b/kontinuity-core/src/commonMain/kotlin/io/mockative/kontinuity/internal/KontinuityFlow.kt
@@ -47,5 +47,5 @@ fun <T> Flow<T>.toKontinuityFlow(scope: CoroutineScope? = null): KontinuityFlow<
         job.asNativeCancellable()
     }
 
-    return flow.freeze()
+    return flow
 }
diff --git a/...inuity-core/src/commonMain/kotlin/io/mockative/kontinuity/internal/KontinuityStateFlow.kt b/...inuity-core/src/commonMain/kotlin/io/mockative/kontinuity/internal/KontinuityStateFlow.kt
@@ -30,5 +30,5 @@ fun <T> StateFlow<T>.toKontinuityStateFlow(scope: CoroutineScope? = null): Konti
         }
     }
 
-    return stateFlow.freeze()
+    return stateFlow
 }
diff --git a/kontinuity-core/src/commonMain/kotlin/io/mockative/kontinuity/internal/KontinuitySuspend.kt b/kontinuity-core/src/commonMain/kotlin/io/mockative/kontinuity/internal/KontinuitySuspend.kt
@@ -43,5 +43,5 @@ fun <T> kontinuitySuspend(scope: CoroutineScope? = null, block: suspend () -> T)
         job.asNativeCancellable()
     }
 
-    return suspend.freeze()
+    return suspend
 }
diff --git a/kontinuity-core/src/darwinMain/kotlin/io/mockative/kontinuity/internal/KontinuityError.kt b/kontinuity-core/src/darwinMain/kotlin/io/mockative/kontinuity/internal/KontinuityError.kt
@@ -9,7 +9,7 @@ actual typealias KontinuityError = NSError
 @OptIn(UnsafeNumber::class)
 internal actual fun Throwable.asKontinuityError(): KontinuityError {
     val userInfo = mutableMapOf<Any?, Any>()
-    userInfo["KotlinException"] = this.freeze()
+    userInfo["KotlinException"] = this
 
     val message = message
     if (message != null) {

diff --git a/kontinuity-core/src/jsMain/kotlin/io/mockative/kontinuity/internal/Freeze.kt b/kontinuity-core/src/jsMain/kotlin/io/mockative/kontinuity/internal/Freeze.kt
diff --git a/kontinuity-core/src/jvmMain/kotlin/io/mockative/kontinuity/internal/Freeze.kt b/kontinuity-core/src/jvmMain/kotlin/io/mockative/kontinuity/internal/Freeze.kt
diff --git a/kontinuity-core/src/nativeMain/kotlin/io/mockative/kontinuity/internal/Freeze.kt b/kontinuity-core/src/nativeMain/kotlin/io/mockative/kontinuity/internal/Freeze.kt
diff --git a/shared/build.gradle.kts b/shared/build.gradle.kts
@@ -49,7 +49,7 @@ kotlin {
         val commonMain by getting {
             dependencies {
                 // KotlinX
-                implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.0-native-mt")
+                implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4")
 
                 // Kontinuity
                 implementation(project(":kontinuity-core"))
@@ -62,7 +62,7 @@ kotlin {
                 implementation(kotlin("test-common"))
                 implementation(kotlin("test-annotations-common"))
 
-                implementation("io.mockative:mockative:1.2.1")
+                implementation("io.mockative:mockative:1.2.5")
             }
         }
 
@@ -103,7 +103,7 @@ dependencies {
     configurations
         .filter { it.name.startsWith("ksp") && it.name.contains("Test") }
         .forEach {
-            add(it.name, "io.mockative:mockative-processor:1.2.1")
+            add(it.name, "io.mockative:mockative-processor:1.2.5")
         }
 }
 
@@ -124,7 +124,7 @@ android {
 
     dependencies {
         androidTestImplementation("androidx.test:runner:1.4.0")
-        androidTestUtil("androidx.test:orchestrator:1.4.0")
+        androidTestUtil("androidx.test:orchestrator:1.4.1")
     }
 }
 

diff --git a/shared/src/iosTest/kotlin/com/app/sample/AuthenticationServiceTests.kt b/shared/src/iosTest/kotlin/com/app/sample/AuthenticationServiceTests.kt
@@ -34,7 +34,8 @@ class AuthenticationServiceTests {
             val mutex = Mutex()
             mutex.lock()
 
-            kAuthenticationService.loginK(request).invoke(
+            val kSuspend = kAuthenticationService.loginK(request)
+            kSuspend.invoke(
                 { value, _ ->
                     resultOrNull = Result.success(value)
                     mutex.unlock()