Merge branch 'master' of https://github.com/tristanhimmelman/Alamofir…

…e-ObjectMapper
tristanhimmelman · Jul 9, 2015 · 864a72a · 864a72a
2 parents 4b8baa3 + dc6fda6
commit 864a72a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 19 deletions.
diff --git a/AlamofireObjectMapper.xcodeproj/project.pbxproj b/AlamofireObjectMapper.xcodeproj/project.pbxproj
@@ -198,7 +198,6 @@
 				6AB2A00C1AF26C36001EBB20 /* Sources */,
 				6AB2A00D1AF26C36001EBB20 /* Frameworks */,
 				6AB2A00E1AF26C36001EBB20 /* Headers */,
-				6A905E411B067F8100884083 /* ShellScript */,
 			);
 			buildRules = (
 			);
@@ -322,24 +321,6 @@
 		};
 /* End PBXResourcesBuildPhase section */
 
-/* Begin PBXShellScriptBuildPhase section */
-		6A905E411B067F8100884083 /* ShellScript */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-				"$(SRCROOT)/Carthage/Build/iOS/Alamofire.framework",
-				"$(SRCROOT)/Carthage/Build/iOS/ObjectMapper.framework",
-			);
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "/usr/local/bin/carthage copy-frameworks";
-		};
-/* End PBXShellScriptBuildPhase section */
-
 /* Begin PBXSourcesBuildPhase section */
 		6AB2A00C1AF26C36001EBB20 /* Sources */ = {
 			isa = PBXSourcesBuildPhase;

diff --git a/README.md b/README.md
@@ -1,5 +1,7 @@
 AlamofireObjectMapper
 ============
+[![CocoaPods](https://img.shields.io/cocoapods/v/AlamofireObjectMapper.svg)](https://github.com/tristanhimmelman/AlamofireObjectMapper)
+[![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage)
 
 An extension to [Alamofire](https://github.com/Alamofire/Alamofire) which automatically converts JSON response data into swift objects using [ObjectMapper](https://github.com/Hearst-DD/ObjectMapper/).