Skip to content

Commit b01b3e5

Browse files
author
Langston Smith
committed
tweaks after @LukasPaczos review
1 parent 35c87c7 commit b01b3e5

File tree

6 files changed

+9
-27
lines changed

6 files changed

+9
-27
lines changed

Makefile

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,6 @@ release:
1414
publish-stable:
1515
export IS_LOCAL_DEVELOPMENT=false; ./gradlew :library:bintrayUpload
1616

17-
publish-local:
18-
# This publishes to ~/.m2/repository/com/mapbox/mapboxsdk
19-
export IS_LOCAL_DEVELOPMENT=true; ./gradlew :library:bintrayUpload
20-
2117
publish-snapshot-to-artifactory:
2218
# This publishes to ~/.m2/repository/com/mapbox/mapboxsdk
2319
export IS_LOCAL_DEVELOPMENT=false; ./gradlew :library:artifactoryPublish

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ The library is published to Maven Central and SNAPSHOTS are available whenever n
4242
```java
4343
// In the root build.gradle file
4444
repositories {
45-
mavenCentral()
46-
maven { url "http://oss.sonatype.org/content/repositories/snapshots/" }
45+
jcenter()
46+
maven { url 'https://oss.jfrog.org/artifactory/oss-snapshot-local/' }
4747
}
4848
```
4949
```java

build.gradle

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@ buildscript {
55
repositories {
66
google()
77
jcenter()
8-
// For publishing files to Bintray
9-
maven { url 'https://oss.jfrog.org/artifactory/oss-snapshot-local/' }
108
}
119
dependencies {
1210
classpath pluginDependencies.gradle

circle.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,13 +70,19 @@ jobs:
7070
BINTRAY_API_KEY=$BINTRAY_API_KEY
7171
GPG_PASSPHRASE=$GPG_PASSPHRASE"
7272
fi
73+
- run:
74+
name: Update version name
75+
command: |
76+
if [[ $CIRCLE_TAG == v* ]]; then
77+
sed -i -e "s/^VERSION_NAME=.*/VERSION_NAME=${CIRCLE_TAG:9}/" library/gradle.properties
78+
fi
7379
- run:
7480
name: Build libraries
7581
command: make release
7682
- deploy:
7783
name: Publish to Bintray
7884
command: |
79-
if [[ $CIRCLE_BRANCH == master ]] || [[ $CIRCLE_BRANCH == release-v* ]] || [[ $CIRCLE_TAG == v* ]]; then
85+
if [[ $CIRCLE_BRANCH == master ]] || [[ $CIRCLE_TAG == v* ]]; then
8086
version=$(cat library/gradle.properties | grep "VERSION_NAME")
8187
if [[ $version != *"SNAPSHOT"* ]]; then
8288
make publish-stable

library/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,5 @@ dependencies {
4747
androidTestImplementation dependenciesList.testEspressoCore
4848
}
4949

50-
apply from: "${rootDir}/gradle/javadoc.gradle"
5150
apply from: "${rootDir}/gradle/gradle-bintray.gradle"
5251
apply from: "${rootDir}/gradle/artifact-settings.gradle"

library/javadoc.gradle

Lines changed: 0 additions & 17 deletions
This file was deleted.

0 commit comments

Comments
 (0)