Skip to content

Commit 0308388

Browse files
inamiyinamiy
committed
Merge pull request #12 from ReactKit/carthage
Fix cf78ad5 by avoiding nested-xcodeproj which cause carthage-build failure.
2 parents 5eb2408 + 4dcdfcc commit 0308388

File tree

4 files changed

+64
-90
lines changed

4 files changed

+64
-90
lines changed

‎.gitignore‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Xcode
2-
build/*
2+
build/
33
*.pbxuser
44
!default.pbxuser
55
*.mode1v3
@@ -8,10 +8,12 @@ build/*
88
!default.mode2v3
99
*.perspectivev3
1010
!default.perspectivev3
11-
*.xcworkspace
12-
!default.xcworkspace
1311
xcuserdata
14-
profile
12+
*.xccheckout
1513
*.moved-aside
14+
DerivedData
15+
*.hmap
16+
*.ipa
17+
*.xcuserstate
1618

1719
Carthage.build

‎SwiftTask.xcodeproj/project.pbxproj‎

Lines changed: 41 additions & 86 deletions
Original file line numberDiff line numberDiff line change
@@ -25,45 +25,16 @@
2525
48511C5B19C17563002FE03C /* RetainCycleTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 48511C5A19C17563002FE03C /* RetainCycleTests.swift */; };
2626
485C31F11A1D619A00040DA3 /* TypeInferenceTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 485C31F01A1D619A00040DA3 /* TypeInferenceTests.swift */; };
2727
485C31F21A1D619A00040DA3 /* TypeInferenceTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 485C31F01A1D619A00040DA3 /* TypeInferenceTests.swift */; };
28-
48A1E8201A366F8C007619EB /* SwiftState.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 48A1E8191A366F52007619EB /* SwiftState.framework */; };
29-
48A1E8211A366F91007619EB /* SwiftState.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 48A1E8191A366F52007619EB /* SwiftState.framework */; };
3028
48A1E8221A366F9C007619EB /* SwiftTask.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1F46DED4199EDF1000F97868 /* SwiftTask.framework */; };
3129
48A1E8231A366FA8007619EB /* SwiftTask.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 48CD5A0C19AEE3570042B9F1 /* SwiftTask.framework */; };
30+
48C6AB331A3683410076A158 /* SwiftState.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 48C6AB2E1A3682F00076A158 /* SwiftState.framework */; };
31+
48C6AB341A3683480076A158 /* SwiftState.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 48C6AB301A3682F00076A158 /* SwiftState.framework */; };
32+
48C6AB351A36839F0076A158 /* SwiftState.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 48C6AB301A3682F00076A158 /* SwiftState.framework */; };
33+
48C6AB6A1A3688850076A158 /* SwiftState.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 48C6AB2E1A3682F00076A158 /* SwiftState.framework */; };
3234
48CD5A3C19AEEBDF0042B9F1 /* SwiftTask.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F46DEFA199EDF8100F97868 /* SwiftTask.swift */; };
3335
48CD5A4619AEEC2E0042B9F1 /* SwiftTask.h in Headers */ = {isa = PBXBuildFile; fileRef = 1F46DED9199EDF1000F97868 /* SwiftTask.h */; settings = {ATTRIBUTES = (Public, ); }; };
3436
/* End PBXBuildFile section */
3537

36-
/* Begin PBXContainerItemProxy section */
37-
48A1E8181A366F52007619EB /* PBXContainerItemProxy */ = {
38-
isa = PBXContainerItemProxy;
39-
containerPortal = 48A1E8031A366F52007619EB /* SwiftState.xcodeproj */;
40-
proxyType = 2;
41-
remoteGlobalIDString = 1FA620001996601000460108;
42-
remoteInfo = "SwiftState-OSX";
43-
};
44-
48A1E81A1A366F52007619EB /* PBXContainerItemProxy */ = {
45-
isa = PBXContainerItemProxy;
46-
containerPortal = 48A1E8031A366F52007619EB /* SwiftState.xcodeproj */;
47-
proxyType = 2;
48-
remoteGlobalIDString = 1FA6200B1996601000460108;
49-
remoteInfo = "SwiftState-OSXTests";
50-
};
51-
48A1E81C1A366F52007619EB /* PBXContainerItemProxy */ = {
52-
isa = PBXContainerItemProxy;
53-
containerPortal = 48A1E8031A366F52007619EB /* SwiftState.xcodeproj */;
54-
proxyType = 2;
55-
remoteGlobalIDString = 4872D5AC19B4211900F326B5;
56-
remoteInfo = "SwiftState-iOS";
57-
};
58-
48A1E81E1A366F52007619EB /* PBXContainerItemProxy */ = {
59-
isa = PBXContainerItemProxy;
60-
containerPortal = 48A1E8031A366F52007619EB /* SwiftState.xcodeproj */;
61-
proxyType = 2;
62-
remoteGlobalIDString = 4822F0A619D0085E00F5F572;
63-
remoteInfo = "SwiftState-iOSTests";
64-
};
65-
/* End PBXContainerItemProxy section */
66-
6738
/* Begin PBXFileReference section */
6839
1F0E282319C1DEA0005EF467 /* Async.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Async.swift; sourceTree = "<group>"; };
6940
1F20250119ADA8FD00DE0495 /* BasicTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BasicTests.swift; sourceTree = "<group>"; };
@@ -80,7 +51,8 @@
8051
4822F0D019D00ABF00F5F572 /* SwiftTask-iOSTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "SwiftTask-iOSTests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
8152
48511C5A19C17563002FE03C /* RetainCycleTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RetainCycleTests.swift; sourceTree = "<group>"; };
8253
485C31F01A1D619A00040DA3 /* TypeInferenceTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TypeInferenceTests.swift; sourceTree = "<group>"; };
83-
48A1E8031A366F52007619EB /* SwiftState.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; path = SwiftState.xcodeproj; sourceTree = "<group>"; };
54+
48C6AB2E1A3682F00076A158 /* SwiftState.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = SwiftState.framework; sourceTree = "<group>"; };
55+
48C6AB301A3682F00076A158 /* SwiftState.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = SwiftState.framework; sourceTree = "<group>"; };
8456
48CD5A0C19AEE3570042B9F1 /* SwiftTask.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SwiftTask.framework; sourceTree = BUILT_PRODUCTS_DIR; };
8557
/* End PBXFileReference section */
8658

@@ -89,7 +61,7 @@
8961
isa = PBXFrameworksBuildPhase;
9062
buildActionMask = 2147483647;
9163
files = (
92-
48A1E8201A366F8C007619EB /* SwiftState.framework in Frameworks */,
64+
48C6AB341A3683480076A158 /* SwiftState.framework in Frameworks */,
9365
);
9466
runOnlyForDeploymentPostprocessing = 0;
9567
};
@@ -98,6 +70,7 @@
9870
buildActionMask = 2147483647;
9971
files = (
10072
48A1E8221A366F9C007619EB /* SwiftTask.framework in Frameworks */,
73+
48C6AB351A36839F0076A158 /* SwiftState.framework in Frameworks */,
10174
);
10275
runOnlyForDeploymentPostprocessing = 0;
10376
};
@@ -106,14 +79,15 @@
10679
buildActionMask = 2147483647;
10780
files = (
10881
48A1E8231A366FA8007619EB /* SwiftTask.framework in Frameworks */,
82+
48C6AB6A1A3688850076A158 /* SwiftState.framework in Frameworks */,
10983
);
11084
runOnlyForDeploymentPostprocessing = 0;
11185
};
11286
48CD5A0819AEE3570042B9F1 /* Frameworks */ = {
11387
isa = PBXFrameworksBuildPhase;
11488
buildActionMask = 2147483647;
11589
files = (
116-
48A1E8211A366F91007619EB /* SwiftState.framework in Frameworks */,
90+
48C6AB331A3683410076A158 /* SwiftState.framework in Frameworks */,
11791
);
11892
runOnlyForDeploymentPostprocessing = 0;
11993
};
@@ -131,7 +105,7 @@
131105
1F46DECA199EDF1000F97868 = {
132106
isa = PBXGroup;
133107
children = (
134-
48A1E7EA1A366F52007619EB /* Carthage.checkout */,
108+
48C6AB2C1A3682F00076A158 /* Carthage.build */,
135109
1FA4631219A8D70A00DD8729 /* Vendor */,
136110
1F46DED6199EDF1000F97868 /* SwiftTask */,
137111
1F46DEE0199EDF1000F97868 /* SwiftTaskTests */,
@@ -215,31 +189,29 @@
215189
path = Source;
216190
sourceTree = "<group>";
217191
};
218-
48A1E7EA1A366F52007619EB /* Carthage.checkout */ = {
192+
48C6AB2C1A3682F00076A158 /* Carthage.build */ = {
219193
isa = PBXGroup;
220194
children = (
221-
48A1E7EB1A366F52007619EB /* SwiftState */,
195+
48C6AB2D1A3682F00076A158 /* iOS */,
196+
48C6AB2F1A3682F00076A158 /* Mac */,
222197
);
223-
path = Carthage.checkout;
198+
path = Carthage.build;
224199
sourceTree = "<group>";
225200
};
226-
48A1E7EB1A366F52007619EB /* SwiftState */ = {
201+
48C6AB2D1A3682F00076A158 /* iOS */ = {
227202
isa = PBXGroup;
228203
children = (
229-
48A1E8031A366F52007619EB /* SwiftState.xcodeproj */,
204+
48C6AB2E1A3682F00076A158 /* SwiftState.framework */,
230205
);
231-
path = SwiftState;
206+
path = iOS;
232207
sourceTree = "<group>";
233208
};
234-
48A1E8041A366F52007619EB /* Products */ = {
209+
48C6AB2F1A3682F00076A158 /* Mac */ = {
235210
isa = PBXGroup;
236211
children = (
237-
48A1E8191A366F52007619EB /* SwiftState.framework */,
238-
48A1E81B1A366F52007619EB /* SwiftState-OSXTests.xctest */,
239-
48A1E81D1A366F52007619EB /* SwiftState.framework */,
240-
48A1E81F1A366F52007619EB /* SwiftStateTests-iOS.xctest */,
212+
48C6AB301A3682F00076A158 /* SwiftState.framework */,
241213
);
242-
name = Products;
214+
path = Mac;
243215
sourceTree = "<group>";
244216
};
245217
/* End PBXGroup section */
@@ -368,12 +340,6 @@
368340
mainGroup = 1F46DECA199EDF1000F97868;
369341
productRefGroup = 1F46DED5199EDF1000F97868 /* Products */;
370342
projectDirPath = "";
371-
projectReferences = (
372-
{
373-
ProductGroup = 48A1E8041A366F52007619EB /* Products */;
374-
ProjectRef = 48A1E8031A366F52007619EB /* SwiftState.xcodeproj */;
375-
},
376-
);
377343
projectRoot = "";
378344
targets = (
379345
1F46DED3199EDF1000F97868 /* SwiftTask-OSX */,
@@ -384,37 +350,6 @@
384350
};
385351
/* End PBXProject section */
386352

387-
/* Begin PBXReferenceProxy section */
388-
48A1E8191A366F52007619EB /* SwiftState.framework */ = {
389-
isa = PBXReferenceProxy;
390-
fileType = wrapper.framework;
391-
path = SwiftState.framework;
392-
remoteRef = 48A1E8181A366F52007619EB /* PBXContainerItemProxy */;
393-
sourceTree = BUILT_PRODUCTS_DIR;
394-
};
395-
48A1E81B1A366F52007619EB /* SwiftState-OSXTests.xctest */ = {
396-
isa = PBXReferenceProxy;
397-
fileType = wrapper.cfbundle;
398-
path = "SwiftState-OSXTests.xctest";
399-
remoteRef = 48A1E81A1A366F52007619EB /* PBXContainerItemProxy */;
400-
sourceTree = BUILT_PRODUCTS_DIR;
401-
};
402-
48A1E81D1A366F52007619EB /* SwiftState.framework */ = {
403-
isa = PBXReferenceProxy;
404-
fileType = wrapper.framework;
405-
path = SwiftState.framework;
406-
remoteRef = 48A1E81C1A366F52007619EB /* PBXContainerItemProxy */;
407-
sourceTree = BUILT_PRODUCTS_DIR;
408-
};
409-
48A1E81F1A366F52007619EB /* SwiftStateTests-iOS.xctest */ = {
410-
isa = PBXReferenceProxy;
411-
fileType = wrapper.cfbundle;
412-
path = "SwiftStateTests-iOS.xctest";
413-
remoteRef = 48A1E81E1A366F52007619EB /* PBXContainerItemProxy */;
414-
sourceTree = BUILT_PRODUCTS_DIR;
415-
};
416-
/* End PBXReferenceProxy section */
417-
418353
/* Begin PBXResourcesBuildPhase section */
419354
1F46DED2199EDF1000F97868 /* Resources */ = {
420355
isa = PBXResourcesBuildPhase;
@@ -585,6 +520,10 @@
585520
DYLIB_COMPATIBILITY_VERSION = 1;
586521
DYLIB_CURRENT_VERSION = 1;
587522
DYLIB_INSTALL_NAME_BASE = "@rpath";
523+
FRAMEWORK_SEARCH_PATHS = (
524+
"$(inherited)",
525+
"$(PROJECT_DIR)/Carthage.build/Mac",
526+
);
588527
FRAMEWORK_VERSION = A;
589528
INFOPLIST_FILE = SwiftTask/Info.plist;
590529
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
@@ -605,6 +544,10 @@
605544
DYLIB_COMPATIBILITY_VERSION = 1;
606545
DYLIB_CURRENT_VERSION = 1;
607546
DYLIB_INSTALL_NAME_BASE = "@rpath";
547+
FRAMEWORK_SEARCH_PATHS = (
548+
"$(inherited)",
549+
"$(PROJECT_DIR)/Carthage.build/Mac",
550+
);
608551
FRAMEWORK_VERSION = A;
609552
INFOPLIST_FILE = SwiftTask/Info.plist;
610553
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
@@ -622,6 +565,7 @@
622565
FRAMEWORK_SEARCH_PATHS = (
623566
"$(DEVELOPER_FRAMEWORKS_DIR)",
624567
"$(inherited)",
568+
"$(PROJECT_DIR)/Carthage.build/Mac",
625569
);
626570
GCC_PREPROCESSOR_DEFINITIONS = (
627571
"DEBUG=1",
@@ -640,6 +584,7 @@
640584
FRAMEWORK_SEARCH_PATHS = (
641585
"$(DEVELOPER_FRAMEWORKS_DIR)",
642586
"$(inherited)",
587+
"$(PROJECT_DIR)/Carthage.build/Mac",
643588
);
644589
INFOPLIST_FILE = SwiftTaskTests/Info.plist;
645590
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
@@ -653,6 +598,7 @@
653598
FRAMEWORK_SEARCH_PATHS = (
654599
"$(SDKROOT)/Developer/Library/Frameworks",
655600
"$(inherited)",
601+
"$(PROJECT_DIR)/Carthage.build/iOS",
656602
);
657603
GCC_PREPROCESSOR_DEFINITIONS = (
658604
"DEBUG=1",
@@ -672,6 +618,7 @@
672618
FRAMEWORK_SEARCH_PATHS = (
673619
"$(SDKROOT)/Developer/Library/Frameworks",
674620
"$(inherited)",
621+
"$(PROJECT_DIR)/Carthage.build/iOS",
675622
);
676623
INFOPLIST_FILE = SwiftTaskTests/Info.plist;
677624
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
@@ -690,6 +637,10 @@
690637
DYLIB_COMPATIBILITY_VERSION = 1;
691638
DYLIB_CURRENT_VERSION = 1;
692639
DYLIB_INSTALL_NAME_BASE = "@rpath";
640+
FRAMEWORK_SEARCH_PATHS = (
641+
"$(inherited)",
642+
"$(PROJECT_DIR)/Carthage.build/iOS",
643+
);
693644
GCC_PREPROCESSOR_DEFINITIONS = (
694645
"DEBUG=1",
695646
"$(inherited)",
@@ -712,6 +663,10 @@
712663
DYLIB_COMPATIBILITY_VERSION = 1;
713664
DYLIB_CURRENT_VERSION = 1;
714665
DYLIB_INSTALL_NAME_BASE = "@rpath";
666+
FRAMEWORK_SEARCH_PATHS = (
667+
"$(inherited)",
668+
"$(PROJECT_DIR)/Carthage.build/iOS",
669+
);
715670
INFOPLIST_FILE = SwiftTask/Info.plist;
716671
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
717672
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";

‎SwiftTask.xcodeproj/project.xcworkspace/contents.xcworkspacedata‎

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎SwiftTask.xcworkspace/contents.xcworkspacedata‎

Lines changed: 10 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)