[ios] update podspecs and version

6 files changed, 12 insertions, 10 deletions

diff --git a/platform/ios/Mapbox-iOS-SDK-symbols.podspec b/platform/ios/Mapbox-iOS-SDK-symbols.podspec
index 6dacd98e21..f7328fa667 100644
--- a/platform/ios/Mapbox-iOS-SDK-symbols.podspec
+++ b/platform/ios/Mapbox-iOS-SDK-symbols.podspec
@@ -2,7 +2,7 @@ Pod::Spec.new do |m|
 
   version = '4.5.0-cn.1'
 
-  m.name    = 'Mapbox-iOS-SDK-symbols-cn'
+  m.name    = 'Mapbox-iOS-SDK-symbols'
   m.version = "#{version}-symbols"
 
   m.summary           = 'Open source vector map solution for iOS with full styling capabilities.'
diff --git a/platform/ios/Mapbox-iOS-SDK.podspec b/platform/ios/Mapbox-iOS-SDK.podspec
index 5ff7800ad5..2b111e4b3d 100644
--- a/platform/ios/Mapbox-iOS-SDK.podspec
+++ b/platform/ios/Mapbox-iOS-SDK.podspec
@@ -2,7 +2,7 @@ Pod::Spec.new do |m|
 
   version = '4.5.0-cn.1'
 
-  m.name    = 'Mapbox-iOS-SDK-cn'
+  m.name    = 'Mapbox-iOS-SDK'
   m.version = version
 
   m.summary           = 'Open source vector map solution for iOS with full styling capabilities.'
diff --git a/platform/ios/Release-CN.md b/platform/ios/Release-CN.md
index 1907b39a19..9a2d20c7fa 100644
--- a/platform/ios/Release-CN.md
+++ b/platform/ios/Release-CN.md
@@ -4,11 +4,13 @@ This branch is intended to exist as a branch off of of the main Maps SDK. There
 
 Before running this script, please check that you are authorized to upload to S3 in China. 
 
-1. Update the `IOS_SDK_VERSION` value in the `platform/ios/scripts/package.sh` file. Versioning will follow: `vX.X.X-cn.X` in order to keep this distinct from the main Maps SDK.
+1. Update the `IOS_SDK_VERSION` and `SEM_VERSION` values in the `platform/ios/scripts/package.sh` file. Versioning will follow: `vX.X.X-cn.X` in order to keep this distinct from the main Maps SDK.
 
 2. Update the SDK version in the podspec files.
 
-3. Run `platform/ios/scripts/publish-cn.sh`. This:
+3. Update the `RELEASE_VERSION` and `SHORT_VERSION` in `platform/ios/scripts/documentation.sh`.
+
+4. Run `platform/ios/scripts/publish-cn.sh`. This:
   - Builds `Mapbox.framework` and a companion dSYM file.
   - Generates documentation.
   - Uploads a .zip file containing the framework and documentation to S3 China.
\ No newline at end of file
diff --git a/platform/ios/scripts/document.sh b/platform/ios/scripts/document.sh
index 99c8967aa1..e130e75a67 100755
--- a/platform/ios/scripts/document.sh
+++ b/platform/ios/scripts/document.sh
@@ -27,8 +27,8 @@ fi
 OUTPUT=${OUTPUT:-documentation}
 
 BRANCH=$( git describe --tags --match=ios-v*.*.* --abbrev=0 )
-SHORT_VERSION=$( echo ${BRANCH} | sed 's/^ios-v//' )
-RELEASE_VERSION=$( echo ${SHORT_VERSION} | sed -e 's/^ios-v//' -e 's/-.*//' )
+SHORT_VERSION="4.5.0-cn.1"
+RELEASE_VERSION="4.5.0-cn.1"
 
 rm -rf /tmp/mbgl
 mkdir -p /tmp/mbgl/
diff --git a/platform/ios/scripts/package.sh b/platform/ios/scripts/package.sh
index eba7e86722..8920cae21f 100755
--- a/platform/ios/scripts/package.sh
+++ b/platform/ios/scripts/package.sh
@@ -9,7 +9,7 @@ DERIVED_DATA=build/ios
 PRODUCTS=${DERIVED_DATA}
 LOG_PATH=build/xcodebuild-$(date +"%Y-%m-%d_%H%M%S").log
 
-BUILDTYPE=${BUILDTYPE:-Debug}
+BUILDTYPE=${BUILDTYPE:-Release}
 BUILD_FOR_DEVICE=${BUILD_DEVICE:-true}
 SYMBOLS=${SYMBOLS:-YES}
 
@@ -55,7 +55,7 @@ echo ${HASH}
 echo ${HASH} >> ${VERSION}
 
 PROJ_VERSION=$(git rev-list --count HEAD)
-SEM_VERSION=$( git describe --tags --match=ios-v*.*.* --abbrev=0 | sed 's/^ios-v//' )
+SEM_VERSION="4.5.0-cn.1"
 SHORT_VERSION=${SEM_VERSION%-*}
 
 step "Building targets (build ${PROJ_VERSION}, version ${SEM_VERSION})"
diff --git a/platform/ios/scripts/publish-cn.sh b/platform/ios/scripts/publish-cn.sh
index 2d2982459c..74746e6fb3 100755
--- a/platform/ios/scripts/publish-cn.sh
+++ b/platform/ios/scripts/publish-cn.sh
@@ -24,7 +24,7 @@ echo "finished!"
 # zip
 #
 cd build/ios/pkg
-ZIP="mapbox-ios-sdk-cn.zip"
+ZIP="mapbox-ios-sdk-4.5.0-cn.1.zip"
 step "Compressing ${ZIP}…"
 rm -f ../${ZIP}
 zip -yr ../${ZIP} *
@@ -49,5 +49,5 @@ step "Uploading ${ZIP} to s3…"
 
 # Since this build is primarily for .CN customers, it will be hosted on .cn. 
 
-aws s3 cp ../${ZIP} s3://binary.mapbox.cn/ios/builds/maps-sdk/ --acl public-read ${PROGRESS}
+aws s3 cp ../${ZIP} https://s3.cn-north-1.amazonaws.com.cn/binary.mapbox.cn/${ZIP} --acl public-read ${PROGRESS}
 echo "URL:  https://s3.cn-north-1.amazonaws.com.cn/binary.mapbox.cn/${ZIP}"