Skip to content

Commit 1a932c1

Browse files
Pablo Guardiolaabhishek1508Łukasz Paczos
committed
Split Directions models from the implementation into a separate module (#1104)
* add new module * refactor move models into previous packages (v5 and models) to avoid breaking semver * make services depend on an artifact of directions models * bump snapshot to 5.1.0 * exclude duplicate walking options classes Co-authored-by: Abhishek Kejriwal <[email protected]> Co-authored-by: Łukasz Paczos <[email protected]>
1 parent d8136ad commit 1a932c1

89 files changed

Lines changed: 164 additions & 697 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Makefile‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,18 +32,21 @@ publish-to-bintray:
3232
./gradlew :services-geojson:bintrayUpload ; \
3333
./gradlew :services:bintrayUpload ; \
3434
./gradlew :services-turf:bintrayUpload ; \
35+
./gradlew :services-directions-models:bintrayUpload ; \
3536

3637
publish-snapshot:
3738
./gradlew :services-core:artifactoryPublish ; \
3839
./gradlew :services-geojson:artifactoryPublish ; \
3940
./gradlew :services:artifactoryPublish ; \
4041
./gradlew :services-turf:artifactoryPublish ; \
42+
./gradlew :services-directions-models:artifactoryPublish ; \
4143

4244
graphs:
4345
./gradlew :services-core:generateDependencyGraphMapboxLibraries
4446
./gradlew :services-geojson:generateDependencyGraphMapboxLibraries
4547
./gradlew :services:generateDependencyGraphMapboxLibraries
4648
./gradlew :services-turf:generateDependencyGraphMapboxLibraries
49+
./gradlew :services-directions:generateDependencyGraphMapboxLibraries
4750

4851
directions-matrix-fixtures:
4952
# request a symmetric 1x3 matrix for pedestrians

‎build.gradle‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ allprojects {
3838
jcenter()
3939
// For publishing to Bintray
4040
maven { url 'https://mapbox.bintray.com/mapbox' }
41+
maven { url 'https://oss.jfrog.org/artifactory/oss-snapshot-local/' }
4142
}
4243
}
4344

@@ -71,6 +72,7 @@ subprojects {
7172
def TESTABLE_MODULES = ["services",
7273
"services-core",
7374
"services-directions",
75+
"services-directions-models",
7476
"services-geocoding",
7577
"services-geojson",
7678
"services-matching",
@@ -87,7 +89,8 @@ def TESTABLE_MODULES = ["services",
8789
def RELEASE_MODULES = ["services",
8890
"services-core",
8991
"services-geojson",
90-
"services-turf"]
92+
"services-turf",
93+
"services-directions-models"]
9194

9295
subprojects { subproject ->
9396

‎gradle.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Project-wide Gradle settings.
2-
VERSION_NAME=4.10.0-SNAPSHOT
2+
VERSION_NAME=5.1.0-SNAPSHOT
33

44
# Specifies the JVM arguments used for the daemon process.
55
# The setting is particularly useful for tweaking memory settings.

‎samples/src/main/java/com/mapbox/samples/BasicDirections.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
package com.mapbox.samples;
22

33
import com.mapbox.api.directions.v5.DirectionsCriteria;
4-
import com.mapbox.api.directions.v5.MapboxDirections;
54
import com.mapbox.api.directions.v5.WalkingOptions;
5+
import com.mapbox.api.directions.v5.MapboxDirections;
66
import com.mapbox.api.directions.v5.models.DirectionsResponse;
77
import com.mapbox.geojson.Point;
88
import com.mapbox.sample.BuildConfig;
9-
109
import java.io.IOException;
1110

1211
import retrofit2.Call;

‎services-directions-models/.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/build

‎services-directions-models/build.gradle‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
apply plugin: 'java-library'
2+
3+
dependencies {
4+
api project(":services-geojson")
5+
6+
// Annotations
7+
implementation dependenciesList.supportAnnotation
8+
9+
// AutoValue
10+
compileOnly dependenciesList.autoValue
11+
compileOnly dependenciesList.autoValueGson
12+
13+
// Test Dependencies
14+
testImplementation dependenciesList.okhttp3Mockwebserver
15+
testImplementation project(path: ':services-core', configuration: 'testOutput')
16+
}

‎services-directions-models/gradle.properties‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
POM_ARTIFACT_ID=mapbox-sdk-directions-models
2+
POM_DESCRIPTION=Mapbox Directions Services Models
3+
POM_PACKAGING=jar

services-directions/src/main/java/com/mapbox/api/directions/v5/DirectionsAdapterFactory.java renamed to services-directions-models/src/main/java/com/mapbox/api/directions/v5/DirectionsAdapterFactory.java

File renamed without changes.

services-directions/src/main/java/com/mapbox/api/directions/v5/DirectionsCriteria.java renamed to services-directions-models/src/main/java/com/mapbox/api/directions/v5/DirectionsCriteria.java

File renamed without changes.

services-directions/src/main/java/com/mapbox/api/directions/v5/WalkingOptions.java renamed to services-directions-models/src/main/java/com/mapbox/api/directions/v5/WalkingOptions.java

File renamed without changes.

0 commit comments

Comments
 (0)