Cherry pick 458 into release-z (#460)

* Support Xcode 12 by excluding arm64 simulators and bumping Telemetry to 0.10.4 (#458)

* [test] Test build fix with MME 0.10.3 with Xcode 12

* Prep for telemetry 0.10.4 [skip ci]

* Some additional tweaks. [skip ci]

* Add Excluded archs

* Update telemetry to 0.10.4

* Remove change log entries introduced from gl-native 5.0.0

* Bump build number

* Cleaned up change log

* Re-add constrain mode.

Co-authored-by: Julian Rex <julian.rex@mapbox.com>

* Trigger build

Co-authored-by: Sudarsana Babu Nagineni <sudarsana.babu@mapbox.com>
Co-authored-by: Julian Rex <julian.rex@mapbox.com>

Author: 3 people

Cartfile

@@ -1,2 +1,2 @@
-binary "https://api.mapbox.com/downloads/v2/carthage/mobile-maps-gl-core/mapbox-ios-sdk-gl-core-static.json" == 5.0.1
-github "mapbox/mapbox-events-ios" ~> 0.10.2
+binary "https://api.mapbox.com/downloads/v2/carthage/mobile-maps-gl-core/mapbox-ios-sdk-gl-core-static.json" == 4.0.0
+github "mapbox/mapbox-events-ios" ~> 0.10.4

Cartfile.resolved

@@ -1,2 +1,2 @@
-binary "https://api.mapbox.com/downloads/v2/carthage/mobile-maps-gl-core/mapbox-ios-sdk-gl-core-static.json" "5.0.1"
-github "mapbox/mapbox-events-ios" "v0.10.3"
+binary "https://api.mapbox.com/downloads/v2/carthage/mobile-maps-gl-core/mapbox-ios-sdk-gl-core-static.json" "4.0.0"
+github "mapbox/mapbox-events-ios" "v0.10.4"

Makefile

@@ -4,7 +4,6 @@ export TARGET_BRANCH ?= master
 
 CMAKE ?= cmake
 
-
 ifeq ($(BUILDTYPE), Release)
 else ifeq ($(BUILDTYPE), RelWithDebInfo)
 else ifeq ($(BUILDTYPE), Sanitize)
@@ -142,13 +141,9 @@ ifneq ($(SKIP_TESTING),)
 	IOS_XCODEBUILD_SIM += -skip-testing:$(SKIP_TESTING)
 endif
 
-ifeq ($(BETA),true)
-	IOS_XCODEBUILD_SIM += -xcconfig xcode-beta-3-build-fix.xcconfig
-else	
 ifneq ($(CI),)
 	IOS_XCODEBUILD_SIM += -xcconfig platform/darwin/ci.xcconfig
 endif
-endif
 
 $(IOS_OUTPUT_PATH):
 	mkdir -p $@
@@ -157,12 +152,7 @@ $(NETRC_FILE):
 	@echo "$$NETRC" > $(NETRC_FILE)
 
 $(CARTHAGE_DEPS): $(NETRC_FILE) | $(IOS_OUTPUT_PATH)
-ifeq ($(BETA),true)
-	@echo "Beta Xcode - applying Carthage workaround"
-	XCODE_XCCONFIG_FILE=$(CURDIR)/xcode-beta-3-build-fix.xcconfig carthage bootstrap --platform iOS --use-netrc
-else	
 	carthage bootstrap --platform iOS --use-netrc
-endif	
 	@echo "Finishing bootstrapping"
 
 $(IOS_USER_DATA_PATH)/WorkspaceSettings.xcsettings: platform/ios/WorkspaceSettings.xcsettings
@@ -333,5 +323,8 @@ clean:
 
 .PHONY: distclean
 distclean: clean
-	-rm -rf ./mason_packages
+	-rm Cartfile.resolved
+	-rm -rf Carthage \
+			~/Library/Caches/carthage \
+			~/Library/Caches/org.carthage.kit
 	-rm -rf ./node_modules

platform/ios/CHANGELOG.md

@@ -2,33 +2,33 @@
 
 Mapbox welcomes participation and contributions from everyone. Please read [CONTRIBUTING.md](../../CONTRIBUTING.md) to get started.
 
-## 6.2.0
+## 6.2.0 - September 17, 2020
 
 **This release supports iOS 14 and Xcode 12**
+For building with Xcode 12, please ensure that mapbox-events-ios is at version 0.10.4 or higher. Please see our [dependency instructions](https://docs.mapbox.com/ios/maps/overview/#add-the-dependency) for more details. This version does not support Apple Silicon Macs (arm64).
 
 ### ✨ New features
 
 * Added `MGLLocationManager.accuracyAuthorization` to check the level of accuracy the app is allowed to support. ([#361](https://github.com/mapbox/mapbox-gl-native-ios/pull/361))
-* Added `[MGLLocationManager requestTemporaryFullAccuracyAuthorizationWithPurposeKeyproperty:]` to allow developers request just-in-time full-accuracy permissions. ([#361](https://github.com/mapbox/mapbox-gl-native-ios/pull/361))
+* Added `[MGLLocationManager requestTemporaryFullAccuracyAuthorizationWithPurposeKey:]` to allow developers request just-in-time full-accuracy permissions. ([#361](https://github.com/mapbox/mapbox-gl-native-ios/pull/361))
 * Added `[MGLLocationManagerDelegate locationManagerDidChangeAuthorization:]` to let `MGLMapView` know about privacy changes. ([#376](https://github.com/mapbox/mapbox-gl-native-ios/pull/376))
 * Added `[MGLMapViewDelegate mapView:didChangeLocationManagerAuthorization:]` to allow developers adjust their apps to privacy settings changes. ([#376](https://github.com/mapbox/mapbox-gl-native-ios/pull/376))
 * Added an approximate user location halo when `MGLLocationManager.accuracyAuthorization` is set to `CLAccuracyAuthorizationReducedAccuracy`. ([#381](https://github.com/mapbox/mapbox-gl-native-ios/pull/381))
 * The `MGLAccuracyAuthorizationDescription` as element of `NSLocationTemporaryUsageDescriptionDictionary` Info.plist key can now be set to describe why you request accuracy authorization. ([#392](https://github.com/mapbox/mapbox-gl-native-ios/pull/392))
 * Added `[MGLMapViewDelegate mapViewStyleForDefaultUserLocationAnnotationView:]` and `MGLUserLocationAnnotationViewStyle` class to allow developers customize the default user location annotation view UI style. ([#403](https://github.com/mapbox/mapbox-gl-native-ios/pull/403))
 * Added `MGLNetworkConfiguration.connected` property to enforce `MGLMapView` to use cached tiles. ([#416](https://github.com/mapbox/mapbox-gl-native-ios/pull/416))
-* Enabled local glyph rasterization for all writing systems. The new feature uses real glyph metrics and improves rendering quality for mixed (Latin / CJKV) labels. (#561)
-* Minimum and Maximum allowed values are now considered for style layer properties, as defined by the specification. Tf a style property is assigned with a value outside the allowed range, the property gets assigned with its default value instead. (#647)
-* Fixed an issue that caused ornaments to consider safe areas when `MGLMapView.automaticallyAdjustsContentInset` is set to `NO`. ([#420](https://github.com/mapbox/mapbox-gl-native-ios/pull/420))
 
 ### 🐞 Bug fixes
 
-* Fixed an issue where the map would hang periodically (on iOS 14 beta). ([#411](https://github.com/mapbox/mapbox-gl-native-ios/pull/411))
-* Fixed a sporadic crash when the application "resigns active", for example, when showing Control Center. ([#412](https://github.com/mapbox/mapbox-gl-native-ios/pull/412))
+* Fixed an issue where the map would hang periodically (on iOS 14). ([#411](https://github.com/mapbox/mapbox-gl-native-ios/pull/411))
+* Fixed a sporadic crash when the application "resigns active", for example, when showing Control Center. ([#412](https://github.com/mapbox/mapbox-gl-native-ios/pull/412)) 
+* Fixed an issue that caused ornaments to consider safe areas when `MGLMapView.automaticallyAdjustsContentInset` is set to `NO`. ([#420](https://github.com/mapbox/mapbox-gl-native-ios/pull/420))
+* Fixed an issue that caused rendering crashes when entering the background. ([#432](https://github.com/mapbox/mapbox-gl-native-ios/pull/432))
 
 ### 🔧 Dependencies
 
-* Core library updated to `5.0.1`. ([#438](https://github.com/mapbox/mapbox-gl-native-ios/pull/453))
-* `mapbox-events-ios` versioning updated to `~> 0.10.2`.
+* Supported Xcode 12 by updating `mapbox-events-ios` to `~> 0.10.4`.([#458](https://github.com/mapbox/mapbox-gl-native-ios/pull/458))
+* Core library updated to `4.0.0`. ([#458](https://github.com/mapbox/mapbox-gl-native-ios/pull/458))
 
 ## 6.1.0 - August 26, 2020
 

platform/ios/Integration Test Harness/Info.plist

@@ -19,7 +19,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>6.2.0</string>
 	<key>CFBundleVersion</key>
-	<string>15269</string>
+	<string>15270</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>UILaunchStoryboardName</key>

platform/ios/Integration Tests/Info.plist

@@ -17,6 +17,6 @@
 	<key>CFBundleShortVersionString</key>
 	<string>6.2.0</string>
 	<key>CFBundleVersion</key>
-	<string>15269</string>
+	<string>15270</string>
 </dict>
 </plist>

platform/ios/Mapbox-iOS-SDK-snapshot-dynamic.podspec

@@ -29,6 +29,6 @@ Pod::Spec.new do |m|
 
   m.preserve_path = '**/*.bcsymbolmap'
 
-  m.dependency "MapboxMobileEvents", "~> 0.10.2"
+  m.dependency "MapboxMobileEvents", "~> 0.10.4"
 
 end

platform/ios/Mapbox-iOS-SDK-stripped.podspec

@@ -29,6 +29,6 @@ Pod::Spec.new do |m|
 
   m.preserve_path = '**/*.bcsymbolmap'
 
-  m.dependency "MapboxMobileEvents", "~> 0.10.2"
+  m.dependency "MapboxMobileEvents", "~> 0.10.4"
 
 end

platform/ios/Mapbox-iOS-SDK.podspec

@@ -29,5 +29,5 @@ Pod::Spec.new do |m|
 
   m.preserve_path = '**/*.bcsymbolmap'
 
-  m.dependency "MapboxMobileEvents", "~> 0.10.2"
+  m.dependency "MapboxMobileEvents", "~> 0.10.4"
 end

platform/ios/app/Info.plist

@@ -21,7 +21,7 @@
 	<key>CFBundleSignature</key>
 	<string>MBGL</string>
 	<key>CFBundleVersion</key>
-	<string>15269</string>
+	<string>15270</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSLocationTemporaryUsageDescriptionDictionary</key>