Skip to content

Commit f828e75

Browse files
twittembtwittemb
committed
rxFlow: use xcframeworks
1 parent 1976784 commit f828e75

File tree

3 files changed

+27
-36
lines changed

3 files changed

+27
-36
lines changed

‎.github/workflows/ci.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
runs-on: macos-latest
99
strategy:
1010
matrix:
11-
destination: ['platform=iOS Simulator,OS=14.0,name=iPhone 11 Pro']
11+
destination: ['platform=iOS Simulator,OS=15.2,name=iPhone 13 Pro']
1212
swift-version: ['5.3']
1313
steps:
1414
- name: Install Swift
@@ -18,7 +18,7 @@ jobs:
1818
- uses: actions/checkout@master
1919
- name: Compile and Test
2020
run: |
21-
./xcarthage-bootstrap.sh --platform iOS --cache-builds && xcodebuild clean test -project RxFlow.xcodeproj -scheme RxFlow -destination "${destination}" CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO ONLY_ACTIVE_ARCH=NO
21+
carthage bootstrap --platform iOS --cache-builds --use-xcframeworks && xcodebuild clean test -project RxFlow.xcodeproj -scheme RxFlow -destination "${destination}" CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO ONLY_ACTIVE_ARCH=NO
2222
env:
2323
destination: ${{ matrix.destination }}
2424

‎Cartfile.resolved

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
github "ReactiveX/RxSwift" "6.2.0"
1+
github "ReactiveX/RxSwift" "6.5.0"

‎RxFlow.xcodeproj/project.pbxproj

+24-33
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,13 @@
1313
1A1627D12186788700952EFC /* TestUIViewController.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 1A1627D02186788700952EFC /* TestUIViewController.storyboard */; };
1414
1A1627D3218679A500952EFC /* TestUIViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1A1627D2218679A500952EFC /* TestUIViewController.swift */; };
1515
1A4B10B42175708A0034672F /* StepperTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1A4B10B32175708A0034672F /* StepperTests.swift */; };
16+
1A6097F928194A3500B91C15 /* RxSwift.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1A6097F628194A3500B91C15 /* RxSwift.xcframework */; };
17+
1A6097FB28194A3500B91C15 /* RxCocoa.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1A6097F728194A3500B91C15 /* RxCocoa.xcframework */; };
18+
1A6097FD28194A3500B91C15 /* RxRelay.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1A6097F828194A3500B91C15 /* RxRelay.xcframework */; };
19+
1A60980028194A5100B91C15 /* RxCocoa.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1A6097F728194A3500B91C15 /* RxCocoa.xcframework */; };
20+
1A60980128194A5100B91C15 /* RxSwift.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1A6097F628194A3500B91C15 /* RxSwift.xcframework */; };
21+
1A60980428194AB700B91C15 /* RxBlocking.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1A60980228194AB700B91C15 /* RxBlocking.xcframework */; };
22+
1A60980528194AB700B91C15 /* RxTest.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1A60980328194AB700B91C15 /* RxTest.xcframework */; };
1623
1A8FBDF21FF8337800389464 /* UIViewController+Presentable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1A8FBDE51FF8337700389464 /* UIViewController+Presentable.swift */; };
1724
1A8FBDF31FF8337800389464 /* Reactive+UIViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1A8FBDE61FF8337700389464 /* Reactive+UIViewController.swift */; };
1825
1A8FBDF41FF8337800389464 /* Stepper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1A8FBDE71FF8337700389464 /* Stepper.swift */; };
@@ -30,18 +37,8 @@
3037
74370EB023C65E20006CB8A6 /* FlowsTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74370EAF23C65E20006CB8A6 /* FlowsTests.swift */; };
3138
74855A472470544500334B8F /* DeprecatedFlows.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74855A462470544500334B8F /* DeprecatedFlows.swift */; };
3239
74855A492470552B00334B8F /* DeprecatedFlowCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74855A482470552B00334B8F /* DeprecatedFlowCoordinator.swift */; };
33-
749B02E822066518001BEBBB /* RxBlocking.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 749B02E722066518001BEBBB /* RxBlocking.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
34-
749B02EC22066538001BEBBB /* RxTest.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 749B02EA22066538001BEBBB /* RxTest.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
35-
749B02EF22066618001BEBBB /* RxCocoa.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 749B02ED22066618001BEBBB /* RxCocoa.framework */; platformFilter = ios; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
36-
749B02F022066618001BEBBB /* RxSwift.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 749B02EE22066618001BEBBB /* RxSwift.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
37-
749B02F12206665A001BEBBB /* RxCocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 749B02ED22066618001BEBBB /* RxCocoa.framework */; };
38-
749B02F22206665A001BEBBB /* RxSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 749B02EE22066618001BEBBB /* RxSwift.framework */; };
39-
749B02F322066675001BEBBB /* RxCocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 749B02ED22066618001BEBBB /* RxCocoa.framework */; platformFilter = ios; };
40-
749B02F422066675001BEBBB /* RxSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 749B02EE22066618001BEBBB /* RxSwift.framework */; };
4140
749B02F82206852D001BEBBB /* Flow+PresentableTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 749B02F72206852D001BEBBB /* Flow+PresentableTests.swift */; };
4241
749B02FC220688EC001BEBBB /* FlowCoordinatorTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 749B02FB220688EC001BEBBB /* FlowCoordinatorTests.swift */; };
43-
74C6AD32227BAE6900B16A95 /* RxRelay.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 74C6AD31227BAE6900B16A95 /* RxRelay.framework */; };
44-
74C6AD33227BAE7800B16A95 /* RxRelay.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 74C6AD31227BAE6900B16A95 /* RxRelay.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
4542
/* End PBXBuildFile section */
4643

4744
/* Begin PBXContainerItemProxy section */
@@ -54,30 +51,18 @@
5451
};
5552
/* End PBXContainerItemProxy section */
5653

57-
/* Begin PBXCopyFilesBuildPhase section */
58-
749B02E622066500001BEBBB /* CopyFiles */ = {
59-
isa = PBXCopyFilesBuildPhase;
60-
buildActionMask = 2147483647;
61-
dstPath = "";
62-
dstSubfolderSpec = 10;
63-
files = (
64-
74C6AD33227BAE7800B16A95 /* RxRelay.framework in CopyFiles */,
65-
749B02EF22066618001BEBBB /* RxCocoa.framework in CopyFiles */,
66-
749B02F022066618001BEBBB /* RxSwift.framework in CopyFiles */,
67-
749B02EC22066538001BEBBB /* RxTest.framework in CopyFiles */,
68-
749B02E822066518001BEBBB /* RxBlocking.framework in CopyFiles */,
69-
);
70-
runOnlyForDeploymentPostprocessing = 0;
71-
};
72-
/* End PBXCopyFilesBuildPhase section */
73-
7454
/* Begin PBXFileReference section */
7555
1A1627C8217D517700952EFC /* ObservableType+PausableTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "ObservableType+PausableTests.swift"; sourceTree = "<group>"; };
7656
1A1627CB217D597400952EFC /* SyncronizableTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SyncronizableTests.swift; sourceTree = "<group>"; };
7757
1A1627CD218677C000952EFC /* UIViewController+PresentableTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIViewController+PresentableTests.swift"; sourceTree = "<group>"; };
7858
1A1627D02186788700952EFC /* TestUIViewController.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = TestUIViewController.storyboard; sourceTree = "<group>"; };
7959
1A1627D2218679A500952EFC /* TestUIViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TestUIViewController.swift; sourceTree = "<group>"; };
8060
1A4B10B32175708A0034672F /* StepperTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StepperTests.swift; sourceTree = "<group>"; };
61+
1A6097F628194A3500B91C15 /* RxSwift.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = RxSwift.xcframework; path = Carthage/Build/RxSwift.xcframework; sourceTree = "<group>"; };
62+
1A6097F728194A3500B91C15 /* RxCocoa.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = RxCocoa.xcframework; path = Carthage/Build/RxCocoa.xcframework; sourceTree = "<group>"; };
63+
1A6097F828194A3500B91C15 /* RxRelay.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = RxRelay.xcframework; path = Carthage/Build/RxRelay.xcframework; sourceTree = "<group>"; };
64+
1A60980228194AB700B91C15 /* RxBlocking.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = RxBlocking.xcframework; path = Carthage/Build/RxBlocking.xcframework; sourceTree = "<group>"; };
65+
1A60980328194AB700B91C15 /* RxTest.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = RxTest.xcframework; path = Carthage/Build/RxTest.xcframework; sourceTree = "<group>"; };
8166
1A8FBDE51FF8337700389464 /* UIViewController+Presentable.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIViewController+Presentable.swift"; sourceTree = "<group>"; };
8267
1A8FBDE61FF8337700389464 /* Reactive+UIViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Reactive+UIViewController.swift"; sourceTree = "<group>"; };
8368
1A8FBDE71FF8337700389464 /* Stepper.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Stepper.swift; sourceTree = "<group>"; };
@@ -114,18 +99,20 @@
11499
isa = PBXFrameworksBuildPhase;
115100
buildActionMask = 2147483647;
116101
files = (
117-
749B02F322066675001BEBBB /* RxCocoa.framework in Frameworks */,
118-
749B02F422066675001BEBBB /* RxSwift.framework in Frameworks */,
102+
1A60980428194AB700B91C15 /* RxBlocking.xcframework in Frameworks */,
103+
1A60980528194AB700B91C15 /* RxTest.xcframework in Frameworks */,
104+
1A60980028194A5100B91C15 /* RxCocoa.xcframework in Frameworks */,
105+
1A60980128194A5100B91C15 /* RxSwift.xcframework in Frameworks */,
119106
);
120107
runOnlyForDeploymentPostprocessing = 0;
121108
};
122109
1AF854881FF8328D00271B52 /* Frameworks */ = {
123110
isa = PBXFrameworksBuildPhase;
124111
buildActionMask = 2147483647;
125112
files = (
126-
74C6AD32227BAE6900B16A95 /* RxRelay.framework in Frameworks */,
127-
749B02F12206665A001BEBBB /* RxCocoa.framework in Frameworks */,
128-
749B02F22206665A001BEBBB /* RxSwift.framework in Frameworks */,
113+
1A6097F928194A3500B91C15 /* RxSwift.xcframework in Frameworks */,
114+
1A6097FB28194A3500B91C15 /* RxCocoa.xcframework in Frameworks */,
115+
1A6097FD28194A3500B91C15 /* RxRelay.xcframework in Frameworks */,
129116
);
130117
runOnlyForDeploymentPostprocessing = 0;
131118
};
@@ -144,6 +131,11 @@
144131
1A8FBDDE1FF8331900389464 /* Frameworks */ = {
145132
isa = PBXGroup;
146133
children = (
134+
1A60980228194AB700B91C15 /* RxBlocking.xcframework */,
135+
1A60980328194AB700B91C15 /* RxTest.xcframework */,
136+
1A6097F728194A3500B91C15 /* RxCocoa.xcframework */,
137+
1A6097F828194A3500B91C15 /* RxRelay.xcframework */,
138+
1A6097F628194A3500B91C15 /* RxSwift.xcframework */,
147139
74C6AD31227BAE6900B16A95 /* RxRelay.framework */,
148140
749B02ED22066618001BEBBB /* RxCocoa.framework */,
149141
749B02EE22066618001BEBBB /* RxSwift.framework */,
@@ -250,7 +242,6 @@
250242
1A8FBE711FF9783100389464 /* Sources */,
251243
1A8FBE721FF9783100389464 /* Frameworks */,
252244
1A8FBE731FF9783100389464 /* Resources */,
253-
749B02E622066500001BEBBB /* CopyFiles */,
254245
);
255246
buildRules = (
256247
);

0 commit comments

Comments
 (0)