From 24b865dbd00bd0e5bbca58cb2748cf572ebd3007 Mon Sep 17 00:00:00 2001 From: Guardiola31337 Date: Thu, 28 Sep 2017 11:15:17 +0200 Subject: [PATCH 1/4] fix version name to release 2.2.5 --- circle.yml | 4 ++-- mapbox/gradle.properties | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/circle.yml b/circle.yml index bfb081cf4..be4c18a37 100644 --- a/circle.yml +++ b/circle.yml @@ -110,13 +110,13 @@ jobs: - deploy: name: Publish Java Services To Maven Central command: | - if [ "${CIRCLE_BRANCH}" == "master" ]; then + if [ "${CIRCLE_BRANCH}" == "release-225" ]; then make publish-java ; fi - deploy: name: Publish Android Services To Maven Central command: | - if [ "${CIRCLE_BRANCH}" == "master" ]; then + if [ "${CIRCLE_BRANCH}" == "release-225" ]; then make publish-android ; fi - store_artifacts: diff --git a/mapbox/gradle.properties b/mapbox/gradle.properties index 5ee512f63..08694de20 100644 --- a/mapbox/gradle.properties +++ b/mapbox/gradle.properties @@ -1,5 +1,5 @@ # Project-wide Gradle settings. -VERSION_NAME=2.3.0-SNAPSHOT +VERSION_NAME=2.2.5 GROUP=com.mapbox.mapboxsdk POM_URL=https://github.com/mapbox/mapbox-java From e102ffb18f41388f91c58a306f4c461b4bd1faf8 Mon Sep 17 00:00:00 2001 From: Guardiola31337 Date: Thu, 28 Sep 2017 11:40:07 +0200 Subject: [PATCH 2/4] change version name back to 2.3.0-SNAPSHOT --- mapbox/gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mapbox/gradle.properties b/mapbox/gradle.properties index 08694de20..5ee512f63 100644 --- a/mapbox/gradle.properties +++ b/mapbox/gradle.properties @@ -1,5 +1,5 @@ # Project-wide Gradle settings. -VERSION_NAME=2.2.5 +VERSION_NAME=2.3.0-SNAPSHOT GROUP=com.mapbox.mapboxsdk POM_URL=https://github.com/mapbox/mapbox-java From 395e580b3898e14977bcc287e6146d9fe4ec9616 Mon Sep 17 00:00:00 2001 From: Guardiola31337 Date: Thu, 28 Sep 2017 11:44:16 +0200 Subject: [PATCH 3/4] [WIP] update CHANGELOG --- CHANGELOG.md | 4 ++++ circle.yml | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3f7f80514..debb077cd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ Mapbox welcomes participation and contributions from everyone. +### v2.2.5 + +### v2.2.4 + ### v2.2.3 - Introduce setDebugLoggingEnabled API [#549](https://github.com/mapbox/mapbox-java/pull/549) diff --git a/circle.yml b/circle.yml index be4c18a37..bfb081cf4 100644 --- a/circle.yml +++ b/circle.yml @@ -110,13 +110,13 @@ jobs: - deploy: name: Publish Java Services To Maven Central command: | - if [ "${CIRCLE_BRANCH}" == "release-225" ]; then + if [ "${CIRCLE_BRANCH}" == "master" ]; then make publish-java ; fi - deploy: name: Publish Android Services To Maven Central command: | - if [ "${CIRCLE_BRANCH}" == "release-225" ]; then + if [ "${CIRCLE_BRANCH}" == "master" ]; then make publish-android ; fi - store_artifacts: From f0499ac99c9b15cfc08b55152c96517b8dbd0d38 Mon Sep 17 00:00:00 2001 From: Cameron Mace Date: Thu, 28 Sep 2017 13:29:52 -0400 Subject: [PATCH 4/4] updated changelog for 2.2.4 and 2.2.5 --- CHANGELOG.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index debb077cd..a5d4c3469 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,8 +4,18 @@ Mapbox welcomes participation and contributions from everyone. ### v2.2.5 +- set sdkIdentifier and sdkVersion when pushing turnstile event [#574](https://github.com/mapbox/mapbox-java/pull/574) + ### v2.2.4 +- Bumped Navigation Events `EVENT_VERSION` variable to version 3 [#570](https://github.com/mapbox/mapbox-java/pull/570) +- Adds missing event parameters to the NavigationEvent methods [#569](https://github.com/mapbox/mapbox-java/pull/569) +- Adds newUserAgent to telemetry [#568](https://github.com/mapbox/mapbox-java/pull/568) +- Fixes arrival timestamp formatting [#567](https://github.com/mapbox/mapbox-java/pull/567) +- Omit null optional fields in Nav events [#566](https://github.com/mapbox/mapbox-java/pull/566) +- Adds missing device attribute to Navigation events [#565](https://github.com/mapbox/mapbox-java/pull/565) +- Adds roundaboutExits param to MapboxDirections [#562](https://github.com/mapbox/mapbox-java/pull/562) + ### v2.2.3 - Introduce setDebugLoggingEnabled API [#549](https://github.com/mapbox/mapbox-java/pull/549)