Prep for telemetry 0.10.4 [skip ci]

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" "fred/carthage-fix"
+github "mapbox/mapbox-events-ios" ~> 0.10.4

Makefile

@@ -4,10 +4,6 @@ export TARGET_BRANCH ?= master
 
 CMAKE ?= cmake
 
-XCODE_VERSION := $(shell xcrun xcodebuild -version | head -1 | awk '{print $2}')
-BETA := $(if $(filter $(XCODE_VERSION),12.0),true,false)
-
-
 ifeq ($(BUILDTYPE), Release)
 else ifeq ($(BUILDTYPE), RelWithDebInfo)
 else ifeq ($(BUILDTYPE), Sanitize)

platform/ios/CHANGELOG.md

@@ -2,7 +2,13 @@
 
 Mapbox welcomes participation and contributions from everyone. Please read [CONTRIBUTING.md](../../CONTRIBUTING.md) to get started.
 
-## 6.2.0
+## master
+
+### 🔧 Dependencies
+
+* Removed Xcode 12/Carthage `lipo` error workaround by updating `mapbox-events-ios` to `~> 0.10.4`.([#458](https://github.com/mapbox/mapbox-gl-native-ios/pull/458))
+
+## 6.2.0 - September 17, 2020
 
 **This release supports iOS 14 and Xcode 12**
 
@@ -29,7 +35,7 @@ Mapbox welcomes participation and contributions from everyone. Please read [CONT
 ### 🔧 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`.
+* `mapbox-events-ios` versioning updated to `~> 0.10.3`.
 
 ## 6.1.0 - August 26, 2020
 

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/scripts/package.sh

@@ -10,8 +10,6 @@ DERIVED_DATA=build/ios
 PRODUCTS=${DERIVED_DATA}/Build/Products
 LOG_PATH=build/xcodebuild-$(date +"%Y-%m-%d_%H%M%S").log
 
-XCODE_VERSION=`xcrun xcodebuild -version | head -1 | awk '{print $2}'`
-
 BUILD_FOR_DEVICE=${BUILD_DEVICE:-true}
 BUILD_DOCS=${BUILD_DOCS:-true}
 SYMBOLS=${SYMBOLS:-YES}
@@ -79,16 +77,10 @@ if [[ ${BUILD_STATIC} == true ]]; then
 fi
 
 XCCONFIG=''
-if [[ "${XCODE_VERSION}" == "12.0" ]]; then
-    xcconfig='xcode-12-beta-fix.xcconfig'
-    echo "Xcode 12 detected, using ${xcconfig}"
+if [[ ! -z "${CI:=}" ]]; then
+    xcconfig='platform/darwin/ci.xcconfig'
+    echo "CI environment, using ${xcconfig}"
     XCCONFIG="-xcconfig ./${xcconfig}"
-else 
-    if [[ ! -z "${CI:=}" ]]; then
-        xcconfig='platform/darwin/ci.xcconfig'
-        echo "CI environment, using ${xcconfig}"
-        XCCONFIG="-xcconfig ./${xcconfig}"
-    fi
 fi
 
 mkdir -p build/ios