Skip to content

Commit cbec9e1

Browse files
Cameron MaceGuardiola31337
Cameron Mace
authored and
Guardiola31337
committed
mapbox java services 3.0 (#664)
* add services module to be able to generate mapbox-java-services artifact including all API services * removed turf and geojson modules * fixed makefile * remove unnecessary services-core code from services module * fix naming structure (new artifact names and namespaces)
1 parent 168d062 commit cbec9e1

File tree

152 files changed

+640
-670
lines changed

Some content is hidden

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

152 files changed

+640
-670
lines changed

‎Makefile‎

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -12,26 +12,16 @@ build-release:
1212
./gradlew assemble
1313

1414
publish:
15-
export IS_LOCAL_DEVELOPMENT=false; ./gradlew :services-core:uploadArchives ; \
16-
export IS_LOCAL_DEVELOPMENT=false; ./gradlew :services-directions:uploadArchives ; \
17-
export IS_LOCAL_DEVELOPMENT=false; ./gradlew :services-geocoding:uploadArchives ; \
18-
export IS_LOCAL_DEVELOPMENT=false; ./gradlew :services-geojson:uploadArchives ; \
19-
export IS_LOCAL_DEVELOPMENT=false; ./gradlew :services-matching:uploadArchives ; \
20-
export IS_LOCAL_DEVELOPMENT=false; ./gradlew :services-matrix:uploadArchives ; \
21-
export IS_LOCAL_DEVELOPMENT=false; ./gradlew :services-optimization:uploadArchives ; \
22-
export IS_LOCAL_DEVELOPMENT=false; ./gradlew :services-staticmap:uploadArchives ; \
23-
export IS_LOCAL_DEVELOPMENT=false; ./gradlew :services-turf:uploadArchives ; \
15+
export IS_LOCAL_DEVELOPMENT=false; ./gradlew :services-core:uploadArchives ; \
16+
export IS_LOCAL_DEVELOPMENT=false; ./gradlew :services-geojson:uploadArchives ; \
17+
export IS_LOCAL_DEVELOPMENT=false; ./gradlew :services:uploadArchives ; \
18+
export IS_LOCAL_DEVELOPMENT=false; ./gradlew :services-turf:uploadArchives ; \
2419

2520
publish-local:
2621
# This publishes to ~/.m2/repository/com/mapbox/mapboxsdk
2722
export IS_LOCAL_DEVELOPMENT=true; ./gradlew :services-core:uploadArchives ; \
28-
export IS_LOCAL_DEVELOPMENT=true; ./gradlew :services-directions:uploadArchives ; \
29-
export IS_LOCAL_DEVELOPMENT=true; ./gradlew :services-geocoding:uploadArchives ; \
3023
export IS_LOCAL_DEVELOPMENT=true; ./gradlew :services-geojson:uploadArchives ; \
31-
export IS_LOCAL_DEVELOPMENT=true; ./gradlew :services-matching:uploadArchives ; \
32-
export IS_LOCAL_DEVELOPMENT=true; ./gradlew :services-matrix:uploadArchives ; \
33-
export IS_LOCAL_DEVELOPMENT=true; ./gradlew :services-optimization:uploadArchives ; \
34-
export IS_LOCAL_DEVELOPMENT=true; ./gradlew :services-staticmap:uploadArchives ; \
24+
export IS_LOCAL_DEVELOPMENT=true; ./gradlew :services:uploadArchives ; \
3525
export IS_LOCAL_DEVELOPMENT=true; ./gradlew :services-turf:uploadArchives ; \
3626

3727
directions-matrix-fixtures:

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

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

3-
import com.mapbox.directions.v5.MapboxDirections;
4-
import com.mapbox.directions.v5.models.DirectionsResponse;
3+
import com.mapbox.api.directions.v5.MapboxDirections;
4+
import com.mapbox.api.directions.v5.models.DirectionsResponse;
55
import com.mapbox.geojson.Point;
66
import retrofit2.Call;
77
import retrofit2.Callback;

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

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

3-
import com.mapbox.geocoding.v5.MapboxGeocoding;
4-
import com.mapbox.geocoding.v5.models.GeocodingResponse;
3+
import com.mapbox.api.geocoding.v5.MapboxGeocoding;
4+
import com.mapbox.api.geocoding.v5.models.GeocodingResponse;
55

66
import retrofit2.Call;
77
import retrofit2.Callback;

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

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

3-
import com.mapbox.geojson.Point;
43
//import com.mapbox.matching.v5.MapboxMapMatching;
54
//import com.mapbox.matching.v5.models.MapMatchingResponse;
65

7-
import retrofit2.Call;
8-
import retrofit2.Callback;
9-
import retrofit2.Response;
106

117
public class BasicMapMatching {
128
// public static void main(String[] args) {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33

44
import com.mapbox.geojson.Point;
5-
import com.mapbox.optimization.v1.MapboxOptimization;
6-
import com.mapbox.optimization.v1.models.OptimizationResponse;
5+
import com.mapbox.api.optimization.v1.MapboxOptimization;
6+
import com.mapbox.api.optimization.v1.models.OptimizationResponse;
77

88
import retrofit2.Call;
99
import retrofit2.Callback;

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package com.mapbox.samples;
22

33
import com.mapbox.geojson.Point;
4-
import com.mapbox.staticmap.v1.MapboxStaticMap;
5-
import com.mapbox.staticmap.v1.StaticMapCriteria;
6-
import com.mapbox.staticmap.v1.models.StaticMarkerAnnotation;
7-
import com.mapbox.staticmap.v1.models.StaticPolylineAnnotation;
4+
import com.mapbox.api.staticmap.v1.MapboxStaticMap;
5+
import com.mapbox.api.staticmap.v1.StaticMapCriteria;
6+
import com.mapbox.api.staticmap.v1.models.StaticMarkerAnnotation;
7+
import com.mapbox.api.staticmap.v1.models.StaticPolylineAnnotation;
88

99
import java.awt.Color;
1010
import java.util.ArrayList;

‎services-core/gradle.properties‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
VERSION_NAME=3.0.0-SNAPSHOT
2-
POM_ARTIFACT_ID=mapbox-java-services-core
3-
POM_NAME=Mapbox Java Services
4-
POM_DESCRIPTION=Mapbox Java Services
2+
POM_ARTIFACT_ID=mapbox-sdk-core
3+
POM_NAME=Mapbox Services SDK
4+
POM_DESCRIPTION=Mapbox Services SDK (core module)
55
POM_PACKAGING=jar

services-core/src/main/java/com/mapbox/services/MapboxService.java renamed to services-core/src/main/java/com/mapbox/core/MapboxService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.mapbox.services;
1+
package com.mapbox.core;
22

33
import okhttp3.OkHttpClient;
44
import okhttp3.logging.HttpLoggingInterceptor;

services-core/src/main/java/com/mapbox/services/constants/Constants.java renamed to services-core/src/main/java/com/mapbox/core/constants/Constants.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.mapbox.services.constants;
1+
package com.mapbox.core.constants;
22

33
/**
44
* Includes common variables used throughout the Mapbox Service modules.

services-core/src/main/java/com/mapbox/services/constants/package-info.java renamed to services-core/src/main/java/com/mapbox/core/constants/package-info.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33
*
44
* @since 3.0.0
55
*/
6-
package com.mapbox.services.constants;
6+
package com.mapbox.core.constants;

0 commit comments

Comments
 (0)