Skip to content

Commit a541525

Browse files
tobrunLangston Smith
authored andcommitted
[all] Update to AndroidX annotation (#1095)
1 parent d5d5b4f commit a541525

86 files changed

Lines changed: 176 additions & 178 deletions

File tree

Some content is hidden

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

gradle/dependencies.gradle

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
ext {
22

33
version = [
4-
autoValue : '1.6.2',
4+
autoValue : '1.7',
55
autoValueGson : '0.8.0',
66
junit : '4.12',
7-
supportLibVersion: '27.1.1',
8-
gson : '2.8.5',
9-
retrofit : '2.4.0',
10-
okhttp3 : '3.11.0',
11-
mockito : '2.18.3',
7+
annotation : '1.0.0',
8+
gson : '2.8.6',
9+
retrofit : '2.7.1',
10+
okhttp3 : '3.12.7',
11+
mockito : '2.28.2',
1212
hamcrestJunit : '2.0.0.0',
1313
errorprone : '2.3.1',
1414
]
@@ -29,7 +29,7 @@ ext {
2929
autoValue : "com.google.auto.value:auto-value:${version.autoValue}",
3030
autoValueGson : "com.ryanharter.auto.value:auto-value-gson:${version.autoValueGson}",
3131
junit : "junit:junit:${version.junit}",
32-
supportAnnotation : "com.android.support:support-annotations:${version.supportLibVersion}",
32+
supportAnnotation : "androidx.annotation:annotation:${version.annotation}",
3333
gson : "com.google.code.gson:gson:${version.gson}",
3434
retrofit : "com.squareup.retrofit2:retrofit:${version.retrofit}",
3535
retrofit2Gson : "com.squareup.retrofit2:converter-gson:${version.retrofit}",
@@ -41,7 +41,6 @@ ext {
4141
errorprone : "com.google.errorprone:error_prone_core:${version.errorprone}"
4242
]
4343

44-
4544
pluginDependencies = [
4645
checkstyle : "com.puppycrawl.tools:checkstyle:${pluginVersion.checkstyle}",
4746
spotbugs : "gradle.plugin.com.github.spotbugs:gradlePlugin:${pluginVersion.spotbugs}",

services-core/src/main/java/com/mapbox/core/internal/Preconditions.java

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

3-
import static android.support.annotation.RestrictTo.Scope.LIBRARY_GROUP;
3+
import static androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP;
44

5-
import android.support.annotation.RestrictTo;
5+
import androidx.annotation.RestrictTo;
66

77
/**
88
* Contains simple precondition checks.

services-core/src/main/java/com/mapbox/core/utils/ApiCallHelper.java

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

3-
import android.support.annotation.NonNull;
4-
import android.support.annotation.Nullable;
3+
import androidx.annotation.NonNull;
4+
import androidx.annotation.Nullable;
55
import com.mapbox.core.constants.Constants;
66

77
import java.util.Locale;

services-directions-refresh/src/main/java/com/mapbox/api/directionsrefresh/v1/MapboxDirectionsRefresh.java

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

3-
import android.support.annotation.NonNull;
4-
import android.support.annotation.Nullable;
3+
import androidx.annotation.NonNull;
4+
import androidx.annotation.Nullable;
55

66
import com.google.auto.value.AutoValue;
77
import com.google.gson.GsonBuilder;

services-directions-refresh/src/main/java/com/mapbox/api/directionsrefresh/v1/models/DirectionsRefreshResponse.java

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

3-
import android.support.annotation.NonNull;
4-
import android.support.annotation.Nullable;
3+
import androidx.annotation.NonNull;
4+
import androidx.annotation.Nullable;
55

66
import com.google.auto.value.AutoValue;
77
import com.google.gson.Gson;

services-directions/src/main/java/com/mapbox/api/directions/v5/DirectionsCriteria.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.mapbox.api.directions.v5;
22

3-
import android.support.annotation.StringDef;
3+
import androidx.annotation.StringDef;
44

55
import java.lang.annotation.Retention;
66
import java.lang.annotation.RetentionPolicy;

services-directions/src/main/java/com/mapbox/api/directions/v5/MapboxDirections.java

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

3-
import android.support.annotation.FloatRange;
4-
import android.support.annotation.IntRange;
5-
import android.support.annotation.NonNull;
6-
import android.support.annotation.Nullable;
3+
import androidx.annotation.FloatRange;
4+
import androidx.annotation.IntRange;
5+
import androidx.annotation.NonNull;
6+
import androidx.annotation.Nullable;
77

88
import com.google.auto.value.AutoValue;
99
import com.google.gson.GsonBuilder;

services-directions/src/main/java/com/mapbox/api/directions/v5/WalkingOptions.java

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

3-
import android.support.annotation.FloatRange;
4-
import android.support.annotation.Nullable;
3+
import androidx.annotation.FloatRange;
4+
import androidx.annotation.Nullable;
55

66
import com.google.auto.value.AutoValue;
77
import com.google.gson.Gson;

services-directions/src/main/java/com/mapbox/api/directions/v5/models/BannerComponents.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package com.mapbox.api.directions.v5.models;
22

3-
import android.support.annotation.NonNull;
4-
import android.support.annotation.Nullable;
5-
import android.support.annotation.StringDef;
3+
import androidx.annotation.NonNull;
4+
import androidx.annotation.Nullable;
5+
import androidx.annotation.StringDef;
66

77
import com.google.auto.value.AutoValue;
88
import com.google.gson.Gson;
@@ -18,7 +18,7 @@
1818

1919
/**
2020
* A part of the {@link BannerText} which includes a snippet of the full banner text instruction. In
21-
* cases where data is avaliable, an image url will be provided to visually include a road shield.
21+
* cases where data is available, an image url will be provided to visually include a road shield.
2222
* To receive this information, your request must have {@link MapboxDirections#bannerInstructions()}
2323
* set to true.
2424
*

services-directions/src/main/java/com/mapbox/api/directions/v5/models/BannerInstructions.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
package com.mapbox.api.directions.v5.models;
22

3-
import android.support.annotation.NonNull;
4-
import android.support.annotation.Nullable;
5-
3+
import androidx.annotation.NonNull;
4+
import androidx.annotation.Nullable;
65
import com.google.auto.value.AutoValue;
76
import com.google.gson.Gson;
87
import com.google.gson.GsonBuilder;

0 commit comments

Comments
 (0)