From c1885b1d1589021e5d876a6e7a46a3f1656ed1c1 Mon Sep 17 00:00:00 2001 From: bbedward Date: Sun, 26 Jul 2020 16:50:31 -0400 Subject: [PATCH] Some updates --- .flutter-plugins-dependencies | 2 +- .github/workflows/ci.yml | 4 ++-- .github/workflows/deploy_beta.yml | 8 ++++---- .github/workflows/deploy_release.yml | 8 ++++---- android/fastlane/Fastfile | 4 ---- ios/fastlane/Fastfile | 4 ---- pubspec.yaml | 4 ++-- 7 files changed, 13 insertions(+), 21 deletions(-) diff --git a/.flutter-plugins-dependencies b/.flutter-plugins-dependencies index 371e0b1b..fe0b8dd8 100644 --- a/.flutter-plugins-dependencies +++ b/.flutter-plugins-dependencies @@ -1 +1 @@ -{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"barcode_scan","path":"/home/brandon/flutter/.pub-cache/git/flutter_barcode_reader-545aa259bd67d9ce9a32f342bddd5a13a9079e4d/","dependencies":[]},{"name":"device_info","path":"/home/brandon/flutter/.pub-cache/hosted/pub.dartlang.org/device_info-0.4.2+4/","dependencies":[]},{"name":"file_picker","path":"/home/brandon/flutter/.pub-cache/hosted/pub.dartlang.org/file_picker-1.9.0+1/","dependencies":[]},{"name":"firebase_messaging","path":"/home/brandon/flutter/.pub-cache/hosted/pub.dartlang.org/firebase_messaging-6.0.16/","dependencies":[]},{"name":"flutter_nano_ffi","path":"/home/brandon/flutter/.pub-cache/hosted/pub.dartlang.org/flutter_nano_ffi-1.0.2/","dependencies":[]},{"name":"flutter_secure_storage","path":"/home/brandon/flutter/.pub-cache/hosted/pub.dartlang.org/flutter_secure_storage-3.3.3/","dependencies":[]},{"name":"flutter_webview_plugin","path":"/home/brandon/flutter/.pub-cache/hosted/pub.dartlang.org/flutter_webview_plugin-0.3.11/","dependencies":[]},{"name":"local_auth","path":"/home/brandon/flutter/.pub-cache/hosted/pub.dartlang.org/local_auth-0.6.2+3/","dependencies":[]},{"name":"package_info","path":"/home/brandon/flutter/.pub-cache/hosted/pub.dartlang.org/package_info-0.4.1/","dependencies":[]},{"name":"path_provider","path":"/home/brandon/flutter/.pub-cache/hosted/pub.dartlang.org/path_provider-1.6.10/","dependencies":[]},{"name":"root_checker","path":"/home/brandon/flutter/.pub-cache/git/root_checker-43d86d620a5b113cd9e0f06e933e225437e779b8/","dependencies":[]},{"name":"share","path":"/home/brandon/flutter/.pub-cache/git/plugins-900165b300b16489bf2b5d4a55b30be7c799293f/packages/share/","dependencies":[]},{"name":"shared_preferences","path":"/home/brandon/flutter/.pub-cache/hosted/pub.dartlang.org/shared_preferences-0.5.7+3/","dependencies":[]},{"name":"sqflite","path":"/home/brandon/flutter/.pub-cache/hosted/pub.dartlang.org/sqflite-1.3.0+2/","dependencies":[]},{"name":"uni_links","path":"/home/brandon/flutter/.pub-cache/git/uni_links-c3072f83690da166d0942c92283f6fdd08c59c26/","dependencies":[]},{"name":"vibrate","path":"/home/brandon/flutter/.pub-cache/git/flutter_vibrate-8f9f1c20179ddf41003fcccf8a984fdeeaca1adc/","dependencies":[]}],"android":[{"name":"barcode_scan","path":"/home/brandon/flutter/.pub-cache/git/flutter_barcode_reader-545aa259bd67d9ce9a32f342bddd5a13a9079e4d/","dependencies":[]},{"name":"device_info","path":"/home/brandon/flutter/.pub-cache/hosted/pub.dartlang.org/device_info-0.4.2+4/","dependencies":[]},{"name":"file_picker","path":"/home/brandon/flutter/.pub-cache/hosted/pub.dartlang.org/file_picker-1.9.0+1/","dependencies":["flutter_plugin_android_lifecycle"]},{"name":"firebase_messaging","path":"/home/brandon/flutter/.pub-cache/hosted/pub.dartlang.org/firebase_messaging-6.0.16/","dependencies":[]},{"name":"flutter_nano_ffi","path":"/home/brandon/flutter/.pub-cache/hosted/pub.dartlang.org/flutter_nano_ffi-1.0.2/","dependencies":[]},{"name":"flutter_plugin_android_lifecycle","path":"/home/brandon/flutter/.pub-cache/hosted/pub.dartlang.org/flutter_plugin_android_lifecycle-1.0.8/","dependencies":[]},{"name":"flutter_secure_storage","path":"/home/brandon/flutter/.pub-cache/hosted/pub.dartlang.org/flutter_secure_storage-3.3.3/","dependencies":[]},{"name":"flutter_webview_plugin","path":"/home/brandon/flutter/.pub-cache/hosted/pub.dartlang.org/flutter_webview_plugin-0.3.11/","dependencies":[]},{"name":"local_auth","path":"/home/brandon/flutter/.pub-cache/hosted/pub.dartlang.org/local_auth-0.6.2+3/","dependencies":["flutter_plugin_android_lifecycle"]},{"name":"package_info","path":"/home/brandon/flutter/.pub-cache/hosted/pub.dartlang.org/package_info-0.4.1/","dependencies":[]},{"name":"path_provider","path":"/home/brandon/flutter/.pub-cache/hosted/pub.dartlang.org/path_provider-1.6.10/","dependencies":[]},{"name":"root_checker","path":"/home/brandon/flutter/.pub-cache/git/root_checker-43d86d620a5b113cd9e0f06e933e225437e779b8/","dependencies":[]},{"name":"share","path":"/home/brandon/flutter/.pub-cache/git/plugins-900165b300b16489bf2b5d4a55b30be7c799293f/packages/share/","dependencies":[]},{"name":"shared_preferences","path":"/home/brandon/flutter/.pub-cache/hosted/pub.dartlang.org/shared_preferences-0.5.7+3/","dependencies":[]},{"name":"sqflite","path":"/home/brandon/flutter/.pub-cache/hosted/pub.dartlang.org/sqflite-1.3.0+2/","dependencies":[]},{"name":"uni_links","path":"/home/brandon/flutter/.pub-cache/git/uni_links-c3072f83690da166d0942c92283f6fdd08c59c26/","dependencies":[]},{"name":"vibrate","path":"/home/brandon/flutter/.pub-cache/git/flutter_vibrate-8f9f1c20179ddf41003fcccf8a984fdeeaca1adc/","dependencies":[]}],"macos":[{"name":"package_info","path":"/home/brandon/flutter/.pub-cache/hosted/pub.dartlang.org/package_info-0.4.1/","dependencies":[]},{"name":"path_provider_macos","path":"/home/brandon/flutter/.pub-cache/hosted/pub.dartlang.org/path_provider_macos-0.0.4+3/","dependencies":[]},{"name":"shared_preferences_macos","path":"/home/brandon/flutter/.pub-cache/hosted/pub.dartlang.org/shared_preferences_macos-0.0.1+10/","dependencies":[]},{"name":"sqflite","path":"/home/brandon/flutter/.pub-cache/hosted/pub.dartlang.org/sqflite-1.3.0+2/","dependencies":[]}],"linux":[{"name":"path_provider_linux","path":"/home/brandon/flutter/.pub-cache/hosted/pub.dartlang.org/path_provider_linux-0.0.1+1/","dependencies":[]}],"windows":[],"web":[{"name":"shared_preferences_web","path":"/home/brandon/flutter/.pub-cache/hosted/pub.dartlang.org/shared_preferences_web-0.1.2+7/","dependencies":[]}]},"dependencyGraph":[{"name":"barcode_scan","dependencies":[]},{"name":"device_info","dependencies":[]},{"name":"file_picker","dependencies":["flutter_plugin_android_lifecycle"]},{"name":"firebase_messaging","dependencies":[]},{"name":"flutter_nano_ffi","dependencies":[]},{"name":"flutter_plugin_android_lifecycle","dependencies":[]},{"name":"flutter_secure_storage","dependencies":[]},{"name":"flutter_webview_plugin","dependencies":[]},{"name":"local_auth","dependencies":["flutter_plugin_android_lifecycle"]},{"name":"package_info","dependencies":[]},{"name":"path_provider","dependencies":["path_provider_macos","path_provider_linux"]},{"name":"path_provider_linux","dependencies":[]},{"name":"path_provider_macos","dependencies":[]},{"name":"root_checker","dependencies":[]},{"name":"share","dependencies":[]},{"name":"shared_preferences","dependencies":["shared_preferences_macos","shared_preferences_web"]},{"name":"shared_preferences_macos","dependencies":[]},{"name":"shared_preferences_web","dependencies":[]},{"name":"sqflite","dependencies":[]},{"name":"uni_links","dependencies":[]},{"name":"vibrate","dependencies":[]}],"date_created":"2020-06-04 18:09:00.407680","version":"1.17.2"} \ No newline at end of file +{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"barcode_scan","path":"/home/brandon/flutter/.pub-cache/git/flutter_barcode_reader-545aa259bd67d9ce9a32f342bddd5a13a9079e4d/","dependencies":[]},{"name":"device_info","path":"/home/brandon/flutter/.pub-cache/hosted/pub.dartlang.org/device_info-0.4.2+4/","dependencies":[]},{"name":"file_picker","path":"/home/brandon/flutter/.pub-cache/hosted/pub.dartlang.org/file_picker-1.9.0+1/","dependencies":[]},{"name":"firebase_messaging","path":"/home/brandon/flutter/.pub-cache/hosted/pub.dartlang.org/firebase_messaging-6.0.16/","dependencies":[]},{"name":"flutter_nano_ffi","path":"/home/brandon/flutter/.pub-cache/hosted/pub.dartlang.org/flutter_nano_ffi-1.0.2/","dependencies":[]},{"name":"flutter_secure_storage","path":"/home/brandon/flutter/.pub-cache/hosted/pub.dartlang.org/flutter_secure_storage-3.3.3/","dependencies":[]},{"name":"flutter_webview_plugin","path":"/home/brandon/flutter/.pub-cache/hosted/pub.dartlang.org/flutter_webview_plugin-0.3.11/","dependencies":[]},{"name":"local_auth","path":"/home/brandon/flutter/.pub-cache/hosted/pub.dartlang.org/local_auth-0.6.2+3/","dependencies":[]},{"name":"package_info","path":"/home/brandon/flutter/.pub-cache/hosted/pub.dartlang.org/package_info-0.4.1/","dependencies":[]},{"name":"path_provider","path":"/home/brandon/flutter/.pub-cache/hosted/pub.dartlang.org/path_provider-1.6.10/","dependencies":[]},{"name":"root_checker","path":"/home/brandon/flutter/.pub-cache/git/root_checker-43d86d620a5b113cd9e0f06e933e225437e779b8/","dependencies":[]},{"name":"share","path":"/home/brandon/flutter/.pub-cache/git/plugins-900165b300b16489bf2b5d4a55b30be7c799293f/packages/share/","dependencies":[]},{"name":"shared_preferences","path":"/home/brandon/flutter/.pub-cache/hosted/pub.dartlang.org/shared_preferences-0.5.7+3/","dependencies":[]},{"name":"sqflite","path":"/home/brandon/flutter/.pub-cache/hosted/pub.dartlang.org/sqflite-1.3.0+2/","dependencies":[]},{"name":"uni_links","path":"/home/brandon/flutter/.pub-cache/git/uni_links-c3072f83690da166d0942c92283f6fdd08c59c26/","dependencies":[]},{"name":"vibrate","path":"/home/brandon/flutter/.pub-cache/git/flutter_vibrate-8f9f1c20179ddf41003fcccf8a984fdeeaca1adc/","dependencies":[]}],"android":[{"name":"barcode_scan","path":"/home/brandon/flutter/.pub-cache/git/flutter_barcode_reader-545aa259bd67d9ce9a32f342bddd5a13a9079e4d/","dependencies":[]},{"name":"device_info","path":"/home/brandon/flutter/.pub-cache/hosted/pub.dartlang.org/device_info-0.4.2+4/","dependencies":[]},{"name":"file_picker","path":"/home/brandon/flutter/.pub-cache/hosted/pub.dartlang.org/file_picker-1.9.0+1/","dependencies":["flutter_plugin_android_lifecycle"]},{"name":"firebase_messaging","path":"/home/brandon/flutter/.pub-cache/hosted/pub.dartlang.org/firebase_messaging-6.0.16/","dependencies":[]},{"name":"flutter_nano_ffi","path":"/home/brandon/flutter/.pub-cache/hosted/pub.dartlang.org/flutter_nano_ffi-1.0.2/","dependencies":[]},{"name":"flutter_plugin_android_lifecycle","path":"/home/brandon/flutter/.pub-cache/hosted/pub.dartlang.org/flutter_plugin_android_lifecycle-1.0.8/","dependencies":[]},{"name":"flutter_secure_storage","path":"/home/brandon/flutter/.pub-cache/hosted/pub.dartlang.org/flutter_secure_storage-3.3.3/","dependencies":[]},{"name":"flutter_webview_plugin","path":"/home/brandon/flutter/.pub-cache/hosted/pub.dartlang.org/flutter_webview_plugin-0.3.11/","dependencies":[]},{"name":"local_auth","path":"/home/brandon/flutter/.pub-cache/hosted/pub.dartlang.org/local_auth-0.6.2+3/","dependencies":["flutter_plugin_android_lifecycle"]},{"name":"package_info","path":"/home/brandon/flutter/.pub-cache/hosted/pub.dartlang.org/package_info-0.4.1/","dependencies":[]},{"name":"path_provider","path":"/home/brandon/flutter/.pub-cache/hosted/pub.dartlang.org/path_provider-1.6.10/","dependencies":[]},{"name":"root_checker","path":"/home/brandon/flutter/.pub-cache/git/root_checker-43d86d620a5b113cd9e0f06e933e225437e779b8/","dependencies":[]},{"name":"share","path":"/home/brandon/flutter/.pub-cache/git/plugins-900165b300b16489bf2b5d4a55b30be7c799293f/packages/share/","dependencies":[]},{"name":"shared_preferences","path":"/home/brandon/flutter/.pub-cache/hosted/pub.dartlang.org/shared_preferences-0.5.7+3/","dependencies":[]},{"name":"sqflite","path":"/home/brandon/flutter/.pub-cache/hosted/pub.dartlang.org/sqflite-1.3.0+2/","dependencies":[]},{"name":"uni_links","path":"/home/brandon/flutter/.pub-cache/git/uni_links-c3072f83690da166d0942c92283f6fdd08c59c26/","dependencies":[]},{"name":"vibrate","path":"/home/brandon/flutter/.pub-cache/git/flutter_vibrate-8f9f1c20179ddf41003fcccf8a984fdeeaca1adc/","dependencies":[]}],"macos":[{"name":"package_info","path":"/home/brandon/flutter/.pub-cache/hosted/pub.dartlang.org/package_info-0.4.1/","dependencies":[]},{"name":"path_provider_macos","path":"/home/brandon/flutter/.pub-cache/hosted/pub.dartlang.org/path_provider_macos-0.0.4+3/","dependencies":[]},{"name":"shared_preferences_macos","path":"/home/brandon/flutter/.pub-cache/hosted/pub.dartlang.org/shared_preferences_macos-0.0.1+10/","dependencies":[]},{"name":"sqflite","path":"/home/brandon/flutter/.pub-cache/hosted/pub.dartlang.org/sqflite-1.3.0+2/","dependencies":[]}],"linux":[{"name":"path_provider_linux","path":"/home/brandon/flutter/.pub-cache/hosted/pub.dartlang.org/path_provider_linux-0.0.1+1/","dependencies":[]}],"windows":[],"web":[{"name":"shared_preferences_web","path":"/home/brandon/flutter/.pub-cache/hosted/pub.dartlang.org/shared_preferences_web-0.1.2+7/","dependencies":[]}]},"dependencyGraph":[{"name":"barcode_scan","dependencies":[]},{"name":"device_info","dependencies":[]},{"name":"file_picker","dependencies":["flutter_plugin_android_lifecycle"]},{"name":"firebase_messaging","dependencies":[]},{"name":"flutter_nano_ffi","dependencies":[]},{"name":"flutter_plugin_android_lifecycle","dependencies":[]},{"name":"flutter_secure_storage","dependencies":[]},{"name":"flutter_webview_plugin","dependencies":[]},{"name":"local_auth","dependencies":["flutter_plugin_android_lifecycle"]},{"name":"package_info","dependencies":[]},{"name":"path_provider","dependencies":["path_provider_macos","path_provider_linux"]},{"name":"path_provider_linux","dependencies":[]},{"name":"path_provider_macos","dependencies":[]},{"name":"root_checker","dependencies":[]},{"name":"share","dependencies":[]},{"name":"shared_preferences","dependencies":["shared_preferences_macos","shared_preferences_web"]},{"name":"shared_preferences_macos","dependencies":[]},{"name":"shared_preferences_web","dependencies":[]},{"name":"sqflite","dependencies":[]},{"name":"uni_links","dependencies":[]},{"name":"vibrate","dependencies":[]}],"date_created":"2020-07-26 16:23:51.809956","version":"1.17.2"} \ No newline at end of file diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8959ebfb..7af075fd 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -70,7 +70,7 @@ jobs: echo keyAlias=${{ secrets.ANDROID_KEY_ALIAS }} >> key.properties echo keyPassword=${{ secrets.ANDROID_KEY_PASSWORD }} >> key.properties echo storePassword=${{ secrets.ANDROID_KEY_STORE_PASSWORD }} >> key.properties - fastlane build_android production:true + /usr/local/bin/fastlane build_android production:true rm -f key.properties - name: Upload APK @@ -105,7 +105,7 @@ jobs: GEM_HOME: ~/.gems run: | echo "::add-path::~/.gems/bin" - fastlane build_ios + /usr/local/bin/fastlane build_ios - name: Upload IPA if: success() diff --git a/.github/workflows/deploy_beta.yml b/.github/workflows/deploy_beta.yml index 4844d792..820860c2 100644 --- a/.github/workflows/deploy_beta.yml +++ b/.github/workflows/deploy_beta.yml @@ -68,7 +68,7 @@ jobs: echo keyAlias=${{ secrets.ANDROID_KEY_ALIAS }} >> key.properties echo keyPassword=${{ secrets.ANDROID_KEY_PASSWORD }} >> key.properties echo storePassword=${{ secrets.ANDROID_KEY_STORE_PASSWORD }} >> key.properties - fastlane build_android production:true + /usr/local/bin/fastlane build_android production:true rm -f key.properties - name: Upload APK @@ -103,7 +103,7 @@ jobs: GEM_HOME: ~/.gems run: | echo "::add-path::~/.gems/bin" - fastlane build_ios + /usr/local/bin/fastlane build_ios - name: Upload IPA if: success() @@ -134,7 +134,7 @@ jobs: GEM_HOME: ~/.gems run: | echo "::add-path::~/.gems/bin" - fastlane deploy_android internal:true + /usr/local/bin/fastlane deploy_android internal:true deploy_ios: name: Deploy iOS testflight @@ -160,4 +160,4 @@ jobs: GEM_HOME: ~/.gems run: | echo "::add-path::~/.gems/bin" - fastlane deploy_ios testflight:true \ No newline at end of file + /usr/local/bin/fastlane deploy_ios testflight:true \ No newline at end of file diff --git a/.github/workflows/deploy_release.yml b/.github/workflows/deploy_release.yml index e8c8ae5a..e3082008 100644 --- a/.github/workflows/deploy_release.yml +++ b/.github/workflows/deploy_release.yml @@ -68,7 +68,7 @@ jobs: echo keyAlias=${{ secrets.ANDROID_KEY_ALIAS }} >> key.properties echo keyPassword=${{ secrets.ANDROID_KEY_PASSWORD }} >> key.properties echo storePassword=${{ secrets.ANDROID_KEY_STORE_PASSWORD }} >> key.properties - fastlane build_android production:true + /usr/local/bin/fastlane build_android production:true rm -f key.properties - name: Upload APK @@ -103,7 +103,7 @@ jobs: GEM_HOME: ~/.gems run: | echo "::add-path::~/.gems/bin" - fastlane build_ios + /usr/local/bin/fastlane build_ios - name: Upload IPA if: success() @@ -134,7 +134,7 @@ jobs: GEM_HOME: ~/.gems run: | echo "::add-path::~/.gems/bin" - fastlane deploy_android production:true + /usr/local/bin/fastlane deploy_android production:true deploy_ios: name: Deploy iOS testflight @@ -160,4 +160,4 @@ jobs: GEM_HOME: ~/.gems run: | echo "::add-path::~/.gems/bin" - fastlane deploy_ios \ No newline at end of file + /usr/local/bin/fastlane deploy_ios \ No newline at end of file diff --git a/android/fastlane/Fastfile b/android/fastlane/Fastfile index 35dc2784..f33999ab 100644 --- a/android/fastlane/Fastfile +++ b/android/fastlane/Fastfile @@ -13,10 +13,6 @@ default_platform(:android) platform :android do - before_all do |lane, options| - update_fastlane - end - desc "Build android aab and apk" lane :build_android do |options| sh "./flutter_build.sh --clean" diff --git a/ios/fastlane/Fastfile b/ios/fastlane/Fastfile index 0e22f7d2..c56cabd6 100644 --- a/ios/fastlane/Fastfile +++ b/ios/fastlane/Fastfile @@ -37,10 +37,6 @@ def ensure_temp_keychain(name, password) end platform :ios do - before_all do |lane, options| - update_fastlane - end - desc "Build & sign iOS app" lane :build_ios do |options| begin diff --git a/pubspec.yaml b/pubspec.yaml index afcd2eeb..83e9baee 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -7,7 +7,7 @@ description: Natrium - Fast, Robust & Secure NANO Wallet. # Both the version and the builder number may be overridden in flutter # build by specifying --build-name and --build-number, respectively. # Read more about versioning at semver.org. -version: 2.3.2+72 +version: 2.3.3+73 environment: sdk: ">=2.0.0-dev.68.0 <3.0.0" @@ -22,7 +22,7 @@ dependencies: flutter_secure_storage: ^3.3.3 # Nano core functions - flutter_nano_ffi: ^1.0.2 + flutter_nano_ffi: ^1.0.3 # Shared prefs shared_preferences: ^0.5.7