diff --git a/.github/workflows/dargon2_library-builder.yml b/.github/workflows/dargon2_library-builder.yml index 2061a8f..c846bbc 100644 --- a/.github/workflows/dargon2_library-builder.yml +++ b/.github/workflows/dargon2_library-builder.yml @@ -40,14 +40,14 @@ jobs: git config user.email "GH-actions-ci@github.com" git add -f lib/src/blobs/libargon2-linux.so git commit -m "Create Native Library for Linux" - git push origin main + git push origin ${GITHUB_REF##*/} mac-build: runs-on: macos-latest needs: linux-build steps: - uses: actions/checkout@v2 - name: Get Updated Changes - run: git pull origin main + run: git pull origin ${GITHUB_REF##*/} - name: Make & Copy Library run: | git clone https://github.com/P-H-C/phc-winner-argon2.git argon2_library @@ -78,14 +78,14 @@ jobs: git config user.email "GH-actions-ci@github.com" git add -f lib/src/blobs/libargon2-darwin.dylib git commit -m "Create Native Library for Mac" - git push origin main + git push origin ${GITHUB_REF##*/} windows-build: runs-on: windows-latest needs: [linux-build, mac-build] steps: - uses: actions/checkout@v2 - name: Get Updated Changes - run: git pull origin main + run: git pull origin ${GITHUB_REF##*/} - name: Add msbuild to PATH uses: microsoft/setup-msbuild@v1.0.2 - name: Install Windows 8.1 SDK @@ -119,5 +119,5 @@ jobs: git config user.email "GH-actions-ci@github.com" git add -f lib/src/blobs/libargon2-win.dll git commit -m "Create Native Library for Windows" - git push origin main + git push origin ${GITHUB_REF##*/} shell: bash diff --git a/.github/workflows/dargon2_tests.yml b/.github/workflows/dargon2_tests.yml index a410ac5..4388c32 100644 --- a/.github/workflows/dargon2_tests.yml +++ b/.github/workflows/dargon2_tests.yml @@ -19,6 +19,6 @@ jobs: - uses: actions/checkout@v2 - uses: dart-lang/setup-dart@v1 - name: Install dependencies - run: pub get + run: dart pub get - name: Run tests - run: pub run test + run: dart pub run test diff --git a/dargon2_flutter/dargon2_flutter/example/android/settings.gradle b/dargon2_flutter/dargon2_flutter/example/android/settings.gradle index 44e62bc..c893196 100644 --- a/dargon2_flutter/dargon2_flutter/example/android/settings.gradle +++ b/dargon2_flutter/dargon2_flutter/example/android/settings.gradle @@ -9,3 +9,17 @@ localPropertiesFile.withReader("UTF-8") { reader -> properties.load(reader) } def flutterSdkPath = properties.getProperty("flutter.sdk") assert flutterSdkPath != null, "flutter.sdk not set in local.properties" apply from: "$flutterSdkPath/packages/flutter_tools/gradle/app_plugin_loader.gradle" + +def flutterProjectRoot = rootProject.projectDir.parentFile.toPath() + +def plugins = new Properties() +def pluginsFile = new File(flutterProjectRoot.toFile(), '.flutter-plugins') +if (pluginsFile.exists()) { + pluginsFile.withReader('UTF-8') { reader -> plugins.load(reader) } +} + +plugins.each { name, path -> + def pluginDirectory = flutterProjectRoot.resolve(path).resolve('android').toFile() + include ":$name" + project(":$name").projectDir = pluginDirectory +} diff --git a/dargon2_flutter/dargon2_flutter/example/integration_test/argon2_ffi_test.dart b/dargon2_flutter/dargon2_flutter/example/integration_test/argon2_ffi_test.dart index b64a44e..3d4d480 100644 --- a/dargon2_flutter/dargon2_flutter/example/integration_test/argon2_ffi_test.dart +++ b/dargon2_flutter/dargon2_flutter/example/integration_test/argon2_ffi_test.dart @@ -9,10 +9,10 @@ import 'package:dargon2_flutter_example/main.dart' as app; void main() { IntegrationTestWidgetsFlutterBinding.ensureInitialized(); app.main(); - // Argon2i test group group('Hash Tests - Argon2i', () { - testWidgets('v = ${0x13}, t = 2, m = 16, p = 1,', (_) async { + testWidgets('v = ${0x13}, t = 2, m = 16, p = 1,', (tester) async { + await tester.pumpAndSettle(); var code = await hashTest(Argon2Version.V13, 2, 16, 1, 'password', 'somesalt', '03df1d13e10203bcc663405e31ab1687939730c9152459bca28fd10c23e38f50', '\$argon2i\$v=19\$m=16,t=2,p=1\$c29tZXNhbHQ\$A98dE+ECA7zGY0BeMasWh5OXMMkVJFm8oo/RDCPjj1A', Argon2Type.i); @@ -130,6 +130,7 @@ Future hashTest(Argon2Version version, int iterations, int mem return DArgon2ErrorCode.ARGON2_OK; } on DArgon2Exception catch (e) { + print("Catch: $e"); return e.errorCode; } } diff --git a/dargon2_flutter/dargon2_flutter/example/ios/Podfile b/dargon2_flutter/dargon2_flutter/example/ios/Podfile index f7d6a5e..90744ef 100644 --- a/dargon2_flutter/dargon2_flutter/example/ios/Podfile +++ b/dargon2_flutter/dargon2_flutter/example/ios/Podfile @@ -31,6 +31,8 @@ target 'Runner' do flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__)) end +pod 'Argon2Swift' + post_install do |installer| installer.pods_project.targets.each do |target| flutter_additional_ios_build_settings(target) diff --git a/dargon2_flutter/dargon2_flutter/example/ios/Podfile.lock b/dargon2_flutter/dargon2_flutter/example/ios/Podfile.lock index 10e7084..b42cd64 100644 --- a/dargon2_flutter/dargon2_flutter/example/ios/Podfile.lock +++ b/dargon2_flutter/dargon2_flutter/example/ios/Podfile.lock @@ -1,14 +1,11 @@ PODS: - - Argon2Swift (1.0.2) - - dargon2_flutter_mobile (1.2.0): - - Argon2Swift - - Flutter + - Argon2Swift (1.0.3) - Flutter (1.0.0) - integration_test (0.0.1): - Flutter DEPENDENCIES: - - dargon2_flutter_mobile (from `.symlinks/plugins/dargon2_flutter_mobile/ios`) + - Argon2Swift - Flutter (from `Flutter`) - integration_test (from `.symlinks/plugins/integration_test/ios`) @@ -17,19 +14,16 @@ SPEC REPOS: - Argon2Swift EXTERNAL SOURCES: - dargon2_flutter_mobile: - :path: ".symlinks/plugins/dargon2_flutter_mobile/ios" Flutter: :path: Flutter integration_test: :path: ".symlinks/plugins/integration_test/ios" SPEC CHECKSUMS: - Argon2Swift: 370c9687875b4a2365ecb7de06ea5ea0c46e7504 - dargon2_flutter_mobile: 5e4b8f7f39e1640d98f17c0215c284eebd4ec2d7 + Argon2Swift: 99482c1b8122a03524b61e41c4903a9548e7c33b Flutter: 50d75fe2f02b26cc09d224853bb45737f8b3214a integration_test: a1e7d09bd98eca2fc37aefd79d4f41ad37bdbbe5 -PODFILE CHECKSUM: 8e679eca47255a8ca8067c4c67aab20e64cb974d +PODFILE CHECKSUM: 09676ccd4ad5d43d3e19b1b80360c67111482ec0 -COCOAPODS: 1.11.2 +COCOAPODS: 1.11.3