Skip to content

Commit cea7ce4

Browse files
Add local aar and jar generation support (#431)
* add local aar and jar generation support fixing maven push android and java gradle config files respectively and fix javadoc issue * add IS_LOCAL_DEVELOPMENT as an environment variable and remove it from gradle properties file * fix isLocalBuild() to return true by default to make releases more explicit and fix Makefile
1 parent 71d3080 commit cea7ce4

4 files changed

Lines changed: 64 additions & 33 deletions

File tree

Makefile

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -41,25 +41,25 @@ javadoc:
4141
cd mapbox; ./gradlew :libandroid-ui:javadocrelease
4242

4343
publish-java:
44-
cd mapbox; ./gradlew :libjava-core:uploadArchives
45-
cd mapbox; ./gradlew :libjava-geojson:uploadArchives
46-
cd mapbox; ./gradlew :libjava-services:uploadArchives
47-
cd mapbox; ./gradlew :libjava-services-rx:uploadArchives
44+
cd mapbox; export IS_LOCAL_DEVELOPMENT=false; ./gradlew :libjava-core:uploadArchives
45+
cd mapbox; export IS_LOCAL_DEVELOPMENT=false; ./gradlew :libjava-geojson:uploadArchives
46+
cd mapbox; export IS_LOCAL_DEVELOPMENT=false; ./gradlew :libjava-services:uploadArchives
47+
cd mapbox; export IS_LOCAL_DEVELOPMENT=false; ./gradlew :libjava-services-rx:uploadArchives
4848

4949
publish-android:
50-
cd mapbox; ./gradlew :libandroid-telemetry:uploadArchives
51-
cd mapbox; ./gradlew :libandroid-services:uploadArchives
52-
cd mapbox; ./gradlew :libandroid-ui:uploadArchives
50+
cd mapbox; export IS_LOCAL_DEVELOPMENT=false; ./gradlew :libandroid-telemetry:uploadArchives
51+
cd mapbox; export IS_LOCAL_DEVELOPMENT=false; ./gradlew :libandroid-services:uploadArchives
52+
cd mapbox; export IS_LOCAL_DEVELOPMENT=false; ./gradlew :libandroid-ui:uploadArchives
5353

5454
publish-local:
5555
# This publishes to ~/.m2/repository/com/mapbox/mapboxsdk
56-
cd mapbox; ./gradlew :libjava-core:install
57-
cd mapbox; ./gradlew :libjava-geojson:install
58-
cd mapbox; ./gradlew :libjava-services:install
59-
cd mapbox; ./gradlew :libjava-services-rx:install
60-
# cd mapbox; ./gradlew :libandroid-telemetry:install
61-
# cd mapbox; ./gradlew :libandroid-services:install
62-
# cd mapbox; ./gradlew :libandroid-ui:install
56+
cd mapbox; export IS_LOCAL_DEVELOPMENT=true; ./gradlew :libjava-core:uploadArchives
57+
cd mapbox; export IS_LOCAL_DEVELOPMENT=true; ./gradlew :libjava-geojson:uploadArchives
58+
cd mapbox; export IS_LOCAL_DEVELOPMENT=true; ./gradlew :libjava-services:uploadArchives
59+
cd mapbox; export IS_LOCAL_DEVELOPMENT=true; ./gradlew :libjava-services-rx:uploadArchives
60+
cd mapbox; export IS_LOCAL_DEVELOPMENT=true; ./gradlew :libandroid-telemetry:uploadArchives
61+
cd mapbox; export IS_LOCAL_DEVELOPMENT=true; ./gradlew :libandroid-services:uploadArchives
62+
cd mapbox; export IS_LOCAL_DEVELOPMENT=true; ./gradlew :libandroid-ui:uploadArchives
6363

6464
dex-count:
6565
cd mapbox; ./gradlew countDebugDexMethods

mapbox/gradle-mvn-push-android.gradle

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,13 @@ def isReleaseBuild() {
2121
return VERSION_NAME.contains("SNAPSHOT") == false
2222
}
2323

24+
def isLocalBuild() {
25+
if (System.getenv('IS_LOCAL_DEVELOPMENT') != null) {
26+
return System.getenv('IS_LOCAL_DEVELOPMENT').toBoolean()
27+
}
28+
return true
29+
}
30+
2431
def getReleaseRepositoryUrl() {
2532
return hasProperty('RELEASE_REPOSITORY_URL') ? RELEASE_REPOSITORY_URL
2633
: "https://oss.sonatype.org/service/local/staging/deploy/maven2/"
@@ -31,6 +38,10 @@ def getSnapshotRepositoryUrl() {
3138
: "https://oss.sonatype.org/content/repositories/snapshots/"
3239
}
3340

41+
def obtainMavenLocalUrl() {
42+
return getRepositories().mavenLocal().getUrl()
43+
}
44+
3445
def getRepositoryUsername() {
3546
return hasProperty('NEXUS_USERNAME') ? NEXUS_USERNAME : ""
3647
}
@@ -49,11 +60,15 @@ afterEvaluate { project ->
4960
pom.artifactId = POM_ARTIFACT_ID
5061
pom.version = VERSION_NAME
5162

52-
repository(url: getReleaseRepositoryUrl()) {
53-
authentication(userName: getRepositoryUsername(), password: getRepositoryPassword())
54-
}
55-
snapshotRepository(url: getSnapshotRepositoryUrl()) {
56-
authentication(userName: getRepositoryUsername(), password: getRepositoryPassword())
63+
if (isLocalBuild()) {
64+
repository(url: obtainMavenLocalUrl())
65+
} else {
66+
repository(url: getReleaseRepositoryUrl()) {
67+
authentication(userName: getRepositoryUsername(), password: getRepositoryPassword())
68+
}
69+
snapshotRepository(url: getSnapshotRepositoryUrl()) {
70+
authentication(userName: getRepositoryUsername(), password: getRepositoryPassword())
71+
}
5772
}
5873

5974
pom.project {

mapbox/gradle-mvn-push-java.gradle

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,13 @@ def isReleaseBuild() {
2121
return VERSION_NAME.contains("SNAPSHOT") == false
2222
}
2323

24+
def isLocalBuild() {
25+
if (System.getenv('IS_LOCAL_DEVELOPMENT') != null) {
26+
return System.getenv('IS_LOCAL_DEVELOPMENT').toBoolean()
27+
}
28+
return true
29+
}
30+
2431
def getReleaseRepositoryUrl() {
2532
return hasProperty('RELEASE_REPOSITORY_URL') ? RELEASE_REPOSITORY_URL
2633
: "https://oss.sonatype.org/service/local/staging/deploy/maven2/"
@@ -31,6 +38,10 @@ def getSnapshotRepositoryUrl() {
3138
: "https://oss.sonatype.org/content/repositories/snapshots/"
3239
}
3340

41+
def obtainMavenLocalUrl() {
42+
return getRepositories().mavenLocal().getUrl()
43+
}
44+
3445
def getRepositoryUsername() {
3546
return hasProperty('NEXUS_USERNAME') ? NEXUS_USERNAME : ""
3647
}
@@ -49,11 +60,15 @@ afterEvaluate { project ->
4960
pom.artifactId = POM_ARTIFACT_ID
5061
pom.version = VERSION_NAME
5162

52-
repository(url: getReleaseRepositoryUrl()) {
53-
authentication(userName: getRepositoryUsername(), password: getRepositoryPassword())
54-
}
55-
snapshotRepository(url: getSnapshotRepositoryUrl()) {
56-
authentication(userName: getRepositoryUsername(), password: getRepositoryPassword())
63+
if (isLocalBuild()) {
64+
repository(url: obtainMavenLocalUrl())
65+
} else {
66+
repository(url: getReleaseRepositoryUrl()) {
67+
authentication(userName: getRepositoryUsername(), password: getRepositoryPassword())
68+
}
69+
snapshotRepository(url: getSnapshotRepositoryUrl()) {
70+
authentication(userName: getRepositoryUsername(), password: getRepositoryPassword())
71+
}
5772
}
5873

5974
pom.project {

mapbox/libandroid-telemetry/src/main/java/com/mapbox/services/android/telemetry/MapboxEvent.java

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -62,14 +62,15 @@ public class MapboxEvent implements Serializable {
6262
/**
6363
* Helper method for tracking gesture events
6464
*
65-
* @param gestureId Type of Gesture See {@see MapboxEvent#GESTURE_SINGLETAP
66-
* MapboxEvent#GESTURE_DOUBLETAP
67-
* MapboxEvent#GESTURE_TWO_FINGER_SINGLETAP
68-
* MapboxEvent#GESTURE_QUICK_ZOOM
69-
* MapboxEvent#GESTURE_PAN_START
70-
* MapboxEvent#GESTURE_PINCH_START
71-
* MapboxEvent#GESTURE_ROTATION_START
72-
* MapboxEvent#GESTURE_PITCH_START}
65+
* @param gestureId Type of Gesture
66+
* @see MapboxEvent#GESTURE_SINGLETAP
67+
* @see MapboxEvent#GESTURE_DOUBLETAP
68+
* @see MapboxEvent#GESTURE_TWO_FINGER_SINGLETAP
69+
* @see MapboxEvent#GESTURE_QUICK_ZOOM
70+
* @see MapboxEvent#GESTURE_PAN_START
71+
* @see MapboxEvent#GESTURE_PINCH_START
72+
* @see MapboxEvent#GESTURE_ROTATION_START
73+
* @see MapboxEvent#GESTURE_PITCH_START
7374
* @param location Location coordinates at start of gesture
7475
* @param zoom Zoom level to be registered
7576
*/
@@ -96,7 +97,7 @@ public static Hashtable<String, Object> buildMapClickEvent(
9697

9798
/**
9899
* Helper method for tracking DragEnd gesture event
99-
* See {@see MapboxEvent#TYPE_MAP_DRAG_END}
100+
* @see MapboxEvent#TYPE_MAP_DRAG_END
100101
*
101102
* @param location Original location coordinate at end of drag
102103
* @param zoom Zoom level to be registered

0 commit comments

Comments
 (0)