From 202e252c1cf3b4578e883d9a2765c1711f85a14f Mon Sep 17 00:00:00 2001 From: ThibaultBee <37510686+ThibaultBee@users.noreply.github.com> Date: Thu, 2 May 2024 15:33:41 +0200 Subject: [PATCH] chore(ios): improve xcodeproj --- example/ios/Example.xcodeproj/project.pbxproj | 51 ++++++++++++++----- ios/RNLivestream.xcodeproj/project.pbxproj | 8 +-- 2 files changed, 42 insertions(+), 17 deletions(-) diff --git a/example/ios/Example.xcodeproj/project.pbxproj b/example/ios/Example.xcodeproj/project.pbxproj index 0d932d9..927c449 100644 --- a/example/ios/Example.xcodeproj/project.pbxproj +++ b/example/ios/Example.xcodeproj/project.pbxproj @@ -12,8 +12,8 @@ 21237D8F2A866D8C00A5CDCD /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 21237D8A2A866D8C00A5CDCD /* main.m */; }; 21237D902A866D8C00A5CDCD /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 21237D8B2A866D8C00A5CDCD /* Images.xcassets */; }; 21237D912A866D8C00A5CDCD /* AppDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 21237D8C2A866D8C00A5CDCD /* AppDelegate.mm */; }; + 2F21BA6DB39C6B7CB28532E3 /* libPods-Example-ExampleTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3E08D45AE78EB580EFD28A3F /* libPods-Example-ExampleTests.a */; }; 5B9EEBB1FA8F4F5659D13B65 /* libPods-Example.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C1119FE49D5E3163CC135930 /* libPods-Example.a */; }; - 8962E1349D8456E52434FAD9 /* libPods-Example-ExampleTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2D53E756602B78482D4C50F8 /* libPods-Example-ExampleTests.a */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -24,6 +24,13 @@ remoteGlobalIDString = 13B07F861A680F5B00A75B9A; remoteInfo = LiveStreamExample; }; + 21407D002BDBA4D400E54A12 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 21407CFC2BDBA4D400E54A12 /* RNLivestream.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 134814201AA4EA6300B7C361; + remoteInfo = RNLivestream; + }; /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ @@ -37,14 +44,11 @@ 21237D8B2A866D8C00A5CDCD /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = ""; }; 21237D8C2A866D8C00A5CDCD /* AppDelegate.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = AppDelegate.mm; sourceTree = ""; }; 21237D8D2A866D8C00A5CDCD /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 2D53E756602B78482D4C50F8 /* libPods-Example-ExampleTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Example-ExampleTests.a"; sourceTree = BUILT_PRODUCTS_DIR; }; - 3B4392A12AC88292D35C810B /* Pods-ReactNativeLivestreamExample.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ReactNativeLivestreamExample.debug.xcconfig"; path = "Target Support Files/Pods-ReactNativeLivestreamExample/Pods-ReactNativeLivestreamExample.debug.xcconfig"; sourceTree = ""; }; + 21407CFC2BDBA4D400E54A12 /* RNLivestream.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RNLivestream.xcodeproj; path = ../../ios/RNLivestream.xcodeproj; sourceTree = ""; }; + 3E08D45AE78EB580EFD28A3F /* libPods-Example-ExampleTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Example-ExampleTests.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 3E76A185ADB13D194ABFF487 /* Pods-Example.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Example.release.xcconfig"; path = "Target Support Files/Pods-Example/Pods-Example.release.xcconfig"; sourceTree = ""; }; 4BE827D97744F4F65B4365E1 /* Pods-Example-ExampleTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Example-ExampleTests.release.xcconfig"; path = "Target Support Files/Pods-Example-ExampleTests/Pods-Example-ExampleTests.release.xcconfig"; sourceTree = ""; }; 565035413651C7B7BE90029A /* Pods-Example-ExampleTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Example-ExampleTests.debug.xcconfig"; path = "Target Support Files/Pods-Example-ExampleTests/Pods-Example-ExampleTests.debug.xcconfig"; sourceTree = ""; }; - 5709B34CF0A7D63546082F79 /* Pods-ReactNativeLivestreamExample.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ReactNativeLivestreamExample.release.xcconfig"; path = "Target Support Files/Pods-ReactNativeLivestreamExample/Pods-ReactNativeLivestreamExample.release.xcconfig"; sourceTree = ""; }; - 5B7EB9410499542E8C5724F5 /* Pods-ReactNativeLivestreamExample-ReactNativeLivestreamExampleTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ReactNativeLivestreamExample-ReactNativeLivestreamExampleTests.debug.xcconfig"; path = "Target Support Files/Pods-ReactNativeLivestreamExample-ReactNativeLivestreamExampleTests/Pods-ReactNativeLivestreamExample-ReactNativeLivestreamExampleTests.debug.xcconfig"; sourceTree = ""; }; - 89C6BE57DB24E9ADA2F236DE /* Pods-ReactNativeLivestreamExample-ReactNativeLivestreamExampleTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ReactNativeLivestreamExample-ReactNativeLivestreamExampleTests.release.xcconfig"; path = "Target Support Files/Pods-ReactNativeLivestreamExample-ReactNativeLivestreamExampleTests/Pods-ReactNativeLivestreamExample-ReactNativeLivestreamExampleTests.release.xcconfig"; sourceTree = ""; }; 934108E1B243901F796765B8 /* Pods-Example.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Example.debug.xcconfig"; path = "Target Support Files/Pods-Example/Pods-Example.debug.xcconfig"; sourceTree = ""; }; C1119FE49D5E3163CC135930 /* libPods-Example.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Example.a"; sourceTree = BUILT_PRODUCTS_DIR; }; ED297162215061F000B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; }; @@ -55,7 +59,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 8962E1349D8456E52434FAD9 /* libPods-Example-ExampleTests.a in Frameworks */, + 2F21BA6DB39C6B7CB28532E3 /* libPods-Example-ExampleTests.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -100,12 +104,20 @@ path = Example; sourceTree = ""; }; + 21407CFD2BDBA4D400E54A12 /* Products */ = { + isa = PBXGroup; + children = ( + 21407D012BDBA4D400E54A12 /* libRNLivestream.a */, + ); + name = Products; + sourceTree = ""; + }; 2D16E6871FA4F8E400B85C8A /* Frameworks */ = { isa = PBXGroup; children = ( ED297162215061F000B7C4FE /* JavaScriptCore.framework */, C1119FE49D5E3163CC135930 /* libPods-Example.a */, - 2D53E756602B78482D4C50F8 /* libPods-Example-ExampleTests.a */, + 3E08D45AE78EB580EFD28A3F /* libPods-Example-ExampleTests.a */, ); name = Frameworks; sourceTree = ""; @@ -120,6 +132,7 @@ 83CBB9F61A601CBA00E9B192 = { isa = PBXGroup; children = ( + 21407CFC2BDBA4D400E54A12 /* RNLivestream.xcodeproj */, 21237D872A866D8C00A5CDCD /* Example */, 832341AE1AAA6A7D00B99B32 /* Libraries */, 00E356EF1AD99517003FC87E /* ExampleTests */, @@ -144,10 +157,6 @@ BBD78D7AC51CEA395F1C20DB /* Pods */ = { isa = PBXGroup; children = ( - 3B4392A12AC88292D35C810B /* Pods-ReactNativeLivestreamExample.debug.xcconfig */, - 5709B34CF0A7D63546082F79 /* Pods-ReactNativeLivestreamExample.release.xcconfig */, - 5B7EB9410499542E8C5724F5 /* Pods-ReactNativeLivestreamExample-ReactNativeLivestreamExampleTests.debug.xcconfig */, - 89C6BE57DB24E9ADA2F236DE /* Pods-ReactNativeLivestreamExample-ReactNativeLivestreamExampleTests.release.xcconfig */, 934108E1B243901F796765B8 /* Pods-Example.debug.xcconfig */, 3E76A185ADB13D194ABFF487 /* Pods-Example.release.xcconfig */, 565035413651C7B7BE90029A /* Pods-Example-ExampleTests.debug.xcconfig */, @@ -215,7 +224,7 @@ TestTargetID = 13B07F861A680F5B00A75B9A; }; 13B07F861A680F5B00A75B9A = { - LastSwiftMigration = 1120; + LastSwiftMigration = 1530; }; }; }; @@ -230,6 +239,12 @@ mainGroup = 83CBB9F61A601CBA00E9B192; productRefGroup = 83CBBA001A601CBA00E9B192 /* Products */; projectDirPath = ""; + projectReferences = ( + { + ProductGroup = 21407CFD2BDBA4D400E54A12 /* Products */; + ProjectRef = 21407CFC2BDBA4D400E54A12 /* RNLivestream.xcodeproj */; + }, + ); projectRoot = ""; targets = ( 13B07F861A680F5B00A75B9A /* Example */, @@ -238,6 +253,16 @@ }; /* End PBXProject section */ +/* Begin PBXReferenceProxy section */ + 21407D012BDBA4D400E54A12 /* libRNLivestream.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = libRNLivestream.a; + remoteRef = 21407D002BDBA4D400E54A12 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; +/* End PBXReferenceProxy section */ + /* Begin PBXResourcesBuildPhase section */ 00E356EC1AD99517003FC87E /* Resources */ = { isa = PBXResourcesBuildPhase; diff --git a/ios/RNLivestream.xcodeproj/project.pbxproj b/ios/RNLivestream.xcodeproj/project.pbxproj index 77733f0..a9cf676 100644 --- a/ios/RNLivestream.xcodeproj/project.pbxproj +++ b/ios/RNLivestream.xcodeproj/project.pbxproj @@ -22,10 +22,10 @@ 134814201AA4EA6300B7C361 /* libRNLivestream.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libRNLivestream.a; sourceTree = BUILT_PRODUCTS_DIR; }; 21237D932A866EFD00A5CDCD /* RNLivestream-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "RNLivestream-Bridging-Header.h"; sourceTree = ""; }; 212E11F62B4468BC00FFDE96 /* RNLiveStreamViewManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RNLiveStreamViewManager.swift; sourceTree = ""; }; - 212E11F72B4468BC00FFDE96 /* RNLiveStreamViewManager.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNLiveStreamViewManager.m; sourceTree = ""; }; 212E11F82B4468BD00FFDE96 /* RNLiveStreamViewImpl.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RNLiveStreamViewImpl.swift; sourceTree = ""; }; - 212E11F92B4468BD00FFDE96 /* RNLiveStreamView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNLiveStreamView.m; sourceTree = ""; }; 212E11FA2B4468BD00FFDE96 /* RNLiveStreamView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNLiveStreamView.h; sourceTree = ""; }; + 21407D072BDBA4FB00E54A12 /* RNLiveStreamView.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = RNLiveStreamView.mm; sourceTree = ""; }; + 21407D082BDBA4FC00E54A12 /* RNLiveStreamViewManager.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = RNLiveStreamViewManager.mm; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -50,10 +50,10 @@ 58B511D21A9E6C8500147676 = { isa = PBXGroup; children = ( + 21407D072BDBA4FB00E54A12 /* RNLiveStreamView.mm */, + 21407D082BDBA4FC00E54A12 /* RNLiveStreamViewManager.mm */, 212E11FA2B4468BD00FFDE96 /* RNLiveStreamView.h */, - 212E11F92B4468BD00FFDE96 /* RNLiveStreamView.m */, 212E11F82B4468BD00FFDE96 /* RNLiveStreamViewImpl.swift */, - 212E11F72B4468BC00FFDE96 /* RNLiveStreamViewManager.m */, 212E11F62B4468BC00FFDE96 /* RNLiveStreamViewManager.swift */, 134814211AA4EA7D00B7C361 /* Products */, 21237D932A866EFD00A5CDCD /* RNLivestream-Bridging-Header.h */,