Merge pull request #39 from uphold/bugfix/copy-frameworks

Fix copy frameworks
uphold · Apr 12, 2016 · 2f2ebe0 · 2f2ebe0
2 parents ea8170d + d331766
commit 2f2ebe0
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 41 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -8,7 +8,6 @@ env:
 
 before_script:
   - brew update
-  - brew install carthage
   - brew install swiftlint
   # Workaround to fix xctool issue #666(https://github.com/facebook/xctool/issues/666)
   - brew reinstall --HEAD xctool

diff --git a/UpholdSdk.xcodeproj/project.pbxproj b/UpholdSdk.xcodeproj/project.pbxproj
@@ -796,7 +796,6 @@
 				BC2381291BB462170060CC80 /* Headers */,
 				BC23812A1BB462170060CC80 /* Resources */,
 				BC62F2AE1BCE4EFA007E6FDB /* SwiftLint Run Script */,
-				BC91D9561BFCC385000207AD /* Carthage Dependencies Run Script */,
 				BCC9D7251C5643BA00671171 /* Environment Configuration Run Script */,
 			);
 			buildRules = (
@@ -857,7 +856,6 @@
 				BCC9D70F1C56377E00671171 /* Headers */,
 				BCC9D7101C56377E00671171 /* Resources */,
 				BCC9D7111C56377E00671171 /* SwiftLint Run Script */,
-				BCC9D7121C56377E00671171 /* Carthage Dependencies Run Script */,
 				BCC9D7261C5644F100671171 /* Environment Configuration Run Script */,
 			);
 			buildRules = (
@@ -952,25 +950,6 @@
 			shellPath = /bin/sh;
 			shellScript = "if which swiftlint >/dev/null; then\n    swiftlint\nelse\n    echo \"SwiftLint does not exist, download from https://github.com/realm/SwiftLint\"\nfi";
 		};
-		BC91D9561BFCC385000207AD /* Carthage Dependencies Run Script */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-				"$(SRCROOT)/Carthage/Build/iOS/KeychainSwift.framework",
-				"$(SRCROOT)/Carthage/Build/iOS/ObjectMapper.framework",
-				"$(SRCROOT)/Carthage/Build/iOS/SwiftClient.framework",
-				"$(SRCROOT)/Carthage/Build/iOS/PromiseKit.framework",
-				"$(SRCROOT)/Carthage/Build/iOS/OMGHTTPURLRQ.framework",
-			);
-			name = "Carthage Dependencies Run Script";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "/usr/local/bin/carthage copy-frameworks";
-		};
 		BC91D9571BFCC401000207AD /* Carthage Dependencies Run Script */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
@@ -1045,25 +1024,6 @@
 			shellPath = /bin/sh;
 			shellScript = "if which swiftlint >/dev/null; then\n    swiftlint\nelse\n    echo \"SwiftLint does not exist, download from https://github.com/realm/SwiftLint\"\nfi";
 		};
-		BCC9D7121C56377E00671171 /* Carthage Dependencies Run Script */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-				"$(SRCROOT)/Carthage/Build/iOS/KeychainSwift.framework",
-				"$(SRCROOT)/Carthage/Build/iOS/ObjectMapper.framework",
-				"$(SRCROOT)/Carthage/Build/iOS/SwiftClient.framework",
-				"$(SRCROOT)/Carthage/Build/iOS/PromiseKit.framework",
-				"$(SRCROOT)/Carthage/Build/iOS/OMGHTTPURLRQ.framework",
-			);
-			name = "Carthage Dependencies Run Script";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "/usr/local/bin/carthage copy-frameworks";
-		};
 		BCC9D7251C5643BA00671171 /* Environment Configuration Run Script */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;