Skip to content

Fix 4a7fc95 by updating SwiftState to v1.1.1 #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 12, 2014
Merged

Fix 4a7fc95 by updating SwiftState to v1.1.1 #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Cartfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
github "ReactKit/SwiftState" ~> 1.1.0
github "ReactKit/SwiftState" ~> 1.1.1
2 changes: 1 addition & 1 deletion Cartfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
github "ReactKit/SwiftState" "1.1.0"
github "ReactKit/SwiftState" "1.1.1"
2 changes: 1 addition & 1 deletion Carthage.checkout/SwiftState
Open in desktop
Submodule SwiftState updated 3 files
+6 −4 .gitignore
+12 −2 SwiftState.xcodeproj/project.pbxproj
+7 −0 SwiftState.xcodeproj/project.xcworkspace/contents.xcworkspacedata
44 changes: 40 additions & 4 deletions SwiftTask.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,10 @@
48511C5B19C17563002FE03C /* RetainCycleTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 48511C5A19C17563002FE03C /* RetainCycleTests.swift */; };
485C31F11A1D619A00040DA3 /* TypeInferenceTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 485C31F01A1D619A00040DA3 /* TypeInferenceTests.swift */; };
485C31F21A1D619A00040DA3 /* TypeInferenceTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 485C31F01A1D619A00040DA3 /* TypeInferenceTests.swift */; };
48A0FC771A3A7B8B00FE2637 /* SwiftState.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 48A0FC711A3A7B8B00FE2637 /* SwiftState.framework */; };
48A0FC7A1A3A7B8B00FE2637 /* SwiftState.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 48A0FC741A3A7B8B00FE2637 /* SwiftState.framework */; };
48A0FC7F1A3A7CA900FE2637 /* SwiftState.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 48A0FC711A3A7B8B00FE2637 /* SwiftState.framework */; };
48A0FC801A3A7CAF00FE2637 /* SwiftState.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 48A0FC741A3A7B8B00FE2637 /* SwiftState.framework */; };
48A1E8221A366F9C007619EB /* SwiftTask.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1F46DED4199EDF1000F97868 /* SwiftTask.framework */; };
48A1E8231A366FA8007619EB /* SwiftTask.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 48CD5A0C19AEE3570042B9F1 /* SwiftTask.framework */; };
48CD5A3C19AEEBDF0042B9F1 /* SwiftTask.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F46DEFA199EDF8100F97868 /* SwiftTask.swift */; };
Expand All @@ -47,6 +51,8 @@
4822F0D019D00ABF00F5F572 /* SwiftTask-iOSTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "SwiftTask-iOSTests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
48511C5A19C17563002FE03C /* RetainCycleTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RetainCycleTests.swift; sourceTree = "<group>"; };
485C31F01A1D619A00040DA3 /* TypeInferenceTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TypeInferenceTests.swift; sourceTree = "<group>"; };
48A0FC711A3A7B8B00FE2637 /* SwiftState.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = SwiftState.framework; sourceTree = "<group>"; };
48A0FC741A3A7B8B00FE2637 /* SwiftState.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = SwiftState.framework; sourceTree = "<group>"; };
48CD5A0C19AEE3570042B9F1 /* SwiftTask.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SwiftTask.framework; sourceTree = BUILT_PRODUCTS_DIR; };
/* End PBXFileReference section */

Expand All @@ -55,13 +61,15 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
48A0FC7A1A3A7B8B00FE2637 /* SwiftState.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
1F46DEDC199EDF1000F97868 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
48A0FC801A3A7CAF00FE2637 /* SwiftState.framework in Frameworks */,
48A1E8221A366F9C007619EB /* SwiftTask.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand All @@ -70,6 +78,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
48A0FC7F1A3A7CA900FE2637 /* SwiftState.framework in Frameworks */,
48A1E8231A366FA8007619EB /* SwiftTask.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand All @@ -78,6 +87,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
48A0FC771A3A7B8B00FE2637 /* SwiftState.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand All @@ -95,6 +105,7 @@
1F46DECA199EDF1000F97868 = {
isa = PBXGroup;
children = (
48A0FC6F1A3A7B8B00FE2637 /* Carthage.build */,
1FA4631219A8D70A00DD8729 /* Vendor */,
1F46DED6199EDF1000F97868 /* SwiftTask */,
1F46DEE0199EDF1000F97868 /* SwiftTaskTests */,
Expand Down Expand Up @@ -178,6 +189,31 @@
path = Source;
sourceTree = "<group>";
};
48A0FC6F1A3A7B8B00FE2637 /* Carthage.build */ = {
isa = PBXGroup;
children = (
48A0FC701A3A7B8B00FE2637 /* iOS */,
48A0FC731A3A7B8B00FE2637 /* Mac */,
);
path = Carthage.build;
sourceTree = "<group>";
};
48A0FC701A3A7B8B00FE2637 /* iOS */ = {
isa = PBXGroup;
children = (
48A0FC711A3A7B8B00FE2637 /* SwiftState.framework */,
);
path = iOS;
sourceTree = "<group>";
};
48A0FC731A3A7B8B00FE2637 /* Mac */ = {
isa = PBXGroup;
children = (
48A0FC741A3A7B8B00FE2637 /* SwiftState.framework */,
);
path = Mac;
sourceTree = "<group>";
};
/* End PBXGroup section */

/* Begin PBXHeadersBuildPhase section */
Expand Down Expand Up @@ -536,7 +572,7 @@
"$(inherited)",
);
INFOPLIST_FILE = SwiftTaskTests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks $(PROJECT_DIR)/Carthage.build/Mac";
PRODUCT_NAME = "$(TARGET_NAME)";
};
name = Debug;
Expand All @@ -551,7 +587,7 @@
"$(PROJECT_DIR)/Carthage.build/Mac",
);
INFOPLIST_FILE = SwiftTaskTests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks $(PROJECT_DIR)/Carthage.build/Mac";
PRODUCT_NAME = "$(TARGET_NAME)";
};
name = Release;
Expand All @@ -570,7 +606,7 @@
);
INFOPLIST_FILE = SwiftTaskTests/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks $(PROJECT_DIR)/Carthage.build/iOS";
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = iphoneos;
};
Expand All @@ -586,7 +622,7 @@
);
INFOPLIST_FILE = SwiftTaskTests/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks $(PROJECT_DIR)/Carthage.build/iOS";
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = iphoneos;
VALIDATE_PRODUCT = YES;
Expand Down