Uses new memory model by default (#723)

* Uses new memory model by default * Do not show DEPLOY mavenRepository by default, but uses gradle's logger * Do not fail test on the new memory manager
korlibs-archive · Jun 5, 2022 · f01a13a · f01a13a
1 parent b75ac68
commit f01a13a
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/buildSrc/src/main/kotlin/com/soywiz/korge/gradle/KorgeExtension.kt b/buildSrc/src/main/kotlin/com/soywiz/korge/gradle/KorgeExtension.kt
@@ -242,7 +242,7 @@ class KorgeExtension(val project: Project) {
     //val DEFAULT_JVM_TARGET = "1.6"
 	var jvmTarget: String = project.findProject("jvm.target")?.toString() ?: DEFAULT_JVM_TARGET
     var useMimalloc = true
-    var useNewMemoryModel = false
+    var useNewMemoryModel = true
 	var androidLibrary: Boolean = project.findProperty("android.library") == "true"
     var overwriteAndroidFiles: Boolean = project.findProperty("overwrite.android.files") == "false"
     var id: String = "com.unknown.unknownapp"

diff --git a/buildSrc/src/main/kotlin/com/soywiz/korlibs/modules/Publishing.kt b/buildSrc/src/main/kotlin/com/soywiz/korlibs/modules/Publishing.kt
@@ -73,9 +73,7 @@ fun Project.configurePublishing(multiplatform: Boolean = true) {
                             project.stagedRepositoryId != null -> uri("https://oss.sonatype.org/service/local/staging/deployByRepositoryId/${project.stagedRepositoryId}/")
                             else -> uri("https://oss.sonatype.org/service/local/staging/deploy/maven2/")
                         }
-                        rootProject.doOnce("showDeployTo") {
-                            println("DEPLOY mavenRepository: $url")
-                        }
+                        doOnce("showDeployTo") { logger.info("DEPLOY mavenRepository: $url") }
                     }
                 }
             }

diff --git a/gradle.properties b/gradle.properties
@@ -1,6 +1,6 @@
 version=2.0.0.999
 
-#kotlin.native.binary.memoryModel=experimental
+kotlin.native.binary.memoryModel=experimental
 
 android.useAndroidX=true
 

diff --git a/klogger/src/nativeTest/kotlin/com.soywiz.klogger.test/LoggerMultithreadedTest.kt b/klogger/src/nativeTest/kotlin/com.soywiz.klogger.test/LoggerMultithreadedTest.kt
@@ -21,7 +21,9 @@ class LoggerMultithreadedTest {
         val future = worker.execute(TransferMode.SAFE, { changeLoggerLevel.freeze() }) { it() }
         val result = future.result
 
-        assertTrue(logger.isFrozen)
+        if (Platform.memoryModel != MemoryModel.EXPERIMENTAL) {
+            assertTrue(logger.isFrozen)
+        }
         assertTrue { result == Logger.Level.INFO }
         assertTrue { logger.level == Logger.Level.INFO }
 
@@ -35,7 +37,9 @@ class LoggerMultithreadedTest {
         val future2 = worker2.execute(TransferMode.SAFE, { getLoggerLevel.freeze() }) { it() }
         val result2 = future2.result
 
-        assertTrue(logger2.isFrozen)
+        if (Platform.memoryModel != MemoryModel.EXPERIMENTAL) {
+            assertTrue(logger2.isFrozen)
+        }
         assertTrue { result2 == Logger.Level.INFO }
         assertTrue { logger2.level == Logger.Level.INFO }