Enable hierarchical multiplatform project structure

Author: sellmair

gradle.properties

@@ -2,7 +2,7 @@ kotlin.code.style=official
 
 GROUP=co.touchlab
 VERSION_NAME=1.0.6
-KOTLIN_VERSION=1.5.0
+KOTLIN_VERSION=1.5.30-RC
 
 kotlin.native.ignoreDisabledTargets=true
 
@@ -23,5 +23,7 @@ POM_DEVELOPER_NAME=Kevin Galligan
 POM_DEVELOPER_ORG=Kevin Galligan
 POM_DEVELOPER_URL=https://touchlab.co/
 
-#kotlin.mpp.enableGranularSourceSetsMetadata=true
-#kotlin.native.enableDependencyPropagation=false
+kotlin.mpp.enableGranularSourceSetsMetadata=true
+kotlin.native.enableDependencyPropagation=false
+kotlin.mpp.enableCInteropCommonization=true
+kotlin.mpp.commonizerLogLevel=info

sqliter-driver/build.gradle.kts

@@ -71,24 +71,21 @@ kotlin {
         val linuxMain = sourceSets.maybeCreate("linuxX64Main").apply {
             dependsOn(nativeCommonMain)
         }
-
-
+        
         val mingwMain = sourceSets.maybeCreate("mingwMain").apply {
             dependsOn(nativeCommonMain)
         }
         knTargets.forEach { target ->
             when {
                 target.name.startsWith("mingw") -> {
-                    target.compilations.getByName("main").source(mingwMain)
-                    target.compilations.getByName("test").source(nativeCommonTest)
+                    target.compilations.getByName("test").defaultSourceSet.dependsOn(nativeCommonTest)
                 }
                 target.name.startsWith("linux") -> {
-                    target.compilations.getByName("main").source(linuxMain)
-                    target.compilations.getByName("test").source(nativeCommonTest)
+                    target.compilations.getByName("test").defaultSourceSet.dependsOn(nativeCommonTest)
                 }
                 else -> {
-                    target.compilations.getByName("main").source(appleMain)
-                    target.compilations.getByName("test").source(nativeCommonTest)
+                    target.compilations.getByName("main").defaultSourceSet.dependsOn(appleMain)
+                    target.compilations.getByName("test").defaultSourceSet.dependsOn(nativeCommonTest)
                 }
             }
 

sqliter-driver/src/appleMain/kotlin/co/touchlab/sqliter/DatabaseFileContext.kt

@@ -48,7 +48,7 @@ actual object DatabaseFileContext{
         return databaseDirectory
     }
 
-    internal fun databaseFile(databaseName:String, datapathPath:String?):File = File(datapathPath?:databaseDirPath(), databaseName)
+    internal actual fun databaseFile(databaseName:String, datapathPath:String?):File = File(datapathPath?:databaseDirPath(), databaseName)
 
     internal fun deleteDatabaseFile(file:File):Boolean {
         var deleted = false
@@ -77,4 +77,4 @@ actual object DatabaseFileContext{
         }
         return deleted
     }
-}
+}

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

@@ -5,4 +5,4 @@ import platform.Foundation.NSRecursiveLock
 actual typealias Lock = NSRecursiveLock
 
 @Suppress("NOTHING_TO_INLINE")
-actual inline fun Lock.close() {}
+actual inline fun Lock.close() {}

sqliter-driver/src/appleMain/kotlin/co/touchlab/sqliter/internal/File.kt

@@ -19,9 +19,9 @@ package co.touchlab.sqliter.internal
 import platform.Foundation.*
 import platform.posix.*
 
-internal class File(dirPath:String?=null, name:String){
+internal actual class File(dirPath:String?=null, name:String){
 
-    val path:String
+    actual val path:String
 
     init {
         if (dirPath == null || dirPath.isEmpty()) {

sqliter-driver/src/appleMain/kotlin/co/touchlab/sqliter/util/usleep.kt

@@ -0,0 +1,5 @@
+package co.touchlab.sqliter.util
+
+actual fun usleep(seconds: UInt) {
+    platform.posix.usleep(seconds)
+}

sqliter-driver/src/linuxX64Main/kotlin/co/touchlab/sqliter/DatabaseFileContext.kt

@@ -31,7 +31,7 @@ actual object DatabaseFileContext {
 
     internal fun getHomeDirPath(): String? = getenv("HOME")?.toKString()
 
-    internal fun databaseFile(databaseName: String, datapathPath: String?): File =
+    internal actual fun databaseFile(databaseName: String, datapathPath: String?): File =
         File(datapathPath ?: databaseDirPath(), databaseName)
 
     internal fun deleteDatabaseFile(file: File): Boolean {

sqliter-driver/src/linuxX64Main/kotlin/co/touchlab/sqliter/internal/File.kt

@@ -19,9 +19,9 @@ package co.touchlab.sqliter.internal
 import kotlinx.cinterop.*
 import platform.posix.*
 
-internal class File(dirPath: String? = null, name: String) {
+internal actual class File(dirPath: String? = null, name: String) {
 
-    val path: String
+    actual val path: String
 
     init {
         if (dirPath == null || dirPath.isEmpty()) {

sqliter-driver/src/linuxX64Main/kotlin/co/touchlab/sqliter/util/usleep.kt

@@ -0,0 +1,8 @@
+package co.touchlab.sqliter.util
+
+/**
+ * Wrapper for platform.posix.usleep
+ */
+actual fun usleep(seconds: UInt) {
+    platform.posix.usleep(seconds)
+}

sqliter-driver/src/mingwMain/kotlin/co/touchlab/sqliter/DatabaseFileContext.kt

@@ -13,7 +13,7 @@ actual object DatabaseFileContext {
         return databaseFile(databaseName, datapathPath).path
     }
 
-    internal fun databaseFile(databaseName:String, datapathPath:String?):File {
+    internal actual fun databaseFile(databaseName:String, datapathPath:String?):File {
         return File(datapathPath ?: Utils.getUserDirectory(), databaseName)
     }