maybe freeze

Author: kpgalligan

gradle.properties

@@ -1,8 +1,8 @@
 kotlin.code.style=official
 
 GROUP=co.touchlab
-VERSION_NAME=1.0.10
-KOTLIN_VERSION=1.5.30
+VERSION_NAME=1.0.11
+KOTLIN_VERSION=1.6.10
 
 kotlin.native.ignoreDisabledTargets=true
 

sqliter-driver/build.gradle.kts

@@ -115,6 +115,12 @@ if(!HostManager.hostIsLinux) {
     tasks.findByName("publishLinuxX64PublicationToMavenRepository")?.enabled = false
 }
 
+if(!HostManager.hostIsMingw) {
+    tasks.findByName("mingwX64Test")?.enabled = false
+    tasks.findByName("linkDebugTestMingwX64")?.enabled = false
+    tasks.findByName("publishMingwX64PublicationToMavenRepository")?.enabled = false
+}
+
 apply(from = "../gradle/gradle-mvn-mpp-push.gradle")
 
 tasks.register("publishMac"){

sqliter-driver/src/linuxX64Main/kotlin/co/touchlab/sqliter/concurrency/Lock.kt

@@ -1,10 +1,10 @@
 package co.touchlab.sqliter.concurrency
 
+import co.touchlab.sqliter.util.maybeFreeze
 import kotlinx.cinterop.Arena
 import kotlinx.cinterop.alloc
 import kotlinx.cinterop.ptr
 import platform.posix.*
-import kotlin.native.concurrent.freeze
 
 /**
  * A simple lock.
@@ -19,7 +19,7 @@ actual class Lock actual constructor() {
         pthread_mutexattr_init(attr.ptr)
         pthread_mutexattr_settype(attr.ptr, PTHREAD_MUTEX_RECURSIVE.toInt())
         pthread_mutex_init(mutex.ptr, attr.ptr)
-        freeze()
+        maybeFreeze()
     }
 
     actual fun lock() {

sqliter-driver/src/mingwX64Main/kotlin/co/touchlab/sqliter/concurrency/Lock.kt

@@ -1,5 +1,6 @@
 package co.touchlab.sqliter.concurrency
 
+import co.touchlab.sqliter.util.maybeFreeze
 import kotlinx.cinterop.Arena
 import kotlinx.cinterop.alloc
 import kotlinx.cinterop.ptr
@@ -14,7 +15,6 @@ import platform.posix.pthread_mutexattr_destroy
 import platform.posix.pthread_mutexattr_init
 import platform.posix.pthread_mutexattr_settype
 import platform.posix.pthread_mutexattr_tVar
-import kotlin.native.concurrent.freeze
 
 /**
  * A simple lock.
@@ -29,7 +29,7 @@ actual class Lock actual constructor() {
         pthread_mutexattr_init(attr.ptr)
         pthread_mutexattr_settype(attr.ptr, PTHREAD_MUTEX_RECURSIVE.toInt())
         pthread_mutex_init(mutex.ptr, attr.ptr)
-        freeze()
+        maybeFreeze()
     }
 
     actual fun lock() {

sqliter-driver/src/mingwX86Main/kotlin/co/touchlab/sqliter/concurrency/Lock.kt

@@ -1,5 +1,6 @@
 package co.touchlab.sqliter.concurrency
 
+import co.touchlab.sqliter.util.maybeFreeze
 import kotlinx.cinterop.Arena
 import kotlinx.cinterop.alloc
 import kotlinx.cinterop.ptr
@@ -14,7 +15,6 @@ import platform.posix.pthread_mutexattr_destroy
 import platform.posix.pthread_mutexattr_init
 import platform.posix.pthread_mutexattr_settype
 import platform.posix.pthread_mutexattr_tVar
-import kotlin.native.concurrent.freeze
 
 /**
  * A simple lock.
@@ -29,7 +29,7 @@ actual class Lock actual constructor() {
         pthread_mutexattr_init(attr.ptr)
         pthread_mutexattr_settype(attr.ptr, PTHREAD_MUTEX_RECURSIVE.toInt())
         pthread_mutex_init(mutex.ptr, attr.ptr)
-        freeze()
+        maybeFreeze()
     }
 
     actual fun lock() {

sqliter-driver/src/nativeCommonMain/kotlin/co/touchlab/sqliter/native/NativeDatabaseConnection.kt

@@ -20,9 +20,9 @@ import co.touchlab.sqliter.*
 import co.touchlab.sqliter.concurrency.Lock
 import co.touchlab.sqliter.concurrency.withLock
 import co.touchlab.sqliter.interop.SqliteDatabase
+import co.touchlab.sqliter.util.maybeFreeze
 import kotlin.native.concurrent.AtomicInt
 import kotlin.native.concurrent.AtomicReference
-import kotlin.native.concurrent.freeze
 
 class NativeDatabaseConnection(
     val dbManager: NativeDatabaseManager,
@@ -45,12 +45,12 @@ class NativeDatabaseConnection(
 
     override fun beginTransaction() = transLock.withLock {
         withStatement("BEGIN;") { execute() }
-        transaction.value = Transaction(false).freeze()
+        transaction.value = Transaction(false).maybeFreeze()
     }
 
     override fun setTransactionSuccessful() = transLock.withLock {
         val trans = checkFailTransaction()
-        transaction.value = trans.copy(successful = true).freeze()
+        transaction.value = trans.copy(successful = true).maybeFreeze()
     }
 
     override fun endTransaction() = transLock.withLock {

sqliter-driver/src/nativeCommonMain/kotlin/co/touchlab/sqliter/native/NativeDatabaseManager.kt

@@ -23,14 +23,14 @@ import co.touchlab.sqliter.concurrency.SingleThreadDatabaseConnection
 import co.touchlab.sqliter.concurrency.withLock
 import co.touchlab.sqliter.interop.OpenFlags
 import co.touchlab.sqliter.interop.dbOpen
+import co.touchlab.sqliter.util.maybeFreeze
 import kotlin.native.concurrent.AtomicInt
-import kotlin.native.concurrent.freeze
 
 class NativeDatabaseManager(private val path:String,
                             override val configuration: DatabaseConfiguration
 ): DatabaseManager {
     override fun createMultiThreadedConnection(): DatabaseConnection {
-        return ConcurrentDatabaseConnection(createConnection()).freeze()
+        return ConcurrentDatabaseConnection(createConnection()).maybeFreeze()
     }
 
     override fun createSingleThreadedConnection(): DatabaseConnection {

sqliter-driver/src/nativeCommonMain/kotlin/co/touchlab/sqliter/util/Functions.kt

@@ -0,0 +1,9 @@
+package co.touchlab.sqliter.util
+
+import kotlin.native.concurrent.freeze
+
+internal inline fun <T> T.maybeFreeze(): T = if (Platform.memoryModel == MemoryModel.STRICT) {
+    this.freeze()
+} else {
+    this
+}