diff options
| author | Jason Wray <jason@mapbox.com> | 2018-01-18 16:13:56 -0500 |
|---|---|---|
| committer | Jason Wray <jason@mapbox.com> | 2018-01-19 10:25:17 -0500 |
| commit | 7c2e8c5eb1cda536be73e97afbc4b5276735fb51 (patch) | |
| tree | 971068f10aefb3c4f6862939f6f9190418d65ba9 | |
| parent | fa5722479100875778d07427d817cd3c64d7aeca (diff) | |
| download | qtlocation-mapboxgl-7c2e8c5eb1cda536be73e97afbc4b5276735fb51.tar.gz | |
[ios] Remove support for 32-bit simulators (i386)
And restore some docs that got lost in a merge.
| -rw-r--r-- | platform/ios/CHANGELOG.md | 4 | ||||
| -rw-r--r-- | platform/ios/INSTALL.md | 6 | ||||
| -rwxr-xr-x | platform/ios/scripts/package.sh | 7 |
3 files changed, 9 insertions, 8 deletions
diff --git a/platform/ios/CHANGELOG.md b/platform/ios/CHANGELOG.md index 0172ad7afb..d71acd70ad 100644 --- a/platform/ios/CHANGELOG.md +++ b/platform/ios/CHANGELOG.md @@ -4,6 +4,10 @@ Mapbox welcomes participation and contributions from everyone. Please read [CONT ## master +### Packaging + +* Removed support for 32-bit simulators. ([#10962](https://github.com/mapbox/mapbox-gl-native/pull/10962)) + ### Styles and rendering * Added `MGLComputedShapeSource` source class that allows applications to supply vector data on a per-tile basis. diff --git a/platform/ios/INSTALL.md b/platform/ios/INSTALL.md index f8cd7b3754..3aef7db6f4 100644 --- a/platform/ios/INSTALL.md +++ b/platform/ios/INSTALL.md @@ -10,9 +10,11 @@ The Mapbox Maps SDK for iOS is intended to run on iOS 8.0 and above on the follo * iPad 2 and above (3, 4, Mini, Air, Mini 2, Air 2, Pro) * iPod touch 5th generation and above -Note that debugging in 32-bit simulators (such as the iPhone 5 or iPad 2) is only partially supported. Support for these simulators will be removed entirely in a future release of this SDK. +Note that 32-bit simulators (such as the iPhone 5 or iPad 2) are not supported. -The Mapbox Maps SDK for iOS requires Xcode 8.0 or higher. To use this SDK with Xcode 7.3.1, download and use a symbols build from the [releases](https://github.com/mapbox/mapbox-gl-native/releases) page. +The Mapbox Maps SDK for iOS requires: + +* Xcode 9.1 or higher to compile from source * Xcode 8.0 or higher to integrate the compiled framework into an application ### Building the SDK diff --git a/platform/ios/scripts/package.sh b/platform/ios/scripts/package.sh index 31285182a7..6df1b687b4 100755 --- a/platform/ios/scripts/package.sh +++ b/platform/ios/scripts/package.sh @@ -70,7 +70,7 @@ xcodebuild \ CURRENT_SHORT_VERSION=${SHORT_VERSION} \ CURRENT_SEMANTIC_VERSION=${SEM_VERSION} \ CURRENT_COMMIT_HASH=${HASH} \ - ONLY_ACTIVE_ARCH=NO \ + ARCHS="x86_64" \ -derivedDataPath ${DERIVED_DATA} \ -workspace ./platform/ios/ios.xcworkspace \ -scheme ${SCHEME} \ @@ -194,11 +194,6 @@ if [[ ${BUILD_DYNAMIC} == true && ${BUILDTYPE} == Release ]]; then validate_dsym \ "${OUTPUT}/dynamic/${NAME}.framework.dSYM/Contents/Resources/DWARF/${NAME}" \ "${OUTPUT}/dynamic/${NAME}.framework/${NAME}" - - # To-do: remove this in 4.0.0, as we intend to remove support for i386 entirely. - step "Removing i386 slice from dSYM" - lipo -remove i386 "${OUTPUT}/dynamic/${NAME}.framework.dSYM/Contents/Resources/DWARF/${NAME}" -o "${OUTPUT}/dynamic/${NAME}.framework.dSYM/Contents/Resources/DWARF/${NAME}" - lipo -info "${OUTPUT}/dynamic/${NAME}.framework.dSYM/Contents/Resources/DWARF/${NAME}" fi function create_podspec { |