From a54152514e4ba4e2e7d9184ba4b93abc8fba7885 Mon Sep 17 00:00:00 2001 From: Tobrun Date: Thu, 9 Jan 2020 00:43:38 +0100 Subject: [PATCH] [all] Update to AndroidX annotation (#1095) --- gradle/dependencies.gradle | 15 +++++++-------- .../com/mapbox/core/internal/Preconditions.java | 4 ++-- .../java/com/mapbox/core/utils/ApiCallHelper.java | 4 ++-- .../v1/MapboxDirectionsRefresh.java | 4 ++-- .../v1/models/DirectionsRefreshResponse.java | 4 ++-- .../api/directions/v5/DirectionsCriteria.java | 2 +- .../api/directions/v5/MapboxDirections.java | 8 ++++---- .../mapbox/api/directions/v5/WalkingOptions.java | 4 ++-- .../directions/v5/models/BannerComponents.java | 8 ++++---- .../directions/v5/models/BannerInstructions.java | 5 ++--- .../api/directions/v5/models/BannerText.java | 4 ++-- .../api/directions/v5/models/BannerView.java | 8 ++++---- .../api/directions/v5/models/DirectionsError.java | 2 +- .../directions/v5/models/DirectionsResponse.java | 4 ++-- .../api/directions/v5/models/DirectionsRoute.java | 2 +- .../directions/v5/models/DirectionsWaypoint.java | 2 +- .../directions/v5/models/IntersectionLanes.java | 2 +- .../api/directions/v5/models/LegAnnotation.java | 2 +- .../mapbox/api/directions/v5/models/LegStep.java | 4 ++-- .../mapbox/api/directions/v5/models/MaxSpeed.java | 2 +- .../mapbox/api/directions/v5/models/RouteLeg.java | 2 +- .../api/directions/v5/models/RouteOptions.java | 4 ++-- .../directions/v5/models/StepIntersection.java | 4 ++-- .../api/directions/v5/models/StepManeuver.java | 8 ++++---- .../directions/v5/models/VoiceInstructions.java | 2 +- .../api/geocoding/v5/GeocodingCriteria.java | 2 +- .../mapbox/api/geocoding/v5/MapboxGeocoding.java | 8 ++++---- .../api/geocoding/v5/models/CarmenContext.java | 4 ++-- .../api/geocoding/v5/models/CarmenFeature.java | 4 ++-- .../geocoding/v5/models/GeocodingResponse.java | 2 +- .../typeadapters/RuntimeTypeAdapterFactory.java | 2 +- .../geojson/BaseCoordinatesTypeAdapter.java | 2 +- .../mapbox/geojson/BaseGeometryTypeAdapter.java | 2 +- .../main/java/com/mapbox/geojson/BoundingBox.java | 6 +++--- .../com/mapbox/geojson/CoordinateContainer.java | 2 +- .../src/main/java/com/mapbox/geojson/Feature.java | 6 +++--- .../com/mapbox/geojson/FeatureCollection.java | 6 +++--- .../src/main/java/com/mapbox/geojson/GeoJson.java | 2 +- .../main/java/com/mapbox/geojson/Geometry.java | 2 +- .../mapbox/geojson/GeometryAdapterFactory.java | 2 +- .../com/mapbox/geojson/GeometryCollection.java | 6 +++--- .../main/java/com/mapbox/geojson/LineString.java | 6 +++--- .../ListOfDoublesCoordinatesTypeAdapter.java | 2 +- .../ListOfListOfPointCoordinatesTypeAdapter.java | 2 +- .../ListOfPointCoordinatesTypeAdapter.java | 2 +- ...ofListofListOfPointCoordinatesTypeAdapter.java | 2 +- .../java/com/mapbox/geojson/MultiLineString.java | 6 +++--- .../main/java/com/mapbox/geojson/MultiPoint.java | 6 +++--- .../java/com/mapbox/geojson/MultiPolygon.java | 6 +++--- .../src/main/java/com/mapbox/geojson/Point.java | 8 ++++---- .../geojson/PointAsCoordinatesTypeAdapter.java | 2 +- .../src/main/java/com/mapbox/geojson/Polygon.java | 8 ++++---- .../geojson/gson/BoundingBoxTypeAdapter.java | 2 +- .../geojson/gson/GeoJsonAdapterFactory.java | 2 +- .../com/mapbox/geojson/gson/GeometryGeoJson.java | 4 ++-- .../com/mapbox/geojson/utils/PolylineUtils.java | 2 +- .../mapbox/api/isochrone/IsochroneCriteria.java | 2 +- .../com/mapbox/api/isochrone/MapboxIsochrone.java | 8 ++++---- .../mapbox/api/matching/v5/MapboxMapMatching.java | 8 ++++---- .../api/matching/v5/models/MapMatchingError.java | 2 +- .../matching/v5/models/MapMatchingMatching.java | 2 +- .../matching/v5/models/MapMatchingResponse.java | 4 ++-- .../matching/v5/models/MapMatchingTracepoint.java | 2 +- .../com/mapbox/api/matrix/v1/MapboxMatrix.java | 4 ++-- .../api/matrix/v1/models/MatrixResponse.java | 4 ++-- .../api/optimization/v1/MapboxOptimization.java | 6 +++--- .../v1/models/OptimizationResponse.java | 4 ++-- .../v1/models/OptimizationWaypoint.java | 4 ++-- .../api/routetiles/v1/MapboxRouteTiles.java | 4 ++-- .../v1/versions/MapboxRouteTileVersions.java | 4 ++-- .../models/RouteTileVersionsResponse.java | 2 +- .../com/mapbox/api/speech/v1/MapboxSpeech.java | 4 ++-- .../mapbox/api/staticmap/v1/MapboxStaticMap.java | 8 ++++---- .../api/staticmap/v1/StaticMapCriteria.java | 2 +- .../v1/models/StaticMarkerAnnotation.java | 6 +++--- .../v1/models/StaticPolylineAnnotation.java | 10 +++++----- .../com/mapbox/api/tilequery/MapboxTilequery.java | 4 ++-- .../mapbox/api/tilequery/TilequeryCriteria.java | 2 +- .../java/com/mapbox/turf/TurfClassification.java | 2 +- .../main/java/com/mapbox/turf/TurfConstants.java | 2 +- .../main/java/com/mapbox/turf/TurfConversion.java | 6 +++--- .../java/com/mapbox/turf/TurfMeasurement.java | 6 +++--- .../src/main/java/com/mapbox/turf/TurfMeta.java | 2 +- .../src/main/java/com/mapbox/turf/TurfMisc.java | 6 +++--- .../java/com/mapbox/turf/TurfTransformation.java | 4 ++-- .../mapbox/turf/models/LineIntersectsResult.java | 2 +- 86 files changed, 176 insertions(+), 178 deletions(-) diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle index a785850b0..93d7be895 100644 --- a/gradle/dependencies.gradle +++ b/gradle/dependencies.gradle @@ -1,14 +1,14 @@ ext { version = [ - autoValue : '1.6.2', + autoValue : '1.7', autoValueGson : '0.8.0', junit : '4.12', - supportLibVersion: '27.1.1', - gson : '2.8.5', - retrofit : '2.4.0', - okhttp3 : '3.11.0', - mockito : '2.18.3', + annotation : '1.0.0', + gson : '2.8.6', + retrofit : '2.7.1', + okhttp3 : '3.12.7', + mockito : '2.28.2', hamcrestJunit : '2.0.0.0', errorprone : '2.3.1', ] @@ -29,7 +29,7 @@ ext { autoValue : "com.google.auto.value:auto-value:${version.autoValue}", autoValueGson : "com.ryanharter.auto.value:auto-value-gson:${version.autoValueGson}", junit : "junit:junit:${version.junit}", - supportAnnotation : "com.android.support:support-annotations:${version.supportLibVersion}", + supportAnnotation : "androidx.annotation:annotation:${version.annotation}", gson : "com.google.code.gson:gson:${version.gson}", retrofit : "com.squareup.retrofit2:retrofit:${version.retrofit}", retrofit2Gson : "com.squareup.retrofit2:converter-gson:${version.retrofit}", @@ -41,7 +41,6 @@ ext { errorprone : "com.google.errorprone:error_prone_core:${version.errorprone}" ] - pluginDependencies = [ checkstyle : "com.puppycrawl.tools:checkstyle:${pluginVersion.checkstyle}", spotbugs : "gradle.plugin.com.github.spotbugs:gradlePlugin:${pluginVersion.spotbugs}", diff --git a/services-core/src/main/java/com/mapbox/core/internal/Preconditions.java b/services-core/src/main/java/com/mapbox/core/internal/Preconditions.java index 2f738841a..4ee02aaaa 100644 --- a/services-core/src/main/java/com/mapbox/core/internal/Preconditions.java +++ b/services-core/src/main/java/com/mapbox/core/internal/Preconditions.java @@ -1,8 +1,8 @@ package com.mapbox.core.internal; -import static android.support.annotation.RestrictTo.Scope.LIBRARY_GROUP; +import static androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP; -import android.support.annotation.RestrictTo; +import androidx.annotation.RestrictTo; /** * Contains simple precondition checks. diff --git a/services-core/src/main/java/com/mapbox/core/utils/ApiCallHelper.java b/services-core/src/main/java/com/mapbox/core/utils/ApiCallHelper.java index 6b644b12b..27bce79dc 100644 --- a/services-core/src/main/java/com/mapbox/core/utils/ApiCallHelper.java +++ b/services-core/src/main/java/com/mapbox/core/utils/ApiCallHelper.java @@ -1,7 +1,7 @@ package com.mapbox.core.utils; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.mapbox.core.constants.Constants; import java.util.Locale; diff --git a/services-directions-refresh/src/main/java/com/mapbox/api/directionsrefresh/v1/MapboxDirectionsRefresh.java b/services-directions-refresh/src/main/java/com/mapbox/api/directionsrefresh/v1/MapboxDirectionsRefresh.java index 371494249..f3901e808 100644 --- a/services-directions-refresh/src/main/java/com/mapbox/api/directionsrefresh/v1/MapboxDirectionsRefresh.java +++ b/services-directions-refresh/src/main/java/com/mapbox/api/directionsrefresh/v1/MapboxDirectionsRefresh.java @@ -1,7 +1,7 @@ package com.mapbox.api.directionsrefresh.v1; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.google.auto.value.AutoValue; import com.google.gson.GsonBuilder; diff --git a/services-directions-refresh/src/main/java/com/mapbox/api/directionsrefresh/v1/models/DirectionsRefreshResponse.java b/services-directions-refresh/src/main/java/com/mapbox/api/directionsrefresh/v1/models/DirectionsRefreshResponse.java index f71eefda3..e1bfdf2b7 100644 --- a/services-directions-refresh/src/main/java/com/mapbox/api/directionsrefresh/v1/models/DirectionsRefreshResponse.java +++ b/services-directions-refresh/src/main/java/com/mapbox/api/directionsrefresh/v1/models/DirectionsRefreshResponse.java @@ -1,7 +1,7 @@ package com.mapbox.api.directionsrefresh.v1.models; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.google.auto.value.AutoValue; import com.google.gson.Gson; diff --git a/services-directions/src/main/java/com/mapbox/api/directions/v5/DirectionsCriteria.java b/services-directions/src/main/java/com/mapbox/api/directions/v5/DirectionsCriteria.java index 2cacbf0ab..0c60e56cc 100644 --- a/services-directions/src/main/java/com/mapbox/api/directions/v5/DirectionsCriteria.java +++ b/services-directions/src/main/java/com/mapbox/api/directions/v5/DirectionsCriteria.java @@ -1,6 +1,6 @@ package com.mapbox.api.directions.v5; -import android.support.annotation.StringDef; +import androidx.annotation.StringDef; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/services-directions/src/main/java/com/mapbox/api/directions/v5/MapboxDirections.java b/services-directions/src/main/java/com/mapbox/api/directions/v5/MapboxDirections.java index dd9b9ca07..4484253e9 100644 --- a/services-directions/src/main/java/com/mapbox/api/directions/v5/MapboxDirections.java +++ b/services-directions/src/main/java/com/mapbox/api/directions/v5/MapboxDirections.java @@ -1,9 +1,9 @@ package com.mapbox.api.directions.v5; -import android.support.annotation.FloatRange; -import android.support.annotation.IntRange; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.FloatRange; +import androidx.annotation.IntRange; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.google.auto.value.AutoValue; import com.google.gson.GsonBuilder; diff --git a/services-directions/src/main/java/com/mapbox/api/directions/v5/WalkingOptions.java b/services-directions/src/main/java/com/mapbox/api/directions/v5/WalkingOptions.java index be23b58e6..cf5dd1b7c 100644 --- a/services-directions/src/main/java/com/mapbox/api/directions/v5/WalkingOptions.java +++ b/services-directions/src/main/java/com/mapbox/api/directions/v5/WalkingOptions.java @@ -1,7 +1,7 @@ package com.mapbox.api.directions.v5; -import android.support.annotation.FloatRange; -import android.support.annotation.Nullable; +import androidx.annotation.FloatRange; +import androidx.annotation.Nullable; import com.google.auto.value.AutoValue; import com.google.gson.Gson; diff --git a/services-directions/src/main/java/com/mapbox/api/directions/v5/models/BannerComponents.java b/services-directions/src/main/java/com/mapbox/api/directions/v5/models/BannerComponents.java index 19f26df8b..98cc47638 100644 --- a/services-directions/src/main/java/com/mapbox/api/directions/v5/models/BannerComponents.java +++ b/services-directions/src/main/java/com/mapbox/api/directions/v5/models/BannerComponents.java @@ -1,8 +1,8 @@ package com.mapbox.api.directions.v5.models; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.StringDef; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.StringDef; import com.google.auto.value.AutoValue; import com.google.gson.Gson; @@ -18,7 +18,7 @@ /** * A part of the {@link BannerText} which includes a snippet of the full banner text instruction. In - * cases where data is avaliable, an image url will be provided to visually include a road shield. + * cases where data is available, an image url will be provided to visually include a road shield. * To receive this information, your request must have {@link MapboxDirections#bannerInstructions()} * set to true. * diff --git a/services-directions/src/main/java/com/mapbox/api/directions/v5/models/BannerInstructions.java b/services-directions/src/main/java/com/mapbox/api/directions/v5/models/BannerInstructions.java index 757278fa3..fabee7deb 100644 --- a/services-directions/src/main/java/com/mapbox/api/directions/v5/models/BannerInstructions.java +++ b/services-directions/src/main/java/com/mapbox/api/directions/v5/models/BannerInstructions.java @@ -1,8 +1,7 @@ package com.mapbox.api.directions.v5.models; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; - +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.google.auto.value.AutoValue; import com.google.gson.Gson; import com.google.gson.GsonBuilder; diff --git a/services-directions/src/main/java/com/mapbox/api/directions/v5/models/BannerText.java b/services-directions/src/main/java/com/mapbox/api/directions/v5/models/BannerText.java index 38adc93ee..993c31663 100644 --- a/services-directions/src/main/java/com/mapbox/api/directions/v5/models/BannerText.java +++ b/services-directions/src/main/java/com/mapbox/api/directions/v5/models/BannerText.java @@ -1,7 +1,7 @@ package com.mapbox.api.directions.v5.models; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.google.auto.value.AutoValue; import com.google.gson.Gson; diff --git a/services-directions/src/main/java/com/mapbox/api/directions/v5/models/BannerView.java b/services-directions/src/main/java/com/mapbox/api/directions/v5/models/BannerView.java index 1b0f9f703..372edafcc 100644 --- a/services-directions/src/main/java/com/mapbox/api/directions/v5/models/BannerView.java +++ b/services-directions/src/main/java/com/mapbox/api/directions/v5/models/BannerView.java @@ -1,8 +1,5 @@ package com.mapbox.api.directions.v5.models; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; - import com.google.auto.value.AutoValue; import com.google.gson.Gson; import com.google.gson.GsonBuilder; @@ -12,6 +9,9 @@ import java.util.List; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + /** * Includes both plain text information that can be visualized inside your navigation application * along with the text string broken down into {@link BannerComponents} which may or may not @@ -34,7 +34,7 @@ public static Builder builder() { } /** - * Plain text with all the {@link BannerComponents} text combined. + * Plain text with all the {@link BannerComponents} text combined.BannerInstructions. * * @return plain text with all the {@link BannerComponents} text items combined * @since 5.0.0 diff --git a/services-directions/src/main/java/com/mapbox/api/directions/v5/models/DirectionsError.java b/services-directions/src/main/java/com/mapbox/api/directions/v5/models/DirectionsError.java index 054517f7e..948ec1f67 100644 --- a/services-directions/src/main/java/com/mapbox/api/directions/v5/models/DirectionsError.java +++ b/services-directions/src/main/java/com/mapbox/api/directions/v5/models/DirectionsError.java @@ -1,6 +1,6 @@ package com.mapbox.api.directions.v5.models; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import com.google.auto.value.AutoValue; import com.google.gson.Gson; import com.google.gson.TypeAdapter; diff --git a/services-directions/src/main/java/com/mapbox/api/directions/v5/models/DirectionsResponse.java b/services-directions/src/main/java/com/mapbox/api/directions/v5/models/DirectionsResponse.java index 522a189b3..e2e134b4d 100644 --- a/services-directions/src/main/java/com/mapbox/api/directions/v5/models/DirectionsResponse.java +++ b/services-directions/src/main/java/com/mapbox/api/directions/v5/models/DirectionsResponse.java @@ -1,7 +1,7 @@ package com.mapbox.api.directions.v5.models; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.google.auto.value.AutoValue; import com.google.gson.Gson; diff --git a/services-directions/src/main/java/com/mapbox/api/directions/v5/models/DirectionsRoute.java b/services-directions/src/main/java/com/mapbox/api/directions/v5/models/DirectionsRoute.java index 882ab4dfe..31ad9a5ee 100644 --- a/services-directions/src/main/java/com/mapbox/api/directions/v5/models/DirectionsRoute.java +++ b/services-directions/src/main/java/com/mapbox/api/directions/v5/models/DirectionsRoute.java @@ -1,6 +1,6 @@ package com.mapbox.api.directions.v5.models; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import com.google.auto.value.AutoValue; import com.google.gson.Gson; diff --git a/services-directions/src/main/java/com/mapbox/api/directions/v5/models/DirectionsWaypoint.java b/services-directions/src/main/java/com/mapbox/api/directions/v5/models/DirectionsWaypoint.java index e06b8004d..8bc39181e 100644 --- a/services-directions/src/main/java/com/mapbox/api/directions/v5/models/DirectionsWaypoint.java +++ b/services-directions/src/main/java/com/mapbox/api/directions/v5/models/DirectionsWaypoint.java @@ -1,6 +1,6 @@ package com.mapbox.api.directions.v5.models; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import com.google.auto.value.AutoValue; import com.google.gson.Gson; import com.google.gson.GsonBuilder; diff --git a/services-directions/src/main/java/com/mapbox/api/directions/v5/models/IntersectionLanes.java b/services-directions/src/main/java/com/mapbox/api/directions/v5/models/IntersectionLanes.java index ce52e3b11..f60063963 100644 --- a/services-directions/src/main/java/com/mapbox/api/directions/v5/models/IntersectionLanes.java +++ b/services-directions/src/main/java/com/mapbox/api/directions/v5/models/IntersectionLanes.java @@ -1,6 +1,6 @@ package com.mapbox.api.directions.v5.models; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import com.google.auto.value.AutoValue; import com.google.gson.Gson; import com.google.gson.GsonBuilder; diff --git a/services-directions/src/main/java/com/mapbox/api/directions/v5/models/LegAnnotation.java b/services-directions/src/main/java/com/mapbox/api/directions/v5/models/LegAnnotation.java index 5a2a8b43f..e3e4079ce 100644 --- a/services-directions/src/main/java/com/mapbox/api/directions/v5/models/LegAnnotation.java +++ b/services-directions/src/main/java/com/mapbox/api/directions/v5/models/LegAnnotation.java @@ -1,6 +1,6 @@ package com.mapbox.api.directions.v5.models; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import com.google.auto.value.AutoValue; import com.google.gson.Gson; import com.google.gson.GsonBuilder; diff --git a/services-directions/src/main/java/com/mapbox/api/directions/v5/models/LegStep.java b/services-directions/src/main/java/com/mapbox/api/directions/v5/models/LegStep.java index 0271f721d..6741ca832 100644 --- a/services-directions/src/main/java/com/mapbox/api/directions/v5/models/LegStep.java +++ b/services-directions/src/main/java/com/mapbox/api/directions/v5/models/LegStep.java @@ -1,7 +1,7 @@ package com.mapbox.api.directions.v5.models; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.google.auto.value.AutoValue; import com.google.gson.Gson; import com.google.gson.GsonBuilder; diff --git a/services-directions/src/main/java/com/mapbox/api/directions/v5/models/MaxSpeed.java b/services-directions/src/main/java/com/mapbox/api/directions/v5/models/MaxSpeed.java index f759495c5..81fbd9154 100644 --- a/services-directions/src/main/java/com/mapbox/api/directions/v5/models/MaxSpeed.java +++ b/services-directions/src/main/java/com/mapbox/api/directions/v5/models/MaxSpeed.java @@ -1,6 +1,6 @@ package com.mapbox.api.directions.v5.models; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import com.google.auto.value.AutoValue; import com.google.gson.Gson; diff --git a/services-directions/src/main/java/com/mapbox/api/directions/v5/models/RouteLeg.java b/services-directions/src/main/java/com/mapbox/api/directions/v5/models/RouteLeg.java index 468077d6d..71872e078 100644 --- a/services-directions/src/main/java/com/mapbox/api/directions/v5/models/RouteLeg.java +++ b/services-directions/src/main/java/com/mapbox/api/directions/v5/models/RouteLeg.java @@ -1,6 +1,6 @@ package com.mapbox.api.directions.v5.models; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import com.google.auto.value.AutoValue; import com.google.gson.Gson; import com.google.gson.GsonBuilder; diff --git a/services-directions/src/main/java/com/mapbox/api/directions/v5/models/RouteOptions.java b/services-directions/src/main/java/com/mapbox/api/directions/v5/models/RouteOptions.java index a97a16b78..19e69f79c 100644 --- a/services-directions/src/main/java/com/mapbox/api/directions/v5/models/RouteOptions.java +++ b/services-directions/src/main/java/com/mapbox/api/directions/v5/models/RouteOptions.java @@ -1,7 +1,7 @@ package com.mapbox.api.directions.v5.models; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.google.auto.value.AutoValue; import com.google.gson.Gson; diff --git a/services-directions/src/main/java/com/mapbox/api/directions/v5/models/StepIntersection.java b/services-directions/src/main/java/com/mapbox/api/directions/v5/models/StepIntersection.java index b2b817ba1..74e84438f 100644 --- a/services-directions/src/main/java/com/mapbox/api/directions/v5/models/StepIntersection.java +++ b/services-directions/src/main/java/com/mapbox/api/directions/v5/models/StepIntersection.java @@ -1,7 +1,7 @@ package com.mapbox.api.directions.v5.models; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.google.auto.value.AutoValue; import com.google.gson.Gson; import com.google.gson.GsonBuilder; diff --git a/services-directions/src/main/java/com/mapbox/api/directions/v5/models/StepManeuver.java b/services-directions/src/main/java/com/mapbox/api/directions/v5/models/StepManeuver.java index b736151eb..cdc36bc8d 100644 --- a/services-directions/src/main/java/com/mapbox/api/directions/v5/models/StepManeuver.java +++ b/services-directions/src/main/java/com/mapbox/api/directions/v5/models/StepManeuver.java @@ -1,9 +1,9 @@ package com.mapbox.api.directions.v5.models; -import android.support.annotation.FloatRange; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.StringDef; +import androidx.annotation.FloatRange; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.StringDef; import com.google.auto.value.AutoValue; import com.google.gson.Gson; diff --git a/services-directions/src/main/java/com/mapbox/api/directions/v5/models/VoiceInstructions.java b/services-directions/src/main/java/com/mapbox/api/directions/v5/models/VoiceInstructions.java index 6c1cb8215..724c1760c 100644 --- a/services-directions/src/main/java/com/mapbox/api/directions/v5/models/VoiceInstructions.java +++ b/services-directions/src/main/java/com/mapbox/api/directions/v5/models/VoiceInstructions.java @@ -1,6 +1,6 @@ package com.mapbox.api.directions.v5.models; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import com.google.auto.value.AutoValue; import com.google.gson.Gson; import com.google.gson.GsonBuilder; diff --git a/services-geocoding/src/main/java/com/mapbox/api/geocoding/v5/GeocodingCriteria.java b/services-geocoding/src/main/java/com/mapbox/api/geocoding/v5/GeocodingCriteria.java index 94b3edaef..0727375bf 100644 --- a/services-geocoding/src/main/java/com/mapbox/api/geocoding/v5/GeocodingCriteria.java +++ b/services-geocoding/src/main/java/com/mapbox/api/geocoding/v5/GeocodingCriteria.java @@ -1,6 +1,6 @@ package com.mapbox.api.geocoding.v5; -import android.support.annotation.StringDef; +import androidx.annotation.StringDef; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/services-geocoding/src/main/java/com/mapbox/api/geocoding/v5/MapboxGeocoding.java b/services-geocoding/src/main/java/com/mapbox/api/geocoding/v5/MapboxGeocoding.java index 70ae644fc..242b8099c 100644 --- a/services-geocoding/src/main/java/com/mapbox/api/geocoding/v5/MapboxGeocoding.java +++ b/services-geocoding/src/main/java/com/mapbox/api/geocoding/v5/MapboxGeocoding.java @@ -1,9 +1,9 @@ package com.mapbox.api.geocoding.v5; -import android.support.annotation.FloatRange; -import android.support.annotation.IntRange; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.FloatRange; +import androidx.annotation.IntRange; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.google.auto.value.AutoValue; import com.google.gson.GsonBuilder; diff --git a/services-geocoding/src/main/java/com/mapbox/api/geocoding/v5/models/CarmenContext.java b/services-geocoding/src/main/java/com/mapbox/api/geocoding/v5/models/CarmenContext.java index 515cc0fd4..1d4cb4db7 100644 --- a/services-geocoding/src/main/java/com/mapbox/api/geocoding/v5/models/CarmenContext.java +++ b/services-geocoding/src/main/java/com/mapbox/api/geocoding/v5/models/CarmenContext.java @@ -1,7 +1,7 @@ package com.mapbox.api.geocoding.v5.models; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.google.auto.value.AutoValue; import com.google.gson.Gson; import com.google.gson.GsonBuilder; diff --git a/services-geocoding/src/main/java/com/mapbox/api/geocoding/v5/models/CarmenFeature.java b/services-geocoding/src/main/java/com/mapbox/api/geocoding/v5/models/CarmenFeature.java index 79bb7056b..700f1f85a 100644 --- a/services-geocoding/src/main/java/com/mapbox/api/geocoding/v5/models/CarmenFeature.java +++ b/services-geocoding/src/main/java/com/mapbox/api/geocoding/v5/models/CarmenFeature.java @@ -1,7 +1,7 @@ package com.mapbox.api.geocoding.v5.models; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.google.auto.value.AutoValue; import com.google.gson.Gson; import com.google.gson.GsonBuilder; diff --git a/services-geocoding/src/main/java/com/mapbox/api/geocoding/v5/models/GeocodingResponse.java b/services-geocoding/src/main/java/com/mapbox/api/geocoding/v5/models/GeocodingResponse.java index f0008418e..8ffcfc817 100644 --- a/services-geocoding/src/main/java/com/mapbox/api/geocoding/v5/models/GeocodingResponse.java +++ b/services-geocoding/src/main/java/com/mapbox/api/geocoding/v5/models/GeocodingResponse.java @@ -1,6 +1,6 @@ package com.mapbox.api.geocoding.v5.models; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.google.auto.value.AutoValue; import com.google.gson.Gson; import com.google.gson.GsonBuilder; diff --git a/services-geojson/src/main/java/com/google/gson/typeadapters/RuntimeTypeAdapterFactory.java b/services-geojson/src/main/java/com/google/gson/typeadapters/RuntimeTypeAdapterFactory.java index ebc58ccc0..fd1adf5e1 100644 --- a/services-geojson/src/main/java/com/google/gson/typeadapters/RuntimeTypeAdapterFactory.java +++ b/services-geojson/src/main/java/com/google/gson/typeadapters/RuntimeTypeAdapterFactory.java @@ -16,7 +16,7 @@ package com.google.gson.typeadapters; -import android.support.annotation.Keep; +import androidx.annotation.Keep; import java.io.IOException; import java.util.LinkedHashMap; diff --git a/services-geojson/src/main/java/com/mapbox/geojson/BaseCoordinatesTypeAdapter.java b/services-geojson/src/main/java/com/mapbox/geojson/BaseCoordinatesTypeAdapter.java index c039b15b5..274dbfe36 100644 --- a/services-geojson/src/main/java/com/mapbox/geojson/BaseCoordinatesTypeAdapter.java +++ b/services-geojson/src/main/java/com/mapbox/geojson/BaseCoordinatesTypeAdapter.java @@ -1,6 +1,6 @@ package com.mapbox.geojson; -import android.support.annotation.Keep; +import androidx.annotation.Keep; import com.google.gson.TypeAdapter; import com.google.gson.stream.JsonReader; diff --git a/services-geojson/src/main/java/com/mapbox/geojson/BaseGeometryTypeAdapter.java b/services-geojson/src/main/java/com/mapbox/geojson/BaseGeometryTypeAdapter.java index 386c9b096..47ed7c913 100644 --- a/services-geojson/src/main/java/com/mapbox/geojson/BaseGeometryTypeAdapter.java +++ b/services-geojson/src/main/java/com/mapbox/geojson/BaseGeometryTypeAdapter.java @@ -1,6 +1,6 @@ package com.mapbox.geojson; -import android.support.annotation.Keep; +import androidx.annotation.Keep; import com.google.gson.Gson; import com.google.gson.TypeAdapter; diff --git a/services-geojson/src/main/java/com/mapbox/geojson/BoundingBox.java b/services-geojson/src/main/java/com/mapbox/geojson/BoundingBox.java index a39aa1399..cfe823a71 100644 --- a/services-geojson/src/main/java/com/mapbox/geojson/BoundingBox.java +++ b/services-geojson/src/main/java/com/mapbox/geojson/BoundingBox.java @@ -3,9 +3,9 @@ import static com.mapbox.geojson.constants.GeoJsonConstants.MIN_LATITUDE; import static com.mapbox.geojson.constants.GeoJsonConstants.MIN_LONGITUDE; -import android.support.annotation.FloatRange; -import android.support.annotation.Keep; -import android.support.annotation.NonNull; +import androidx.annotation.FloatRange; +import androidx.annotation.Keep; +import androidx.annotation.NonNull; import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.google.gson.TypeAdapter; diff --git a/services-geojson/src/main/java/com/mapbox/geojson/CoordinateContainer.java b/services-geojson/src/main/java/com/mapbox/geojson/CoordinateContainer.java index 3a458e90b..51f18e6e9 100644 --- a/services-geojson/src/main/java/com/mapbox/geojson/CoordinateContainer.java +++ b/services-geojson/src/main/java/com/mapbox/geojson/CoordinateContainer.java @@ -1,6 +1,6 @@ package com.mapbox.geojson; -import android.support.annotation.Keep; +import androidx.annotation.Keep; /** * Each of the s geometries which make up GeoJson implement this interface and consume a varying diff --git a/services-geojson/src/main/java/com/mapbox/geojson/Feature.java b/services-geojson/src/main/java/com/mapbox/geojson/Feature.java index fd1c0364d..843e8e5d6 100644 --- a/services-geojson/src/main/java/com/mapbox/geojson/Feature.java +++ b/services-geojson/src/main/java/com/mapbox/geojson/Feature.java @@ -1,8 +1,8 @@ package com.mapbox.geojson; -import android.support.annotation.Keep; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.Keep; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.google.gson.JsonElement; diff --git a/services-geojson/src/main/java/com/mapbox/geojson/FeatureCollection.java b/services-geojson/src/main/java/com/mapbox/geojson/FeatureCollection.java index 5aece44d0..89430427f 100644 --- a/services-geojson/src/main/java/com/mapbox/geojson/FeatureCollection.java +++ b/services-geojson/src/main/java/com/mapbox/geojson/FeatureCollection.java @@ -1,8 +1,8 @@ package com.mapbox.geojson; -import android.support.annotation.Keep; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.Keep; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.google.gson.TypeAdapter; diff --git a/services-geojson/src/main/java/com/mapbox/geojson/GeoJson.java b/services-geojson/src/main/java/com/mapbox/geojson/GeoJson.java index e0dea8297..f62a58e18 100644 --- a/services-geojson/src/main/java/com/mapbox/geojson/GeoJson.java +++ b/services-geojson/src/main/java/com/mapbox/geojson/GeoJson.java @@ -1,6 +1,6 @@ package com.mapbox.geojson; -import android.support.annotation.Keep; +import androidx.annotation.Keep; import java.io.Serializable; diff --git a/services-geojson/src/main/java/com/mapbox/geojson/Geometry.java b/services-geojson/src/main/java/com/mapbox/geojson/Geometry.java index b6dec00bb..9b1cba7aa 100644 --- a/services-geojson/src/main/java/com/mapbox/geojson/Geometry.java +++ b/services-geojson/src/main/java/com/mapbox/geojson/Geometry.java @@ -1,6 +1,6 @@ package com.mapbox.geojson; -import android.support.annotation.Keep; +import androidx.annotation.Keep; /** * Each of the six geometries and {@link GeometryCollection} diff --git a/services-geojson/src/main/java/com/mapbox/geojson/GeometryAdapterFactory.java b/services-geojson/src/main/java/com/mapbox/geojson/GeometryAdapterFactory.java index acee1738e..7bd5b3a7c 100644 --- a/services-geojson/src/main/java/com/mapbox/geojson/GeometryAdapterFactory.java +++ b/services-geojson/src/main/java/com/mapbox/geojson/GeometryAdapterFactory.java @@ -1,6 +1,6 @@ package com.mapbox.geojson; -import android.support.annotation.Keep; +import androidx.annotation.Keep; import com.google.gson.TypeAdapterFactory; diff --git a/services-geojson/src/main/java/com/mapbox/geojson/GeometryCollection.java b/services-geojson/src/main/java/com/mapbox/geojson/GeometryCollection.java index 3aefae639..2f1f85a80 100644 --- a/services-geojson/src/main/java/com/mapbox/geojson/GeometryCollection.java +++ b/services-geojson/src/main/java/com/mapbox/geojson/GeometryCollection.java @@ -1,8 +1,8 @@ package com.mapbox.geojson; -import android.support.annotation.Keep; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.Keep; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.google.gson.Gson; import com.google.gson.GsonBuilder; diff --git a/services-geojson/src/main/java/com/mapbox/geojson/LineString.java b/services-geojson/src/main/java/com/mapbox/geojson/LineString.java index 50d0fb606..e57edb101 100644 --- a/services-geojson/src/main/java/com/mapbox/geojson/LineString.java +++ b/services-geojson/src/main/java/com/mapbox/geojson/LineString.java @@ -1,8 +1,8 @@ package com.mapbox.geojson; -import android.support.annotation.Keep; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.Keep; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.google.gson.TypeAdapter; diff --git a/services-geojson/src/main/java/com/mapbox/geojson/ListOfDoublesCoordinatesTypeAdapter.java b/services-geojson/src/main/java/com/mapbox/geojson/ListOfDoublesCoordinatesTypeAdapter.java index 209099328..4be4e86f7 100644 --- a/services-geojson/src/main/java/com/mapbox/geojson/ListOfDoublesCoordinatesTypeAdapter.java +++ b/services-geojson/src/main/java/com/mapbox/geojson/ListOfDoublesCoordinatesTypeAdapter.java @@ -1,6 +1,6 @@ package com.mapbox.geojson; -import android.support.annotation.Keep; +import androidx.annotation.Keep; import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonWriter; diff --git a/services-geojson/src/main/java/com/mapbox/geojson/ListOfListOfPointCoordinatesTypeAdapter.java b/services-geojson/src/main/java/com/mapbox/geojson/ListOfListOfPointCoordinatesTypeAdapter.java index 6f6a5b31f..b23df3878 100644 --- a/services-geojson/src/main/java/com/mapbox/geojson/ListOfListOfPointCoordinatesTypeAdapter.java +++ b/services-geojson/src/main/java/com/mapbox/geojson/ListOfListOfPointCoordinatesTypeAdapter.java @@ -1,6 +1,6 @@ package com.mapbox.geojson; -import android.support.annotation.Keep; +import androidx.annotation.Keep; import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonToken; diff --git a/services-geojson/src/main/java/com/mapbox/geojson/ListOfPointCoordinatesTypeAdapter.java b/services-geojson/src/main/java/com/mapbox/geojson/ListOfPointCoordinatesTypeAdapter.java index 517172856..215aec083 100644 --- a/services-geojson/src/main/java/com/mapbox/geojson/ListOfPointCoordinatesTypeAdapter.java +++ b/services-geojson/src/main/java/com/mapbox/geojson/ListOfPointCoordinatesTypeAdapter.java @@ -1,6 +1,6 @@ package com.mapbox.geojson; -import android.support.annotation.Keep; +import androidx.annotation.Keep; import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonToken; diff --git a/services-geojson/src/main/java/com/mapbox/geojson/ListofListofListOfPointCoordinatesTypeAdapter.java b/services-geojson/src/main/java/com/mapbox/geojson/ListofListofListOfPointCoordinatesTypeAdapter.java index 2a657ce62..7cb87df08 100644 --- a/services-geojson/src/main/java/com/mapbox/geojson/ListofListofListOfPointCoordinatesTypeAdapter.java +++ b/services-geojson/src/main/java/com/mapbox/geojson/ListofListofListOfPointCoordinatesTypeAdapter.java @@ -1,6 +1,6 @@ package com.mapbox.geojson; -import android.support.annotation.Keep; +import androidx.annotation.Keep; import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonToken; diff --git a/services-geojson/src/main/java/com/mapbox/geojson/MultiLineString.java b/services-geojson/src/main/java/com/mapbox/geojson/MultiLineString.java index ce4543709..659b5ffa0 100644 --- a/services-geojson/src/main/java/com/mapbox/geojson/MultiLineString.java +++ b/services-geojson/src/main/java/com/mapbox/geojson/MultiLineString.java @@ -1,8 +1,8 @@ package com.mapbox.geojson; -import android.support.annotation.Keep; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.Keep; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.google.gson.TypeAdapter; diff --git a/services-geojson/src/main/java/com/mapbox/geojson/MultiPoint.java b/services-geojson/src/main/java/com/mapbox/geojson/MultiPoint.java index 47cc6a194..4e3757890 100644 --- a/services-geojson/src/main/java/com/mapbox/geojson/MultiPoint.java +++ b/services-geojson/src/main/java/com/mapbox/geojson/MultiPoint.java @@ -1,8 +1,8 @@ package com.mapbox.geojson; -import android.support.annotation.Keep; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.Keep; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.google.gson.TypeAdapter; diff --git a/services-geojson/src/main/java/com/mapbox/geojson/MultiPolygon.java b/services-geojson/src/main/java/com/mapbox/geojson/MultiPolygon.java index b6ef1b7c7..325479d9c 100644 --- a/services-geojson/src/main/java/com/mapbox/geojson/MultiPolygon.java +++ b/services-geojson/src/main/java/com/mapbox/geojson/MultiPolygon.java @@ -1,8 +1,8 @@ package com.mapbox.geojson; -import android.support.annotation.Keep; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.Keep; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.google.gson.TypeAdapter; diff --git a/services-geojson/src/main/java/com/mapbox/geojson/Point.java b/services-geojson/src/main/java/com/mapbox/geojson/Point.java index b69c12151..516c9165a 100644 --- a/services-geojson/src/main/java/com/mapbox/geojson/Point.java +++ b/services-geojson/src/main/java/com/mapbox/geojson/Point.java @@ -5,10 +5,10 @@ import static com.mapbox.geojson.constants.GeoJsonConstants.MIN_LATITUDE; import static com.mapbox.geojson.constants.GeoJsonConstants.MIN_LONGITUDE; -import android.support.annotation.FloatRange; -import android.support.annotation.Keep; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.FloatRange; +import androidx.annotation.Keep; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.google.gson.TypeAdapter; diff --git a/services-geojson/src/main/java/com/mapbox/geojson/PointAsCoordinatesTypeAdapter.java b/services-geojson/src/main/java/com/mapbox/geojson/PointAsCoordinatesTypeAdapter.java index 8fa691afa..265c59cc6 100644 --- a/services-geojson/src/main/java/com/mapbox/geojson/PointAsCoordinatesTypeAdapter.java +++ b/services-geojson/src/main/java/com/mapbox/geojson/PointAsCoordinatesTypeAdapter.java @@ -1,6 +1,6 @@ package com.mapbox.geojson; -import android.support.annotation.Keep; +import androidx.annotation.Keep; import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonWriter; diff --git a/services-geojson/src/main/java/com/mapbox/geojson/Polygon.java b/services-geojson/src/main/java/com/mapbox/geojson/Polygon.java index d5f9942b0..c40d5791c 100644 --- a/services-geojson/src/main/java/com/mapbox/geojson/Polygon.java +++ b/services-geojson/src/main/java/com/mapbox/geojson/Polygon.java @@ -1,9 +1,9 @@ package com.mapbox.geojson; -import android.support.annotation.Keep; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.Size; +import androidx.annotation.Keep; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.Size; import com.google.gson.Gson; import com.google.gson.GsonBuilder; diff --git a/services-geojson/src/main/java/com/mapbox/geojson/gson/BoundingBoxTypeAdapter.java b/services-geojson/src/main/java/com/mapbox/geojson/gson/BoundingBoxTypeAdapter.java index 14d71ab75..fa0591931 100644 --- a/services-geojson/src/main/java/com/mapbox/geojson/gson/BoundingBoxTypeAdapter.java +++ b/services-geojson/src/main/java/com/mapbox/geojson/gson/BoundingBoxTypeAdapter.java @@ -1,6 +1,6 @@ package com.mapbox.geojson.gson; -import android.support.annotation.Keep; +import androidx.annotation.Keep; import com.google.gson.TypeAdapter; import com.google.gson.stream.JsonReader; diff --git a/services-geojson/src/main/java/com/mapbox/geojson/gson/GeoJsonAdapterFactory.java b/services-geojson/src/main/java/com/mapbox/geojson/gson/GeoJsonAdapterFactory.java index abc16b25e..b4eb7dc69 100644 --- a/services-geojson/src/main/java/com/mapbox/geojson/gson/GeoJsonAdapterFactory.java +++ b/services-geojson/src/main/java/com/mapbox/geojson/gson/GeoJsonAdapterFactory.java @@ -1,6 +1,6 @@ package com.mapbox.geojson.gson; -import android.support.annotation.Keep; +import androidx.annotation.Keep; import com.google.gson.Gson; import com.google.gson.TypeAdapter; diff --git a/services-geojson/src/main/java/com/mapbox/geojson/gson/GeometryGeoJson.java b/services-geojson/src/main/java/com/mapbox/geojson/gson/GeometryGeoJson.java index 8620eeb0d..457680ff8 100644 --- a/services-geojson/src/main/java/com/mapbox/geojson/gson/GeometryGeoJson.java +++ b/services-geojson/src/main/java/com/mapbox/geojson/gson/GeometryGeoJson.java @@ -1,7 +1,7 @@ package com.mapbox.geojson.gson; -import android.support.annotation.Keep; -import android.support.annotation.NonNull; +import androidx.annotation.Keep; +import androidx.annotation.NonNull; import com.google.gson.GsonBuilder; import com.mapbox.geojson.Geometry; diff --git a/services-geojson/src/main/java/com/mapbox/geojson/utils/PolylineUtils.java b/services-geojson/src/main/java/com/mapbox/geojson/utils/PolylineUtils.java index 67ec4ff5c..10c9df160 100644 --- a/services-geojson/src/main/java/com/mapbox/geojson/utils/PolylineUtils.java +++ b/services-geojson/src/main/java/com/mapbox/geojson/utils/PolylineUtils.java @@ -1,6 +1,6 @@ package com.mapbox.geojson.utils; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.mapbox.geojson.Point; import java.util.ArrayList; diff --git a/services-isochrone/src/main/java/com/mapbox/api/isochrone/IsochroneCriteria.java b/services-isochrone/src/main/java/com/mapbox/api/isochrone/IsochroneCriteria.java index f57b2f927..05adad458 100644 --- a/services-isochrone/src/main/java/com/mapbox/api/isochrone/IsochroneCriteria.java +++ b/services-isochrone/src/main/java/com/mapbox/api/isochrone/IsochroneCriteria.java @@ -1,6 +1,6 @@ package com.mapbox.api.isochrone; -import android.support.annotation.StringDef; +import androidx.annotation.StringDef; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/services-isochrone/src/main/java/com/mapbox/api/isochrone/MapboxIsochrone.java b/services-isochrone/src/main/java/com/mapbox/api/isochrone/MapboxIsochrone.java index f1c5d6fb0..6ec9bce3e 100644 --- a/services-isochrone/src/main/java/com/mapbox/api/isochrone/MapboxIsochrone.java +++ b/services-isochrone/src/main/java/com/mapbox/api/isochrone/MapboxIsochrone.java @@ -1,9 +1,9 @@ package com.mapbox.api.isochrone; -import android.support.annotation.FloatRange; -import android.support.annotation.IntRange; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.FloatRange; +import androidx.annotation.IntRange; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.google.auto.value.AutoValue; import com.google.gson.GsonBuilder; diff --git a/services-matching/src/main/java/com/mapbox/api/matching/v5/MapboxMapMatching.java b/services-matching/src/main/java/com/mapbox/api/matching/v5/MapboxMapMatching.java index 110591730..2cd9554e0 100644 --- a/services-matching/src/main/java/com/mapbox/api/matching/v5/MapboxMapMatching.java +++ b/services-matching/src/main/java/com/mapbox/api/matching/v5/MapboxMapMatching.java @@ -1,9 +1,9 @@ package com.mapbox.api.matching.v5; -import android.support.annotation.FloatRange; -import android.support.annotation.IntRange; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.FloatRange; +import androidx.annotation.IntRange; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.google.auto.value.AutoValue; import com.google.gson.GsonBuilder; diff --git a/services-matching/src/main/java/com/mapbox/api/matching/v5/models/MapMatchingError.java b/services-matching/src/main/java/com/mapbox/api/matching/v5/models/MapMatchingError.java index e4b3f3f44..9c91e9a91 100644 --- a/services-matching/src/main/java/com/mapbox/api/matching/v5/models/MapMatchingError.java +++ b/services-matching/src/main/java/com/mapbox/api/matching/v5/models/MapMatchingError.java @@ -1,6 +1,6 @@ package com.mapbox.api.matching.v5.models; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import com.google.auto.value.AutoValue; import com.google.gson.Gson; diff --git a/services-matching/src/main/java/com/mapbox/api/matching/v5/models/MapMatchingMatching.java b/services-matching/src/main/java/com/mapbox/api/matching/v5/models/MapMatchingMatching.java index f6ee396d1..02f5dcc2a 100644 --- a/services-matching/src/main/java/com/mapbox/api/matching/v5/models/MapMatchingMatching.java +++ b/services-matching/src/main/java/com/mapbox/api/matching/v5/models/MapMatchingMatching.java @@ -1,6 +1,6 @@ package com.mapbox.api.matching.v5.models; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import com.google.auto.value.AutoValue; import com.google.gson.Gson; diff --git a/services-matching/src/main/java/com/mapbox/api/matching/v5/models/MapMatchingResponse.java b/services-matching/src/main/java/com/mapbox/api/matching/v5/models/MapMatchingResponse.java index cf16b505c..a032c918a 100644 --- a/services-matching/src/main/java/com/mapbox/api/matching/v5/models/MapMatchingResponse.java +++ b/services-matching/src/main/java/com/mapbox/api/matching/v5/models/MapMatchingResponse.java @@ -1,7 +1,7 @@ package com.mapbox.api.matching.v5.models; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.google.auto.value.AutoValue; import com.google.gson.Gson; diff --git a/services-matching/src/main/java/com/mapbox/api/matching/v5/models/MapMatchingTracepoint.java b/services-matching/src/main/java/com/mapbox/api/matching/v5/models/MapMatchingTracepoint.java index 41819a0aa..4aa85f7ed 100644 --- a/services-matching/src/main/java/com/mapbox/api/matching/v5/models/MapMatchingTracepoint.java +++ b/services-matching/src/main/java/com/mapbox/api/matching/v5/models/MapMatchingTracepoint.java @@ -1,6 +1,6 @@ package com.mapbox.api.matching.v5.models; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import com.google.auto.value.AutoValue; import com.google.gson.Gson; diff --git a/services-matrix/src/main/java/com/mapbox/api/matrix/v1/MapboxMatrix.java b/services-matrix/src/main/java/com/mapbox/api/matrix/v1/MapboxMatrix.java index be54cff86..f226633c9 100644 --- a/services-matrix/src/main/java/com/mapbox/api/matrix/v1/MapboxMatrix.java +++ b/services-matrix/src/main/java/com/mapbox/api/matrix/v1/MapboxMatrix.java @@ -1,7 +1,7 @@ package com.mapbox.api.matrix.v1; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.google.auto.value.AutoValue; import com.google.gson.GsonBuilder; diff --git a/services-matrix/src/main/java/com/mapbox/api/matrix/v1/models/MatrixResponse.java b/services-matrix/src/main/java/com/mapbox/api/matrix/v1/models/MatrixResponse.java index b927e0376..85f66c68d 100644 --- a/services-matrix/src/main/java/com/mapbox/api/matrix/v1/models/MatrixResponse.java +++ b/services-matrix/src/main/java/com/mapbox/api/matrix/v1/models/MatrixResponse.java @@ -3,13 +3,13 @@ import java.io.Serializable; import java.util.List; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import com.google.auto.value.AutoValue; import com.google.gson.Gson; import com.google.gson.TypeAdapter; import com.mapbox.api.directions.v5.models.DirectionsWaypoint; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; /** * This contains the Matrix API response information which can be used to display the results. diff --git a/services-optimization/src/main/java/com/mapbox/api/optimization/v1/MapboxOptimization.java b/services-optimization/src/main/java/com/mapbox/api/optimization/v1/MapboxOptimization.java index 7601f55cf..bd9dc7817 100644 --- a/services-optimization/src/main/java/com/mapbox/api/optimization/v1/MapboxOptimization.java +++ b/services-optimization/src/main/java/com/mapbox/api/optimization/v1/MapboxOptimization.java @@ -1,8 +1,8 @@ package com.mapbox.api.optimization.v1; -import android.support.annotation.FloatRange; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.FloatRange; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.google.auto.value.AutoValue; import com.google.gson.GsonBuilder; diff --git a/services-optimization/src/main/java/com/mapbox/api/optimization/v1/models/OptimizationResponse.java b/services-optimization/src/main/java/com/mapbox/api/optimization/v1/models/OptimizationResponse.java index e8d9b0125..1bd03d22a 100644 --- a/services-optimization/src/main/java/com/mapbox/api/optimization/v1/models/OptimizationResponse.java +++ b/services-optimization/src/main/java/com/mapbox/api/optimization/v1/models/OptimizationResponse.java @@ -1,7 +1,7 @@ package com.mapbox.api.optimization.v1.models; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.google.auto.value.AutoValue; import com.google.gson.Gson; import com.google.gson.TypeAdapter; diff --git a/services-optimization/src/main/java/com/mapbox/api/optimization/v1/models/OptimizationWaypoint.java b/services-optimization/src/main/java/com/mapbox/api/optimization/v1/models/OptimizationWaypoint.java index 70c329113..23652ff0c 100644 --- a/services-optimization/src/main/java/com/mapbox/api/optimization/v1/models/OptimizationWaypoint.java +++ b/services-optimization/src/main/java/com/mapbox/api/optimization/v1/models/OptimizationWaypoint.java @@ -1,7 +1,7 @@ package com.mapbox.api.optimization.v1.models; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.google.auto.value.AutoValue; import com.google.gson.Gson; import com.google.gson.TypeAdapter; diff --git a/services-route-tiles/src/main/java/com/mapbox/api/routetiles/v1/MapboxRouteTiles.java b/services-route-tiles/src/main/java/com/mapbox/api/routetiles/v1/MapboxRouteTiles.java index d77e36482..7947acc4d 100644 --- a/services-route-tiles/src/main/java/com/mapbox/api/routetiles/v1/MapboxRouteTiles.java +++ b/services-route-tiles/src/main/java/com/mapbox/api/routetiles/v1/MapboxRouteTiles.java @@ -1,7 +1,7 @@ package com.mapbox.api.routetiles.v1; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.google.auto.value.AutoValue; import com.mapbox.api.routetiles.v1.versions.MapboxRouteTileVersions; diff --git a/services-route-tiles/src/main/java/com/mapbox/api/routetiles/v1/versions/MapboxRouteTileVersions.java b/services-route-tiles/src/main/java/com/mapbox/api/routetiles/v1/versions/MapboxRouteTileVersions.java index ab9000417..46dec1e1b 100644 --- a/services-route-tiles/src/main/java/com/mapbox/api/routetiles/v1/versions/MapboxRouteTileVersions.java +++ b/services-route-tiles/src/main/java/com/mapbox/api/routetiles/v1/versions/MapboxRouteTileVersions.java @@ -1,7 +1,7 @@ package com.mapbox.api.routetiles.v1.versions; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.google.auto.value.AutoValue; import com.google.gson.GsonBuilder; diff --git a/services-route-tiles/src/main/java/com/mapbox/api/routetiles/v1/versions/models/RouteTileVersionsResponse.java b/services-route-tiles/src/main/java/com/mapbox/api/routetiles/v1/versions/models/RouteTileVersionsResponse.java index 0fc42df33..4c0501019 100644 --- a/services-route-tiles/src/main/java/com/mapbox/api/routetiles/v1/versions/models/RouteTileVersionsResponse.java +++ b/services-route-tiles/src/main/java/com/mapbox/api/routetiles/v1/versions/models/RouteTileVersionsResponse.java @@ -1,6 +1,6 @@ package com.mapbox.api.routetiles.v1.versions.models; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.google.auto.value.AutoValue; import com.google.gson.Gson; diff --git a/services-speech/src/main/java/com/mapbox/api/speech/v1/MapboxSpeech.java b/services-speech/src/main/java/com/mapbox/api/speech/v1/MapboxSpeech.java index ea686b808..dc8350dd6 100644 --- a/services-speech/src/main/java/com/mapbox/api/speech/v1/MapboxSpeech.java +++ b/services-speech/src/main/java/com/mapbox/api/speech/v1/MapboxSpeech.java @@ -1,7 +1,7 @@ package com.mapbox.api.speech.v1; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.google.auto.value.AutoValue; import com.mapbox.core.MapboxService; diff --git a/services-staticmap/src/main/java/com/mapbox/api/staticmap/v1/MapboxStaticMap.java b/services-staticmap/src/main/java/com/mapbox/api/staticmap/v1/MapboxStaticMap.java index 421975cce..2354daf58 100644 --- a/services-staticmap/src/main/java/com/mapbox/api/staticmap/v1/MapboxStaticMap.java +++ b/services-staticmap/src/main/java/com/mapbox/api/staticmap/v1/MapboxStaticMap.java @@ -1,9 +1,9 @@ package com.mapbox.api.staticmap.v1; -import android.support.annotation.FloatRange; -import android.support.annotation.IntRange; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.FloatRange; +import androidx.annotation.IntRange; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.google.auto.value.AutoValue; import com.mapbox.api.staticmap.v1.models.StaticMarkerAnnotation; import com.mapbox.api.staticmap.v1.models.StaticPolylineAnnotation; diff --git a/services-staticmap/src/main/java/com/mapbox/api/staticmap/v1/StaticMapCriteria.java b/services-staticmap/src/main/java/com/mapbox/api/staticmap/v1/StaticMapCriteria.java index 42bccc9a1..295b86146 100644 --- a/services-staticmap/src/main/java/com/mapbox/api/staticmap/v1/StaticMapCriteria.java +++ b/services-staticmap/src/main/java/com/mapbox/api/staticmap/v1/StaticMapCriteria.java @@ -2,7 +2,7 @@ import static java.lang.annotation.RetentionPolicy.SOURCE; -import android.support.annotation.StringDef; +import androidx.annotation.StringDef; import java.lang.annotation.Retention; diff --git a/services-staticmap/src/main/java/com/mapbox/api/staticmap/v1/models/StaticMarkerAnnotation.java b/services-staticmap/src/main/java/com/mapbox/api/staticmap/v1/models/StaticMarkerAnnotation.java index 17ae11207..1aec83c7a 100644 --- a/services-staticmap/src/main/java/com/mapbox/api/staticmap/v1/models/StaticMarkerAnnotation.java +++ b/services-staticmap/src/main/java/com/mapbox/api/staticmap/v1/models/StaticMarkerAnnotation.java @@ -1,10 +1,10 @@ package com.mapbox.api.staticmap.v1.models; -import static android.support.annotation.RestrictTo.Scope.LIBRARY; +import static androidx.annotation.RestrictTo.Scope.LIBRARY; import static com.mapbox.core.utils.ColorUtils.toHexString; -import android.support.annotation.Nullable; -import android.support.annotation.RestrictTo; +import androidx.annotation.Nullable; +import androidx.annotation.RestrictTo; import com.google.auto.value.AutoValue; import com.mapbox.api.staticmap.v1.StaticMapCriteria; import com.mapbox.api.staticmap.v1.StaticMapCriteria.MarkerCriteria; diff --git a/services-staticmap/src/main/java/com/mapbox/api/staticmap/v1/models/StaticPolylineAnnotation.java b/services-staticmap/src/main/java/com/mapbox/api/staticmap/v1/models/StaticPolylineAnnotation.java index 21d1f10a0..5c149f143 100644 --- a/services-staticmap/src/main/java/com/mapbox/api/staticmap/v1/models/StaticPolylineAnnotation.java +++ b/services-staticmap/src/main/java/com/mapbox/api/staticmap/v1/models/StaticPolylineAnnotation.java @@ -1,13 +1,13 @@ package com.mapbox.api.staticmap.v1.models; -import static android.support.annotation.RestrictTo.Scope.LIBRARY; +import static androidx.annotation.RestrictTo.Scope.LIBRARY; import static com.mapbox.core.utils.ColorUtils.toHexString; -import android.support.annotation.FloatRange; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.FloatRange; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; -import android.support.annotation.RestrictTo; +import androidx.annotation.RestrictTo; import com.google.auto.value.AutoValue; import com.mapbox.api.staticmap.v1.MapboxStaticMap; import com.mapbox.geojson.utils.PolylineUtils; diff --git a/services-tilequery/src/main/java/com/mapbox/api/tilequery/MapboxTilequery.java b/services-tilequery/src/main/java/com/mapbox/api/tilequery/MapboxTilequery.java index 82ff58606..793002eef 100644 --- a/services-tilequery/src/main/java/com/mapbox/api/tilequery/MapboxTilequery.java +++ b/services-tilequery/src/main/java/com/mapbox/api/tilequery/MapboxTilequery.java @@ -1,7 +1,7 @@ package com.mapbox.api.tilequery; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.google.auto.value.AutoValue; import com.google.gson.GsonBuilder; diff --git a/services-tilequery/src/main/java/com/mapbox/api/tilequery/TilequeryCriteria.java b/services-tilequery/src/main/java/com/mapbox/api/tilequery/TilequeryCriteria.java index f49a354b4..081d82fbd 100644 --- a/services-tilequery/src/main/java/com/mapbox/api/tilequery/TilequeryCriteria.java +++ b/services-tilequery/src/main/java/com/mapbox/api/tilequery/TilequeryCriteria.java @@ -1,6 +1,6 @@ package com.mapbox.api.tilequery; -import android.support.annotation.StringDef; +import androidx.annotation.StringDef; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/services-turf/src/main/java/com/mapbox/turf/TurfClassification.java b/services-turf/src/main/java/com/mapbox/turf/TurfClassification.java index 151ed27cb..b3d1d90d6 100644 --- a/services-turf/src/main/java/com/mapbox/turf/TurfClassification.java +++ b/services-turf/src/main/java/com/mapbox/turf/TurfClassification.java @@ -1,6 +1,6 @@ package com.mapbox.turf; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.mapbox.geojson.Point; diff --git a/services-turf/src/main/java/com/mapbox/turf/TurfConstants.java b/services-turf/src/main/java/com/mapbox/turf/TurfConstants.java index 006af5149..83c2d1548 100644 --- a/services-turf/src/main/java/com/mapbox/turf/TurfConstants.java +++ b/services-turf/src/main/java/com/mapbox/turf/TurfConstants.java @@ -1,6 +1,6 @@ package com.mapbox.turf; -import android.support.annotation.StringDef; +import androidx.annotation.StringDef; import com.mapbox.geojson.Point; diff --git a/services-turf/src/main/java/com/mapbox/turf/TurfConversion.java b/services-turf/src/main/java/com/mapbox/turf/TurfConversion.java index fb64b89a9..57a1567c5 100644 --- a/services-turf/src/main/java/com/mapbox/turf/TurfConversion.java +++ b/services-turf/src/main/java/com/mapbox/turf/TurfConversion.java @@ -1,8 +1,8 @@ package com.mapbox.turf; -import android.support.annotation.FloatRange; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.FloatRange; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.google.gson.JsonObject; import com.mapbox.geojson.Feature; diff --git a/services-turf/src/main/java/com/mapbox/turf/TurfMeasurement.java b/services-turf/src/main/java/com/mapbox/turf/TurfMeasurement.java index 2f40680bb..f1eb37510 100644 --- a/services-turf/src/main/java/com/mapbox/turf/TurfMeasurement.java +++ b/services-turf/src/main/java/com/mapbox/turf/TurfMeasurement.java @@ -3,9 +3,9 @@ import static com.mapbox.turf.TurfConversion.degreesToRadians; import static com.mapbox.turf.TurfConversion.radiansToDegrees; -import android.support.annotation.FloatRange; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.FloatRange; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.google.gson.JsonObject; import com.mapbox.geojson.BoundingBox; diff --git a/services-turf/src/main/java/com/mapbox/turf/TurfMeta.java b/services-turf/src/main/java/com/mapbox/turf/TurfMeta.java index 1c70e7685..2df028289 100644 --- a/services-turf/src/main/java/com/mapbox/turf/TurfMeta.java +++ b/services-turf/src/main/java/com/mapbox/turf/TurfMeta.java @@ -1,6 +1,6 @@ package com.mapbox.turf; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.mapbox.geojson.Feature; import com.mapbox.geojson.FeatureCollection; diff --git a/services-turf/src/main/java/com/mapbox/turf/TurfMisc.java b/services-turf/src/main/java/com/mapbox/turf/TurfMisc.java index 8dac9c34d..319228136 100644 --- a/services-turf/src/main/java/com/mapbox/turf/TurfMisc.java +++ b/services-turf/src/main/java/com/mapbox/turf/TurfMisc.java @@ -1,8 +1,8 @@ package com.mapbox.turf; -import android.support.annotation.FloatRange; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.FloatRange; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.mapbox.geojson.Feature; import com.mapbox.geojson.LineString; diff --git a/services-turf/src/main/java/com/mapbox/turf/TurfTransformation.java b/services-turf/src/main/java/com/mapbox/turf/TurfTransformation.java index 5a98a0156..76b4c55d0 100644 --- a/services-turf/src/main/java/com/mapbox/turf/TurfTransformation.java +++ b/services-turf/src/main/java/com/mapbox/turf/TurfTransformation.java @@ -1,7 +1,7 @@ package com.mapbox.turf; -import android.support.annotation.IntRange; -import android.support.annotation.NonNull; +import androidx.annotation.IntRange; +import androidx.annotation.NonNull; import com.mapbox.geojson.Polygon; import com.mapbox.geojson.Point; diff --git a/services-turf/src/main/java/com/mapbox/turf/models/LineIntersectsResult.java b/services-turf/src/main/java/com/mapbox/turf/models/LineIntersectsResult.java index d2d049f7d..1f51c4203 100644 --- a/services-turf/src/main/java/com/mapbox/turf/models/LineIntersectsResult.java +++ b/services-turf/src/main/java/com/mapbox/turf/models/LineIntersectsResult.java @@ -1,6 +1,6 @@ package com.mapbox.turf.models; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; /** * if the lines intersect, the result contains the x and y of the intersection (treating the lines