From 0a417b021d6f61aa3f1f7269583bc1287960debe Mon Sep 17 00:00:00 2001 From: Brian Croom Date: Sat, 30 May 2015 16:50:07 -0400 Subject: [PATCH] Move Cartfile to fix nested dependency resolution --- .gitignore | 2 +- Example/Cartfile => Cartfile | 0 Example/Cartfile.resolved => Cartfile.resolved | 0 Example/BlindsidedStoryboard.xcodeproj/project.pbxproj | 6 +++--- 4 files changed, 4 insertions(+), 4 deletions(-) rename Example/Cartfile => Cartfile (100%) rename Example/Cartfile.resolved => Cartfile.resolved (100%) diff --git a/.gitignore b/.gitignore index f208f78..dbe4d3a 100644 --- a/.gitignore +++ b/.gitignore @@ -25,4 +25,4 @@ DerivedData Pods/ # Carthage -Example/Carthage/Checkouts +Carthage/Checkouts diff --git a/Example/Cartfile b/Cartfile similarity index 100% rename from Example/Cartfile rename to Cartfile diff --git a/Example/Cartfile.resolved b/Cartfile.resolved similarity index 100% rename from Example/Cartfile.resolved rename to Cartfile.resolved diff --git a/Example/BlindsidedStoryboard.xcodeproj/project.pbxproj b/Example/BlindsidedStoryboard.xcodeproj/project.pbxproj index f1e088f..3aecda6 100644 --- a/Example/BlindsidedStoryboard.xcodeproj/project.pbxproj +++ b/Example/BlindsidedStoryboard.xcodeproj/project.pbxproj @@ -60,7 +60,7 @@ 34B985BB1B1A4E3E00DE719D /* BlindsidedStoryboard.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = BlindsidedStoryboard.m; path = ../../Pod/Classes/BlindsidedStoryboard.m; sourceTree = ""; }; 34B985BC1B1A4E3E00DE719D /* BlindsidedStoryboard+CrossStoryboardSegues.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "BlindsidedStoryboard+CrossStoryboardSegues.h"; path = "../../Pod/Classes/BlindsidedStoryboard+CrossStoryboardSegues.h"; sourceTree = ""; }; 34B985BD1B1A4E3E00DE719D /* BlindsidedStoryboard+CrossStoryboardSegues.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "BlindsidedStoryboard+CrossStoryboardSegues.m"; path = "../../Pod/Classes/BlindsidedStoryboard+CrossStoryboardSegues.m"; sourceTree = ""; }; - 34B985C21B1A51F200DE719D /* Blindside.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Blindside.framework; path = Carthage/Build/iOS/Blindside.framework; sourceTree = ""; }; + 34B985C21B1A51F200DE719D /* Blindside.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Blindside.framework; path = ../Carthage/Build/iOS/Blindside.framework; sourceTree = ""; }; 6003F58A195388D20070C39A /* BlindsidedStoryboard_Example.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = BlindsidedStoryboard_Example.app; sourceTree = BUILT_PRODUCTS_DIR; }; 6003F58D195388D20070C39A /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; 6003F58F195388D20070C39A /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; }; @@ -552,7 +552,7 @@ ENABLE_STRICT_OBJC_MSGSEND = YES; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", - "$(PROJECT_DIR)/Carthage/Build/iOS", + "$(PROJECT_DIR)/../Carthage/Build/iOS", ); GCC_NO_COMMON_BLOCKS = YES; GCC_PREPROCESSOR_DEFINITIONS = ( @@ -585,7 +585,7 @@ ENABLE_STRICT_OBJC_MSGSEND = YES; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", - "$(PROJECT_DIR)/Carthage/Build/iOS", + "$(PROJECT_DIR)/../Carthage/Build/iOS", ); GCC_NO_COMMON_BLOCKS = YES; INFOPLIST_FILE = BlindsidedStoryboard/Info.plist;