Prepare release 5.9.0

Author: kmadsen

circle.yml .circleci/config.ymlcircle.yml renamed to .circleci/config.yml

@@ -4,19 +4,43 @@ workflows:
   default:
     jobs:
       - build
+      - test
+      - release-snapshot:
+          requires:
+            - build
+            - test
+          filters:
+            branches:
+              only:
+                - master
       - release:
+          requires:
+            - build
+            - test
           filters:
             tags:
-              only: /v.*/
+              only: /^v.*/
+            branches:
+              ignore: /.*/
+
 jobs:
   build:
     working_directory: ~/code
     docker:
-      - image: mbgl/android-ndk-r19:8e91a7ebab
-    environment:
-      JVM_OPTS: -Xmx3200m
-      BUILDTYPE: Debug
-      IS_LOCAL_DEVELOPMENT: false
+      - image: mbgl/android-ndk-r19:latest
+    steps:
+      - checkout
+      - run:
+          name: Build libraries
+          command: make build-release
+      - run:
+          name: Build command line interface
+          command: make build-cli
+
+  test:
+    working_directory: ~/code
+    docker:
+      - image: mbgl/android-ndk-r19:latest
     steps:
       - checkout
       - restore_cache:
@@ -44,43 +68,25 @@ jobs:
           command: |
             bash <(curl -s https://codecov.io/bash)
 
-
 # ------------------------------------------------------------------------------
-  release:
-    branch:
-      only:
-      - master
+  release-snapshot:
     docker:
-      - image: mbgl/android-ndk-r19:8e91a7ebab
+      - image: mbgl/android-ndk-r19:latest
     working_directory: ~/code
-    environment:
-      BUILDTYPE: Release
-      IS_LOCAL_DEVELOPMENT: false
     steps:
       - checkout
-      - run:
-          name: Generate Maven credentials
-          command: |
-            if [ -n "${BINTRAY_USER}" ]; then
-              echo "BINTRAY_USER=$BINTRAY_USER
-              BINTRAY_API_KEY=$BINTRAY_API_KEY
-              GPG_PASSPHRASE=$GPG_PASSPHRASE"
-            fi
-      - run:
-          name: Update version name
+      - deploy:
+          name: Publish Java snapshot libraries to Mapbox SDK Registry
           command: |
-            if [[ $CIRCLE_TAG == v* ]]; then
-              sed -i -e "s/^VERSION_NAME=.*/VERSION_NAME=${CIRCLE_TAG:1}/" gradle.properties
-            fi          
-      - run:
-          name: Build Java libraries
-          command: make build-release
+            make sdk-registry-publish-snapshot
+
+  release:
+    docker:
+      - image: mbgl/android-ndk-r19:latest
+    working_directory: ~/code
+    steps:
+      - checkout
       - deploy:
-          name: Publish Java libraries to Bintray
+          name: Publish Java libraries to Mapbox SDK Registry
           command: |
-            if [[ $CIRCLE_BRANCH == master ]] || [[ $CIRCLE_TAG == v* ]]; then
-              version=$(cat gradle.properties | grep "VERSION_NAME")
-              if [[ $version != *"SNAPSHOT"* ]]; then
-                make publish-to-sdk-registry
-              fi
-            fi
+            make sdk-registry-publish

CHANGELOG.md

@@ -4,6 +4,9 @@ Mapbox welcomes participation and contributions from everyone.
 
 ### master
 
+### 5.9.0 - February 12, 2021
+ - Stopped releasing artifacts to jfrog and now to Mapbox's sdk-registry
+
 ### 5.9.0-alpha-1 - February 12, 2021
 - Fixed `DirectionsRefreshResponse` flow: introduced `DirectionsRouteRefresh` and restricted dependency on `DirectionsRoute` which is a critical bug fixes. Even though this is a semver-breaking change, we're not considering it as one because the refresh feature was non-functional beforehand. [#1225](https://github.com/mapbox/mapbox-java/pull/1225)
 

Makefile

@@ -30,14 +30,22 @@ javadoc:
 	./gradlew :services-turf:javadoc; mv services-turf/build/docs/javadoc/ ./documentation/turf/javadoc/ ; \
 	./gradlew :services:javadoc; mv services/build/docs/javadoc/ ./documentation/services/javadoc/ ; \
 
-publish-to-sdk-registry:
+sdk-registry-publish:
 	./gradlew :services-core:mapboxSDKRegistryUpload ; \
 	./gradlew :services-geojson:mapboxSDKRegistryUpload ; \
 	./gradlew :services:mapboxSDKRegistryUpload ; \
 	./gradlew :services-turf:mapboxSDKRegistryUpload ; \
 	./gradlew :services-directions-models:mapboxSDKRegistryUpload ; \
 	./gradlew :services-directions-refresh-models:mapboxSDKRegistryUpload ; \
 
+sdk-registry-publish-snapshot:
+	./gradlew :services-core:mapboxSDKRegistryUpload -Psnapshot=true ; \
+	./gradlew :services-geojson:mapboxSDKRegistryUpload -Psnapshot=true ; \
+	./gradlew :services:mapboxSDKRegistryUpload -Psnapshot=true ; \
+	./gradlew :services-turf:mapboxSDKRegistryUpload -Psnapshot=true ; \
+	./gradlew :services-directions-models:mapboxSDKRegistryUpload -Psnapshot=true ; \
+	./gradlew :services-directions-refresh-models:mapboxSDKRegistryUpload -Psnapshot=true ; \
+
 graphs:
 	./gradlew :services-core:generateDependencyGraphMapboxLibraries
 	./gradlew :services-geojson:generateDependencyGraphMapboxLibraries

gradle.properties

@@ -1,6 +1,3 @@
-# Project-wide Gradle settings.
-VERSION_NAME=5.8.0-SNAPSHOT
-
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
 org.gradle.jvmargs=-Xmx2048M

gradle/artifact-settings.gradle

@@ -1,5 +1,4 @@
 ext {
-
     mapboxArtifactGroupId = 'com.mapbox.mapboxsdk'
     mapboxArtifactId = project.hasProperty('POM_ARTIFACT_ID') ? project.property('POM_ARTIFACT_ID') : System.getenv('POM_ARTIFACT_ID')
     mapboxArtifactTitle = 'Mapbox Java SDK'
@@ -14,5 +13,25 @@ ext {
     mapboxArtifactScmUrl = 'scm:git@github.com:mapbox/mapbox-java.git'
     mapboxArtifactLicenseName = 'The Apache Software License, Version 2.0'
     mapboxArtifactLicenseUrl = 'http://www.apache.org/licenses/LICENSE-2.0.txt'
-    versionName = project.hasProperty('VERSION_NAME') ? project.property('VERSION_NAME') : System.getenv('VERSION_NAME')
-}
+    versionName = getVersionName()
+}
+
+def getVersionName() {
+    def cmd = "git describe --tag --abbrev=0"
+    def proc = cmd.execute()
+    def version = proc.text.trim()
+    return isSnapshot() ? getSnapshotVersion(version) : version
+}
+
+def isSnapshot() {
+    return project.hasProperty("snapshot")
+            ? project.property("snapshot").toBoolean()
+            : false
+}
+
+private static def getSnapshotVersion(String version) {
+    def matcher = version =~ /^[v|V](\d+).(\d+)?.*/
+    def major = (matcher[0][1] as Integer)
+    def minor = (matcher[0][2] as Integer) + 1
+    return "v${major}.${minor}.0-SNAPSHOT"
+}

gradle/publish.gradle

@@ -60,14 +60,15 @@ registry {
     sdkName = sdkNameMap[project.name]
     production = true
     snapshot = project.ext.versionName.endsWith("-SNAPSHOT")
-    override = snapshot ? true : false
+    override = snapshot
     dryRun = false
     publish = true
     publications = ["MapboxJavaSDKPublication"]
 }
 
+
 tasks.withType(Javadoc) {
     options.addStringOption('encoding', 'UTF-8')
     options.addStringOption('docencoding', 'UTF-8')
     options.addStringOption('charset', 'UTF-8')
-}
+}

services-core/build.gradle

@@ -4,6 +4,7 @@ apply plugin: 'java-library'
 // so that Maps SDK doesn't rely on them being served from the top level build.gradle
 apply plugin: 'de.fuerstenau.buildconfig'
 apply from: "../gradle/dependencies.gradle"
+apply from: file("${rootDir}/gradle/artifact-settings.gradle")
 
 buildscript {
   apply from: "../gradle/dependencies.gradle"
@@ -23,7 +24,7 @@ configurations {
 
 buildConfig {
   packageName = 'com.mapbox.core'
-  version = project.VERSION_NAME
+  version = project.ext.versionName
   buildConfigField 'String', 'GIT_REVISION', getGitRevision()
 }