Merge pull request #113 from qiaoyuang/main

Fix CI/CD pipeline issue

Author: qiaoyuang

gradle.properties

@@ -27,6 +27,7 @@ kotlin.code.style=official
 kotlin.mpp.stability.nowarn=true
 kotlin.mpp.enableCInteropCommonization=true
 kotlin.native.increment=true
+kotlin.native.ignoreDisabledTargets=true
 kotlin.jvm.target.validation.mode=warning
 kotlin.native.binary.pagedAllocator=false
 kotlin.native.binary.latin1Strings=true

sqllin-driver/build.gradle.kts

@@ -89,12 +89,12 @@ gradle.taskGraph.whenReady {
         return@whenReady
     tasks.forEach {
         when {
-            it.name.contains("linux", true) -> {
-                it.enabled = HostManager.hostIsLinux
-            }
-            it.name.contains("mingw", true) -> {
-                it.enabled = HostManager.hostIsMingw
-            }
+            it.name.contains("linux", true) -> it.enabled = HostManager.hostIsLinux
+            it.name.contains("mingw", true) -> it.enabled = HostManager.hostIsMingw
+            it.name.contains("ios", true)
+                    || it.name.contains("macos", true)
+                    || it.name.contains("watchos", true)
+                    || it.name.contains("tvos", true) -> it.enabled = HostManager.hostIsMac
         }
     }
 }

sqllin-driver/src/androidMain/AndroidManifest.xml

@@ -63,34 +63,6 @@ kotlin {
             implementation(libs.kotlinx.serialization)
             implementation(libs.kotlinx.coroutines.core)
         }
-        val jvmAndNativeMain by creating {
-            dependsOn(commonMain.get())
-        }
-
-        jvmMain { dependsOn(jvmAndNativeMain) }
-
-        // Configure all native targets to depend on jvmAndNativeMain
-        iosX64Main { dependsOn(jvmAndNativeMain) }
-        iosArm64Main { dependsOn(jvmAndNativeMain) }
-        iosSimulatorArm64Main { dependsOn(jvmAndNativeMain) }
-
-        macosX64Main { dependsOn(jvmAndNativeMain) }
-        macosArm64Main { dependsOn(jvmAndNativeMain) }
-
-        watchosArm32Main { dependsOn(jvmAndNativeMain) }
-        watchosArm64Main { dependsOn(jvmAndNativeMain) }
-        watchosX64Main { dependsOn(jvmAndNativeMain) }
-        watchosSimulatorArm64Main { dependsOn(jvmAndNativeMain) }
-        watchosDeviceArm64Main { dependsOn(jvmAndNativeMain) }
-
-        tvosArm64Main { dependsOn(jvmAndNativeMain) }
-        tvosX64Main { dependsOn(jvmAndNativeMain) }
-        tvosSimulatorArm64Main { dependsOn(jvmAndNativeMain) }
-
-        linuxX64Main { dependsOn(jvmAndNativeMain) }
-        linuxArm64Main { dependsOn(jvmAndNativeMain) }
-
-        mingwX64Main { dependsOn(jvmAndNativeMain) }
     }
 }
 
@@ -99,12 +71,12 @@ gradle.taskGraph.whenReady {
         return@whenReady
     tasks.forEach {
         when {
-            it.name.contains("linux", true) -> {
-                it.enabled = HostManager.hostIsLinux
-            }
-            it.name.contains("mingw", true) -> {
-                it.enabled = HostManager.hostIsMingw
-            }
+            it.name.contains("linux", true) -> it.enabled = HostManager.hostIsLinux
+            it.name.contains("mingw", true) -> it.enabled = HostManager.hostIsMingw
+            it.name.contains("ios", true)
+                    || it.name.contains("macos", true)
+                    || it.name.contains("watchos", true)
+                    || it.name.contains("tvos", true) -> it.enabled = HostManager.hostIsMac
         }
     }
 }

sqllin-dsl/build.gradle.kts

@@ -34,7 +34,7 @@ import com.ctrip.sqllin.dsl.sql.Table
  *
  * @author Yuang Qiao
  */
-public open class DefaultClauseBlob internal constructor(
+public class ClauseBlob(
     valueName: String,
     table: Table<*>,
     isFunction: Boolean,
@@ -58,7 +58,7 @@ public open class DefaultClauseBlob internal constructor(
      * @param clauseBlob The BLOB column/function to compare against
      * @return Condition expression comparing two BLOB columns
      */
-    internal infix fun eq(clauseBlob: DefaultClauseBlob): SelectCondition = appendClauseBlob("=", clauseBlob)
+    internal infix fun eq(clauseBlob: ClauseBlob): SelectCondition = appendClauseBlob("=", clauseBlob)
 
     /**
      * Creates an inequality comparison condition (!=).
@@ -78,9 +78,9 @@ public open class DefaultClauseBlob internal constructor(
      * @param clauseBlob The BLOB column/function to compare against
      * @return Condition expression comparing two BLOB columns
      */
-    internal infix fun neq(clauseBlob: DefaultClauseBlob): SelectCondition = appendClauseBlob("!=", clauseBlob)
+    internal infix fun neq(clauseBlob: ClauseBlob): SelectCondition = appendClauseBlob("!=", clauseBlob)
 
-    protected open fun appendBlob(notNullSymbol: String, nullSymbol: String, blob: ByteArray?): SelectCondition {
+    private fun appendBlob(notNullSymbol: String, nullSymbol: String, blob: ByteArray?): SelectCondition {
         val sql = buildString {
             if (!isFunction) {
                 append(table.tableName)
@@ -97,7 +97,7 @@ public open class DefaultClauseBlob internal constructor(
         return SelectCondition(sql, if (blob == null) null else mutableListOf(blob))
     }
 
-    private fun appendClauseBlob(symbol: String, clauseBlob: DefaultClauseBlob): SelectCondition {
+    private fun appendClauseBlob(symbol: String, clauseBlob: ClauseBlob): SelectCondition {
         val sql = buildString {
             append(table.tableName)
             append('.')
@@ -113,13 +113,7 @@ public open class DefaultClauseBlob internal constructor(
     }
 
     override fun hashCode(): Int = valueName.hashCode() + table.tableName.hashCode()
-    override fun equals(other: Any?): Boolean = (other as? DefaultClauseBlob)?.let {
+    override fun equals(other: Any?): Boolean = (other as? ClauseBlob)?.let {
         it.valueName == valueName && it.table.tableName == table.tableName
     } ?: false
-}
-
-public expect fun ClauseBlob(
-    valueName: String,
-    table: Table<*>,
-    isFunction: Boolean,
-): DefaultClauseBlob
+}

sqllin-dsl/src/androidMain/AndroidManifest.xml

@@ -101,7 +101,6 @@ class ClauseProcessor(
                 writer.write("import com.ctrip.sqllin.dsl.sql.clause.ClauseBoolean\n")
                 writer.write("import com.ctrip.sqllin.dsl.sql.clause.ClauseNumber\n")
                 writer.write("import com.ctrip.sqllin.dsl.sql.clause.ClauseString\n")
-                writer.write("import com.ctrip.sqllin.dsl.sql.clause.DefaultClauseBlob\n")
                 writer.write("import com.ctrip.sqllin.dsl.sql.clause.SetClause\n")
                 writer.write("import com.ctrip.sqllin.dsl.sql.PrimaryKeyInfo\n")
                 writer.write("import com.ctrip.sqllin.dsl.sql.Table\n\n")