Clean up build v1.0.0-b2

Author: kpgalligan

gradle.properties

@@ -1,9 +1,8 @@
 kotlin.code.style=official
 
 GROUP=co.touchlab
-VERSION_NAME=1.0.0-b1
+VERSION_NAME=1.0.0-b2
 
-KOTLIN_VERSION=1.4.21
 kotlin.native.ignoreDisabledTargets=true
 
 POM_URL=https://github.com/touchlab/SQLiter
@@ -22,3 +21,6 @@ POM_DEVELOPER_ID=kpgalligan
 POM_DEVELOPER_NAME=Kevin Galligan
 POM_DEVELOPER_ORG=Kevin Galligan
 POM_DEVELOPER_URL=https://touchlab.co/
+
+#kotlin.mpp.enableGranularSourceSetsMetadata=true
+#kotlin.native.enableDependencyPropagation=false

sqliter-driver/build.gradle.kts

@@ -1,91 +1,81 @@
 plugins {
-	kotlin("multiplatform") version "1.4.20"
+    kotlin("multiplatform") version "1.4.31"
 }
 
-val GROUP:String by project
-val VERSION_NAME:String by project
+val GROUP: String by project
+val VERSION_NAME: String by project
 
 group = GROUP
 version = VERSION_NAME
 
-val ideaActive = System.getProperty("idea.active") == "true"
-
 fun configInterop(target: org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget) {
-	val main by target.compilations.getting
-	val sqlite3 by main.cinterops.creating {
-		includeDirs("$projectDir/src/include")
-	}
+    val main by target.compilations.getting
+    val sqlite3 by main.cinterops.creating {
+        includeDirs("$projectDir/src/include")
+    }
 }
 
 val onWindows = org.jetbrains.kotlin.konan.target.HostManager.hostIsMingw
 
 kotlin {
-	val knTargets = if (ideaActive) {
-		listOf(
-			macosX64("nativeCommon"),
-			mingwX64("mingw")
-		)
-	} else {
-		listOf(
-			macosX64(),
-			iosX64(),
-			iosArm64(),
-			iosArm32(),
-			watchosArm32(),
-			watchosArm64(),
-			watchosX86(),
-			tvosArm64(),
-			tvosX64(),
-			mingwX64("mingw") {
-				compilations.forEach {
-					it.kotlinOptions.freeCompilerArgs += listOf("-linker-options", "-Lc:\\msys64\\mingw64\\lib")
-				}
-			}
-		)
-	}
+    val knTargets = listOf(
+        macosX64(),
+        iosX64(),
+        iosArm64(),
+        iosArm32(),
+        watchosArm32(),
+        watchosArm64(),
+        watchosX86(),
+        tvosArm64(),
+        tvosX64(),
+        mingwX64("mingw") {
+            compilations.forEach {
+                it.kotlinOptions.freeCompilerArgs += listOf("-linker-options", "-Lc:\\msys64\\mingw64\\lib")
+            }
+        }
+    )
+
+    knTargets.forEach { configInterop(it) }
 
-	knTargets.forEach { configInterop(it) }
+    knTargets.forEach { target ->
+        val test by target.compilations.getting
+        test.kotlinOptions.freeCompilerArgs += listOf("-linker-options", "-lsqlite3")
+    }
 
-	knTargets.forEach { target ->
-		val test by target.compilations.getting
-		test.kotlinOptions.freeCompilerArgs += listOf("-linker-options", "-lsqlite3")
-	}
+    sourceSets {
+        commonMain {
+            dependencies {
+                implementation("org.jetbrains.kotlin:kotlin-stdlib-common")
+            }
+        }
+        commonTest {
+            dependencies {
+                implementation("org.jetbrains.kotlin:kotlin-test-common")
+                implementation("org.jetbrains.kotlin:kotlin-test-annotations-common")
+            }
+        }
 
-	sourceSets {
-		commonMain {
-			dependencies {
-				implementation("org.jetbrains.kotlin:kotlin-stdlib-common")
-			}
-		}
-		commonTest {
-			dependencies {
-				implementation("org.jetbrains.kotlin:kotlin-test-common")
-				implementation("org.jetbrains.kotlin:kotlin-test-annotations-common")
-			}
-		}
+        val nativeCommonMain = sourceSets.maybeCreate("nativeCommonMain")
+        val nativeCommonTest = sourceSets.maybeCreate("nativeCommonTest")
 
-		val nativeCommonMain = sourceSets.maybeCreate("nativeCommonMain")
-		val nativeCommonTest = sourceSets.maybeCreate("nativeCommonTest")
+        val appleMain = sourceSets.maybeCreate("appleMain").apply {
+            dependsOn(nativeCommonMain)
+        }
 
-		val appleMain = sourceSets.maybeCreate("appleMain").apply {
-			dependsOn(nativeCommonMain)
-		}
+        val mingwMain = sourceSets.maybeCreate("mingwMain").apply {
+            dependsOn(nativeCommonMain)
+        }
+        knTargets.forEach { target ->
+            if (target.name.startsWith("mingw")) {
+                target.compilations.getByName("main").source(mingwMain)
+                target.compilations.getByName("test").source(nativeCommonTest)
+            } else {
+                target.compilations.getByName("main").source(appleMain)
+                target.compilations.getByName("test").source(nativeCommonTest)
+            }
+        }
 
-		if(!ideaActive) {
-			val mingwMain = sourceSets.maybeCreate("mingwMain").apply {
-				dependsOn(nativeCommonMain)
-			}
-			knTargets.forEach { target ->
-				if (target.name.startsWith("mingw")) {
-					target.compilations.getByName("main").source(mingwMain)
-					target.compilations.getByName("test").source(nativeCommonTest)
-				} else {
-					target.compilations.getByName("main").source(appleMain)
-					target.compilations.getByName("test").source(nativeCommonTest)
-				}
-			}
-		}
-	}
+    }
 }
 
 apply(from = "../gradle/gradle-mvn-mpp-push.gradle")