Merge pull request #12 from lightninglabs/ios-config

Update iOS and gitignore config
lightninglabs · Nov 28, 2022 · 3f2e13b · 3f2e13b
2 parents ff09870 + 5985cc3
commit 3f2e13b
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 26 deletions.
diff --git a/.gitignore b/.gitignore
@@ -60,3 +60,7 @@ android/keystores/debug.keystore
 
 # generated by bob
 **/**/*.swp
+
+# LNC library binaries
+android/libs/*
+ios/Lncmobile.xcframework/*
diff --git a/android/libs/lnc-mobile-sources.jar b/android/libs/lnc-mobile-sources.jar
diff --git a/android/libs/lnc-mobile.aar b/android/libs/lnc-mobile.aar
diff --git a/demos/connect-demo/ios/lncmobiledemo.xcodeproj/project.pbxproj b/demos/connect-demo/ios/lncmobiledemo.xcodeproj/project.pbxproj
@@ -12,7 +12,7 @@
 		13B07FBC1A68108700A75B9A /* AppDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB01A68108700A75B9A /* AppDelegate.mm */; };
 		13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; };
 		13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; };
-		743AABF92926988F00AFC09D /* Lndmobile.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 743AABF82926988F00AFC09D /* Lndmobile.xcframework */; };
+		74D902A22930F65800BC2EBB /* Lncmobile.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 74D902A12930F65800BC2EBB /* Lncmobile.xcframework */; };
 		7699B88040F8A987B510C191 /* libPods-lncmobiledemo-lncmobiledemoTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 19F6CBCC0A4E27FBF8BF4A61 /* libPods-lncmobiledemo-lncmobiledemoTests.a */; };
 		81AB9BB82411601600AC10FF /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */; };
 /* End PBXBuildFile section */
@@ -42,7 +42,7 @@
 		5709B34CF0A7D63546082F79 /* Pods-lncmobiledemo.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-lncmobiledemo.release.xcconfig"; path = "Target Support Files/Pods-lncmobiledemo/Pods-lncmobiledemo.release.xcconfig"; sourceTree = "<group>"; };
 		5B7EB9410499542E8C5724F5 /* Pods-lncmobiledemo-lncmobiledemoTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-lncmobiledemo-lncmobiledemoTests.debug.xcconfig"; path = "Target Support Files/Pods-lncmobiledemo-lncmobiledemoTests/Pods-lncmobiledemo-lncmobiledemoTests.debug.xcconfig"; sourceTree = "<group>"; };
 		5DCACB8F33CDC322A6C60F78 /* libPods-lncmobiledemo.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-lncmobiledemo.a"; sourceTree = BUILT_PRODUCTS_DIR; };
-		743AABF82926988F00AFC09D /* Lndmobile.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = Lndmobile.xcframework; path = ../../../ios/Lndmobile.xcframework; sourceTree = "<group>"; };
+		74D902A12930F65800BC2EBB /* Lncmobile.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = Lncmobile.xcframework; path = ../../../ios/Lncmobile.xcframework; sourceTree = "<group>"; };
 		81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = LaunchScreen.storyboard; path = lncmobiledemo/LaunchScreen.storyboard; sourceTree = "<group>"; };
 		89C6BE57DB24E9ADA2F236DE /* Pods-lncmobiledemo-lncmobiledemoTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-lncmobiledemo-lncmobiledemoTests.release.xcconfig"; path = "Target Support Files/Pods-lncmobiledemo-lncmobiledemoTests/Pods-lncmobiledemo-lncmobiledemoTests.release.xcconfig"; sourceTree = "<group>"; };
 		ED297162215061F000B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; };
@@ -61,8 +61,8 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				743AABF92926988F00AFC09D /* Lndmobile.xcframework in Frameworks */,
 				0C80B921A6F3F58F76C31292 /* libPods-lncmobiledemo.a in Frameworks */,
+				74D902A22930F65800BC2EBB /* Lncmobile.xcframework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -102,7 +102,7 @@
 		2D16E6871FA4F8E400B85C8A /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
-				743AABF82926988F00AFC09D /* Lndmobile.xcframework */,
+				74D902A12930F65800BC2EBB /* Lncmobile.xcframework */,
 				ED297162215061F000B7C4FE /* JavaScriptCore.framework */,
 				5DCACB8F33CDC322A6C60F78 /* libPods-lncmobiledemo.a */,
 				19F6CBCC0A4E27FBF8BF4A61 /* libPods-lncmobiledemo-lncmobiledemoTests.a */,

diff --git a/demos/multi-connect-demo/ios/lncmobiledemo.xcodeproj/project.pbxproj b/demos/multi-connect-demo/ios/lncmobiledemo.xcodeproj/project.pbxproj
@@ -12,7 +12,7 @@
 		13B07FBC1A68108700A75B9A /* AppDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB01A68108700A75B9A /* AppDelegate.mm */; };
 		13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; };
 		13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; };
-		743AABFB29269F3A00AFC09D /* Lndmobile.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 743AABFA29269F3A00AFC09D /* Lndmobile.xcframework */; };
+		74D902A42930F72500BC2EBB /* Lncmobile.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 74D902A32930F72500BC2EBB /* Lncmobile.xcframework */; };
 		7699B88040F8A987B510C191 /* libPods-lncmobiledemo-lncmobiledemoTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 19F6CBCC0A4E27FBF8BF4A61 /* libPods-lncmobiledemo-lncmobiledemoTests.a */; };
 		81AB9BB82411601600AC10FF /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */; };
 /* End PBXBuildFile section */
@@ -42,7 +42,7 @@
 		5709B34CF0A7D63546082F79 /* Pods-lncmobiledemo.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-lncmobiledemo.release.xcconfig"; path = "Target Support Files/Pods-lncmobiledemo/Pods-lncmobiledemo.release.xcconfig"; sourceTree = "<group>"; };
 		5B7EB9410499542E8C5724F5 /* Pods-lncmobiledemo-lncmobiledemoTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-lncmobiledemo-lncmobiledemoTests.debug.xcconfig"; path = "Target Support Files/Pods-lncmobiledemo-lncmobiledemoTests/Pods-lncmobiledemo-lncmobiledemoTests.debug.xcconfig"; sourceTree = "<group>"; };
 		5DCACB8F33CDC322A6C60F78 /* libPods-lncmobiledemo.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-lncmobiledemo.a"; sourceTree = BUILT_PRODUCTS_DIR; };
-		743AABFA29269F3A00AFC09D /* Lndmobile.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = Lndmobile.xcframework; path = ../../../ios/Lndmobile.xcframework; sourceTree = "<group>"; };
+		74D902A32930F72500BC2EBB /* Lncmobile.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = Lncmobile.xcframework; path = ../../../ios/Lncmobile.xcframework; sourceTree = "<group>"; };
 		81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = LaunchScreen.storyboard; path = lncmobiledemo/LaunchScreen.storyboard; sourceTree = "<group>"; };
 		89C6BE57DB24E9ADA2F236DE /* Pods-lncmobiledemo-lncmobiledemoTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-lncmobiledemo-lncmobiledemoTests.release.xcconfig"; path = "Target Support Files/Pods-lncmobiledemo-lncmobiledemoTests/Pods-lncmobiledemo-lncmobiledemoTests.release.xcconfig"; sourceTree = "<group>"; };
 		ED297162215061F000B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; };
@@ -61,8 +61,8 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				743AABFB29269F3A00AFC09D /* Lndmobile.xcframework in Frameworks */,
 				0C80B921A6F3F58F76C31292 /* libPods-lncmobiledemo.a in Frameworks */,
+				74D902A42930F72500BC2EBB /* Lncmobile.xcframework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -102,7 +102,7 @@
 		2D16E6871FA4F8E400B85C8A /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
-				743AABFA29269F3A00AFC09D /* Lndmobile.xcframework */,
+				74D902A32930F72500BC2EBB /* Lncmobile.xcframework */,
 				ED297162215061F000B7C4FE /* JavaScriptCore.framework */,
 				5DCACB8F33CDC322A6C60F78 /* libPods-lncmobiledemo.a */,
 				19F6CBCC0A4E27FBF8BF4A61 /* libPods-lncmobiledemo-lncmobiledemoTests.a */,

diff --git a/ios/LncModule.mm b/ios/LncModule.mm
@@ -1,7 +1,7 @@
 #import "LncModule.h"
 #import "Callback.h"
 #import "StreamingCallback.h"
-#import "Lndmobile.xcframework/ios-arm64/Lndmobile.framework/Headers/Lndmobile.h"
+#import "Lncmobile.xcframework/ios-arm64/Lncmobile.framework/Headers/Lncmobile.h"
 
 
 #ifdef RCT_NEW_ARCH_ENABLED
@@ -186,37 +186,34 @@ -(void)stopObserving {}
 }
 
 - (NSArray<NSString *> *)supportedEvents {
-    // TODO add all streaming events names to list
     return @[
-        @"lnrpc.Lightning.SubscribePeerEvents",
-        @"lnrpc.Lightning.SubscribePeerEvents",
+        @"chainrpc.ChainNotifier.RegisterBlockEpochNtfn",
         @"chainrpc.ChainNotifier.RegisterConfirmationsNtfn",
         @"chainrpc.ChainNotifier.RegisterSpendNtfn",
-        @"chainrpc.ChainNotifier.RegisterBlockEpochNtfn",
         @"invoicesrpc.Invoices.SubscribeSingleInvoice",
-        @"lnrpc.Lightning.SubscribeTransactions",
-        @"lnrpc.Lightning.SubscribePeerEvents",
-        @"lnrpc.Lightning.SubscribeChannelEvents",
-        @"lnrpc.Lightning.OpenChannel",
         @"lnrpc.Lightning.ChannelAcceptor",
         @"lnrpc.Lightning.CloseChannel",
+        @"lnrpc.Lightning.OpenChannel",
+        @"lnrpc.Lightning.RegisterRPCMiddleware",
         @"lnrpc.Lightning.SendPayment",
         @"lnrpc.Lightning.SendToRoute",
-        @"lnrpc.Lightning.SubscribeInvoices",
-        @"lnrpc.Lightning.SubscribeChannelGraph",
         @"lnrpc.Lightning.SubscribeChannelBackups",
-        @"lnrpc.Lightning.RegisterRPCMiddleware",
+        @"lnrpc.Lightning.SubscribeChannelEvents",
+        @"lnrpc.Lightning.SubscribeChannelGraph",
         @"lnrpc.Lightning.SubscribeCustomMessages",
-        @"routerrpc.Router.SendPaymentV2",
-        @"routerrpc.Router.TrackPaymentV2",
-        @"routerrpc.Router.SubscribeHtlcEvents",
-        @"routerrpc.Router.SendPayment",
-        @"routerrpc.Router.TrackPayment",
-        @"routerrpc.Router.HtlcInterceptor",
+        @"lnrpc.Lightning.SubscribeInvoices",
+        @"lnrpc.Lightning.SubscribePeerEvents",
+        @"lnrpc.Lightning.SubscribeTransactions",
         @"looprpc.SwapClient.Monitor",
         @"poolrpc.ChannelAuctioneer.SubscribeBatchAuction",
         @"poolrpc.ChannelAuctioneer.SubscribeSidecar",
         @"poolrpc.HashMail.RecvStream"
+        @"routerrpc.Router.HtlcInterceptor",
+        @"routerrpc.Router.SendPayment",
+        @"routerrpc.Router.SendPaymentV2",
+        @"routerrpc.Router.SubscribeHtlcEvents",
+        @"routerrpc.Router.TrackPayment",
+        @"routerrpc.Router.TrackPaymentV2"
     ];
 }