From f618873f6e5544abc006ad1e373a4bfd5372620a Mon Sep 17 00:00:00 2001 From: Dan Green-Leipciger <158079665+dan-at-confirm@users.noreply.github.com> Date: Tue, 12 Mar 2024 09:56:39 -0400 Subject: [PATCH 1/5] Add ffiPlugin config --- dargon2_flutter/dargon2_flutter_mobile/pubspec.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dargon2_flutter/dargon2_flutter_mobile/pubspec.yaml b/dargon2_flutter/dargon2_flutter_mobile/pubspec.yaml index ccaf0c4..cb5f7f6 100644 --- a/dargon2_flutter/dargon2_flutter_mobile/pubspec.yaml +++ b/dargon2_flutter/dargon2_flutter_mobile/pubspec.yaml @@ -33,5 +33,8 @@ flutter: platforms: android: dartPluginClass: DArgon2Mobile + ffiPlugin: true ios: dartPluginClass: DArgon2Mobile + ffiPlugin: true + From 2436a6368651206b58629ee426b1a8183d92cf72 Mon Sep 17 00:00:00 2001 From: Dan Green-Leipciger <158079665+dan-at-confirm@users.noreply.github.com> Date: Tue, 12 Mar 2024 09:57:43 -0400 Subject: [PATCH 2/5] Upgrade gradle --- .../android/gradle/wrapper/gradle-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dargon2_flutter/dargon2_flutter_mobile/android/gradle/wrapper/gradle-wrapper.properties b/dargon2_flutter/dargon2_flutter_mobile/android/gradle/wrapper/gradle-wrapper.properties index 01a286e..8bc9958 100644 --- a/dargon2_flutter/dargon2_flutter_mobile/android/gradle/wrapper/gradle-wrapper.properties +++ b/dargon2_flutter/dargon2_flutter_mobile/android/gradle/wrapper/gradle-wrapper.properties @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-all.zip From 16e05f4b934857bc8c1200dfc71574fd71cbe2e8 Mon Sep 17 00:00:00 2001 From: Jason Colburne Date: Fri, 15 Mar 2024 16:52:52 -0300 Subject: [PATCH 3/5] add plugin param to desktop build --- dargon2_flutter/dargon2_flutter_desktop/pubspec.yaml | 3 +++ dargon2_flutter/dargon2_flutter_mobile/pubspec.yaml | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/dargon2_flutter/dargon2_flutter_desktop/pubspec.yaml b/dargon2_flutter/dargon2_flutter_desktop/pubspec.yaml index 11f3f11..e339365 100644 --- a/dargon2_flutter/dargon2_flutter_desktop/pubspec.yaml +++ b/dargon2_flutter/dargon2_flutter_desktop/pubspec.yaml @@ -34,10 +34,13 @@ flutter: platforms: linux: pluginClass: Dargon2FlutterDesktopPlugin + ffiPlugin: true macos: pluginClass: Dargon2FlutterDesktopPlugin + ffiPlugin: true windows: pluginClass: Dargon2FlutterDesktopPlugin + ffiPlugin: true # To add assets to your plugin package, add an assets section, like this: # assets: diff --git a/dargon2_flutter/dargon2_flutter_mobile/pubspec.yaml b/dargon2_flutter/dargon2_flutter_mobile/pubspec.yaml index cb5f7f6..99f0633 100644 --- a/dargon2_flutter/dargon2_flutter_mobile/pubspec.yaml +++ b/dargon2_flutter/dargon2_flutter_mobile/pubspec.yaml @@ -37,4 +37,3 @@ flutter: ios: dartPluginClass: DArgon2Mobile ffiPlugin: true - From d69c3d5fa5f372b025ca816aca6b5e52a932587c Mon Sep 17 00:00:00 2001 From: Jason Colburne Date: Mon, 18 Mar 2024 09:11:18 -0300 Subject: [PATCH 4/5] upgrade flutter CI tests --- .github/workflows/dargon2_flutter_tests.yml | 24 +++++++++++---------- .github/workflows/dargon2_tests.yml | 4 ++-- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/.github/workflows/dargon2_flutter_tests.yml b/.github/workflows/dargon2_flutter_tests.yml index 85b35c5..b25de2b 100644 --- a/.github/workflows/dargon2_flutter_tests.yml +++ b/.github/workflows/dargon2_flutter_tests.yml @@ -2,7 +2,9 @@ name: dargon2_flutter on: push: + branches: [main] pull_request: + branches: [main] defaults: run: @@ -13,23 +15,23 @@ jobs: runs-on: macos-latest steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: submodules: recursive - name: Setup Java - uses: actions/setup-java@v2 + uses: actions/setup-java@v4 with: java-version: '17' distribution: 'zulu' - name: Gradle cache - uses: actions/cache@v2 + uses: actions/cache@v4 with: path: | ~/.gradle/caches ~/.gradle/wrapper key: gradle-${{ runner.os }}-${{ hashFiles('**/*.gradle*') }}-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }}-${{ hashFiles('**/buildSrc/**/*.kt') }} - name: AVD cache - uses: actions/cache@v2 + uses: actions/cache@v4 id: avd-cache with: path: | @@ -56,9 +58,9 @@ jobs: mv ../../dargon2_flutter_mobile/pubspec.test.yaml ../../dargon2_flutter_mobile/pubspec.yaml mv ../../dargon2_flutter_desktop/pubspec.test.yaml ../../dargon2_flutter_desktop/pubspec.yaml mv ../../dargon2_flutter_platform_interface/pubspec.test.yaml ../../dargon2_flutter_platform_interface/pubspec.yaml - mv ../../../dargon2_core/pubspec.test.yaml ../../../dargon2_core/pubspec.yaml + mv ../../../dargon2_core/pubspec.test.yaml ../../../dargon2_core/pubspec.yaml - name: Run Integration Tests - uses: reactivecircus/android-emulator-runner@v2.22.0 + uses: reactivecircus/android-emulator-runner@v2.30.1 with: api-level: 33 target: google_apis @@ -67,10 +69,10 @@ jobs: script: flutter test integration_test/ test_ios: - runs-on: macos-latest + runs-on: macos-14 steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: submodules: recursive - name: Download Flutter @@ -85,7 +87,7 @@ jobs: - name: Start Simulator run: | UDID=$( - xcrun simctl list devices | grep "iPhone 13 (" | awk -F"[()]" '{print $2}' | awk 'NR==1{print $1}' + xcrun simctl list devices | grep "iPhone 15 (" | awk -F"[()]" '{print $2}' | awk 'NR==1{print $1}' ) xcrun simctl boot "${UDID:?No Simulator with this name found}" - name: Use Test Pubspec Files @@ -108,7 +110,7 @@ jobs: test_web: runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - uses: subosito/flutter-action@v2 - name: Use Test Pubspec Files run: | @@ -146,7 +148,7 @@ jobs: FLUTTER_CHANNEL: stable steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: submodules: recursive - name: Download Flutter diff --git a/.github/workflows/dargon2_tests.yml b/.github/workflows/dargon2_tests.yml index e3492d3..d1c8d7b 100644 --- a/.github/workflows/dargon2_tests.yml +++ b/.github/workflows/dargon2_tests.yml @@ -1,8 +1,8 @@ name: dargon2 on: - push: - pull_request: + # push: + # pull_request: defaults: run: From 0e2df64ef54852e3acc600d6842f88be8b3b6cda Mon Sep 17 00:00:00 2001 From: Jason Colburne Date: Tue, 19 Mar 2024 03:21:03 -0300 Subject: [PATCH 5/5] fix tests for dart 3.3 by using deprecation override (will break in 3.4) --- .github/workflows/dargon2_tests.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/dargon2_tests.yml b/.github/workflows/dargon2_tests.yml index d1c8d7b..684d8ff 100644 --- a/.github/workflows/dargon2_tests.yml +++ b/.github/workflows/dargon2_tests.yml @@ -1,8 +1,10 @@ name: dargon2 on: - # push: - # pull_request: + push: + branches: [main] + pull_request: + branches: [main] defaults: run: @@ -27,4 +29,4 @@ jobs: - name: Install dependencies run: dart pub get - name: Run tests - run: dart pub run test + run: dart --enable_deprecated_wait_for test