Skip to content

Commit 89161c1

Browse files
funct7mgray88
funct7
and
mgray88
authored
Fix/embed framework error (#185)
* Fix: remove invalid framework references * Fix: Demo - remove Rx* frameworks used by RxFlow * Update github workflow runner environment Swift version requested in the workflow no longer available on github hosted runners * Force CI run --------- Co-authored-by: Mike Gray <[email protected]>
1 parent e42d849 commit 89161c1

File tree

2 files changed

+6
-44
lines changed

2 files changed

+6
-44
lines changed

‎RxFlow.xcodeproj/project.pbxproj

-12
Original file line numberDiff line numberDiff line change
@@ -84,14 +84,8 @@
8484
74370EAF23C65E20006CB8A6 /* FlowsTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FlowsTests.swift; sourceTree = "<group>"; };
8585
74855A462470544500334B8F /* DeprecatedFlows.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DeprecatedFlows.swift; sourceTree = "<group>"; };
8686
74855A482470552B00334B8F /* DeprecatedFlowCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DeprecatedFlowCoordinator.swift; sourceTree = "<group>"; };
87-
749B02E722066518001BEBBB /* RxBlocking.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RxBlocking.framework; path = Carthage/Build/iOS/RxBlocking.framework; sourceTree = "<group>"; };
88-
749B02E922066537001BEBBB /* Reusable.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Reusable.framework; path = Carthage/Build/iOS/Reusable.framework; sourceTree = "<group>"; };
89-
749B02EA22066538001BEBBB /* RxTest.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RxTest.framework; path = Carthage/Build/iOS/RxTest.framework; sourceTree = "<group>"; };
90-
749B02ED22066618001BEBBB /* RxCocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RxCocoa.framework; path = Carthage/Build/iOS/RxCocoa.framework; sourceTree = "<group>"; };
91-
749B02EE22066618001BEBBB /* RxSwift.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RxSwift.framework; path = Carthage/Build/iOS/RxSwift.framework; sourceTree = "<group>"; };
9287
749B02F72206852D001BEBBB /* Flow+PresentableTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Flow+PresentableTests.swift"; sourceTree = "<group>"; };
9388
749B02FB220688EC001BEBBB /* FlowCoordinatorTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FlowCoordinatorTests.swift; sourceTree = "<group>"; };
94-
74C6AD31227BAE6900B16A95 /* RxRelay.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RxRelay.framework; path = Carthage/Build/iOS/RxRelay.framework; sourceTree = "<group>"; };
9589
/* End PBXFileReference section */
9690

9791
/* Begin PBXFrameworksBuildPhase section */
@@ -136,12 +130,6 @@
136130
1A6097F728194A3500B91C15 /* RxCocoa.xcframework */,
137131
1A6097F828194A3500B91C15 /* RxRelay.xcframework */,
138132
1A6097F628194A3500B91C15 /* RxSwift.xcframework */,
139-
74C6AD31227BAE6900B16A95 /* RxRelay.framework */,
140-
749B02ED22066618001BEBBB /* RxCocoa.framework */,
141-
749B02EE22066618001BEBBB /* RxSwift.framework */,
142-
749B02E922066537001BEBBB /* Reusable.framework */,
143-
749B02EA22066538001BEBBB /* RxTest.framework */,
144-
749B02E722066518001BEBBB /* RxBlocking.framework */,
145133
);
146134
name = Frameworks;
147135
sourceTree = "<group>";

‎RxFlowDemo/RxFlowDemo.xcodeproj/project.pbxproj

+6-32
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10+
0331DD16283C9C94002BFBCC /* RxFlow.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0331DD15283C9C94002BFBCC /* RxFlow.framework */; };
11+
0331DD17283C9C94002BFBCC /* RxFlow.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 0331DD15283C9C94002BFBCC /* RxFlow.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
1012
1A25DE81202D3CFE00F1C4B8 /* AppFlow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1A25DE80202D3CFE00F1C4B8 /* AppFlow.swift */; };
1113
1A25DE83202FB62500F1C4B8 /* PreferencesService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1A25DE82202FB62500F1C4B8 /* PreferencesService.swift */; };
1214
1A25DE85203129F200F1C4B8 /* OnboardingFlow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1A25DE84203129F200F1C4B8 /* OnboardingFlow.swift */; };
@@ -16,12 +18,6 @@
1618
1A350D062038F6E9002DDE02 /* SettingsApiKeyViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1A350D052038F6E9002DDE02 /* SettingsApiKeyViewModel.swift */; };
1719
1A6097EB2819417500B91C15 /* Reusable.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1A6097EA2819417500B91C15 /* Reusable.xcframework */; };
1820
1A6097EC2819417500B91C15 /* Reusable.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 1A6097EA2819417500B91C15 /* Reusable.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
19-
1A6097F02819421600B91C15 /* RxSwift.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1A6097ED2819421600B91C15 /* RxSwift.xcframework */; };
20-
1A6097F12819421600B91C15 /* RxSwift.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 1A6097ED2819421600B91C15 /* RxSwift.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
21-
1A6097F22819421600B91C15 /* RxCocoa.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1A6097EE2819421600B91C15 /* RxCocoa.xcframework */; };
22-
1A6097F32819421600B91C15 /* RxCocoa.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 1A6097EE2819421600B91C15 /* RxCocoa.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
23-
1A6097F42819421600B91C15 /* RxRelay.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1A6097EF2819421600B91C15 /* RxRelay.xcframework */; };
24-
1A6097F52819421600B91C15 /* RxRelay.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 1A6097EF2819421600B91C15 /* RxRelay.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
2521
1A8FBE261FF8480C00389464 /* WishlistFlow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1A8FBE211FF8480B00389464 /* WishlistFlow.swift */; };
2622
1A8FBE271FF8480C00389464 /* DemoStep.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1A8FBE221FF8480C00389464 /* DemoStep.swift */; };
2723
1A8FBE281FF8480C00389464 /* SettingsFlow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1A8FBE231FF8480C00389464 /* SettingsFlow.swift */; };
@@ -59,8 +55,6 @@
5955
1AF854B31FF832AE00271B52 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1AF854B21FF832AE00271B52 /* AppDelegate.swift */; };
6056
1AF854BA1FF832AE00271B52 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 1AF854B91FF832AE00271B52 /* Assets.xcassets */; };
6157
1AF854BD1FF832AE00271B52 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 1AF854BB1FF832AE00271B52 /* LaunchScreen.storyboard */; };
62-
741F456A21D7BE3900E5FADA /* RxFlow.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 741F456921D7BE3900E5FADA /* RxFlow.framework */; };
63-
741F456B21D7BE3900E5FADA /* RxFlow.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 741F456921D7BE3900E5FADA /* RxFlow.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
6458
F69BD9D425233820005923F5 /* TrendingViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F69BD9D325233820005923F5 /* TrendingViewController.swift */; };
6559
F69BD9D625236943005923F5 /* TrendingViewController.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F69BD9D525236943005923F5 /* TrendingViewController.storyboard */; };
6660
F69BD9D825236C62005923F5 /* TrendingFlow.swift in Sources */ = {isa = PBXBuildFile; fileRef = F69BD9D725236C62005923F5 /* TrendingFlow.swift */; };
@@ -81,18 +75,16 @@
8175
dstPath = "";
8276
dstSubfolderSpec = 10;
8377
files = (
84-
1A6097F12819421600B91C15 /* RxSwift.xcframework in Embed Frameworks */,
85-
1A6097F32819421600B91C15 /* RxCocoa.xcframework in Embed Frameworks */,
78+
0331DD17283C9C94002BFBCC /* RxFlow.framework in Embed Frameworks */,
8679
1A6097EC2819417500B91C15 /* Reusable.xcframework in Embed Frameworks */,
87-
1A6097F52819421600B91C15 /* RxRelay.xcframework in Embed Frameworks */,
88-
741F456B21D7BE3900E5FADA /* RxFlow.framework in Embed Frameworks */,
8980
);
9081
name = "Embed Frameworks";
9182
runOnlyForDeploymentPostprocessing = 0;
9283
};
9384
/* End PBXCopyFilesBuildPhase section */
9485

9586
/* Begin PBXFileReference section */
87+
0331DD15283C9C94002BFBCC /* RxFlow.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = RxFlow.framework; sourceTree = BUILT_PRODUCTS_DIR; };
9688
1A25DE80202D3CFE00F1C4B8 /* AppFlow.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppFlow.swift; sourceTree = "<group>"; };
9789
1A25DE82202FB62500F1C4B8 /* PreferencesService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PreferencesService.swift; sourceTree = "<group>"; };
9890
1A25DE84203129F200F1C4B8 /* OnboardingFlow.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OnboardingFlow.swift; sourceTree = "<group>"; };
@@ -101,12 +93,6 @@
10193
1A25DE8A20351E1D00F1C4B8 /* DashboardFlow.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DashboardFlow.swift; sourceTree = "<group>"; };
10294
1A350D052038F6E9002DDE02 /* SettingsApiKeyViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsApiKeyViewModel.swift; sourceTree = "<group>"; };
10395
1A6097EA2819417500B91C15 /* Reusable.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = Reusable.xcframework; path = Carthage/Build/Reusable.xcframework; sourceTree = "<group>"; };
104-
1A6097ED2819421600B91C15 /* RxSwift.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = RxSwift.xcframework; path = Carthage/Build/RxSwift.xcframework; sourceTree = "<group>"; };
105-
1A6097EE2819421600B91C15 /* RxCocoa.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = RxCocoa.xcframework; path = Carthage/Build/RxCocoa.xcframework; sourceTree = "<group>"; };
106-
1A6097EF2819421600B91C15 /* RxRelay.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = RxRelay.xcframework; path = Carthage/Build/RxRelay.xcframework; sourceTree = "<group>"; };
107-
1A8FBE0D1FF845EE00389464 /* Reusable.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Reusable.framework; path = Carthage/Build/iOS/Reusable.framework; sourceTree = "<group>"; };
108-
1A8FBE0E1FF845EE00389464 /* RxSwift.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RxSwift.framework; path = Carthage/Build/iOS/RxSwift.framework; sourceTree = "<group>"; };
109-
1A8FBE0F1FF845EE00389464 /* RxCocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RxCocoa.framework; path = Carthage/Build/iOS/RxCocoa.framework; sourceTree = "<group>"; };
11096
1A8FBE211FF8480B00389464 /* WishlistFlow.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WishlistFlow.swift; sourceTree = "<group>"; };
11197
1A8FBE221FF8480C00389464 /* DemoStep.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DemoStep.swift; sourceTree = "<group>"; };
11298
1A8FBE231FF8480C00389464 /* SettingsFlow.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SettingsFlow.swift; sourceTree = "<group>"; };
@@ -146,8 +132,6 @@
146132
1AF854B91FF832AE00271B52 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
147133
1AF854BC1FF832AE00271B52 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
148134
1AF854BE1FF832AE00271B52 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
149-
741F456921D7BE3900E5FADA /* RxFlow.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = RxFlow.framework; sourceTree = BUILT_PRODUCTS_DIR; };
150-
74C6AD34227BC52B00B16A95 /* RxRelay.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RxRelay.framework; path = ../Carthage/Build/iOS/RxRelay.framework; sourceTree = "<group>"; };
151135
F69BD9D325233820005923F5 /* TrendingViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TrendingViewController.swift; sourceTree = "<group>"; };
152136
F69BD9D525236943005923F5 /* TrendingViewController.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = TrendingViewController.storyboard; sourceTree = "<group>"; };
153137
F69BD9D725236C62005923F5 /* TrendingFlow.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TrendingFlow.swift; sourceTree = "<group>"; };
@@ -166,11 +150,8 @@
166150
isa = PBXFrameworksBuildPhase;
167151
buildActionMask = 2147483647;
168152
files = (
169-
1A6097F02819421600B91C15 /* RxSwift.xcframework in Frameworks */,
170-
1A6097F22819421600B91C15 /* RxCocoa.xcframework in Frameworks */,
153+
0331DD16283C9C94002BFBCC /* RxFlow.framework in Frameworks */,
171154
1A6097EB2819417500B91C15 /* Reusable.xcframework in Frameworks */,
172-
1A6097F42819421600B91C15 /* RxRelay.xcframework in Frameworks */,
173-
741F456A21D7BE3900E5FADA /* RxFlow.framework in Frameworks */,
174155
);
175156
runOnlyForDeploymentPostprocessing = 0;
176157
};
@@ -180,14 +161,8 @@
180161
1A8FBE0C1FF845EE00389464 /* Frameworks */ = {
181162
isa = PBXGroup;
182163
children = (
183-
1A6097EE2819421600B91C15 /* RxCocoa.xcframework */,
184-
1A6097EF2819421600B91C15 /* RxRelay.xcframework */,
185-
1A6097ED2819421600B91C15 /* RxSwift.xcframework */,
164+
0331DD15283C9C94002BFBCC /* RxFlow.framework */,
186165
1A6097EA2819417500B91C15 /* Reusable.xcframework */,
187-
74C6AD34227BC52B00B16A95 /* RxRelay.framework */,
188-
1A8FBE0D1FF845EE00389464 /* Reusable.framework */,
189-
1A8FBE0F1FF845EE00389464 /* RxCocoa.framework */,
190-
1A8FBE0E1FF845EE00389464 /* RxSwift.framework */,
191166
);
192167
name = Frameworks;
193168
sourceTree = "<group>";
@@ -324,7 +299,6 @@
324299
1AF854A61FF832AE00271B52 = {
325300
isa = PBXGroup;
326301
children = (
327-
741F456921D7BE3900E5FADA /* RxFlow.framework */,
328302
1AF854B11FF832AE00271B52 /* RxFlowDemo */,
329303
1AF854B01FF832AE00271B52 /* Products */,
330304
1A8FBE0C1FF845EE00389464 /* Frameworks */,

0 commit comments

Comments
 (0)