Merge pull request #1 from Autoc0diq/carthage

Carthage compatibility for Mapbox 3.1.2

Gemfile.lock

@@ -1,7 +1,7 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.2.5)
+    activesupport (4.2.6)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -30,8 +30,9 @@ GEM
     cocoapods-downloader (0.9.3)
     cocoapods-plugins (0.4.2)
       nap
-    cocoapods-rome (0.3.0)
+    cocoapods-rome (0.4.2)
       cocoapods (>= 0.38.0)
+      fourflusher (~> 0.3.0)
     cocoapods-search (0.1.0)
     cocoapods-stats (0.6.2)
     cocoapods-trunk (0.6.4)
@@ -40,12 +41,13 @@ GEM
     cocoapods-try (0.5.1)
     colored (1.2)
     escape (0.0.4)
+    fourflusher (0.3.0)
     fuzzy_match (2.0.4)
     i18n (0.7.0)
     json (1.8.3)
-    minitest (5.8.3)
-    molinillo (0.4.0)
-    nap (1.0.0)
+    minitest (5.8.4)
+    molinillo (0.4.4)
+    nap (1.1.0)
     netrc (0.7.8)
     thread_safe (0.3.5)
     tzinfo (1.2.2)
@@ -61,3 +63,6 @@ PLATFORMS
 DEPENDENCIES
   cocoapods
   cocoapods-rome
+
+BUNDLED WITH
+   1.11.2

Mapbox.xcodeproj/project.pbxproj

@@ -0,0 +1,188 @@
+// !$*UTF8*$!
+{
+	archiveVersion = 1;
+	classes = {
+	};
+	objectVersion = 46;
+	objects = {
+
+/* Begin PBXFileReference section */
+		E49374151C90C8FA00A94596 /* Mapbox.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Mapbox.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		E49374211C90C94500A94596 /* Mapbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Mapbox.framework; path = "Pods/Mapbox-iOS-SDK/dynamic/Mapbox.framework"; sourceTree = "<group>"; };
+/* End PBXFileReference section */
+
+/* Begin PBXGroup section */
+		E493740B1C90C8FA00A94596 = {
+			isa = PBXGroup;
+			children = (
+				E49374211C90C94500A94596 /* Mapbox.framework */,
+				E49374161C90C8FA00A94596 /* Products */,
+			);
+			sourceTree = "<group>";
+		};
+		E49374161C90C8FA00A94596 /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				E49374151C90C8FA00A94596 /* Mapbox.framework */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+/* End PBXGroup section */
+
+/* Begin PBXNativeTarget section */
+		E49374141C90C8FA00A94596 /* Mapbox */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = E493741D1C90C8FA00A94596 /* Build configuration list for PBXNativeTarget "Mapbox" */;
+			buildPhases = (
+				E49374231C90D37000A94596 /* Replace Framework */,
+				E49374241C90D61B00A94596 /* Strip Invalid Architectures */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = Mapbox;
+			productName = Mapbox;
+			productReference = E49374151C90C8FA00A94596 /* Mapbox.framework */;
+			productType = "com.apple.product-type.framework";
+		};
+/* End PBXNativeTarget section */
+
+/* Begin PBXProject section */
+		E493740C1C90C8FA00A94596 /* Project object */ = {
+			isa = PBXProject;
+			attributes = {
+				LastUpgradeCheck = 0720;
+				ORGANIZATIONNAME = "Automatic Labs";
+				TargetAttributes = {
+					E49374141C90C8FA00A94596 = {
+						CreatedOnToolsVersion = 7.2.1;
+					};
+				};
+			};
+			buildConfigurationList = E493740F1C90C8FA00A94596 /* Build configuration list for PBXProject "Mapbox" */;
+			compatibilityVersion = "Xcode 3.2";
+			developmentRegion = English;
+			hasScannedForEncodings = 0;
+			knownRegions = (
+				en,
+			);
+			mainGroup = E493740B1C90C8FA00A94596;
+			productRefGroup = E49374161C90C8FA00A94596 /* Products */;
+			projectDirPath = "";
+			projectRoot = "";
+			targets = (
+				E49374141C90C8FA00A94596 /* Mapbox */,
+			);
+		};
+/* End PBXProject section */
+
+/* Begin PBXShellScriptBuildPhase section */
+		E49374231C90D37000A94596 /* Replace Framework */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+			);
+			name = "Replace Framework";
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "rm -rf $BUILT_PRODUCTS_DIR/Mapbox.framework\ncp -R Pods/Mapbox-iOS-SDK/dynamic/Mapbox.framework $BUILT_PRODUCTS_DIR";
+		};
+		E49374241C90D61B00A94596 /* Strip Invalid Architectures */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+				$BUILT_PRODUCTS_DIR/Mapbox.framework,
+			);
+			name = "Strip Invalid Architectures";
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "# This script strips all non-valid architectures from dynamic libraries in\n# the build output directory.\n#\n# This is required since the framework is being replaced\n# with a fat binary in the previous run script, otherwise carthage\n# would fail during its fat binary creation phase due to similar\n# architectures.\n#\n#\n# The following environment variables are required:\n#\n# BUILT_PRODUCTS_DIR\n# VALID_ARCHS\n# EXPANDED_CODE_SIGN_IDENTITY\n\n\n# Signs a framework with the provided identity\ncode_sign() {\n    # Use the current code_sign_identitiy\n    echo \"Code Signing $1 with Identity ${EXPANDED_CODE_SIGN_IDENTITY_NAME}\"\n    echo \"/usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} --preserve-metadata=identifier,entitlements $1\"\n    /usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} --preserve-metadata=identifier,entitlements \"$1\"\n}\n\necho \"Stripping frameworks\"\ncd \"${BUILT_PRODUCTS_DIR}\"\n\nfor file in $(find . -type f -perm +111); do\n    # Skip non-dynamic libraries\n    if ! [[ \"$(file \"$file\")\" == *\"dynamically linked shared library\"* ]]; then\n        continue\n    fi\n    # Get architectures for current file\n    archs=\"$(lipo -info \"${file}\" | rev | cut -d ':' -f1 | rev)\"\n    stripped=\"\"\n    for arch in $archs; do\n        if ! [[ \"${VALID_ARCHS}\" == *\"$arch\"* ]]; then\n            # Strip non-valid architectures in-place\n            lipo -remove \"$arch\" -output \"$file\" \"$file\" || exit 1\n            stripped=\"$stripped $arch\"\n        fi\n    done\n    if [[ \"$stripped\" != \"\" ]]; then\n        echo \"Stripped $file of architectures:$stripped\"\n        if [ \"${CODE_SIGNING_REQUIRED}\" == \"YES\" ]; then\n            code_sign \"${file}\"\n        fi\n    fi\ndone";
+		};
+/* End PBXShellScriptBuildPhase section */
+
+/* Begin XCBuildConfiguration section */
+		E493741B1C90C8FA00A94596 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				CURRENT_PROJECT_VERSION = 1;
+				SDKROOT = iphoneos;
+				VERSION_INFO_PREFIX = "";
+			};
+			name = Debug;
+		};
+		E493741C1C90C8FA00A94596 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				CURRENT_PROJECT_VERSION = 1;
+				SDKROOT = iphoneos;
+				VERSION_INFO_PREFIX = "";
+			};
+			name = Release;
+		};
+		E493741E1C90C8FA00A94596 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				DYLIB_COMPATIBILITY_VERSION = 1;
+				DYLIB_CURRENT_VERSION = 1;
+				DYLIB_INSTALL_NAME_BASE = "@rpath";
+				INFOPLIST_FILE = Mapbox/Info.plist;
+				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				PRODUCT_BUNDLE_IDENTIFIER = com.automatic.Mapbox;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SKIP_INSTALL = YES;
+			};
+			name = Debug;
+		};
+		E493741F1C90C8FA00A94596 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				DYLIB_COMPATIBILITY_VERSION = 1;
+				DYLIB_CURRENT_VERSION = 1;
+				DYLIB_INSTALL_NAME_BASE = "@rpath";
+				INFOPLIST_FILE = Mapbox/Info.plist;
+				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				PRODUCT_BUNDLE_IDENTIFIER = com.automatic.Mapbox;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SKIP_INSTALL = YES;
+			};
+			name = Release;
+		};
+/* End XCBuildConfiguration section */
+
+/* Begin XCConfigurationList section */
+		E493740F1C90C8FA00A94596 /* Build configuration list for PBXProject "Mapbox" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				E493741B1C90C8FA00A94596 /* Debug */,
+				E493741C1C90C8FA00A94596 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		E493741D1C90C8FA00A94596 /* Build configuration list for PBXNativeTarget "Mapbox" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				E493741E1C90C8FA00A94596 /* Debug */,
+				E493741F1C90C8FA00A94596 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+/* End XCConfigurationList section */
+	};
+	rootObject = E493740C1C90C8FA00A94596 /* Project object */;
+}

Pods/Pods.xcodeproj/xcshareddata/xcschemes/Pods-Mapbox-iOS-SDK.xcscheme → Mapbox.xcodeproj/xcshareddata/xcschemes/Mapbox.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0700"
+   LastUpgradeVersion = "0720"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -14,10 +14,10 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "2A7F27BFA9E932AF15C9A6054499A39E"
+               BlueprintIdentifier = "E49374141C90C8FA00A94596"
                BuildableName = "Mapbox.framework"
-               BlueprintName = "Pods-Mapbox-iOS-SDK"
-               ReferencedContainer = "container:Pods.xcodeproj">
+               BlueprintName = "Mapbox"
+               ReferencedContainer = "container:Mapbox.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
       </BuildActionEntries>
@@ -45,10 +45,10 @@
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "2A7F27BFA9E932AF15C9A6054499A39E"
+            BlueprintIdentifier = "E49374141C90C8FA00A94596"
             BuildableName = "Mapbox.framework"
-            BlueprintName = "Pods-Mapbox-iOS-SDK"
-            ReferencedContainer = "container:Pods.xcodeproj">
+            BlueprintName = "Mapbox"
+            ReferencedContainer = "container:Mapbox.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
       <AdditionalOptions>
@@ -60,6 +60,15 @@
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
       debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "E49374141C90C8FA00A94596"
+            BuildableName = "Mapbox.framework"
+            BlueprintName = "Mapbox"
+            ReferencedContainer = "container:Mapbox.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
    </ProfileAction>
    <AnalyzeAction
       buildConfiguration = "Debug">

Mapbox/Info.plist

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>en</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>FMWK</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
+	<key>NSPrincipalClass</key>
+	<string></string>
+</dict>
+</plist>

Podfile.lock

@@ -1,10 +1,10 @@
 PODS:
-  - Mapbox-iOS-SDK (3.0.0)
+  - Mapbox-iOS-SDK (3.1.2)
 
 DEPENDENCIES:
   - Mapbox-iOS-SDK
 
 SPEC CHECKSUMS:
-  Mapbox-iOS-SDK: 5e7bafc554a15ebfc615d8b0fa0a0b5d31faac70
+  Mapbox-iOS-SDK: 0a910c2cce1aa8cff5b9ec2a990e7a32332a776a
 
 COCOAPODS: 0.39.0