macOS vendor library (#59)

jerson · web-flow · commit e25c06473403 · 2023-08-10T08:50:45.000-05:00
* chore: updated macos podspec

* chore: updated binaries from ci

* chore: updated example project

* chore: removed podspec.lock

* chore: using classic version for macos and iOS

* chore: updated macos version

* chore: updated ios simulator version

* chore: fixed macos detection for tests

* chore: updated version
diff --git a/.github/workflows/tests_android.yml b/.github/workflows/tests_android.yml
@@ -9,26 +9,26 @@ on:
 
 jobs:
   e2e:
-    runs-on: macos-latest
+    runs-on: macos-13
     steps:
       - uses: actions/checkout@v3
       - uses: actions/cache@v3
         with:
           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/.github/workflows/tests_ios.yml b/.github/workflows/tests_ios.yml
@@ -9,11 +9,11 @@ on:
 
 jobs:
   e2e:
-    runs-on: macos-latest
+    runs-on: macos-13
     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:
diff --git a/.github/workflows/tests_macos.yml b/.github/workflows/tests_macos.yml
@@ -9,7 +9,7 @@ on:
 
 jobs:
   e2e:
-    runs-on: macos-latest
+    runs-on: macos-13
     steps:
       - uses: actions/checkout@v3
       - uses: subosito/flutter-action@main
diff --git 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/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/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
@@ -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
@@ -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
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1000"
+   LastUpgradeVersion = "1300"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git 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/ios/libopenpgp_bridge.a b/ios/libopenpgp_bridge.a
diff --git 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<Directory>()
+          .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);
       }
diff --git a/macos/libopenpgp_bridge.dylib b/macos/libopenpgp_bridge.dylib
diff --git 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
diff --git a/pubspec.lock b/pubspec.lock
diff --git a/pubspec.yaml b/pubspec.yaml

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-platform :osx, '10.11'`
	`1`	`+platform :osx, '10.14'`
`2`	`2`
`3`	`3`	`# CocoaPods analytics sends network stats synchronously affecting flutter build latency.`
`4`	`4`	`ENV['COCOAPODS_DISABLE_STATS'] = 'true'`