summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ios/Mapbox-iOS-SDK.podspec7
-rwxr-xr-xscripts/ios/framework.sh4
-rwxr-xr-xscripts/ios/package.sh3
3 files changed, 7 insertions, 7 deletions
diff --git a/ios/Mapbox-iOS-SDK.podspec b/ios/Mapbox-iOS-SDK.podspec
index 091dd33ad2..a470ff53a9 100644
--- a/ios/Mapbox-iOS-SDK.podspec
+++ b/ios/Mapbox-iOS-SDK.podspec
@@ -13,7 +13,7 @@ Pod::Spec.new do |m|
m.documentation_url = 'https://www.mapbox.com/ios-sdk/'
m.source = {
- :http => "https://mapbox.s3.amazonaws.com/mapbox-gl-native/ios/builds/mapbox-ios-sdk-#{m.version.to_s}.zip",
+ :http => "https://mapbox.s3.amazonaws.com/mapbox-gl-native/ios/builds/Mapbox.framework-#{m.version.to_s}.zip",
:flatten => true
}
@@ -23,9 +23,8 @@ Pod::Spec.new do |m|
m.requires_arc = true
m.preserve_paths = '**'
- m.source_files = 'Headers/*.h', 'MGLDummy.m'
- m.resource_bundle = { 'Mapbox' => 'Mapbox.bundle/*' }
- m.vendored_library = 'libMapbox.a'
+ m.resource_bundle = { 'Mapbox' => 'Mapbox.framework/Mapbox.bundle/*' }
+ m.vendored_frameworks = 'Mapbox.framework'
m.module_name = 'Mapbox'
m.frameworks = 'CoreLocation', 'GLKit', 'ImageIO', 'MobileCoreServices', 'QuartzCore', 'SystemConfiguration'
diff --git a/scripts/ios/framework.sh b/scripts/ios/framework.sh
index 1d1f755794..e2842a4707 100755
--- a/scripts/ios/framework.sh
+++ b/scripts/ios/framework.sh
@@ -18,6 +18,9 @@ cat ../../../../ios/framework/umbrella >> Mapbox.framework/Headers/Mapbox.h
# resources
cp -rv ../static/Mapbox.bundle Mapbox.framework/Mapbox.bundle
+# license
+cp -v ../../../../LICENSE.md Mapbox.framework
+
# settings bundle
cp -rv ../../../../ios/framework/Settings.bundle Mapbox.framework/Settings.bundle
@@ -31,6 +34,7 @@ cp -v ../../../../ios/framework/modulemap Mapbox.framework/Modules/module.module
# Info.plist
VERSION=$( git tag | grep ^ios | sed 's/^ios-//' | sort -r | grep -v '\-rc.' | grep -v '\-pre.' | sed -n '1p' | sed 's/^v//' )
+echo "Using $VERSION for Info.plist. Note that you will need to manually update the product for pre-releases or release candidates."
cp -v ../../../../ios/framework/Info.plist Mapbox.framework
perl -pi -e "s/#####/$VERSION/" Mapbox.framework/Info.plist
perl -pi -e "s/%%%%%/$VERSION/" Mapbox.framework/Info.plist
diff --git a/scripts/ios/package.sh b/scripts/ios/package.sh
index 41694c2f63..7f0fe447d1 100755
--- a/scripts/ios/package.sh
+++ b/scripts/ios/package.sh
@@ -103,9 +103,6 @@ for i in `ls -R include/mbgl/ios | grep -vi private`; do
cp -pv include/mbgl/ios/$i "${OUTPUT}/static/Headers"
done
-step "Setting up dummy source file for CocoaPods 0.37.0..."
-echo "// https://github.com/mapbox/mapbox-gl-native/issues/1426" > "${OUTPUT}/static/MGLDummy.m"
-
# Manually create resource bundle. We don't use a GYP target here because of
# complications between faked GYP bundles-as-executables, device build