Skip to content
This repository has been archived by the owner on Aug 8, 2023. It is now read-only.

Commit

Permalink
Merge tag 'ios-v4.0.2' into master
Browse files Browse the repository at this point in the history
 Conflicts:
	mapbox-gl-js
	platform/android/CHANGELOG.md
	platform/android/gradle/dependencies.gradle
	platform/ios/CHANGELOG.md
	platform/ios/Mapbox-iOS-SDK-nightly-dynamic.podspec
	platform/ios/Mapbox-iOS-SDK-symbols.podspec
	platform/ios/Mapbox-iOS-SDK.podspec
	platform/node/test/ignores.json
	src/mbgl/geometry/feature_index.cpp
	src/mbgl/geometry/feature_index.hpp
	src/mbgl/layout/symbol_layout.cpp
  • Loading branch information
friedbunny committed May 30, 2018
2 parents 83ebd5f + 43efd61 commit e67f0be
Show file tree
Hide file tree
Showing 12 changed files with 57 additions and 261 deletions.
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
"pixelmatch": "^4.0.2",
"pngjs": "^3.0.0",
"request": "^2.72.0",
"semver": "^5.5.0",
"tape": "^4.5.1"
},
"engines": {
Expand Down
5 changes: 5 additions & 0 deletions platform/ios/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,11 @@ Mapbox welcomes participation and contributions from everyone. Please read [CONT
* Added custom `-hitTest:withEvent:` to `MGLSMCalloutView` to avoid registering taps in transparent areas of the standard annotation callout. ([#11939](https://github.com/mapbox/mapbox-gl-native/pull/11939))
* Improved performance and memory impact of `MGLScaleBar`. ([#11921](https://github.com/mapbox/mapbox-gl-native/pull/11921))

## 4.0.2 - May 29, 2018

* Fixed a crash when constant expressions were used for style properties that didn't support data-driven styling. ([#11960](https://github.com/mapbox/mapbox-gl-native/issues/11960))
* Improved symbol querying. ([#11571](https://github.com/mapbox/mapbox-gl-native/pull/11571), [#11742](https://github.com/mapbox/mapbox-gl-native/pull/11742))

## 4.0.1 - May 14, 2018

### Packaging
Expand Down
25 changes: 0 additions & 25 deletions platform/ios/scripts/add-key.sh

This file was deleted.

Binary file removed platform/ios/scripts/apple.crt
Binary file not shown.
16 changes: 0 additions & 16 deletions platform/ios/scripts/benchmark.sh

This file was deleted.

5 changes: 4 additions & 1 deletion platform/ios/scripts/deploy-packages.sh
Original file line number Diff line number Diff line change
Expand Up @@ -95,17 +95,20 @@ git checkout ${VERSION_TAG}
step "Deploying version ${PUBLISH_VERSION}"

make clean && make distclean
npm install --ignore-scripts
mkdir -p ${BINARY_DIRECTORY}

if [[ "${GITHUB_RELEASE}" == true ]]; then
step "Create GitHub release…"
if [[ $( echo ${PUBLISH_VERSION} | awk '/[0-9]-/' ) ]]; then
PUBLISH_PRE_FLAG='--pre-release'
fi
RELEASE_NOTES=$( ./platform/ios/scripts/release-notes.js )
github-release release \
--tag "ios-v${PUBLISH_VERSION}" \
--name "ios-v${PUBLISH_VERSION}" \
--draft ${PUBLISH_PRE_FLAG}
--draft ${PUBLISH_PRE_FLAG} \
--description "${RELEASE_NOTES}"
fi

buildPackageStyle "ipackage" "symbols"
Expand Down
30 changes: 0 additions & 30 deletions platform/ios/scripts/ios-dist.cer.enc

This file was deleted.

32 changes: 0 additions & 32 deletions platform/ios/scripts/ios-dist.p12.enc

This file was deleted.

153 changes: 0 additions & 153 deletions platform/ios/scripts/ios-in-house.mobileprovision.enc

This file was deleted.

37 changes: 37 additions & 0 deletions platform/ios/scripts/release-notes.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
#!/usr/bin/env node

const fs = require('fs');
const ejs = require('ejs');
const _ = require('lodash');
const semver = require('semver');

const changelog = fs.readFileSync('platform/ios/CHANGELOG.md', 'utf8');

// This regular expression parses the changelog for individual releases:
// - Matches lines starting with "## ".
// - Groups the version number.
// - Skips the (optional) release date.
// - Groups the changelog content.
// - Ends when another "## " is found.
const regex = /^## (\d+\.\d+\.\d+).*?\n(.+?)(?=\n^## )/gms;

let releases = [];
while (match = regex.exec(changelog)) {
releases.push({
'version': match[1],
'changelog': match[2].trim(),
});
}

const currentRelease = releases[0];

const versions = _.map(releases, 'version');
const previousVersion = semver.maxSatisfying(versions, "<" + currentRelease.version);

const releaseNotes = ejs.render(fs.readFileSync('platform/ios/scripts/release-notes.md.ejs', 'utf8'), {
'currentVersion': currentRelease.version,
'previousVersion': previousVersion,
'changelog': currentRelease.changelog,
});

process.stdout.write(releaseNotes);
10 changes: 10 additions & 0 deletions platform/ios/scripts/release-notes.md.ejs
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<%
const CURRENTVERSION = locals.currentVersion;
const PREVIOUSVERSION = locals.previousVersion;
const CHANGELOG = locals.changelog;
-%>
[Changes](https://github.com/mapbox/mapbox-gl-native/compare/ios-v<%-PREVIOUSVERSION%>...ios-v<%-CURRENTVERSION%>) since [Mapbox Maps SDK for iOS v<%-PREVIOUSVERSION%>](https://github.com/mapbox/mapbox-gl-native/releases/tag/ios-v<%-PREVIOUSVERSION%>):

<%-CHANGELOG%>

Documentation is [available online](https://www.mapbox.com/ios-sdk/api/<%-CURRENTVERSION%>/) or as part of the download.
4 changes: 0 additions & 4 deletions platform/ios/scripts/remove-key.sh

This file was deleted.

0 comments on commit e67f0be

Please sign in to comment.