Skip to content

Commit 1e7c595

Browse files
inamiyinamiy
committed
Merge pull request #15 from ReactKit/carthage
Fix 4a7fc95 by updating SwiftState to v1.1.1
2 parents 970ade7 + c7de377 commit 1e7c595

File tree

4 files changed

+43
-7
lines changed

4 files changed

+43
-7
lines changed

‎Cartfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
github "ReactKit/SwiftState" ~> 1.1.0
1+
github "ReactKit/SwiftState" ~> 1.1.1

‎Cartfile.lock‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
github "ReactKit/SwiftState" "1.1.0"
1+
github "ReactKit/SwiftState" "1.1.1"

‎Carthage.checkout/SwiftState‎

‎SwiftTask.xcodeproj/project.pbxproj‎

Lines changed: 40 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,10 @@
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+
48A0FC771A3A7B8B00FE2637 /* SwiftState.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 48A0FC711A3A7B8B00FE2637 /* SwiftState.framework */; };
29+
48A0FC7A1A3A7B8B00FE2637 /* SwiftState.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 48A0FC741A3A7B8B00FE2637 /* SwiftState.framework */; };
30+
48A0FC7F1A3A7CA900FE2637 /* SwiftState.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 48A0FC711A3A7B8B00FE2637 /* SwiftState.framework */; };
31+
48A0FC801A3A7CAF00FE2637 /* SwiftState.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 48A0FC741A3A7B8B00FE2637 /* SwiftState.framework */; };
2832
48A1E8221A366F9C007619EB /* SwiftTask.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1F46DED4199EDF1000F97868 /* SwiftTask.framework */; };
2933
48A1E8231A366FA8007619EB /* SwiftTask.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 48CD5A0C19AEE3570042B9F1 /* SwiftTask.framework */; };
3034
48CD5A3C19AEEBDF0042B9F1 /* SwiftTask.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F46DEFA199EDF8100F97868 /* SwiftTask.swift */; };
@@ -47,6 +51,8 @@
4751
4822F0D019D00ABF00F5F572 /* SwiftTask-iOSTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "SwiftTask-iOSTests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
4852
48511C5A19C17563002FE03C /* RetainCycleTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RetainCycleTests.swift; sourceTree = "<group>"; };
4953
485C31F01A1D619A00040DA3 /* TypeInferenceTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TypeInferenceTests.swift; sourceTree = "<group>"; };
54+
48A0FC711A3A7B8B00FE2637 /* SwiftState.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = SwiftState.framework; sourceTree = "<group>"; };
55+
48A0FC741A3A7B8B00FE2637 /* SwiftState.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = SwiftState.framework; sourceTree = "<group>"; };
5056
48CD5A0C19AEE3570042B9F1 /* SwiftTask.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SwiftTask.framework; sourceTree = BUILT_PRODUCTS_DIR; };
5157
/* End PBXFileReference section */
5258

@@ -55,13 +61,15 @@
5561
isa = PBXFrameworksBuildPhase;
5662
buildActionMask = 2147483647;
5763
files = (
64+
48A0FC7A1A3A7B8B00FE2637 /* SwiftState.framework in Frameworks */,
5865
);
5966
runOnlyForDeploymentPostprocessing = 0;
6067
};
6168
1F46DEDC199EDF1000F97868 /* Frameworks */ = {
6269
isa = PBXFrameworksBuildPhase;
6370
buildActionMask = 2147483647;
6471
files = (
72+
48A0FC801A3A7CAF00FE2637 /* SwiftState.framework in Frameworks */,
6573
48A1E8221A366F9C007619EB /* SwiftTask.framework in Frameworks */,
6674
);
6775
runOnlyForDeploymentPostprocessing = 0;
@@ -70,6 +78,7 @@
7078
isa = PBXFrameworksBuildPhase;
7179
buildActionMask = 2147483647;
7280
files = (
81+
48A0FC7F1A3A7CA900FE2637 /* SwiftState.framework in Frameworks */,
7382
48A1E8231A366FA8007619EB /* SwiftTask.framework in Frameworks */,
7483
);
7584
runOnlyForDeploymentPostprocessing = 0;
@@ -78,6 +87,7 @@
7887
isa = PBXFrameworksBuildPhase;
7988
buildActionMask = 2147483647;
8089
files = (
90+
48A0FC771A3A7B8B00FE2637 /* SwiftState.framework in Frameworks */,
8191
);
8292
runOnlyForDeploymentPostprocessing = 0;
8393
};
@@ -95,6 +105,7 @@
95105
1F46DECA199EDF1000F97868 = {
96106
isa = PBXGroup;
97107
children = (
108+
48A0FC6F1A3A7B8B00FE2637 /* Carthage.build */,
98109
1FA4631219A8D70A00DD8729 /* Vendor */,
99110
1F46DED6199EDF1000F97868 /* SwiftTask */,
100111
1F46DEE0199EDF1000F97868 /* SwiftTaskTests */,
@@ -178,6 +189,31 @@
178189
path = Source;
179190
sourceTree = "<group>";
180191
};
192+
48A0FC6F1A3A7B8B00FE2637 /* Carthage.build */ = {
193+
isa = PBXGroup;
194+
children = (
195+
48A0FC701A3A7B8B00FE2637 /* iOS */,
196+
48A0FC731A3A7B8B00FE2637 /* Mac */,
197+
);
198+
path = Carthage.build;
199+
sourceTree = "<group>";
200+
};
201+
48A0FC701A3A7B8B00FE2637 /* iOS */ = {
202+
isa = PBXGroup;
203+
children = (
204+
48A0FC711A3A7B8B00FE2637 /* SwiftState.framework */,
205+
);
206+
path = iOS;
207+
sourceTree = "<group>";
208+
};
209+
48A0FC731A3A7B8B00FE2637 /* Mac */ = {
210+
isa = PBXGroup;
211+
children = (
212+
48A0FC741A3A7B8B00FE2637 /* SwiftState.framework */,
213+
);
214+
path = Mac;
215+
sourceTree = "<group>";
216+
};
181217
/* End PBXGroup section */
182218

183219
/* Begin PBXHeadersBuildPhase section */
@@ -536,7 +572,7 @@
536572
"$(inherited)",
537573
);
538574
INFOPLIST_FILE = SwiftTaskTests/Info.plist;
539-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
575+
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks $(PROJECT_DIR)/Carthage.build/Mac";
540576
PRODUCT_NAME = "$(TARGET_NAME)";
541577
};
542578
name = Debug;
@@ -551,7 +587,7 @@
551587
"$(PROJECT_DIR)/Carthage.build/Mac",
552588
);
553589
INFOPLIST_FILE = SwiftTaskTests/Info.plist;
554-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
590+
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks $(PROJECT_DIR)/Carthage.build/Mac";
555591
PRODUCT_NAME = "$(TARGET_NAME)";
556592
};
557593
name = Release;
@@ -570,7 +606,7 @@
570606
);
571607
INFOPLIST_FILE = SwiftTaskTests/Info.plist;
572608
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
573-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
609+
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks $(PROJECT_DIR)/Carthage.build/iOS";
574610
PRODUCT_NAME = "$(TARGET_NAME)";
575611
SDKROOT = iphoneos;
576612
};
@@ -586,7 +622,7 @@
586622
);
587623
INFOPLIST_FILE = SwiftTaskTests/Info.plist;
588624
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
589-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
625+
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks $(PROJECT_DIR)/Carthage.build/iOS";
590626
PRODUCT_NAME = "$(TARGET_NAME)";
591627
SDKROOT = iphoneos;
592628
VALIDATE_PRODUCT = YES;

0 commit comments

Comments
 (0)