Prepare for release v0.12.1

mapbox · Dec 8, 2015 · fa39dad · fa39dad
1 parent 0feff82
commit fa39dad
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,29 @@
 
 An in-progress version being developed in the `master` branch.
 
+## 0.12.1 (Dec 8 2015)
+
+#### Breaking changes
+
+* Reversed the direction of `line-offset` (#1808)
+* Renamed `Pinch` interaction handler to `TouchZoomRotate` (#1777)
+* Made `Map#update` and `Map#render` private methods (#1798)
+* Made `Map#remove` remove created DOM elements (#1789)
+
+#### API Improvements
+
+* Added an method to disable touch rotation (#1777)
+* Added a `position` option for `Attribution` (#1689)
+
+#### Bugfixes
+
+* Ensure tile loading errors are properly reported (#1799)
+* Ensure re-adding a previously removed pop-up works (#1477)
+
+#### UX Improvements
+
+* Don't round zoom level during double-click interaction (#1640)
+
 ## 0.12.0 (Dec 2 2015)
 
 #### API Improvements

diff --git a/README.md b/README.md
@@ -7,8 +7,8 @@ A WebGL JavaScript interactive maps library that can render [Mapbox Vector Tiles
 Include the source via HTML tags:
 
 ```html
-<script src='https://api.tiles.mapbox.com/mapbox-gl-js/v0.12.0/mapbox-gl.js'></script>
-<link href='https://api.tiles.mapbox.com/mapbox-gl-js/v0.12.0/mapbox-gl.css' rel='stylesheet' />
+<script src='https://api.tiles.mapbox.com/mapbox-gl-js/v0.12.1/mapbox-gl.js'></script>
+<link href='https://api.tiles.mapbox.com/mapbox-gl-js/v0.12.1/mapbox-gl.css' rel='stylesheet' />
 ```
 
 For more information, see the [API documentation](https://www.mapbox.com/mapbox-gl-js/api/) and [examples](https://www.mapbox.com/mapbox-gl-js/examples/).
@@ -82,9 +82,10 @@ To prepare a release:
 
 * Run `git checkout master && git merge origin/mb-pages` to merge `mb-pages` into `master`:
 * Update `CHANGELOG.md` with all changes since the last release
-* Update the version number in `package.json`, `README.md`, `bench/fps/site.js`, `_config.yml`, and `_config.mb-pages.yml`
 * Commit changes
-* Run `npm version patch` ([or `major`, or `minor`](http://semver.org/)) to bump the version number
+* Update the version number in `package.json`, `README.md`, `bench/fps/site.js`, `_config.yml`, and `_config.mb-pages.yml`
+* Commit changes `git commit -m "vX.Y.Z"`
+* Tag the release, `git tag vX.Y.Z`
 * Run `git push origin && git push origin --follow-tags`.
 * Create a [GitHub release](https://github.com/mapbox/mapbox-gl-js/releases/new) using text from the CHANGELOG.md
 * The CI server will automatically publish tagged builds to the Mapbox CDN. Wait for this build to finish successfully before proceeding.

diff --git a/_config.mb-pages.yml b/_config.mb-pages.yml
@@ -6,7 +6,7 @@ permalink: /:categories/:title
 baseurl: /mapbox-gl-js
 highlighter: pygments
 excerpt_separator: ""
-version: v0.12.0
+version: v0.12.1
 rdiscount:
   extensions: [smart]
 exclude: [dist]
diff --git a/_config.yml b/_config.yml
@@ -6,7 +6,7 @@ permalink: /:categories/:title
 baseurl: /mapbox-gl-js
 highlighter: pygments
 excerpt_separator: ""
-version: v0.12.0
+version: v0.12.1
 mapboxglbase: /mapbox-gl-js/dist
 rdiscount:
   extensions: [smart]
diff --git a/bench/fps/site.js b/bench/fps/site.js
@@ -1,9 +1,9 @@
 var urls = [
     'https://api.tiles.mapbox.com/mapbox-gl-js/v0.10.0/mapbox-gl.js',
-    'https://api.tiles.mapbox.com/mapbox-gl-js/v0.12.0/mapbox-gl.js',
+    'https://api.tiles.mapbox.com/mapbox-gl-js/v0.12.1/mapbox-gl.js',
     '/dist/mapbox-gl.js',
     'https://api.tiles.mapbox.com/mapbox-gl-js/v0.10.0/mapbox-gl.js',
-    'https://api.tiles.mapbox.com/mapbox-gl-js/v0.12.0/mapbox-gl.js',
+    'https://api.tiles.mapbox.com/mapbox-gl-js/v0.12.1/mapbox-gl.js',
     '/dist/mapbox-gl.js'
 ];
 

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "mapbox-gl",
   "description": "A WebGL interactive maps library",
-  "version": "0.12.0",
+  "version": "0.12.1",
   "main": "js/mapbox-gl.js",
   "license": "BSD-3-Clause",
   "repository": {