Version 0.5.7-SNAPSHOT

Author: kpgalligan

SQLager/build.gradle

@@ -25,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 {

SQLager/gradle.properties

@@ -20,7 +20,7 @@ GROUP=co.touchlab
 VERSION_NAME=0.1.1-SNAPSHOT
 
 STATELY_VERSION=0.5.1
-SQLITER_VERSION=0.5.6
+SQLITER_VERSION=0.5.7-SNAPSHOT
 KOTLIN_VERSION=1.3.10
 
 POM_URL=https://github.com/touchlab/SQLiter

SQLager/src/nativeCommonTest/kotlin/co/touchlab/sqlager/user/createDatabaseManager.kt

@@ -2,11 +2,11 @@ package co.touchlab.sqlager.user
 
 import co.touchlab.sqliter.DatabaseConfiguration
 import co.touchlab.sqliter.DatabaseManager
-import co.touchlab.sqliter.NativeFileContext
+import co.touchlab.sqliter.DatabaseFileContext
 
 actual fun createDatabaseManager(config: DatabaseConfiguration): DatabaseManager =
     co.touchlab.sqliter.createDatabaseManager(config)
 
 actual fun deleteDatabase(name:String){
-    NativeFileContext.deleteDatabase(name)
+    DatabaseFileContext.deleteDatabase(name)
 }

SQLiter/build.gradle

@@ -86,11 +86,11 @@ kotlin {
         nativeCommonMain { }
         nativeCommonTest { }
 
-        configure([iosX64Main, iosArm64Main/*, macosMain, iosArm32Main*/]) {
+        configure([iosX64Main, iosArm64Main, macosMain, iosArm32Main]) {
             dependsOn nativeCommonMain
         }
 
-        configure([iosX64Test, iosArm64Test/*, macosTest, iosArm32Test*/]) {
+        configure([iosX64Test, iosArm64Test, macosTest, iosArm32Test]) {
             dependsOn nativeCommonTest
         }
     }

SQLiter/gradle.properties

@@ -17,7 +17,7 @@
 kotlin.code.style=official
 
 GROUP=co.touchlab
-VERSION_NAME=0.5.6
+VERSION_NAME=0.5.7-SNAPSHOT
 
 STATELY_VERSION=0.5.1
 KOTLIN_VERSION=1.3.10

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

@@ -0,0 +1,21 @@
+/*
+ * Copyright (C) 2018 Touchlab, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package co.touchlab.sqliter
+
+expect object DatabaseFileContext{
+    fun deleteDatabase(name: String)
+}

SQLiter/src/jvmMain/kotlin/co/touchlab/sqliter/DatabaseFileContext.kt

@@ -0,0 +1,21 @@
+/*
+ * Copyright (C) 2018 Touchlab, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package co.touchlab.sqliter
+
+actual object DatabaseFileContext {
+    actual fun deleteDatabase(name: String) {}
+}

SQLiter/src/nativeCommonMain/kotlin/co/touchlab/sqliter/NativeFileContext.kt

@@ -23,8 +23,8 @@ import platform.Foundation.NSFileManager
 import platform.Foundation.NSSearchPathForDirectoriesInDomains
 import platform.Foundation.NSUserDomainMask
 
-object NativeFileContext{
-    fun deleteDatabase(name: String) {
+actual object DatabaseFileContext{
+    actual fun deleteDatabase(name: String) {
         deleteDatabaseFile(databaseFile(name))
     }
 

SQLiter/src/nativeCommonMain/kotlin/co/touchlab/sqliter/createDatabaseManager.kt

@@ -17,6 +17,6 @@
 package co.touchlab.sqliter
 
 fun createDatabaseManager(configuration: DatabaseConfiguration): DatabaseManager {
-    val databasePath = NativeFileContext.databasePath(configuration.name, configuration.inMemory)
+    val databasePath = DatabaseFileContext.databasePath(configuration.name, configuration.inMemory)
     return NativeDatabaseManager(databasePath, configuration)
 }

SQLiter/src/nativeCommonTest/kotlin/co/touchlab/sqliter/BaseDatabaseTest.kt

@@ -16,7 +16,7 @@
 
 package co.touchlab.sqliter
 
-import co.touchlab.sqliter.NativeFileContext.deleteDatabase
+import co.touchlab.sqliter.DatabaseFileContext.deleteDatabase
 import kotlin.test.AfterEach
 import kotlin.test.BeforeEach