From 9ad54f0002d6c3e1229e1487990327849f1ef1f8 Mon Sep 17 00:00:00 2001 From: Gerson Pardo Date: Tue, 8 Aug 2023 20:40:09 -0500 Subject: [PATCH 1/9] chore: updated macos podspec --- macos/openpgp.podspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/macos/openpgp.podspec b/macos/openpgp.podspec index cee2b77..5a876b3 100644 --- a/macos/openpgp.podspec +++ b/macos/openpgp.podspec @@ -18,7 +18,7 @@ library for use OpenPGP. s.platform = :osx, '10.11' s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES' } s.swift_version = '5.0' - #s.vendored_libraries = 'libopenpgp_bridge.dylib' + s.vendored_libraries = 'libopenpgp_bridge.dylib' s.resources = ['libopenpgp_bridge.dylib'] s.xcconfig = { 'LD_RUNPATH_SEARCH_PATHS' => '@loader_path/../Frameworks/openpgp.framework/Resources' } From 8182cdc02845fa72fe5f533151e00c6c8b6dde12 Mon Sep 17 00:00:00 2001 From: Gerson Pardo Date: Tue, 8 Aug 2023 22:06:40 -0500 Subject: [PATCH 2/9] chore: updated binaries from ci --- ios/libopenpgp_bridge.a | Bin 12601200 -> 12601200 bytes macos/libopenpgp_bridge.dylib | Bin 7376914 -> 7376936 bytes macos/openpgp.podspec | 7 +++---- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/ios/libopenpgp_bridge.a b/ios/libopenpgp_bridge.a index 9e3ef66553b1962a3b1265e0c4dfcee1eee110bb..2b852f1f0fa16f3db27be5e69c4980316b3e9cfd 100644 GIT binary patch delta 1581 zcmY+^eNd>AswkJO)&Y;vI9F#2+JW@1p-QK~|qSCQBy2)k`9m)LgM)(%qev z>=;ljV)CN=0!sFJX^ z%VtZew<#)5r5V>1+MLSy5w|32d*xxn{KVOItkP%}tNUfYN%90sYFxXT%eFPQb~SEw zbau8^`BtPC93PkSqVXXa9&E%WY(^Qj;4YM-0$x<&ZdBnORAVcAxED3J54EVnHr$T~ zP>=0+5D#Go8qkO)G@}K6Jd9TC#4fa9H};?%9SEQkd+`W@coh54g~#wXo2Qy=2uw=-n0uiz6Htw!@0(C;?!Bm+NHvTm zw&40P)Rr+jfxs-j`X#iqKo2fbk#;$B+NKAImanbhpY#^(vCcZfp2f2j+kLV{p)r5B$(RTnCCX?bu(gFtlR@HZ;FooT`8Nm@byXMdDYx3~HLW`v z8}|C$P5!7M5=I11;Q*e-LG&PsXV8mh@f`Zlk3%?&BRGoZaSShD0LP)=MGWF4yo?hV z!YgYS5etBxNd~nv}uuP=@I9tG4txSAwgG{{^mYwNwvSnj{8$)Ro$f z9E?w_WNJV?p)Fnyj*hE;u9+R0Y`LVK(_6G4kQV=2TRbh=rxD4DdrWg%eqR>7cvu5Gt>;ds~MWZM`XJlK6zM_OHU-mTwnG&x(V+B z1WU0Dx8n{h#|qquyRZ`ZxEuGt1_^c)pb)E2gw1S>lgj*)?ybCa5(gV{Byn`~QuUjLQcM$rab8M1!0gN^HVrRG}I**n(O-ggVsYVLXCI(SSxghR3lL+t7q&Y{w3G(1KR%#4fa9H=aN{ zI^e~VcnW*aiKnp_&!7wY@GQEq9|uHaz*lC8osjAda^;JLd=>NKh1_-up)uc;St$jT zf>CW4mFKF{-mqTueCHcX?Th*!k_-6#EW+`VuPr0KgZ4j)%fI**CQ4x_27N!jA6vU{X*PnEsA!_&0gTN%^^{0QJV9K`cDgu@8p1%&V- zUP2FgaRf(k49D>@`fvg#aSAG4K|fx_YdDPoypA{UCf>psyp4D8F5biYIExSPAwI%6 ze2h=KF4`{fgyYefni+0SNIwuxF~diOQSzVPe{F}UBhpi!ky-sY*i<`VWZkV z=F1R0p0Jdj>j#mQwQZvGAWOVmUVdcX%W| uAI;vh$Um8}zAMOn0YjwJm@@zS!pN`je)P$I&X0^|$M@IX-?tfp5?Yy$EZZqYFEmCVnK&*AzZQfz;`H)p~R(R}{!9 z*aIE%uowBzV;>4oi2W!+F-mX%1{hI_GL)kN2Vp{GbXhWYDrDNI`l|VJe7YdS{ms>4 z_|x?(;Y6F}KXQ*)$IS#kqn&*GtZZQFhN{+)^-UjLA2*lDe;V_P%3e~XSC~8m(5p}TQ_nr;M(11oXp&2b`MH||2 z93AL{9Vc)Sr_hCNIM9P$oJJqczzG-5q91MyU=SV*!3!UTaSr}ya4GQKo%4lQH?LQ< z@gZ3*2)-3T9xDiPN)V)oM<IFS=C7vZAk3t-RKiLrqfb>%=j}N-Fuy;yeYnM=@hTN&c1v2DQe7v(L&+2-b0d|4 zAjHn;pPT(Z&1%uuyxJm{rswdO2oY9Kzp<#fs4&kp(CKLv1b>}vRxxIH{Y8>#_RcsZ zvbHCwqw~^oWA!f)|85}dZPrKfD}YF%xATdS?Bv(hk7oG#N$T}v8S^o=h1L=Z!Q z2t;BHq9Dau$gmF4h(RpmP#_LU#6tx&)*}Il*nlJ?BLy3=38~N^4e7{$7MaLGHgd2T zTab&b&>;`okPkh!qX304pa{h3x(^xfJm?rA7beRxbHvwxs{2 zcJ_AtD=h@-#!Rz{uhaJ(Zzl7r?hc>(cp62;(1so1xL4A9k98v#&leA^+^Bfwc9$ghZ;nq) zdTu{j2!yphi$?d^_;eyBUZn{O8Q)SK$XkX!WX~)#zWjdWdi8L!>uS)N>3iGp3-_Z? A0RR91 diff --git a/macos/openpgp.podspec b/macos/openpgp.podspec index 5a876b3..f73f17e 100644 --- a/macos/openpgp.podspec +++ b/macos/openpgp.podspec @@ -18,8 +18,7 @@ library for use OpenPGP. s.platform = :osx, '10.11' s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES' } s.swift_version = '5.0' - s.vendored_libraries = 'libopenpgp_bridge.dylib' - s.resources = ['libopenpgp_bridge.dylib'] - s.xcconfig = { 'LD_RUNPATH_SEARCH_PATHS' => '@loader_path/../Frameworks/openpgp.framework/Resources' } - + s.preserve_paths = 'libopenpgp_bridge.dylib' + s.vendored_libraries = 'libopenpgp_bridge.dylib' + s.xcconfig = { 'LD_RUNPATH_SEARCH_PATHS' => '@loader_path/../Frameworks' } end From f30310edf36f02d5cfe4441b40ce5f319d333c5e Mon Sep 17 00:00:00 2001 From: Gerson Pardo Date: Tue, 8 Aug 2023 22:10:46 -0500 Subject: [PATCH 3/9] chore: updated example project --- example/macos/Podfile | 2 +- example/macos/Podfile.lock | 8 ++++---- example/macos/Runner.xcodeproj/project.pbxproj | 13 ++++++++----- .../xcshareddata/xcschemes/Runner.xcscheme | 2 +- 4 files changed, 14 insertions(+), 11 deletions(-) diff --git a/example/macos/Podfile b/example/macos/Podfile index dade8df..049abe2 100644 --- a/example/macos/Podfile +++ b/example/macos/Podfile @@ -1,4 +1,4 @@ -platform :osx, '10.11' +platform :osx, '10.14' # CocoaPods analytics sends network stats synchronously affecting flutter build latency. ENV['COCOAPODS_DISABLE_STATS'] = 'true' diff --git a/example/macos/Podfile.lock b/example/macos/Podfile.lock index 939021e..0346c48 100644 --- a/example/macos/Podfile.lock +++ b/example/macos/Podfile.lock @@ -14,9 +14,9 @@ EXTERNAL SOURCES: :path: Flutter/ephemeral/.symlinks/plugins/openpgp/macos SPEC CHECKSUMS: - FlutterMacOS: 57701585bf7de1b3fc2bb61f6378d73bbdea8424 - openpgp: a381edf38bbb0400ff4bab189b935fed0401788f + FlutterMacOS: 8f6f14fa908a6fb3fba0cd85dbd81ec4b251fb24 + openpgp: 74f1193a4edb7b732b71576beca8d5bd3783a1b8 -PODFILE CHECKSUM: 6eac6b3292e5142cfc23bdeb71848a40ec51c14c +PODFILE CHECKSUM: 353c8bcc5d5b0994e508d035b5431cfe18c1dea7 -COCOAPODS: 1.10.1 +COCOAPODS: 1.12.1 diff --git a/example/macos/Runner.xcodeproj/project.pbxproj b/example/macos/Runner.xcodeproj/project.pbxproj index dac9b88..26cbb1e 100644 --- a/example/macos/Runner.xcodeproj/project.pbxproj +++ b/example/macos/Runner.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 51; + objectVersion = 54; objects = { /* Begin PBXAggregateTarget section */ @@ -203,7 +203,7 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 0920; - LastUpgradeCheck = 0930; + LastUpgradeCheck = 1300; ORGANIZATIONNAME = "The Flutter Authors"; TargetAttributes = { 33CC10EC2044A3C60003C045 = { @@ -261,10 +261,12 @@ ); inputPaths = ( "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh", + "${PODS_ROOT}/../Flutter/ephemeral/.symlinks/plugins/openpgp/macos/libopenpgp_bridge.dylib", "${BUILT_PRODUCTS_DIR}/openpgp/openpgp.framework", ); name = "[CP] Embed Pods Frameworks"; outputPaths = ( + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/libopenpgp_bridge.dylib", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/openpgp.framework", ); runOnlyForDeploymentPostprocessing = 0; @@ -274,6 +276,7 @@ }; 3399D490228B24CF009A79C7 /* ShellScript */ = { isa = PBXShellScriptBuildPhase; + alwaysOutOfDate = 1; buildActionMask = 2147483647; files = ( ); @@ -405,7 +408,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.11; + MACOSX_DEPLOYMENT_TARGET = 10.14; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = macosx; SWIFT_COMPILATION_MODE = wholemodule; @@ -488,7 +491,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.11; + MACOSX_DEPLOYMENT_TARGET = 10.14; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = macosx; @@ -535,7 +538,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.11; + MACOSX_DEPLOYMENT_TARGET = 10.14; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = macosx; SWIFT_COMPILATION_MODE = wholemodule; diff --git a/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index f78f773..1e8290b 100644 --- a/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -1,6 +1,6 @@ Date: Wed, 9 Aug 2023 08:27:06 -0500 Subject: [PATCH 4/9] chore: removed podspec.lock --- .gitignore | 9 ++- pubspec.lock | 186 --------------------------------------------------- 2 files changed, 7 insertions(+), 188 deletions(-) delete mode 100644 pubspec.lock diff --git a/.gitignore b/.gitignore index fc2613a..b1e12db 100755 --- a/.gitignore +++ b/.gitignore @@ -1,12 +1,17 @@ .DS_Store .dart_tool/ - .packages .pub/ -doc/ +.vscode/ build/ .idea/ *._* +.flutter* + +# Packages should not commit the "pubspec.lock" file. +# +# See https://dart.dev/guides/libraries/private-files#pubspeclock +/pubspec.lock diff --git a/pubspec.lock b/pubspec.lock deleted file mode 100644 index 47ab3d0..0000000 --- a/pubspec.lock +++ /dev/null @@ -1,186 +0,0 @@ -# Generated by pub -# See https://dart.dev/tools/pub/glossary#lockfile -packages: - async: - dependency: transitive - description: - name: async - sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c" - url: "https://pub.dev" - source: hosted - version: "2.11.0" - boolean_selector: - dependency: transitive - description: - name: boolean_selector - sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66" - url: "https://pub.dev" - source: hosted - version: "2.1.1" - characters: - dependency: transitive - description: - name: characters - sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605" - url: "https://pub.dev" - source: hosted - version: "1.3.0" - clock: - dependency: transitive - description: - name: clock - sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf - url: "https://pub.dev" - source: hosted - version: "1.1.1" - collection: - dependency: transitive - description: - name: collection - sha256: "4a07be6cb69c84d677a6c3096fcf960cc3285a8330b4603e0d463d15d9bd934c" - url: "https://pub.dev" - source: hosted - version: "1.17.1" - fake_async: - dependency: transitive - description: - name: fake_async - sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78" - url: "https://pub.dev" - source: hosted - version: "1.3.1" - ffi: - dependency: "direct main" - description: - name: ffi - sha256: a38574032c5f1dd06c4aee541789906c12ccaab8ba01446e800d9c5b79c4a978 - url: "https://pub.dev" - source: hosted - version: "2.0.1" - flat_buffers: - dependency: "direct main" - description: - name: flat_buffers - sha256: "23e2ced0d8e8ecdffbd9f267f49a668c74438393b9acaeac1c724123e3764263" - url: "https://pub.dev" - source: hosted - version: "2.0.5" - flutter: - dependency: "direct main" - description: flutter - source: sdk - version: "0.0.0" - flutter_test: - dependency: "direct dev" - description: flutter - source: sdk - version: "0.0.0" - flutter_web_plugins: - dependency: "direct main" - description: flutter - source: sdk - version: "0.0.0" - js: - dependency: transitive - description: - name: js - sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3 - url: "https://pub.dev" - source: hosted - version: "0.6.7" - matcher: - dependency: transitive - description: - name: matcher - sha256: "6501fbd55da300384b768785b83e5ce66991266cec21af89ab9ae7f5ce1c4cbb" - url: "https://pub.dev" - source: hosted - version: "0.12.15" - material_color_utilities: - dependency: transitive - description: - name: material_color_utilities - sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724 - url: "https://pub.dev" - source: hosted - version: "0.2.0" - meta: - dependency: transitive - description: - name: meta - sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3" - url: "https://pub.dev" - source: hosted - version: "1.9.1" - path: - dependency: "direct main" - description: - name: path - sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917" - url: "https://pub.dev" - source: hosted - version: "1.8.3" - sky_engine: - dependency: transitive - description: flutter - source: sdk - version: "0.0.99" - source_span: - dependency: transitive - description: - name: source_span - sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250 - url: "https://pub.dev" - source: hosted - version: "1.9.1" - stack_trace: - dependency: transitive - description: - name: stack_trace - sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5 - url: "https://pub.dev" - source: hosted - version: "1.11.0" - stream_channel: - dependency: transitive - description: - name: stream_channel - sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8" - url: "https://pub.dev" - source: hosted - version: "2.1.1" - string_scanner: - dependency: transitive - description: - name: string_scanner - sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde" - url: "https://pub.dev" - source: hosted - version: "1.2.0" - term_glyph: - dependency: transitive - description: - name: term_glyph - sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84 - url: "https://pub.dev" - source: hosted - version: "1.2.1" - test_api: - dependency: transitive - description: - name: test_api - sha256: eb6ac1540b26de412b3403a163d919ba86f6a973fe6cc50ae3541b80092fdcfb - url: "https://pub.dev" - source: hosted - version: "0.5.1" - vector_math: - dependency: transitive - description: - name: vector_math - sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803" - url: "https://pub.dev" - source: hosted - version: "2.1.4" -sdks: - dart: ">=3.0.0-0 <4.0.0" - flutter: ">=1.10.0" From 75e0c62261e37bfa7315bfae4f18b381cb8d6552 Mon Sep 17 00:00:00 2001 From: Gerson Pardo Date: Wed, 9 Aug 2023 08:35:05 -0500 Subject: [PATCH 5/9] chore: using classic version for macos and iOS --- .github/workflows/tests_ios.yml | 2 +- .github/workflows/tests_macos.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tests_ios.yml b/.github/workflows/tests_ios.yml index d000592..4ab7339 100644 --- a/.github/workflows/tests_ios.yml +++ b/.github/workflows/tests_ios.yml @@ -17,7 +17,7 @@ jobs: - uses: actions/checkout@v3 - uses: subosito/flutter-action@main with: - flutter-version: '3.x' + flutter-version: '3.7.7' channel: 'stable' - name: install deps run: | diff --git a/.github/workflows/tests_macos.yml b/.github/workflows/tests_macos.yml index ec33d8f..88e853c 100644 --- a/.github/workflows/tests_macos.yml +++ b/.github/workflows/tests_macos.yml @@ -14,7 +14,7 @@ jobs: - uses: actions/checkout@v3 - uses: subosito/flutter-action@main with: - flutter-version: '3.x' + flutter-version: '3.7.7' channel: 'stable' - name: install deps run: | From 8a76b08d41a9aee97f69ff5825e7faa7b09f087d Mon Sep 17 00:00:00 2001 From: Gerson Pardo Date: Wed, 9 Aug 2023 09:11:25 -0500 Subject: [PATCH 6/9] chore: updated macos version --- .github/workflows/tests_android.yml | 2 +- .github/workflows/tests_ios.yml | 4 ++-- .github/workflows/tests_macos.yml | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/tests_android.yml b/.github/workflows/tests_android.yml index b7bf570..6b3162d 100644 --- a/.github/workflows/tests_android.yml +++ b/.github/workflows/tests_android.yml @@ -9,7 +9,7 @@ on: jobs: e2e: - runs-on: macos-latest + runs-on: macos-13 steps: - uses: actions/checkout@v3 - uses: actions/cache@v3 diff --git a/.github/workflows/tests_ios.yml b/.github/workflows/tests_ios.yml index 4ab7339..85a82c2 100644 --- a/.github/workflows/tests_ios.yml +++ b/.github/workflows/tests_ios.yml @@ -9,7 +9,7 @@ on: jobs: e2e: - runs-on: macos-latest + runs-on: macos-13 steps: - uses: futureware-tech/simulator-action@v1 with: @@ -17,7 +17,7 @@ jobs: - uses: actions/checkout@v3 - uses: subosito/flutter-action@main with: - flutter-version: '3.7.7' + flutter-version: '3.x' channel: 'stable' - name: install deps run: | diff --git a/.github/workflows/tests_macos.yml b/.github/workflows/tests_macos.yml index 88e853c..247b681 100644 --- a/.github/workflows/tests_macos.yml +++ b/.github/workflows/tests_macos.yml @@ -9,12 +9,12 @@ on: jobs: e2e: - runs-on: macos-latest + runs-on: macos-13 steps: - uses: actions/checkout@v3 - uses: subosito/flutter-action@main with: - flutter-version: '3.7.7' + flutter-version: '3.x' channel: 'stable' - name: install deps run: | From 530ba13ae9f6ddf8007694a48d052c7543db96ee Mon Sep 17 00:00:00 2001 From: Gerson Pardo Date: Wed, 9 Aug 2023 09:20:04 -0500 Subject: [PATCH 7/9] chore: updated ios simulator version --- .github/workflows/tests_ios.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests_ios.yml b/.github/workflows/tests_ios.yml index 85a82c2..848d44e 100644 --- a/.github/workflows/tests_ios.yml +++ b/.github/workflows/tests_ios.yml @@ -13,7 +13,7 @@ jobs: steps: - uses: futureware-tech/simulator-action@v1 with: - model: "iPhone 12 mini" + model: "iPhone 14 Plus" - uses: actions/checkout@v3 - uses: subosito/flutter-action@main with: From 19d692c5f557a07bf6ab48baa8e2e502ed5c03ed Mon Sep 17 00:00:00 2001 From: Gerson Pardo Date: Wed, 9 Aug 2023 19:15:10 -0500 Subject: [PATCH 8/9] chore: fixed macos detection for tests --- .github/workflows/tests_android.yml | 12 +++++------- lib/bridge/binding.dart | 18 +++++++++++++++--- 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/.github/workflows/tests_android.yml b/.github/workflows/tests_android.yml index 6b3162d..72af7b2 100644 --- a/.github/workflows/tests_android.yml +++ b/.github/workflows/tests_android.yml @@ -17,18 +17,18 @@ jobs: path: | ~/.gradle/caches ~/.gradle/wrapper - key: gradle + key: gradle-android - uses: actions/cache@v3 id: avd-cache with: path: | ~/.android/avd/* ~/.android/adb* - key: avd + key: avd-android - uses: actions/setup-java@v3 with: distribution: 'temurin' - java-version: '11' + java-version: '17' - uses: android-actions/setup-android@v2 - uses: subosito/flutter-action@main with: @@ -38,18 +38,16 @@ jobs: - if: steps.avd-cache.outputs.cache-hit != 'true' uses: reactivecircus/android-emulator-runner@v2 with: - api-level: 29 + api-level: 30 avd-name: PhoneAPI30 - arch: x86_64 force-avd-creation: false emulator-options: -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none disable-animations: false script: echo "Generated AVD snapshot for caching." - uses: reactivecircus/android-emulator-runner@v2 with: - api-level: 29 + api-level: 30 avd-name: PhoneAPI30 - arch: x86_64 force-avd-creation: false emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none disable-animations: true diff --git a/lib/bridge/binding.dart b/lib/bridge/binding.dart index dbb1b45..00aa29d 100644 --- a/lib/bridge/binding.dart +++ b/lib/bridge/binding.dart @@ -15,7 +15,6 @@ import 'package:path/path.dart' as Path; class Binding { static final String _callFuncName = 'OpenPGPBridgeCall'; static final String _libraryName = 'libopenpgp_bridge'; - static final String _packageName = 'openpgp'; static final Binding _singleton = Binding._internal(); late ffi.DynamicLibrary _library; @@ -117,13 +116,26 @@ class Binding { } } + Directory _findAppDirectory(Directory directory) { + try { + return directory + .listSync(recursive: false, followLinks: false) + .whereType() + .firstWhere((dir) => dir.path.endsWith('.app')); + } catch (e) { + return directory; + } + } + ffi.DynamicLibrary openLib() { var isFlutterTest = Platform.environment.containsKey('FLUTTER_TEST'); if (Platform.isMacOS || Platform.isIOS) { if (isFlutterTest) { - var ffiFile = - 'build/macos/Build/Products/Debug/$_packageName/$_packageName.framework/Resources/$_libraryName.dylib'; + final appDirectory = + _findAppDirectory(Directory('build/macos/Build/Products/Debug')); + var ffiFile = Path.join( + appDirectory.path, "Contents", "Frameworks", "$_libraryName.dylib"); validateTestFFIFile(ffiFile); return ffi.DynamicLibrary.open(ffiFile); } From 0794e65fcc2103fa7bb316ec10b8ca90bdf39d78 Mon Sep 17 00:00:00 2001 From: Gerson Pardo Date: Wed, 9 Aug 2023 19:17:11 -0500 Subject: [PATCH 9/9] chore: updated version --- CHANGELOG.md | 5 +++++ example/pubspec.lock | 2 +- pubspec.yaml | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4745bb4..8f364bb 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +## 3.6.1 + +- Fixed macOS podspec issue when signing apps +- Updated binaries to v1.8.2 + ## 3.6.0 - Updated binaries to v1.8.1 diff --git a/example/pubspec.lock b/example/pubspec.lock index ce7d43b..d586362 100644 --- a/example/pubspec.lock +++ b/example/pubspec.lock @@ -269,7 +269,7 @@ packages: path: ".." relative: true source: path - version: "3.6.0" + version: "3.6.1" package_config: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index 033da59..4a94d2f 100755 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,6 +1,6 @@ name: openpgp description: library for use OpenPGP with support for android and ios, macOS, linux, windows and web -version: 3.6.0 +version: 3.6.1 homepage: https://github.com/jerson/flutter-openpgp environment: