Extract refresh models into separate module

evabishchevich · evabishchevich · commit a24d146f91c7 · 2020-01-24T13:25:55.000+03:00
diff --git a/Makefile b/Makefile
@@ -33,20 +33,23 @@ publish-to-bintray:
 	./gradlew :services:bintrayUpload ; \
 	./gradlew :services-turf:bintrayUpload ; \
 	./gradlew :services-directions-models:bintrayUpload ; \
+	./gradlew :services-directions-refresh-models:bintrayUpload ; \
 
 publish-snapshot:
 	./gradlew :services-core:artifactoryPublish ; \
 	./gradlew :services-geojson:artifactoryPublish ; \
 	./gradlew :services:artifactoryPublish ; \
 	./gradlew :services-turf:artifactoryPublish ; \
 	./gradlew :services-directions-models:artifactoryPublish ; \
+	./gradlew :services-directions-refresh-models:artifactoryPublish ; \
 
 graphs:
 	./gradlew :services-core:generateDependencyGraphMapboxLibraries
 	./gradlew :services-geojson:generateDependencyGraphMapboxLibraries
 	./gradlew :services:generateDependencyGraphMapboxLibraries
 	./gradlew :services-turf:generateDependencyGraphMapboxLibraries
-	./gradlew :services-directions:generateDependencyGraphMapboxLibraries
+	./gradlew :services-directions-models:generateDependencyGraphMapboxLibraries
+	./gradlew :services-directions-refresh-models:generateDependencyGraphMapboxLibraries
 
 directions-matrix-fixtures:
 	# request a symmetric 1x3 matrix for pedestrians
diff --git a/build.gradle b/build.gradle
@@ -84,13 +84,15 @@ def TESTABLE_MODULES = ["services",
                         "services-tilequery",
                         "services-turf",
                         "services-directions-refresh",
+                        "services-directions-refresh-models",
                         "services-isochrone"]
 
 def RELEASE_MODULES = ["services",
                        "services-core",
                        "services-geojson",
                        "services-turf",
-                       "services-directions-models"]
+                       "services-directions-models",
+                       "services-directions-refresh-models"]
 
 subprojects { subproject ->
 
diff --git a/services-core/src/test/java/com/mapbox/core/MapboxServiceTest.java b/services-core/src/test/java/com/mapbox/core/MapboxServiceTest.java
diff --git a/services-directions-refresh-models/.gitignore b/services-directions-refresh-models/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/services-directions-refresh-models/build.gradle b/services-directions-refresh-models/build.gradle
@@ -0,0 +1,12 @@
+apply plugin: 'java-library'
+
+dependencies {
+    api project(":services-directions-models")
+
+    // Annotations
+    implementation dependenciesList.supportAnnotation
+
+    // AutoValue
+    compileOnly dependenciesList.autoValue
+    compileOnly dependenciesList.autoValueGson
+}
diff --git a/services-directions-refresh-models/gradle.properties b/services-directions-refresh-models/gradle.properties
@@ -0,0 +1,3 @@
+POM_ARTIFACT_ID=mapbox-sdk-directions-refresh-models
+POM_DESCRIPTION=Mapbox Directions Refresh Services Models
+POM_PACKAGING=jar
diff --git a/services-directions-refresh-models/src/main/java/com/mapbox/api/directionsrefresh/v1/models/DirectionsRefreshAdapterFactory.java b/services-directions-refresh-models/src/main/java/com/mapbox/api/directionsrefresh/v1/models/DirectionsRefreshAdapterFactory.java
diff --git a/services-directions-refresh-models/src/main/java/com/mapbox/api/directionsrefresh/v1/models/DirectionsRefreshResponse.java b/services-directions-refresh-models/src/main/java/com/mapbox/api/directionsrefresh/v1/models/DirectionsRefreshResponse.java
diff --git a/services-directions-refresh-models/src/main/java/com/mapbox/api/directionsrefresh/v1/models/package-info.java b/services-directions-refresh-models/src/main/java/com/mapbox/api/directionsrefresh/v1/models/package-info.java
diff --git a/services-directions-refresh/build.gradle b/services-directions-refresh/build.gradle
@@ -3,6 +3,7 @@ apply plugin: 'java-library'
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     api project(":services-core")
+    api project(":services-directions-refresh-models")
 
     // Annotations
     compileOnly dependenciesList.supportAnnotation
diff --git a/services/build.gradle b/services/build.gradle
@@ -13,6 +13,7 @@ dependencies {
     api project(":services-core")
     api project(":services-geojson")
     api "com.mapbox.mapboxsdk:mapbox-sdk-directions-models:5.1.0-SNAPSHOT"
+    api "com.mapbox.mapboxsdk:mapbox-sdk-directions-refresh-models:5.1.0-SNAPSHOT"
 
     // Annotations
     compileOnly dependenciesList.supportAnnotation
diff --git a/settings.gradle b/settings.gradle
@@ -1,6 +1,7 @@
 rootProject.name = "mapbox-java"
 
-include ':services', ':services-directions-models'
+include ':services'
+include ':services-directions-models'
 include ':services-speech'
 include ':services-core'
 include ':services-geojson'
@@ -14,5 +15,6 @@ include ':services-staticmap'
 include ':services-tilequery'
 include ':services-route-tiles'
 include ':services-directions-refresh'
+include ':services-directions-refresh-models'
 include ':services-isochrone'
 include 'samples'

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+POM_ARTIFACT_ID=mapbox-sdk-directions-refresh-models`
	`2`	`+POM_DESCRIPTION=Mapbox Directions Refresh Services Models`
	`3`	`+POM_PACKAGING=jar`