Skip to content
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

Update to AndroidX annotation #1095

Merged
merged 2 commits into from
Jan 8, 2020
Merged

Update to AndroidX annotation #1095

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
e2e1251
[all] update to AndroidX annotation
tobrun Jan 7, 2020
bcfe24c
Merge branch 'master' into tvn-upgrade-androidx
Jan 8, 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
15 changes: 7 additions & 8 deletions gradle/dependencies.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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',
]
Expand All @@ -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}",
Expand All @@ -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}",
Expand Down
4 changes: 2 additions & 2 deletions services-core/src/main/java/com/mapbox/core/internal/Preconditions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
4 changes: 2 additions & 2 deletions services-core/src/main/java/com/mapbox/core/utils/ApiCallHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
4 changes: 2 additions & 2 deletions ...ns-refresh/src/main/java/com/mapbox/api/directionsrefresh/v1/MapboxDirectionsRefresh.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
4 changes: 2 additions & 2 deletions ...h/src/main/java/com/mapbox/api/directionsrefresh/v1/models/DirectionsRefreshResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion services-directions/src/main/java/com/mapbox/api/directions/v5/DirectionsCriteria.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
8 changes: 4 additions & 4 deletions services-directions/src/main/java/com/mapbox/api/directions/v5/MapboxDirections.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
4 changes: 2 additions & 2 deletions services-directions/src/main/java/com/mapbox/api/directions/v5/WalkingOptions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
8 changes: 4 additions & 4 deletions services-directions/src/main/java/com/mapbox/api/directions/v5/models/BannerComponents.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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.
*
Expand Down
5 changes: 2 additions & 3 deletions ...ices-directions/src/main/java/com/mapbox/api/directions/v5/models/BannerInstructions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
4 changes: 2 additions & 2 deletions services-directions/src/main/java/com/mapbox/api/directions/v5/models/BannerText.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
8 changes: 4 additions & 4 deletions services-directions/src/main/java/com/mapbox/api/directions/v5/models/BannerView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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
Expand All @@ -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.
langsmith marked this conversation as resolved.
Show resolved Hide resolved
*
* @return plain text with all the {@link BannerComponents} text items combined
* @since 5.0.0
Expand Down
2 changes: 1 addition & 1 deletion services-directions/src/main/java/com/mapbox/api/directions/v5/models/DirectionsError.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
4 changes: 2 additions & 2 deletions ...ices-directions/src/main/java/com/mapbox/api/directions/v5/models/DirectionsResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion services-directions/src/main/java/com/mapbox/api/directions/v5/models/DirectionsRoute.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...ices-directions/src/main/java/com/mapbox/api/directions/v5/models/DirectionsWaypoint.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion services-directions/src/main/java/com/mapbox/api/directions/v5/models/IntersectionLanes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion services-directions/src/main/java/com/mapbox/api/directions/v5/models/LegAnnotation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
4 changes: 2 additions & 2 deletions services-directions/src/main/java/com/mapbox/api/directions/v5/models/LegStep.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion services-directions/src/main/java/com/mapbox/api/directions/v5/models/MaxSpeed.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion services-directions/src/main/java/com/mapbox/api/directions/v5/models/RouteLeg.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
4 changes: 2 additions & 2 deletions services-directions/src/main/java/com/mapbox/api/directions/v5/models/RouteOptions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
4 changes: 2 additions & 2 deletions services-directions/src/main/java/com/mapbox/api/directions/v5/models/StepIntersection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
8 changes: 4 additions & 4 deletions services-directions/src/main/java/com/mapbox/api/directions/v5/models/StepManeuver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion services-directions/src/main/java/com/mapbox/api/directions/v5/models/VoiceInstructions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion services-geocoding/src/main/java/com/mapbox/api/geocoding/v5/GeocodingCriteria.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
8 changes: 4 additions & 4 deletions services-geocoding/src/main/java/com/mapbox/api/geocoding/v5/MapboxGeocoding.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
4 changes: 2 additions & 2 deletions services-geocoding/src/main/java/com/mapbox/api/geocoding/v5/models/CarmenContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
4 changes: 2 additions & 2 deletions services-geocoding/src/main/java/com/mapbox/api/geocoding/v5/models/CarmenFeature.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion services-geocoding/src/main/java/com/mapbox/api/geocoding/v5/models/GeocodingResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion services-geojson/src/main/java/com/google/gson/typeadapters/RuntimeTypeAdapterFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion services-geojson/src/main/java/com/mapbox/geojson/BaseCoordinatesTypeAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion services-geojson/src/main/java/com/mapbox/geojson/BaseGeometryTypeAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
6 changes: 3 additions & 3 deletions services-geojson/src/main/java/com/mapbox/geojson/BoundingBox.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion services-geojson/src/main/java/com/mapbox/geojson/CoordinateContainer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Loading