Fixed target paths.

smyrgeorge · Sep 10, 2024 · 9f287a2 · 9f287a2
1 parent 6634fbb
commit 9f287a2
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 18 deletions.
diff --git a/...ion/src/main/kotlin/io/github/smyrgeorge/sqlx4k/multiplatform/MultiplatformConventions.kt b/...ion/src/main/kotlin/io/github/smyrgeorge/sqlx4k/multiplatform/MultiplatformConventions.kt
@@ -70,8 +70,8 @@ class MultiplatformConventions : Plugin<Project> {
         project.extensions.configure<KotlinMultiplatformExtension> {
             val availableTargets = mapOf(
                 Pair("iosArm64") { iosArm64 { rust("aarch64-apple-ios", !os.isMacOsX) } },
-                Pair("androidNativeX64") { androidNativeX64 { rust("x86_64-linux-android", true) } },
                 Pair("androidNativeArm64") { androidNativeArm64 { rust("aarch64-linux-android", true) } },
+                Pair("androidNativeX64") { androidNativeX64 { rust("x86_64-linux-android", true) } },
                 Pair("macosArm64") { macosArm64 { rust("aarch64-apple-darwin", !os.isMacOsX) } },
                 Pair("macosX64") { macosX64 { rust("x86_64-apple-darwin", !os.isMacOsX) } },
                 Pair("linuxArm64") { linuxArm64 { rust("aarch64-unknown-linux-gnu", !os.isLinux || !arch.isArm64) } },
@@ -111,7 +111,7 @@ class MultiplatformConventions : Plugin<Project> {
                     "macosX64",
                     "linuxArm64",
                     "linuxX64",
-//                "mingwX64"
+                    "mingwX64"
                 )
 
                 else -> it.split(",").map { t -> t.trim() }

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,5 +1,5 @@
 group = "io.github.smyrgeorge"
-version = "0.12.0"
+version = "0.13.0"
 
 plugins {
     alias(libs.plugins.kotlin.multiplatform) apply false

diff --git a/sqlx4k-mysql/src/nativeInterop/cinterop/sqlx4k.def b/sqlx4k-mysql/src/nativeInterop/cinterop/sqlx4k.def
@@ -3,10 +3,10 @@ headers = sqlx4k_mysql.h
 compilerOpts = -I./rust_lib/target
 staticLibraries = libsqlx4k_mysql.a
 libraryPaths.ios_arm64 = ./rust_lib/target/aarch64-apple-ios/release
-libraryPaths.android_x64 = ./rust_lib/target/aarch64-linux-android/release
-libraryPaths.android_arm64 = ./rust_lib/target/aarch64-unknown-linux-gnu/release
+libraryPaths.android_arm64 = ./rust_lib/target/aarch64-linux-android/release
+libraryPaths.android_x64 = ./rust_lib/target/x86_64-linux-android/release
 libraryPaths.macos_arm64 = ./rust_lib/target/aarch64-apple-darwin/release
 libraryPaths.macos_x64 = ./rust_lib/target/x86_64-apple-darwin/release
-libraryPaths.linux_arm64 = ./rust_lib/target/x86_64-linux-android/release
-libraryPaths.linux_x64 = ./rust_lib/target/x86_64-pc-windows-gnu/release
-libraryPaths.minigw_x64 = ./rust_lib/target/x86_64-unknown-linux-gnu/release
+libraryPaths.linux_arm64 = ./rust_lib/target/aarch64-unknown-linux-gnu/release
+libraryPaths.linux_x64 = ./rust_lib/target/x86_64-unknown-linux-gnu/release
+libraryPaths.minigw_x64 = ./rust_lib/target/x86_64-pc-windows-gnu/release
diff --git a/sqlx4k-postgres/src/nativeInterop/cinterop/sqlx4k.def b/sqlx4k-postgres/src/nativeInterop/cinterop/sqlx4k.def
@@ -3,10 +3,10 @@ headers = sqlx4k_postgres.h
 compilerOpts = -I./rust_lib/target
 staticLibraries = libsqlx4k_postgres.a
 libraryPaths.ios_arm64 = ./rust_lib/target/aarch64-apple-ios/release
-libraryPaths.android_x64 = ./rust_lib/target/aarch64-linux-android/release
-libraryPaths.android_arm64 = ./rust_lib/target/aarch64-unknown-linux-gnu/release
+libraryPaths.android_arm64 = ./rust_lib/target/aarch64-linux-android/release
+libraryPaths.android_x64 = ./rust_lib/target/x86_64-linux-android/release
 libraryPaths.macos_arm64 = ./rust_lib/target/aarch64-apple-darwin/release
 libraryPaths.macos_x64 = ./rust_lib/target/x86_64-apple-darwin/release
-libraryPaths.linux_arm64 = ./rust_lib/target/x86_64-linux-android/release
-libraryPaths.linux_x64 = ./rust_lib/target/x86_64-pc-windows-gnu/release
-libraryPaths.minigw_x64 = ./rust_lib/target/x86_64-unknown-linux-gnu/release
+libraryPaths.linux_arm64 = ./rust_lib/target/aarch64-unknown-linux-gnu/release
+libraryPaths.linux_x64 = ./rust_lib/target/x86_64-unknown-linux-gnu/release
+libraryPaths.minigw_x64 = ./rust_lib/target/x86_64-pc-windows-gnu/release
diff --git a/sqlx4k-sqlite/src/nativeInterop/cinterop/sqlx4k.def b/sqlx4k-sqlite/src/nativeInterop/cinterop/sqlx4k.def
@@ -3,10 +3,10 @@ headers = sqlx4k_sqlite.h
 compilerOpts = -I./rust_lib/target
 staticLibraries = libsqlx4k_sqlite.a
 libraryPaths.ios_arm64 = ./rust_lib/target/aarch64-apple-ios/release
-libraryPaths.android_x64 = ./rust_lib/target/aarch64-linux-android/release
-libraryPaths.android_arm64 = ./rust_lib/target/aarch64-unknown-linux-gnu/release
+libraryPaths.android_arm64 = ./rust_lib/target/aarch64-linux-android/release
+libraryPaths.android_x64 = ./rust_lib/target/x86_64-linux-android/release
 libraryPaths.macos_arm64 = ./rust_lib/target/aarch64-apple-darwin/release
 libraryPaths.macos_x64 = ./rust_lib/target/x86_64-apple-darwin/release
-libraryPaths.linux_arm64 = ./rust_lib/target/x86_64-linux-android/release
-libraryPaths.linux_x64 = ./rust_lib/target/x86_64-pc-windows-gnu/release
-libraryPaths.minigw_x64 = ./rust_lib/target/x86_64-unknown-linux-gnu/release
+libraryPaths.linux_arm64 = ./rust_lib/target/aarch64-unknown-linux-gnu/release
+libraryPaths.linux_x64 = ./rust_lib/target/x86_64-unknown-linux-gnu/release
+libraryPaths.minigw_x64 = ./rust_lib/target/x86_64-pc-windows-gnu/release