diff --git a/Cargo.lock b/Cargo.lock index ab772a7..f9a8481 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -475,7 +475,7 @@ dependencies = [ [[package]] name = "bitkitcore" -version = "0.1.70" +version = "0.1.72" dependencies = [ "android_logger", "async-trait", diff --git a/Cargo.toml b/Cargo.toml index bbda54a..329f60a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "bitkitcore" -version = "0.1.70" +version = "0.1.72" edition = "2021" [lib] diff --git a/Package.swift b/Package.swift index 3163275..8be7257 100644 --- a/Package.swift +++ b/Package.swift @@ -3,8 +3,8 @@ import PackageDescription -let tag = "v0.1.70" -let checksum = "3717f97d4c184509f8093a87f6d8a5c4085d771264d789d1102ab6321fbb3ed6" +let tag = "v0.1.72" +let checksum = "0fc1897b87ef3224abcec3b119d02c4a93966dd04c0a7c938588d4c5e98fc013" let url = "https://github.com/synonymdev/bitkit-core/releases/download/\(tag)/BitkitCore.xcframework.zip" let package = Package( diff --git a/bindings/android/gradle.properties b/bindings/android/gradle.properties index 8dcd120..2b1cacb 100644 --- a/bindings/android/gradle.properties +++ b/bindings/android/gradle.properties @@ -3,4 +3,4 @@ android.useAndroidX=true android.enableJetifier=true kotlin.code.style=official group=com.synonym -version=0.1.70 +version=0.1.72 diff --git a/bindings/android/lib/build.gradle.kts b/bindings/android/lib/build.gradle.kts index f46a587..a8409bf 100644 --- a/bindings/android/lib/build.gradle.kts +++ b/bindings/android/lib/build.gradle.kts @@ -121,7 +121,7 @@ fun String.parseElfAlignment(): Long { val validateReleaseNativeLibraries by tasks.registering { group = "verification" - description = "Validates release JNI libraries keep debug metadata and 16 KB LOAD alignment." + description = "Validates release JNI libraries keep full DWARF metadata and 16 KB LOAD alignment." doLast { val readelf = findReadelf() @@ -134,8 +134,8 @@ val validateReleaseNativeLibraries by tasks.registering { } val (sectionsExit, sections) = runReadelf(readelf, "-S", lib.absolutePath) - if (sectionsExit != 0 || !Regex("""\.(symtab|debug_|gnu_debugdata)""").containsMatchIn(sections)) { - throw GradleException("Android native library has no usable debug metadata: '${lib.path}'") + if (sectionsExit != 0 || !Regex("""\.debug_info""").containsMatchIn(sections)) { + throw GradleException("Android native library has no .debug_info DWARF metadata: '${lib.path}'") } val wideHeaders = runReadelf(readelf, "-W", "-l", lib.absolutePath) diff --git a/bindings/ios/BitkitCore.xcframework.zip b/bindings/ios/BitkitCore.xcframework.zip index 5d3050e..1f09de5 100644 Binary files a/bindings/ios/BitkitCore.xcframework.zip and b/bindings/ios/BitkitCore.xcframework.zip differ diff --git a/bindings/ios/BitkitCore.xcframework/Info.plist b/bindings/ios/BitkitCore.xcframework/Info.plist index b7357e0..478a88f 100644 --- a/bindings/ios/BitkitCore.xcframework/Info.plist +++ b/bindings/ios/BitkitCore.xcframework/Info.plist @@ -10,7 +10,7 @@ HeadersPath Headers LibraryIdentifier - ios-arm64-simulator + ios-arm64 LibraryPath libbitkitcore.a SupportedArchitectures @@ -19,8 +19,6 @@ SupportedPlatform ios - SupportedPlatformVariant - simulator BinaryPath @@ -28,7 +26,7 @@ HeadersPath Headers LibraryIdentifier - ios-arm64 + ios-arm64-simulator LibraryPath libbitkitcore.a SupportedArchitectures @@ -37,6 +35,8 @@ SupportedPlatform ios + SupportedPlatformVariant + simulator CFBundlePackageType diff --git a/bindings/ios/BitkitCore.xcframework/ios-arm64-simulator/libbitkitcore.a b/bindings/ios/BitkitCore.xcframework/ios-arm64-simulator/libbitkitcore.a index f67c8fe..0f62ccb 100644 Binary files a/bindings/ios/BitkitCore.xcframework/ios-arm64-simulator/libbitkitcore.a and b/bindings/ios/BitkitCore.xcframework/ios-arm64-simulator/libbitkitcore.a differ diff --git a/bindings/ios/BitkitCore.xcframework/ios-arm64/libbitkitcore.a b/bindings/ios/BitkitCore.xcframework/ios-arm64/libbitkitcore.a index 37a7154..a23a1b3 100644 Binary files a/bindings/ios/BitkitCore.xcframework/ios-arm64/libbitkitcore.a and b/bindings/ios/BitkitCore.xcframework/ios-arm64/libbitkitcore.a differ diff --git a/bindings/python/bitkitcore/libbitkitcore.dylib b/bindings/python/bitkitcore/libbitkitcore.dylib index 8b8908a..7f6b374 100755 Binary files a/bindings/python/bitkitcore/libbitkitcore.dylib and b/bindings/python/bitkitcore/libbitkitcore.dylib differ diff --git a/build_android.sh b/build_android.sh index b42a5f0..0de4d79 100755 --- a/build_android.sh +++ b/build_android.sh @@ -101,8 +101,8 @@ find_readelf() { exit 1 } -has_debug_metadata() { - "$READELF_BIN" -S "$1" | grep -Eq '\.(symtab|debug_|gnu_debugdata)' +has_dwarf_debug_metadata() { + "$READELF_BIN" -S "$1" | grep -Eq '\.debug_info' } readelf_program_headers() { @@ -135,8 +135,8 @@ EOF validate_android_library() { lib="$1" - if ! has_debug_metadata "$lib"; then - echo "Error: Android native library has no usable debug metadata: $lib" + if ! has_dwarf_debug_metadata "$lib"; then + echo "Error: Android native library has no .debug_info DWARF metadata: $lib" exit 1 fi