Skip to content

Commit ed7b524

Browse files
bobgodwinxfreak4pc
bobgodwinx
authored and
freak4pc
committed
Resolved dependencies setting within the project
1 parent 7fd0f08 commit ed7b524

File tree

2 files changed

+101
-6
lines changed

2 files changed

+101
-6
lines changed

‎Action.xcodeproj/project.pbxproj‎

Lines changed: 98 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,27 @@
4747
7F612AD61D7F13B800B93BC5 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 7F612AD51D7F13B800B93BC5 /* Assets.xcassets */; };
4848
7F612AD91D7F13B800B93BC5 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 7F612AD71D7F13B800B93BC5 /* LaunchScreen.storyboard */; };
4949
7FB791EC1D7F1BB600789D53 /* Action.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BE73AD201CDCD101006F8B98 /* Action.framework */; };
50+
C41CE71F22283BBA0006E722 /* Nimble.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C41CE71A22283BB90006E722 /* Nimble.framework */; };
51+
C41CE72022283BBA0006E722 /* RxBlocking.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C41CE71B22283BB90006E722 /* RxBlocking.framework */; };
52+
C41CE72122283BBA0006E722 /* Quick.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C41CE71C22283BB90006E722 /* Quick.framework */; };
53+
C41CE72222283BBA0006E722 /* RxAtomic.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C41CE71D22283BBA0006E722 /* RxAtomic.framework */; };
54+
C41CE72322283BBA0006E722 /* RxSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C41CE71E22283BBA0006E722 /* RxSwift.framework */; };
55+
C41CE72C22283BEE0006E722 /* iOS in Frameworks */ = {isa = PBXBuildFile; fileRef = C41CE72422283BEE0006E722 /* iOS */; };
56+
C41CE72D22283BEE0006E722 /* RxAtomic.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C41CE72522283BEE0006E722 /* RxAtomic.framework */; };
57+
C41CE72E22283BEE0006E722 /* Quick.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C41CE72622283BEE0006E722 /* Quick.framework */; };
58+
C41CE72F22283BEE0006E722 /* RxCocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C41CE72722283BEE0006E722 /* RxCocoa.framework */; };
59+
C41CE73022283BEE0006E722 /* RxBlocking.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C41CE72822283BEE0006E722 /* RxBlocking.framework */; };
60+
C41CE73122283BEE0006E722 /* Nimble.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C41CE72922283BEE0006E722 /* Nimble.framework */; };
61+
C41CE73222283BEE0006E722 /* RxSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C41CE72A22283BEE0006E722 /* RxSwift.framework */; };
62+
C41CE73322283BEE0006E722 /* RxTest.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C41CE72B22283BEE0006E722 /* RxTest.framework */; };
63+
C41CE73622283CAD0006E722 /* RxSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C41CE71E22283BBA0006E722 /* RxSwift.framework */; };
64+
C41CE73722283CAD0006E722 /* RxAtomic.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C41CE71D22283BBA0006E722 /* RxAtomic.framework */; };
65+
C41CE73A22283CD00006E722 /* RxAtomic.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C41CE73822283CD00006E722 /* RxAtomic.framework */; };
66+
C41CE73B22283CD00006E722 /* RxSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C41CE73922283CD00006E722 /* RxSwift.framework */; };
67+
C41CE73C22283CF90006E722 /* RxSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C41CE72A22283BEE0006E722 /* RxSwift.framework */; };
68+
C41CE73D22283CF90006E722 /* RxAtomic.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C41CE72522283BEE0006E722 /* RxAtomic.framework */; };
69+
C41CE74022283D220006E722 /* RxAtomic.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C41CE73E22283D220006E722 /* RxAtomic.framework */; };
70+
C41CE74122283D220006E722 /* RxSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C41CE73F22283D220006E722 /* RxSwift.framework */; };
5071
CA2861C81ED6979400BB327A /* InputSubject.swift in Sources */ = {isa = PBXBuildFile; fileRef = CA2861C71ED6979400BB327A /* InputSubject.swift */; };
5172
CA2861CA1ED6A41700BB327A /* InputSubjectTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = CA2861C91ED6A41700BB327A /* InputSubjectTests.swift */; };
5273
CA2861CB1ED6B08300BB327A /* InputSubject.swift in Sources */ = {isa = PBXBuildFile; fileRef = CA2861C71ED6979400BB327A /* InputSubject.swift */; };
@@ -117,6 +138,23 @@
117138
7F612AD81D7F13B800B93BC5 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
118139
7F612ADA1D7F13B800B93BC5 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
119140
BE73AD201CDCD101006F8B98 /* Action.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Action.framework; sourceTree = BUILT_PRODUCTS_DIR; };
141+
C41CE71A22283BB90006E722 /* Nimble.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Nimble.framework; path = Carthage/Build/iOS/Nimble.framework; sourceTree = "<group>"; };
142+
C41CE71B22283BB90006E722 /* RxBlocking.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RxBlocking.framework; path = Carthage/Build/iOS/RxBlocking.framework; sourceTree = "<group>"; };
143+
C41CE71C22283BB90006E722 /* Quick.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Quick.framework; path = Carthage/Build/iOS/Quick.framework; sourceTree = "<group>"; };
144+
C41CE71D22283BBA0006E722 /* RxAtomic.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RxAtomic.framework; path = Carthage/Build/iOS/RxAtomic.framework; sourceTree = "<group>"; };
145+
C41CE71E22283BBA0006E722 /* RxSwift.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RxSwift.framework; path = Carthage/Build/iOS/RxSwift.framework; sourceTree = "<group>"; };
146+
C41CE72422283BEE0006E722 /* iOS */ = {isa = PBXFileReference; lastKnownFileType = folder; name = iOS; path = Carthage/Build/iOS; sourceTree = "<group>"; };
147+
C41CE72522283BEE0006E722 /* RxAtomic.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RxAtomic.framework; path = Carthage/Build/Mac/RxAtomic.framework; sourceTree = "<group>"; };
148+
C41CE72622283BEE0006E722 /* Quick.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Quick.framework; path = Carthage/Build/Mac/Quick.framework; sourceTree = "<group>"; };
149+
C41CE72722283BEE0006E722 /* RxCocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RxCocoa.framework; path = Carthage/Build/Mac/RxCocoa.framework; sourceTree = "<group>"; };
150+
C41CE72822283BEE0006E722 /* RxBlocking.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RxBlocking.framework; path = Carthage/Build/Mac/RxBlocking.framework; sourceTree = "<group>"; };
151+
C41CE72922283BEE0006E722 /* Nimble.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Nimble.framework; path = Carthage/Build/Mac/Nimble.framework; sourceTree = "<group>"; };
152+
C41CE72A22283BEE0006E722 /* RxSwift.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RxSwift.framework; path = Carthage/Build/Mac/RxSwift.framework; sourceTree = "<group>"; };
153+
C41CE72B22283BEE0006E722 /* RxTest.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RxTest.framework; path = Carthage/Build/Mac/RxTest.framework; sourceTree = "<group>"; };
154+
C41CE73822283CD00006E722 /* RxAtomic.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RxAtomic.framework; path = Carthage/Build/tvOS/RxAtomic.framework; sourceTree = "<group>"; };
155+
C41CE73922283CD00006E722 /* RxSwift.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RxSwift.framework; path = Carthage/Build/tvOS/RxSwift.framework; sourceTree = "<group>"; };
156+
C41CE73E22283D220006E722 /* RxAtomic.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RxAtomic.framework; path = Carthage/Build/watchOS/RxAtomic.framework; sourceTree = "<group>"; };
157+
C41CE73F22283D220006E722 /* RxSwift.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RxSwift.framework; path = Carthage/Build/watchOS/RxSwift.framework; sourceTree = "<group>"; };
120158
C4E0263F20D119EE00C8164C /* Action.podspec */ = {isa = PBXFileReference; lastKnownFileType = text; path = Action.podspec; sourceTree = "<group>"; };
121159
C4E0264020D11A0F00C8164C /* Cartfile */ = {isa = PBXFileReference; lastKnownFileType = text; path = Cartfile; sourceTree = "<group>"; };
122160
C4E0264120D11A0F00C8164C /* Cartfile.private */ = {isa = PBXFileReference; lastKnownFileType = text; path = Cartfile.private; sourceTree = "<group>"; };
@@ -132,27 +170,41 @@
132170
isa = PBXFrameworksBuildPhase;
133171
buildActionMask = 2147483647;
134172
files = (
173+
C41CE73A22283CD00006E722 /* RxAtomic.framework in Frameworks */,
174+
C41CE73B22283CD00006E722 /* RxSwift.framework in Frameworks */,
135175
);
136176
runOnlyForDeploymentPostprocessing = 0;
137177
};
138178
1FCDDA7E1EAC3295006EB95B /* Frameworks */ = {
139179
isa = PBXFrameworksBuildPhase;
140180
buildActionMask = 2147483647;
141181
files = (
182+
C41CE73C22283CF90006E722 /* RxSwift.framework in Frameworks */,
183+
C41CE73D22283CF90006E722 /* RxAtomic.framework in Frameworks */,
142184
);
143185
runOnlyForDeploymentPostprocessing = 0;
144186
};
145187
1FCDDA921EAC33B0006EB95B /* Frameworks */ = {
146188
isa = PBXFrameworksBuildPhase;
147189
buildActionMask = 2147483647;
148190
files = (
191+
C41CE74022283D220006E722 /* RxAtomic.framework in Frameworks */,
192+
C41CE74122283D220006E722 /* RxSwift.framework in Frameworks */,
149193
);
150194
runOnlyForDeploymentPostprocessing = 0;
151195
};
152196
3DD965B81F5DC0E400C180FE /* Frameworks */ = {
153197
isa = PBXFrameworksBuildPhase;
154198
buildActionMask = 2147483647;
155199
files = (
200+
C41CE72C22283BEE0006E722 /* iOS in Frameworks */,
201+
C41CE72D22283BEE0006E722 /* RxAtomic.framework in Frameworks */,
202+
C41CE72E22283BEE0006E722 /* Quick.framework in Frameworks */,
203+
C41CE72F22283BEE0006E722 /* RxCocoa.framework in Frameworks */,
204+
C41CE73022283BEE0006E722 /* RxBlocking.framework in Frameworks */,
205+
C41CE73122283BEE0006E722 /* Nimble.framework in Frameworks */,
206+
C41CE73222283BEE0006E722 /* RxSwift.framework in Frameworks */,
207+
C41CE73322283BEE0006E722 /* RxTest.framework in Frameworks */,
156208
3DD965C01F5DC0E400C180FE /* Action.framework in Frameworks */,
157209
);
158210
runOnlyForDeploymentPostprocessing = 0;
@@ -161,6 +213,11 @@
161213
isa = PBXFrameworksBuildPhase;
162214
buildActionMask = 2147483647;
163215
files = (
216+
C41CE71F22283BBA0006E722 /* Nimble.framework in Frameworks */,
217+
C41CE72022283BBA0006E722 /* RxBlocking.framework in Frameworks */,
218+
C41CE72122283BBA0006E722 /* Quick.framework in Frameworks */,
219+
C41CE72222283BBA0006E722 /* RxAtomic.framework in Frameworks */,
220+
C41CE72322283BBA0006E722 /* RxSwift.framework in Frameworks */,
164221
7F612AA01D7F103A00B93BC5 /* Action.framework in Frameworks */,
165222
);
166223
runOnlyForDeploymentPostprocessing = 0;
@@ -177,6 +234,8 @@
177234
isa = PBXFrameworksBuildPhase;
178235
buildActionMask = 2147483647;
179236
files = (
237+
C41CE73622283CAD0006E722 /* RxSwift.framework in Frameworks */,
238+
C41CE73722283CAD0006E722 /* RxAtomic.framework in Frameworks */,
180239
);
181240
runOnlyForDeploymentPostprocessing = 0;
182241
};
@@ -256,6 +315,23 @@
256315
7F5E6A5C1D7F06C4000B6076 /* Frameworks */ = {
257316
isa = PBXGroup;
258317
children = (
318+
C41CE73822283CD00006E722 /* RxAtomic.framework */,
319+
C41CE73922283CD00006E722 /* RxSwift.framework */,
320+
C41CE73E22283D220006E722 /* RxAtomic.framework */,
321+
C41CE73F22283D220006E722 /* RxSwift.framework */,
322+
C41CE72422283BEE0006E722 /* iOS */,
323+
C41CE72922283BEE0006E722 /* Nimble.framework */,
324+
C41CE72622283BEE0006E722 /* Quick.framework */,
325+
C41CE72522283BEE0006E722 /* RxAtomic.framework */,
326+
C41CE72822283BEE0006E722 /* RxBlocking.framework */,
327+
C41CE72722283BEE0006E722 /* RxCocoa.framework */,
328+
C41CE72A22283BEE0006E722 /* RxSwift.framework */,
329+
C41CE72B22283BEE0006E722 /* RxTest.framework */,
330+
C41CE71A22283BB90006E722 /* Nimble.framework */,
331+
C41CE71C22283BB90006E722 /* Quick.framework */,
332+
C41CE71D22283BBA0006E722 /* RxAtomic.framework */,
333+
C41CE71B22283BB90006E722 /* RxBlocking.framework */,
334+
C41CE71E22283BBA0006E722 /* RxSwift.framework */,
259335
);
260336
name = Frameworks;
261337
sourceTree = "<group>";
@@ -935,10 +1011,14 @@
9351011
CODE_SIGN_STYLE = Automatic;
9361012
COMBINE_HIDPI_IMAGES = YES;
9371013
DEVELOPMENT_TEAM = "";
1014+
FRAMEWORK_SEARCH_PATHS = (
1015+
"$(inherited)",
1016+
"$(PROJECT_DIR)/Carthage/Build/Mac",
1017+
);
9381018
GCC_C_LANGUAGE_STANDARD = gnu11;
9391019
GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = NO;
9401020
INFOPLIST_FILE = Tests/ActionTests/Info.plist;
941-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
1021+
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks $(PROJECT_DIR)/Carthage/Build/iOS";
9421022
MACOSX_DEPLOYMENT_TARGET = 10.12;
9431023
PRODUCT_BUNDLE_IDENTIFIER = "com.ashfurrow.Tests-macOS";
9441024
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -964,10 +1044,14 @@
9641044
CODE_SIGN_STYLE = Automatic;
9651045
COMBINE_HIDPI_IMAGES = YES;
9661046
DEVELOPMENT_TEAM = "";
1047+
FRAMEWORK_SEARCH_PATHS = (
1048+
"$(inherited)",
1049+
"$(PROJECT_DIR)/Carthage/Build/Mac",
1050+
);
9671051
GCC_C_LANGUAGE_STANDARD = gnu11;
9681052
GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = NO;
9691053
INFOPLIST_FILE = Tests/ActionTests/Info.plist;
970-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
1054+
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks $(PROJECT_DIR)/Carthage/Build/iOS";
9711055
MACOSX_DEPLOYMENT_TARGET = 10.12;
9721056
PRODUCT_BUNDLE_IDENTIFIER = "com.ashfurrow.Tests-macOS";
9731057
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -982,10 +1066,13 @@
9821066
CLANG_ENABLE_MODULES = YES;
9831067
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
9841068
CLANG_WARN_SUSPICIOUS_MOVES = YES;
985-
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
1069+
FRAMEWORK_SEARCH_PATHS = (
1070+
"$(inherited)",
1071+
"$(PROJECT_DIR)/Carthage/Build/iOS",
1072+
);
9861073
GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = NO;
9871074
INFOPLIST_FILE = Tests/ActionTests/Info.plist;
988-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
1075+
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks $(PROJECT_DIR)/Carthage/Build/iOS";
9891076
PRODUCT_BUNDLE_IDENTIFIER = "-.Tests";
9901077
PRODUCT_NAME = "$(TARGET_NAME)";
9911078
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
@@ -1001,10 +1088,13 @@
10011088
CLANG_ENABLE_MODULES = YES;
10021089
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
10031090
CLANG_WARN_SUSPICIOUS_MOVES = YES;
1004-
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
1091+
FRAMEWORK_SEARCH_PATHS = (
1092+
"$(inherited)",
1093+
"$(PROJECT_DIR)/Carthage/Build/iOS",
1094+
);
10051095
GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = NO;
10061096
INFOPLIST_FILE = Tests/ActionTests/Info.plist;
1007-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
1097+
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks $(PROJECT_DIR)/Carthage/Build/iOS";
10081098
PRODUCT_BUNDLE_IDENTIFIER = "-.Tests";
10091099
PRODUCT_NAME = "$(TARGET_NAME)";
10101100
SWIFT_VERSION = 4.2;
@@ -1176,6 +1266,7 @@
11761266
FRAMEWORK_SEARCH_PATHS = (
11771267
"$(inherited)",
11781268
"$(PROJECT_DIR)/Carthage/Build/iOS",
1269+
"$(PROJECT_DIR)/Carthage/Build/Mac",
11791270
);
11801271
GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = NO;
11811272
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
@@ -1200,6 +1291,7 @@
12001291
FRAMEWORK_SEARCH_PATHS = (
12011292
"$(inherited)",
12021293
"$(PROJECT_DIR)/Carthage/Build/iOS",
1294+
"$(PROJECT_DIR)/Carthage/Build/Mac",
12031295
);
12041296
GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = NO;
12051297
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";

‎Cartfile.resolved‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
github "Quick/Nimble" "v7.3.4"
2+
github "Quick/Quick" "v1.3.4"
3+
github "ReactiveX/RxSwift" "4.4.1"

0 commit comments

Comments
 (0)