Merge branch 'main' into feat/overhaul

Author: sneurlax

.gitignore

@@ -33,8 +33,7 @@ rust/default/
 ios/include/
 ios/libs/
 linux/bin/
-macos/include/
-macos/libs/
+macos/framework
 
 lib/git_versions.dart
 rust/src/bin

macos/flutter_libepiccash.podspec

@@ -14,12 +14,11 @@ A new Flutter plugin project.
   s.author           = { 'Your Company' => 'email@example.com' }
 
   s.source           = { :path => '.' }
-  s.source_files = 'Classes/**/*'
-  s.static_framework = true
-  s.vendored_libraries = "**/*.a"
+  s.source_files     = 'Classes/**/*'
+  s.vendored_frameworks = 'framework/EpicWallet.xcframework'
   s.dependency 'FlutterMacOS'
 
-  s.platform = :osx, '10.11'
+  s.platform = :osx, '10.15'
   s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES', 'EXCLUDED_ARCHS[sdk=macosx*]' => 'x86_64' }
   s.swift_version = '5.0'
 end

scripts/ios/build_all.sh

@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+set -e
+rm -rf build
 mkdir build
 echo ''$(git log -1 --pretty=format:"%H")' '$(date) >> build/git_commit_version.txt
 VERSIONS_FILE=../../lib/git_versions.dart
@@ -8,15 +10,19 @@ if [ ! -f "$VERSIONS_FILE" ]; then
 fi
 COMMIT=$(git log -1 --pretty=format:"%H")
 OS="IOS"
-sed -i '' "/\/\*${OS}_VERSION/c\\/\*${OS}_VERSION\*\/ const ${OS}_VERSION = \"$COMMIT\";" $VERSIONS_FILE
+sed -i '' '/\/\*${OS}_VERSION/c\'$'\n''/\*${OS}_VERSION\*\/ const ${OS}_VERSION = "'"$COMMIT"'";' "$VERSIONS_FILE"
 cp -r ../../rust build/rust
 cd build/rust
 
 rustup target add aarch64-apple-ios x86_64-apple-ios
 
 # building
 cp target/epic_cash_wallet.h libepic_cash_wallet.h
-cargo lipo --release
+
+export IPHONEOS_DEPLOYMENT_TARGET=15.0
+export RUSTFLAGS="-C link-arg=-mios-version-min=15.0"
+cargo build --release --target aarch64-apple-ios
+#cargo lipo --release
 
 # moving files to the ios project
 inc=../../../../ios/include

scripts/macos/build_all.sh

@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+set -e
+rm -rf build
 mkdir build
 echo ''$(git log -1 --pretty=format:"%H")' '$(date) >> build/git_commit_version.txt
 VERSIONS_FILE=../../lib/git_versions.dart
@@ -8,22 +10,21 @@ if [ ! -f "$VERSIONS_FILE" ]; then
 fi
 COMMIT=$(git log -1 --pretty=format:"%H")
 OSX="OSX"
-sed -i '' "/\/\*${OS}_VERSION/c\\/\*${OS}_VERSION\*\/ const ${OS}_VERSION = \"$COMMIT\";" $VERSIONS_FILE
+sed -i '' '/\/\*${OS}_VERSION/c\'$'\n''/\*${OS}_VERSION\*\/ const ${OS}_VERSION = "'"$COMMIT"'";' "$VERSIONS_FILE"
 cp -r ../../rust build/rust
 cd build/rust
 
 # building
 cp target/epic_cash_wallet.h libepic_cash_wallet.h
 cargo lipo --release --targets aarch64-apple-darwin
 
-# moving files to the ios project
-inc=../../../../macos/include
-libs=../../../../macos/libs
+xcodebuild -create-xcframework \
+  -library target/aarch64-apple-darwin/release/libepic_cash_wallet.a \
+  -headers libepic_cash_wallet.h \
+  -output ../EpicWallet.xcframework
 
-rm -rf ${inc} ${libs}
-
-mkdir ${inc}
-mkdir ${libs}
-
-cp libepic_cash_wallet.h ${inc}
-cp target/aarch64-apple-darwin/release/libepic_cash_wallet.a ${libs}
+# moving files to the macos project
+fwk=../../../../macos/framework/
+rm -rf ${fwk}
+mkdir ${fwk}
+mv ../EpicWallet.xcframework ${fwk}