Updates to stately

Author: kpgalligan

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,19 +51,18 @@ kotlin {
             }
         }
 
-        fromPreset(presets.iosArm32, 'iosArm32'){
+        /*fromPreset(presets.iosArm32, 'iosArm32'){
             compilations.each {
                 it.extraOpts("-linker-options", "-lsqlite3")
             }
-        }
+        }*/
 
     }
     sourceSets {
         commonMain {
             dependencies {
                 implementation "co.touchlab:stately:$STATELY_VERSION"
                 implementation 'org.jetbrains.kotlin:kotlin-stdlib-common'
-//                implementation 'com.squareup.sqldelight:runtime:1.0.0-rc4'
             }
         }
         commonTest {
@@ -87,11 +86,11 @@ kotlin {
         nativeCommonMain { }
         nativeCommonTest { }
 
-        configure([iosX64Main, iosArm32Main, iosArm64Main, macosMain]) {
+        configure([iosX64Main, iosArm64Main/*, macosMain, iosArm32Main*/]) {
             dependsOn nativeCommonMain
         }
 
-        configure([iosX64Test, iosArm32Test, iosArm64Test, macosTest]) {
+        configure([iosX64Test, iosArm64Test/*, macosTest, iosArm32Test*/]) {
             dependsOn nativeCommonTest
         }
     }

SQLiter/gradle.properties

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

SQLiter/src/commonMain/kotlin/co/touchlab/sqliter/Cursor.kt

@@ -34,7 +34,8 @@ interface Cursor {
 }
 
 enum class FieldType(val nativeCode: Int) {
-    INTEGER(1), FLOAT(2), BLOB(4), NULL(5), TEXT(3);
+    //These names a prefixed with 'TYPE_' to avoid Kotlin/Native to Swift name collisions
+    TYPE_INTEGER(1), TYPE_FLOAT(2), TYPE_BLOB(4), TYPE_NULL(5), TYPE_TEXT(3);
 
     companion object {
         fun forCode(nativeCode: Int):FieldType{

SQLiter/src/commonMain/kotlin/co/touchlab/sqliter/CursorExtensions.kt

@@ -32,11 +32,11 @@ class CursorIterator(private val cursor: Cursor):Iterator<Row> {
         for(i in 0 until cursor.columnCount){
             val type = cursor.getType(i)
             val value:Any? = when(type){
-                FieldType.BLOB -> cursor.getBytes(i)
-                FieldType.FLOAT -> cursor.getDouble(i)
-                FieldType.INTEGER -> cursor.getLong(i)
-                FieldType.NULL -> null
-                FieldType.TEXT -> cursor.getString(i)
+                FieldType.TYPE_BLOB -> cursor.getBytes(i)
+                FieldType.TYPE_FLOAT -> cursor.getDouble(i)
+                FieldType.TYPE_INTEGER -> cursor.getLong(i)
+                FieldType.TYPE_NULL -> null
+                FieldType.TYPE_TEXT -> cursor.getString(i)
             }
 
             result.values.add(Pair(type, value))

SQLiter/src/commonMain/kotlin/co/touchlab/sqliter/DatabaseConfiguration.kt

@@ -16,6 +16,8 @@
 
 package co.touchlab.sqliter
 
+import co.touchlab.sqliter.Constants.validDatabaseName
+
 data class DatabaseConfiguration(
 
     val name:String,
@@ -33,7 +35,9 @@ data class DatabaseConfiguration(
     }
 }
 
-internal val validDatabaseName = "[A-Za-z0-9\\-_.]+".toRegex()
+object Constants{
+    val validDatabaseName = "[A-Za-z0-9\\-_.]+".toRegex()
+}
 
 enum class JournalMode {
     DELETE, WAL;

SQLiter/src/commonMain/kotlin/co/touchlab/sqliter/concurrency/ConcurrentDatabaseConnection.kt

@@ -20,11 +20,11 @@ import co.touchlab.sqliter.Cursor
 import co.touchlab.sqliter.DatabaseConnection
 import co.touchlab.sqliter.FieldType
 import co.touchlab.sqliter.Statement
-import co.touchlab.stately.concurrency.ReentrantLock
+import co.touchlab.stately.concurrency.Lock
 import co.touchlab.stately.concurrency.withLock
 
 class ConcurrentDatabaseConnection(private val delegateConnection:DatabaseConnection):DatabaseConnection{
-    private val accessLock = ReentrantLock()
+    private val accessLock = Lock()
 
     override fun createStatement(sql: String): Statement = accessLock.withLock { ConcurrentStatement(delegateConnection.createStatement(sql)) }