diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 2af4a223..c8191011 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -9,7 +9,7 @@ jobs: strategy: matrix: - flavor: ['samsungapps', 'sideload', 'huawei'] + flavor: ['playstoredev', 'samsungapps', 'sideload', 'huawei'] fail-fast: true diff --git a/.travis.yml b/.travis.yml index 95ae8bea..e15dd2cf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,7 +15,9 @@ jobs: name: 'Android Dev Build' os: linux language: android - if: branch = master + #if: branch = master + # disabled for now, build via github actions. + if: 1 != 1 dist: trusty android: components: diff --git a/authpass/_tools/install_flutter.sh b/authpass/_tools/install_flutter.sh index da9694dc..4e716f32 100755 --- a/authpass/_tools/install_flutter.sh +++ b/authpass/_tools/install_flutter.sh @@ -19,7 +19,7 @@ FLUTTER_CHANNEL='stable' #FLUTTER_VERSION='v1.15.17-beta' #FLUTTER_VERSION='1.17.0-dev.3.1-beta' #FLUTTER_VERSION='1.17.0-3.2.pre-beta' -FLUTTER_VERSION='1.17.2-stable' +FLUTTER_VERSION='1.17.4-stable' #FLUTTER_MAC_CHANNEL='dev' #FLUTTER_MAC_VERSION='v1.13.6-dev' diff --git a/authpass/_tools/release.sh b/authpass/_tools/release.sh index 85118a2a..3cea7203 100755 --- a/authpass/_tools/release.sh +++ b/authpass/_tools/release.sh @@ -89,12 +89,14 @@ case "${flavor}" in playstoredev) $FLT build -v appbundle -t lib/env/production.dart --release --build-number $buildnumber --flavor playstoredev cd android - fastlane dev + bundle install + bundle exec fastlane beta ;; android) $FLT build -v appbundle -t lib/env/production.dart --release --build-number $buildnumber --flavor playstore cd android - fastlane beta + bundle install + bundle exec fastlane beta ;; linux) version=$(cat pubspec.yaml | grep version | cut -d' ' -f2 | cut -d'+' -f1) diff --git a/authpass/pubspec.lock b/authpass/pubspec.lock index fe099217..747b62ee 100644 --- a/authpass/pubspec.lock +++ b/authpass/pubspec.lock @@ -235,7 +235,7 @@ packages: name: crypto url: "https://pub.dartlang.org" source: hosted - version: "2.1.5" + version: "2.1.4" cryptography: dependency: transitive description: @@ -292,13 +292,6 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "0.1.5" - fake_async: - dependency: transitive - description: - name: fake_async - url: "https://pub.dartlang.org" - source: hosted - version: "1.1.0" ffi: dependency: "direct main" description: @@ -494,6 +487,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "3.1.4" + image: + dependency: transitive + description: + name: image + url: "https://pub.dartlang.org" + source: hosted + version: "2.1.12" intl: dependency: "direct main" description: @@ -535,7 +535,7 @@ packages: name: json_rpc_2 url: "https://pub.dartlang.org" source: hosted - version: "2.2.0" + version: "2.1.0" json_serializable: dependency: "direct dev" description: @@ -672,7 +672,7 @@ packages: name: path url: "https://pub.dartlang.org" source: hosted - version: "1.7.0" + version: "1.6.4" path_drawing: dependency: transitive description: @@ -779,7 +779,7 @@ packages: name: process url: "https://pub.dartlang.org" source: hosted - version: "3.0.13" + version: "3.0.12" prompts: dependency: transitive description: @@ -975,21 +975,21 @@ packages: name: test url: "https://pub.dartlang.org" source: hosted - version: "1.14.7" + version: "1.14.4" test_api: dependency: transitive description: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.2.16" + version: "0.2.15" test_core: dependency: transitive description: name: test_core url: "https://pub.dartlang.org" source: hosted - version: "0.3.7" + version: "0.3.4" timing: dependency: transitive description: