No commit message

CHANGELOG.md

@@ -1,3 +1,11 @@
+## 0.6.3
+
+Released 2024-07-08
+
+  - Update search paths for tomcrypt to point to intermediates/merged_native_libs/debug/mergeDebugNativeLibs/out/lib to accommodate change in android gradle plugin 8.5.0
+  - Update README
+  - ci: update workflow actions location
+
 ## 0.6.2
 
 Released 2024-03-05

Package.swift

@@ -10,11 +10,11 @@ let package = Package(
         .library(name: "SkipSQLPlus", type: .dynamic, targets: ["SkipSQLPlus"]),
     ],
     dependencies: [
-        .package(url: "https://source.skip.tools/skip.git", from: "0.8.19"),
-        .package(url: "https://source.skip.tools/skip-foundation.git", from: "0.5.11"),
-        .package(url: "https://source.skip.tools/skip-ffi.git", from: "0.3.2"),
-        .package(url: "https://source.skip.tools/skip-ltc.git", from: "0.0.2"),
-        .package(url: "https://source.skip.tools/skip-unit.git", from: "0.6.1"),
+        .package(url: "https://source.skip.tools/skip.git", from: "0.9.4"),
+        .package(url: "https://source.skip.tools/skip-foundation.git", from: "0.7.0"),
+        .package(url: "https://source.skip.tools/skip-ffi.git", from: "0.3.3"),
+        .package(url: "https://source.skip.tools/skip-ltc.git", from: "0.0.3"),
+        .package(url: "https://source.skip.tools/skip-unit.git", from: "0.8.1"),
     ],
     targets: [
         .target(name: "SkipSQL", dependencies: [

Sources/SQLExt/CMakeLists.txt

@@ -50,7 +50,22 @@ set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE BOTH)
 set(CMAKE_FIND_DEBUG_MODE ON)
 
 get_filename_component(CMAKE_PARENT_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR} DIRECTORY)
-message("CMAKE FINDING LIBRARY FOR ABI: ${ANDROID_ABI} in: ${CMAKE_PARENT_SOURCE_DIR}")
+message("CMAKE FINDING LIBRARY FOR ABI: ${ANDROID_ABI} in: ${CMAKE_PARENT_SOURCE_DIR} for build type: ${CMAKE_BUILD_TYPE}")
+
+if(CMAKE_BUILD_TYPE STREQUAL "Release")
+    set(BUILD_MODE "Release")
+elseif(CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")
+    set(BUILD_MODE "Release")
+elseif(CMAKE_BUILD_TYPE STREQUAL "MinSizeRel")
+    set(BUILD_MODE "Release")
+elseif(CMAKE_BUILD_TYPE STREQUAL "Debug")
+    set(BUILD_MODE "Debug")
+else()
+    message(WARNING "CMAKE_BUILD_TYPE is set to an unsupported value: ${CMAKE_BUILD_TYPE}. Defaulting to Debug.")
+    set(BUILD_MODE "Debug")
+endif()
+
+string(TOLOWER "${BUILD_MODE}" BUILD_MODE_LOWER)
 
 find_library(TOMCRYPT
     NAMES tomcrypt
@@ -60,10 +75,8 @@ find_library(TOMCRYPT
     # the output paths for the LibTomCrypt project
     # it would be nice if we could discover this automatically based on the gradle dependency
     # after updating to the android-gradle-plugin 8.5.0, the output has moved to mergeDebugNativeLibs/mergeReleaseNativeLibs
-    ${CMAKE_PARENT_SOURCE_DIR}/../LibTomCrypt/build/intermediates/merged_native_libs/debug/out/lib/${ANDROID_ABI}/
-    ${CMAKE_PARENT_SOURCE_DIR}/../LibTomCrypt/build/intermediates/merged_native_libs/debug/mergeDebugNativeLibs/out/lib/${ANDROID_ABI}/
-    ${CMAKE_PARENT_SOURCE_DIR}/../LibTomCrypt/build/intermediates/merged_native_libs/release/out/lib/${ANDROID_ABI}/
-    ${CMAKE_PARENT_SOURCE_DIR}/../LibTomCrypt/build/intermediates/merged_native_libs/release/mergeReleaseNativeLibs/out/lib/${ANDROID_ABI}/
+    #${CMAKE_PARENT_SOURCE_DIR}/../LibTomCrypt/build/intermediates/merged_native_libs/${BUILD_MODE_LOWER}/out/lib/${ANDROID_ABI}/
+    ${CMAKE_PARENT_SOURCE_DIR}/../LibTomCrypt/build/intermediates/merged_native_libs/${BUILD_MODE_LOWER}/merge${BUILD_MODE}NativeLibs/out/lib/${ANDROID_ABI}/
 
     NO_DEFAULT_PATH
     NO_CMAKE_FIND_ROOT_PATH