Skip to content

Extract refresh models into separate module #1107

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
evabishchevich merged 2 commits into from
Jan 24, 2020
Merged

Extract refresh models into separate module #1107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4b4bb3c
Extract refresh models into separate module
evabishchevich Jan 22, 2020
81f1b13
Change models dependency to local modules
evabishchevich Jan 24, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 3 additions & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ->

Expand Down
11 changes: 0 additions & 11 deletions services-core/src/test/java/com/mapbox/core/MapboxServiceTest.java
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions services-directions-refresh-models/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/build
12 changes: 12 additions & 0 deletions services-directions-refresh-models/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
}
3 changes: 3 additions & 0 deletions services-directions-refresh-models/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
POM_ARTIFACT_ID=mapbox-sdk-directions-refresh-models
POM_DESCRIPTION=Mapbox Directions Refresh Services Models
POM_PACKAGING=jar
0 ...dels/DirectionsRefreshAdapterFactory.java → ...dels/DirectionsRefreshAdapterFactory.java
View file
Open in desktop
File renamed without changes.
0 .../v1/models/DirectionsRefreshResponse.java → .../v1/models/DirectionsRefreshResponse.java
View file
Open in desktop
File renamed without changes.
0 ...ctionsrefresh/v1/models/package-info.java → ...ctionsrefresh/v1/models/package-info.java
View file
Open in desktop
File renamed without changes.
1 change: 1 addition & 0 deletions services-directions-refresh/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion services/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ sourceSets {
dependencies {
api project(":services-core")
api project(":services-geojson")
api "com.mapbox.mapboxsdk:mapbox-sdk-directions-models:5.1.0-SNAPSHOT"
api project(":services-directions-models")
Copy link
Contributor

@Guardiola31337 Guardiola31337 Jan 23, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe we should keep adding the explicit dependency until it's released. Same for services-directions-refresh-models cc @LukasPaczos

Copy link
Contributor

@LukasPaczos LukasPaczos Jan 23, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yea, I think that's correct

Copy link
Contributor Author

@evabishchevich evabishchevich Jan 24, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we still want to keep it as explicit dependency?
@LukasPaczos @Guardiola31337

api project(":services-directions-refresh-models")

// Annotations
compileOnly dependenciesList.supportAnnotation
Expand Down
4 changes: 3 additions & 1 deletion settings.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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'
Expand All @@ -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'