Version 0.5.6

Author: kpgalligan

SQLager/build.gradle

@@ -13,7 +13,6 @@ buildscript {
 apply plugin: 'org.jetbrains.kotlin.multiplatform'
 
 repositories {
-    mavenLocal()
     mavenCentral()
     maven {
         url 'https://oss.sonatype.org/content/repositories/snapshots/'
@@ -26,7 +25,7 @@ version = VERSION_NAME
 kotlin {
     targets {
 //        fromPreset(presets.jvm, 'jvm')
-//        fromPreset(presets.macosX64, 'nativeCommon')
+        fromPreset(presets.macosX64, 'nativeCommon')
 
         fromPreset(presets.macosX64, 'macos') {
             compilations.each {
@@ -79,7 +78,11 @@ kotlin {
             }
         }*/
         nativeCommonMain {}
-        nativeCommonTest {}
+        nativeCommonTest {
+            dependencies {
+                implementation "co.touchlab:sqliter:$SQLITER_VERSION"
+            }
+        }
 
         configure([iosX64Main, iosArm32Main, iosArm64Main, macosMain]) {
             dependsOn nativeCommonMain

SQLager/gradle.properties

@@ -19,8 +19,8 @@ kotlin.code.style=official
 GROUP=co.touchlab
 VERSION_NAME=0.1.1-SNAPSHOT
 
-STATELY_VERSION=0.4.0-SNAPSHOT
-SQLITER_VERSION=0.4.3-SNAPSHOT
+STATELY_VERSION=0.5.1
+SQLITER_VERSION=0.5.6
 KOTLIN_VERSION=1.3.10
 
 POM_URL=https://github.com/touchlab/SQLiter

SQLager/src/commonMain/kotlin/co/touchlab/sqlager/user/BinderStatement.kt

@@ -3,6 +3,7 @@ package co.touchlab.sqlager.user
 import co.touchlab.sqliter.*
 import co.touchlab.stately.concurrency.AtomicBoolean
 import co.touchlab.stately.concurrency.AtomicInt
+import co.touchlab.stately.concurrency.value
 
 class BinderStatement internal constructor(internal val sql:String, internal val statement: Statement):
     Binder {

SQLager/src/commonMain/kotlin/co/touchlab/sqlager/user/Database.kt

@@ -1,12 +1,12 @@
 package co.touchlab.sqlager.user
 
 import co.touchlab.sqliter.DatabaseManager
-import co.touchlab.stately.annotation.ThreadLocal
 import co.touchlab.stately.collections.AbstractSharedLinkedList
 import co.touchlab.stately.collections.SharedLinkedList
 import co.touchlab.stately.collections.frozenLinkedList
-import co.touchlab.stately.concurrency.ReentrantLock
+import co.touchlab.stately.concurrency.Lock
 import co.touchlab.stately.concurrency.ThreadLocalRef
+import co.touchlab.stately.concurrency.value
 import co.touchlab.stately.concurrency.withLock
 
 class Database(
@@ -23,7 +23,7 @@ class Database(
     }
     internal val databaseInstances = frozenLinkedList<DatabaseInstance>() as SharedLinkedList<DatabaseInstance>
 
-    private val accessLock = ReentrantLock()
+    private val accessLock = Lock()
     private val threadLocalDatabaseInstance = ThreadLocalRef<DatabaseInstance>()
 
     /**
@@ -38,7 +38,7 @@ class Database(
             val instanceNode: AbstractSharedLinkedList.Node<DatabaseInstance> = accessLock.withLock {
 
                 if (databaseInstances.size < instanceCap) {
-                    val connection = databaseManager.createConnection()
+                    val connection = databaseManager.createMultiThreadedConnection()
                     val inst = DatabaseInstance(connection, cacheSize)
                     databaseInstances.addNode(inst)
                 } else {

SQLager/src/commonMain/kotlin/co/touchlab/sqlager/user/DatabaseInstance.kt

@@ -6,7 +6,7 @@ import co.touchlab.sqliter.stringForQuery
 import co.touchlab.sqliter.withTransaction
 import co.touchlab.stately.collections.frozenLruCache
 import co.touchlab.stately.concurrency.AtomicBoolean
-import co.touchlab.stately.concurrency.ReentrantLock
+import co.touchlab.stately.concurrency.Lock
 import co.touchlab.stately.concurrency.withLock
 
 internal class DatabaseInstance internal constructor(
@@ -19,12 +19,12 @@ internal class DatabaseInstance internal constructor(
         it.value.statement.finalizeStatement()
     }
 
-    private val accessLock = ReentrantLock()
+    private val accessLock = Lock()
     internal inline fun <R> access(block:(DatabaseInstance)->R):R = accessLock.withLock {
         block(this)
     }
 
-    private val cacheLock = ReentrantLock()
+    private val cacheLock = Lock()
 
     override fun execute(sql: String, bind: Binder.() -> Unit) {
         safeUseStatement(sql) {

SQLager/src/commonTest/kotlin/co/touchlab/sqlager/user/DatabaseTest.kt

@@ -1,14 +1,9 @@
 package co.touchlab.sqlager.user
 
-import co.touchlab.sqliter.DatabaseConfiguration
 import co.touchlab.sqliter.JournalMode
-import co.touchlab.sqliter.journalMode
-import co.touchlab.sqliter.withConnection
-import co.touchlab.stately.collections.frozenLinkedList
 import co.touchlab.stately.concurrency.AtomicInt
-import co.touchlab.stately.concurrency.ReentrantLock
-import co.touchlab.stately.concurrency.SingleLock
-import co.touchlab.stately.concurrency.withLock
+import co.touchlab.stately.concurrency.value
+
 import co.touchlab.stately.freeze
 import kotlin.test.*
 
@@ -300,7 +295,7 @@ class DatabaseTest{
                         sleep(700)
                     }
                 } catch (e: Exception) {
-                    exceptions.increment()
+                    exceptions.incrementAndGet()
                 }
             }
         }

SQLiter/build.gradle

@@ -30,14 +30,14 @@ kotlin {
 
 //                fromPreset(presets.macosX64, 'nativeCommon')
 
-        /*fromPreset(presets.macosX64, 'macos'){
+        fromPreset(presets.macosX64, 'macos'){
             compilations.each {
                 it.extraOpts("-linker-options", "-lsqlite3")
             }
             compilations.test {
                 it.extraOpts("-native-library", "../KotlinCpp/bcdist/macos_x64/tlruntime.bc")
             }
-        }*/
+        }
 
         fromPreset(presets.iosX64, 'iosX64'){
             compilations.each {
@@ -51,11 +51,11 @@ kotlin {
             }
         }
 
-        /*fromPreset(presets.iosArm32, 'iosArm32'){
+        fromPreset(presets.iosArm32, 'iosArm32'){
             compilations.each {
                 it.extraOpts("-linker-options", "-lsqlite3")
             }
-        }*/
+        }
 
     }
     sourceSets {

SQLiter/gradle.properties

@@ -17,9 +17,9 @@
 kotlin.code.style=official
 
 GROUP=co.touchlab
-VERSION_NAME=0.5.5-SNAPSHOT
+VERSION_NAME=0.5.6
 
-STATELY_VERSION=0.5.0-SNAPSHOT
+STATELY_VERSION=0.5.1
 KOTLIN_VERSION=1.3.10
 DOKKA_VERSION=0.9.17