Merge pull request #32 from futurepaul/repair-macos

get macos building

Author: justinmoon

justfile

@@ -17,5 +17,6 @@ gen:
     flutter_rust_bridge_codegen \
         -r minimint-bridge/src/api.rs \
         -d lib/bridge_generated.dart \
-        -c ios/Runner/bridge_generated.h
+        -c ios/Runner/bridge_generated.h \
+        -c macos/Runner/bridge_generated.h
 

lib/screens/receive.dart

@@ -74,10 +74,12 @@ class ReceiveScreen extends ConsumerWidget {
                       var desc = descriptionController.text;
                       var amount = int.parse(amountController.text);
                       try {
-                        await receiveNotifier.createReceive(
-                            Receive(description: desc, amountSats: amount));
-                        // TODO figure out the right way to do this async without the mounted flag
-                        context.go("/receive/confirm");
+                        await receiveNotifier
+                            .createReceive(
+                                Receive(description: desc, amountSats: amount))
+                            .then((_) {
+                          context.go("/receive/confirm");
+                        });
                       } catch (err) {
                         context.go("/errormodal", extra: err);
                       }

macos/Podfile.lock

@@ -0,0 +1,40 @@
+PODS:
+  - FlutterMacOS (1.0.0)
+  - path_provider_macos (0.0.1):
+    - FlutterMacOS
+  - share_plus_macos (0.0.1):
+    - FlutterMacOS
+  - shared_preferences_macos (0.0.1):
+    - FlutterMacOS
+  - url_launcher_macos (0.0.1):
+    - FlutterMacOS
+
+DEPENDENCIES:
+  - FlutterMacOS (from `Flutter/ephemeral`)
+  - path_provider_macos (from `Flutter/ephemeral/.symlinks/plugins/path_provider_macos/macos`)
+  - share_plus_macos (from `Flutter/ephemeral/.symlinks/plugins/share_plus_macos/macos`)
+  - shared_preferences_macos (from `Flutter/ephemeral/.symlinks/plugins/shared_preferences_macos/macos`)
+  - url_launcher_macos (from `Flutter/ephemeral/.symlinks/plugins/url_launcher_macos/macos`)
+
+EXTERNAL SOURCES:
+  FlutterMacOS:
+    :path: Flutter/ephemeral
+  path_provider_macos:
+    :path: Flutter/ephemeral/.symlinks/plugins/path_provider_macos/macos
+  share_plus_macos:
+    :path: Flutter/ephemeral/.symlinks/plugins/share_plus_macos/macos
+  shared_preferences_macos:
+    :path: Flutter/ephemeral/.symlinks/plugins/shared_preferences_macos/macos
+  url_launcher_macos:
+    :path: Flutter/ephemeral/.symlinks/plugins/url_launcher_macos/macos
+
+SPEC CHECKSUMS:
+  FlutterMacOS: 57701585bf7de1b3fc2bb61f6378d73bbdea8424
+  path_provider_macos: 3c0c3b4b0d4a76d2bf989a913c2de869c5641a19
+  share_plus_macos: 853ee48e7dce06b633998ca0735d482dd671ade4
+  shared_preferences_macos: a64dc611287ed6cbe28fd1297898db1336975727
+  url_launcher_macos: 597e05b8e514239626bcf4a850fcf9ef5c856ec3
+
+PODFILE CHECKSUM: 6eac6b3292e5142cfc23bdeb71848a40ec51c14c
+
+COCOAPODS: 1.11.3

macos/Runner.xcodeproj/project.pbxproj

@@ -26,6 +26,7 @@
 		33CC10F32044A3C60003C045 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F22044A3C60003C045 /* Assets.xcassets */; };
 		33CC10F62044A3C60003C045 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F42044A3C60003C045 /* MainMenu.xib */; };
 		33CC11132044BFA00003C045 /* MainFlutterWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CC11122044BFA00003C045 /* MainFlutterWindow.swift */; };
+		6E24AAD528BD9F7A002F45B1 /* libminimint-bridge_static.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6E24AAD028BD9D6D002F45B1 /* libminimint-bridge_static.a */; };
 		8E2193B11A39F6A15AD9BA97 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A638F82B11816F36070305A0 /* Pods_Runner.framework */; };
 /* End PBXBuildFile section */
 
@@ -37,6 +38,20 @@
 			remoteGlobalIDString = 33CC111A2044C6BA0003C045;
 			remoteInfo = FLX;
 		};
+		6E24AACF28BD9D6D002F45B1 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 6E24AACB28BD9D6D002F45B1 /* minimint-bridge.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = CA60AA3689D6BE71F52C75AC;
+			remoteInfo = "minimint-bridge-staticlib";
+		};
+		6E24AAD128BD9D8A002F45B1 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 6E24AACB28BD9D6D002F45B1 /* minimint-bridge.xcodeproj */;
+			proxyType = 1;
+			remoteGlobalIDString = CA60AA3689D62C3761166523;
+			remoteInfo = "minimint-bridge-staticlib";
+		};
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXCopyFilesBuildPhase section */
@@ -70,6 +85,7 @@
 		4957D26F29264BA81A878AEC /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = "<group>"; };
 		5B16FE20128C16D5B6AB7CEC /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
 		5E108007AD5E32F3107B01FA /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
+		6E24AACB28BD9D6D002F45B1 /* minimint-bridge.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = "minimint-bridge.xcodeproj"; path = "../../minimint-bridge/minimint-bridge.xcodeproj"; sourceTree = "<group>"; };
 		7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Release.xcconfig; sourceTree = "<group>"; };
 		9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Debug.xcconfig; sourceTree = "<group>"; };
 		A638F82B11816F36070305A0 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -80,6 +96,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				6E24AAD528BD9F7A002F45B1 /* libminimint-bridge_static.a in Frameworks */,
 				8E2193B11A39F6A15AD9BA97 /* Pods_Runner.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -94,7 +111,6 @@
 				5E108007AD5E32F3107B01FA /* Pods-Runner.release.xcconfig */,
 				5B16FE20128C16D5B6AB7CEC /* Pods-Runner.profile.xcconfig */,
 			);
-			name = Pods;
 			path = Pods;
 			sourceTree = "<group>";
 		};
@@ -153,6 +169,7 @@
 		33FAB671232836740065AC1E /* Runner */ = {
 			isa = PBXGroup;
 			children = (
+				6E24AACB28BD9D6D002F45B1 /* minimint-bridge.xcodeproj */,
 				33CC10F02044A3C60003C045 /* AppDelegate.swift */,
 				33CC11122044BFA00003C045 /* MainFlutterWindow.swift */,
 				33E51913231747F40026EE4D /* DebugProfile.entitlements */,
@@ -163,6 +180,14 @@
 			path = Runner;
 			sourceTree = "<group>";
 		};
+		6E24AACC28BD9D6D002F45B1 /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				6E24AAD028BD9D6D002F45B1 /* libminimint-bridge_static.a */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
 		D73912EC22F37F3D000D13A0 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
@@ -189,6 +214,7 @@
 			buildRules = (
 			);
 			dependencies = (
+				6E24AAD228BD9D8A002F45B1 /* PBXTargetDependency */,
 				33CC11202044C79F0003C045 /* PBXTargetDependency */,
 			);
 			name = Runner;
@@ -233,6 +259,12 @@
 			mainGroup = 33CC10E42044A3C60003C045;
 			productRefGroup = 33CC10EE2044A3C60003C045 /* Products */;
 			projectDirPath = "";
+			projectReferences = (
+				{
+					ProductGroup = 6E24AACC28BD9D6D002F45B1 /* Products */;
+					ProjectRef = 6E24AACB28BD9D6D002F45B1 /* minimint-bridge.xcodeproj */;
+				},
+			);
 			projectRoot = "";
 			targets = (
 				33CC10EC2044A3C60003C045 /* Runner */,
@@ -241,6 +273,16 @@
 		};
 /* End PBXProject section */
 
+/* Begin PBXReferenceProxy section */
+		6E24AAD028BD9D6D002F45B1 /* libminimint-bridge_static.a */ = {
+			isa = PBXReferenceProxy;
+			fileType = archive.ar;
+			path = "libminimint-bridge_static.a";
+			remoteRef = 6E24AACF28BD9D6D002F45B1 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+/* End PBXReferenceProxy section */
+
 /* Begin PBXResourcesBuildPhase section */
 		33CC10EB2044A3C60003C045 /* Resources */ = {
 			isa = PBXResourcesBuildPhase;
@@ -351,6 +393,11 @@
 			target = 33CC111A2044C6BA0003C045 /* Flutter Assemble */;
 			targetProxy = 33CC111F2044C79F0003C045 /* PBXContainerItemProxy */;
 		};
+		6E24AAD228BD9D8A002F45B1 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			name = "minimint-bridge-staticlib";
+			targetProxy = 6E24AAD128BD9D8A002F45B1 /* PBXContainerItemProxy */;
+		};
 /* End PBXTargetDependency section */
 
 /* Begin PBXVariantGroup section */
@@ -421,12 +468,14 @@
 				CODE_SIGN_ENTITLEMENTS = Runner/DebugProfile.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
+				DEVELOPMENT_TEAM = "";
 				INFOPLIST_FILE = Runner/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
 				PROVISIONING_PROFILE_SPECIFIER = "";
+				SWIFT_OBJC_BRIDGING_HEADER = Runner/bridge_generated.h;
 				SWIFT_VERSION = 5.0;
 			};
 			name = Profile;
@@ -547,12 +596,14 @@
 				CODE_SIGN_ENTITLEMENTS = Runner/DebugProfile.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
+				DEVELOPMENT_TEAM = "";
 				INFOPLIST_FILE = Runner/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
 				PROVISIONING_PROFILE_SPECIFIER = "";
+				SWIFT_OBJC_BRIDGING_HEADER = Runner/bridge_generated.h;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 5.0;
 			};
@@ -567,12 +618,14 @@
 				CODE_SIGN_ENTITLEMENTS = Runner/Release.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
+				DEVELOPMENT_TEAM = "";
 				INFOPLIST_FILE = Runner/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
 				PROVISIONING_PROFILE_SPECIFIER = "";
+				SWIFT_OBJC_BRIDGING_HEADER = Runner/bridge_generated.h;
 				SWIFT_VERSION = 5.0;
 			};
 			name = Release;

macos/Runner/AppDelegate.swift

@@ -4,6 +4,8 @@ import FlutterMacOS
 @NSApplicationMain
 class AppDelegate: FlutterAppDelegate {
   override func applicationShouldTerminateAfterLastWindowClosed(_ sender: NSApplication) -> Bool {
+    // http://cjycode.com/flutter_rust_bridge/integrate/ios_headers.html
+    dummy_method_to_enforce_bundling()
     return true
   }
 }

macos/Runner/DebugProfile.entitlements

@@ -8,5 +8,7 @@
 	<true/>
 	<key>com.apple.security.network.server</key>
 	<true/>
+	<key>com.apple.security.network.client</key>
+	<true/>
 </dict>
 </plist>

macos/Runner/bridge_generated.h

@@ -0,0 +1,55 @@
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct wire_uint_8_list {
+  uint8_t *ptr;
+  int32_t len;
+} wire_uint_8_list;
+
+typedef struct WireSyncReturnStruct {
+  uint8_t *ptr;
+  int32_t len;
+  bool success;
+} WireSyncReturnStruct;
+
+typedef int64_t DartPort;
+
+typedef bool (*DartPostCObjectFnType)(DartPort port_id, void *message);
+
+void wire_init(int64_t port_, struct wire_uint_8_list *path);
+
+void wire_join_federation(int64_t port_,
+                          struct wire_uint_8_list *user_dir,
+                          struct wire_uint_8_list *config_url);
+
+void wire_leave_federation(int64_t port_);
+
+void wire_balance(int64_t port_);
+
+void wire_pay(int64_t port_, struct wire_uint_8_list *bolt11);
+
+void wire_decode_invoice(int64_t port_, struct wire_uint_8_list *bolt11);
+
+void wire_invoice(int64_t port_, uint64_t amount, struct wire_uint_8_list *description);
+
+struct wire_uint_8_list *new_uint_8_list(int32_t len);
+
+void free_WireSyncReturnStruct(struct WireSyncReturnStruct val);
+
+void store_dart_post_cobject(DartPostCObjectFnType ptr);
+
+static int64_t dummy_method_to_enforce_bundling(void) {
+    int64_t dummy_var = 0;
+    dummy_var ^= ((int64_t) (void*) wire_init);
+    dummy_var ^= ((int64_t) (void*) wire_join_federation);
+    dummy_var ^= ((int64_t) (void*) wire_leave_federation);
+    dummy_var ^= ((int64_t) (void*) wire_balance);
+    dummy_var ^= ((int64_t) (void*) wire_pay);
+    dummy_var ^= ((int64_t) (void*) wire_decode_invoice);
+    dummy_var ^= ((int64_t) (void*) wire_invoice);
+    dummy_var ^= ((int64_t) (void*) new_uint_8_list);
+    dummy_var ^= ((int64_t) (void*) free_WireSyncReturnStruct);
+    dummy_var ^= ((int64_t) (void*) store_dart_post_cobject);
+    return dummy_var;
+}

minimint-bridge/minimint-bridge.xcodeproj/xcuserdata/futurepaul.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -7,7 +7,7 @@
 		<key>minimint-bridge-staticlib.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>9</integer>
+			<integer>8</integer>
 		</dict>
 	</dict>
 </dict>