Merge branch 'hm/linux-build-publish' of https://github.com/hbmartin/…

…SQLiter into hbmartin-hm/linux-build-publish
touchlab · Nov 6, 2023 · 93f2486 · 93f2486
2 parents 46b04d1 + 152f32f
commit 93f2486
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -12,14 +12,17 @@ jobs:
   build:
     strategy:
       matrix:
-        os: [ macOS-latest ]
-#        os: [ macOS-latest, ubuntu-18.04 ] GitHub actions removed ubuntu-18.04
-#        os: [ macOS-latest, windows-latest, ubuntu-18.04 ]
+        os: [ macOS-latest, windows-latest, ubuntu-22.04 ]
     runs-on: ${{matrix.os}}
     steps:
       - name: Checkout the repo
         uses: actions/checkout@v2
 
+      - uses: actions/setup-java@v3
+        with:
+          distribution: temurin
+          java-version: 11
+
       - name: Install msys2
         if: matrix.os == 'windows-latest'
         uses: msys2/setup-msys2@v2

diff --git a/sqliter-driver/build.gradle.kts b/sqliter-driver/build.gradle.kts
@@ -33,9 +33,7 @@ fun configInterop(target: org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTar
 
 kotlin {
     jvmToolchain(11)
-}
 
-kotlin {
     val knTargets = listOf(
         macosX64(),
         iosX64(),

diff --git a/sqliter-driver/src/nativeCommonMain/kotlin/co/touchlab/sqliter/interop/SQLiteException.kt b/sqliter-driver/src/nativeCommonMain/kotlin/co/touchlab/sqliter/interop/SQLiteException.kt
@@ -1,13 +1,16 @@
 package co.touchlab.sqliter.interop
 
-open class SQLiteException internal constructor(message: String, private val config: SqliteDatabaseConfig) : Exception(message)
+open class SQLiteException internal constructor(message: String, internal val config: SqliteDatabaseConfig) : Exception(message)
 
 class SQLiteExceptionErrorCode internal constructor(message: String, config: SqliteDatabaseConfig, private val errorCode: Int) : SQLiteException(message, config) {
     val errorType: SqliteErrorType by lazy {
         val checkErrorCode = errorCode and 0xff
         SqliteErrorType.values().find { it.code == checkErrorCode }
             ?: throw IllegalArgumentException("Unknown errorCode $errorCode, checkErrorCode $checkErrorCode")
     }
+    override fun toString(): String {
+        return "SQLiteExceptionErrorCode(message=$message, errorCode=$errorCode, config=$config)"
+    }
 }
 
 internal inline fun sqlException(logging: Logger, config: SqliteDatabaseConfig, message: String, errorCode: Int = -1): SQLiteException {