tweaks after @LukasPaczos review

mapbox · Jul 3, 2019 · 48a0524 · 48a0524
1 parent 468a2e6
commit 48a0524
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 16 deletions.
diff --git a/Makefile b/Makefile
@@ -39,14 +39,6 @@ publish-snapshot:
 	export IS_LOCAL_DEVELOPMENT=false; ./gradlew :services:artifactoryPublish ; \
 	export IS_LOCAL_DEVELOPMENT=false; ./gradlew :services-turf:artifactoryPublish ; \
 
-
-publish-local:
-	# This publishes to ~/.m2/repository/com/mapbox/mapboxsdk
-	export IS_LOCAL_DEVELOPMENT=true; ./gradlew :services-core: bintrayUpload ; \
-    export IS_LOCAL_DEVELOPMENT=true; ./gradlew :services-geojson: bintrayUpload ; \
-    export IS_LOCAL_DEVELOPMENT=true; ./gradlew :services: bintrayUpload ; \
-    export IS_LOCAL_DEVELOPMENT=true; ./gradlew :services-turf: bintrayUpload ; \
-
 graphs:
 	./gradlew :services-core:generateDependencyGraphMapboxLibraries
 	./gradlew :services-geojson:generateDependencyGraphMapboxLibraries

diff --git a/README.md b/README.md
@@ -41,8 +41,8 @@ If you want to test recent bugfixes or features that have not been packaged in a
 
 ```gradle
 repositories {
-    mavenCentral()
-    maven { url 'https://oss.jfrog.org/artifactory/oss-snapshot-local/' }
+    jcenter()
+	 maven { url 'https://oss.jfrog.org/artifactory/oss-snapshot-local/' }
 }
 
 dependencies {

diff --git a/build.gradle b/build.gradle
@@ -3,7 +3,6 @@ buildscript {
 
   repositories {
     maven { url 'https://plugins.gradle.org/m2' }
-    maven { url 'https://oss.jfrog.org/artifactory/oss-snapshot-local/' }
     google()
     mavenCentral()
     jcenter()

diff --git a/circle.yml b/circle.yml
@@ -64,13 +64,19 @@ jobs:
               BINTRAY_API_KEY=$BINTRAY_API_KEY
               GPG_PASSPHRASE=$GPG_PASSPHRASE"
             fi
+      - run:
+          name: Update version name
+          command: |
+            if [[ $CIRCLE_TAG == v* ]]; then
+              sed -i -e "s/^VERSION_NAME=.*/VERSION_NAME=${CIRCLE_TAG:9}/" gradle.properties
+            fi          
       - run:
           name: Build Java libraries
           command: make build-release
       - deploy:
           name: Publish Java libraries to Bintray
           command: |
-            if [[ $CIRCLE_BRANCH == master ]] || [[ $CIRCLE_BRANCH == release-* ]] || [[ $CIRCLE_TAG == android-v* ]]; then
+            if [[ $CIRCLE_BRANCH == master ]] || [[ $CIRCLE_TAG == android-v* ]]; then
               version=$(cat gradle.properties | grep "VERSION_NAME")
               if [[ $version != *"SNAPSHOT"* ]]; then
                 make publish-to-bintray

diff --git a/services-core/gradle.properties b/services-core/gradle.properties
@@ -1,5 +1,4 @@
 VERSION_NAME=4.9.0-SNAPSHOT
 POM_ARTIFACT_ID=mapbox-sdk-core
-POM_NAME=Mapbox Services SDK
 POM_DESCRIPTION=Mapbox Services SDK (Core module)
 POM_PACKAGING=jar
diff --git a/services-geojson/gradle.properties b/services-geojson/gradle.properties
@@ -1,5 +1,4 @@
 VERSION_NAME=4.9.0-SNAPSHOT
 POM_ARTIFACT_ID=mapbox-sdk-geojson
-POM_NAME=Mapbox Services SDK
 POM_DESCRIPTION=Mapbox Services SDK (GeoJSON support)
 POM_PACKAGING=jar
diff --git a/services-turf/gradle.properties b/services-turf/gradle.properties
@@ -1,5 +1,4 @@
 VERSION_NAME=4.9.0-SNAPSHOT
 POM_ARTIFACT_ID=mapbox-sdk-turf
-POM_NAME=Mapbox Services SDK
 POM_DESCRIPTION=Mapbox Services SDK (Turf support)
 POM_PACKAGING=jar
diff --git a/services/gradle.properties b/services/gradle.properties
@@ -1,5 +1,4 @@
 VERSION_NAME=4.9.0-SNAPSHOT
 POM_ARTIFACT_ID=mapbox-sdk-services
-POM_NAME=Mapbox Services SDK
 POM_DESCRIPTION=Mapbox Services SDK (APIs)
 POM_PACKAGING=jar