From c7de377a18985e22939c21b4ffca33699768c010 Mon Sep 17 00:00:00 2001 From: Yasuhiro Inami Date: Fri, 12 Dec 2014 11:40:08 +0900 Subject: [PATCH] Fix 4a7fc95 by updating SwiftState to v1.1.1 --- Cartfile | 2 +- Cartfile.lock | 2 +- Carthage.checkout/SwiftState | 2 +- SwiftTask.xcodeproj/project.pbxproj | 44 ++++++++++++++++++++++++++--- 4 files changed, 43 insertions(+), 7 deletions(-) diff --git a/Cartfile b/Cartfile index 0318615..7a61e81 100644 --- a/Cartfile +++ b/Cartfile @@ -1 +1 @@ -github "ReactKit/SwiftState" ~> 1.1.0 \ No newline at end of file +github "ReactKit/SwiftState" ~> 1.1.1 \ No newline at end of file diff --git a/Cartfile.lock b/Cartfile.lock index 747c46c..98df14a 100644 --- a/Cartfile.lock +++ b/Cartfile.lock @@ -1 +1 @@ -github "ReactKit/SwiftState" "1.1.0" +github "ReactKit/SwiftState" "1.1.1" diff --git a/Carthage.checkout/SwiftState b/Carthage.checkout/SwiftState index 740a2a7..a150c12 160000 --- a/Carthage.checkout/SwiftState +++ b/Carthage.checkout/SwiftState @@ -1 +1 @@ -Subproject commit 740a2a74011a1c2698579c2d543e2a1f38051164 +Subproject commit a150c1242bfc9e5c6cc1eb784651222a154f97db diff --git a/SwiftTask.xcodeproj/project.pbxproj b/SwiftTask.xcodeproj/project.pbxproj index cce4e98..4852c2f 100644 --- a/SwiftTask.xcodeproj/project.pbxproj +++ b/SwiftTask.xcodeproj/project.pbxproj @@ -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 */; }; @@ -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 = ""; }; 485C31F01A1D619A00040DA3 /* TypeInferenceTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TypeInferenceTests.swift; sourceTree = ""; }; + 48A0FC711A3A7B8B00FE2637 /* SwiftState.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = SwiftState.framework; sourceTree = ""; }; + 48A0FC741A3A7B8B00FE2637 /* SwiftState.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = SwiftState.framework; sourceTree = ""; }; 48CD5A0C19AEE3570042B9F1 /* SwiftTask.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SwiftTask.framework; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ @@ -55,6 +61,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 48A0FC7A1A3A7B8B00FE2637 /* SwiftState.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -62,6 +69,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 48A0FC801A3A7CAF00FE2637 /* SwiftState.framework in Frameworks */, 48A1E8221A366F9C007619EB /* SwiftTask.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -70,6 +78,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 48A0FC7F1A3A7CA900FE2637 /* SwiftState.framework in Frameworks */, 48A1E8231A366FA8007619EB /* SwiftTask.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -78,6 +87,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 48A0FC771A3A7B8B00FE2637 /* SwiftState.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -95,6 +105,7 @@ 1F46DECA199EDF1000F97868 = { isa = PBXGroup; children = ( + 48A0FC6F1A3A7B8B00FE2637 /* Carthage.build */, 1FA4631219A8D70A00DD8729 /* Vendor */, 1F46DED6199EDF1000F97868 /* SwiftTask */, 1F46DEE0199EDF1000F97868 /* SwiftTaskTests */, @@ -178,6 +189,31 @@ path = Source; sourceTree = ""; }; + 48A0FC6F1A3A7B8B00FE2637 /* Carthage.build */ = { + isa = PBXGroup; + children = ( + 48A0FC701A3A7B8B00FE2637 /* iOS */, + 48A0FC731A3A7B8B00FE2637 /* Mac */, + ); + path = Carthage.build; + sourceTree = ""; + }; + 48A0FC701A3A7B8B00FE2637 /* iOS */ = { + isa = PBXGroup; + children = ( + 48A0FC711A3A7B8B00FE2637 /* SwiftState.framework */, + ); + path = iOS; + sourceTree = ""; + }; + 48A0FC731A3A7B8B00FE2637 /* Mac */ = { + isa = PBXGroup; + children = ( + 48A0FC741A3A7B8B00FE2637 /* SwiftState.framework */, + ); + path = Mac; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXHeadersBuildPhase section */ @@ -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; @@ -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; @@ -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; }; @@ -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;