From 0ab7a6cfc1bfcdc74142c8f88998f260a4967c43 Mon Sep 17 00:00:00 2001 From: BitcoinZavior Date: Sun, 1 Sep 2024 00:24:00 -0400 Subject: [PATCH] Android SDK & NDK added --- .github/workflows/precompile_binaries.yml | 6 ++++++ android/build.gradle | 1 - android/src/main/AndroidManifest.xml | 2 +- example/macos/Podfile.lock | 4 ++-- macos/bdk_flutter.podspec | 6 ++++-- rust/cargokit.yaml | 3 +-- 6 files changed, 14 insertions(+), 8 deletions(-) diff --git a/.github/workflows/precompile_binaries.yml b/.github/workflows/precompile_binaries.yml index 0f6bca95..6dfe7c50 100644 --- a/.github/workflows/precompile_binaries.yml +++ b/.github/workflows/precompile_binaries.yml @@ -32,6 +32,12 @@ jobs: - uses: subosito/flutter-action@v2 with: channel: 'stable' + - name: Set up Android SDK + if: (matrix.os == 'ubuntu-20.04') + uses: android-actions/setup-android@v2 + - name: Install Specific NDK + if: (matrix.os == 'ubuntu-20.04') + run: sdkmanager --install "ndk;24.0.8215888" - name: Precompile (with iOS) if: (matrix.os == 'macOS-latest') run: dart run build_tool precompile-binaries -v --manifest-dir=../../rust --repository=LtbLightning/bdk-flutter diff --git a/android/build.gradle b/android/build.gradle index af4681e5..0a24818b 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -26,7 +26,6 @@ apply plugin: 'kotlin-android' android { compileSdkVersion 31 - namespace "io.bdk.f.bdk_flutter" compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 diff --git a/android/src/main/AndroidManifest.xml b/android/src/main/AndroidManifest.xml index 0bfa73ba..e59e280d 100644 --- a/android/src/main/AndroidManifest.xml +++ b/android/src/main/AndroidManifest.xml @@ -1 +1 @@ - + diff --git a/example/macos/Podfile.lock b/example/macos/Podfile.lock index 55a89e94..2d921409 100644 --- a/example/macos/Podfile.lock +++ b/example/macos/Podfile.lock @@ -14,9 +14,9 @@ EXTERNAL SOURCES: :path: Flutter/ephemeral SPEC CHECKSUMS: - bdk_flutter: f31096ce6d28094dbbb43d2a3fb130f7c54683df + bdk_flutter: d0437c6116753242241fed48270587542a636d40 FlutterMacOS: 8f6f14fa908a6fb3fba0cd85dbd81ec4b251fb24 PODFILE CHECKSUM: 6acf97521436d16fc31cd5e1a02000905acdb3ae -COCOAPODS: 1.14.3 +COCOAPODS: 1.15.2 diff --git a/macos/bdk_flutter.podspec b/macos/bdk_flutter.podspec index 5d5b3899..c1ff53ea 100644 --- a/macos/bdk_flutter.podspec +++ b/macos/bdk_flutter.podspec @@ -27,8 +27,10 @@ Pod::Spec.new do |s| } s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES', - # Flutter.framework does not contain a i386 slice. - 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'i386', 'OTHER_LDFLAGS' => '-force_load ${BUILT_PRODUCTS_DIR}/libbdk_flutter.a', + 'DEAD_CODE_STRIPPING' => 'YES', + 'STRIP_INSTALLED_PRODUCT[config=Release][sdk=*][arch=*]' => "YES", + 'STRIP_STYLE[config=Release][sdk=*][arch=*]' => "non-global", + 'DEPLOYMENT_POSTPROCESSING[config=Release][sdk=*][arch=*]' => "YES", } end diff --git a/rust/cargokit.yaml b/rust/cargokit.yaml index 6056237a..4657395e 100644 --- a/rust/cargokit.yaml +++ b/rust/cargokit.yaml @@ -3,5 +3,4 @@ cargo: toolchain: stable precompiled_binaries: url_prefix: https://github.com/LtbLightning/bdk-flutter/releases/download/precompiled_ - public_key: 0e43d5e8452d00db7f3000c18fb1ba796babfcb5dc6306bb0629eff24f8be85b - + public_key: 0e43d5e8452d00db7f3000c18fb1ba796babfcb5dc6306bb0629eff24f8be85b \ No newline at end of file