diff --git a/gradle.properties b/gradle.properties index aac7c9b..9e6fce1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,6 +9,8 @@ # Specifies the JVM arguments used for the daemon process. # The setting is particularly useful for tweaking memory settings. +android.enableJetifier=true +android.useAndroidX=true org.gradle.jvmargs=-Xmx1536m # When configured, Gradle will run in incubating parallel mode. diff --git a/iotcore/build.gradle b/iotcore/build.gradle index 7c7a68a..c17cfe0 100644 --- a/iotcore/build.gradle +++ b/iotcore/build.gradle @@ -9,7 +9,7 @@ android { versionCode 1 versionName "1.0" - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' } buildTypes { @@ -33,14 +33,14 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation 'com.android.support:support-annotations:28.0.0' + implementation 'androidx.annotation:annotation:1.0.0' testImplementation 'com.google.truth:truth:0.40' testImplementation 'junit:junit:4.12' testImplementation 'org.mockito:mockito-core:2.18.0' testImplementation 'org.robolectric:robolectric:4.0' testImplementation 'io.jsonwebtoken:jjwt:0.9.0' - androidTestImplementation 'com.android.support.test:runner:1.0.2' - androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2' + androidTestImplementation 'androidx.test.ext:junit:1.1.1' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0' // MQTT implementation('org.eclipse.paho:org.eclipse.paho.client.mqttv3:1.2.0') { diff --git a/iotcore/src/main/java/com/google/android/things/iotcore/CapacityQueue.java b/iotcore/src/main/java/com/google/android/things/iotcore/CapacityQueue.java index 9aad37f..a2a4903 100644 --- a/iotcore/src/main/java/com/google/android/things/iotcore/CapacityQueue.java +++ b/iotcore/src/main/java/com/google/android/things/iotcore/CapacityQueue.java @@ -14,8 +14,8 @@ package com.google.android.things.iotcore; -import android.support.annotation.IntDef; -import android.support.annotation.NonNull; +import androidx.annotation.IntDef; +import androidx.annotation.NonNull; import android.util.Log; import java.lang.annotation.Retention; diff --git a/iotcore/src/main/java/com/google/android/things/iotcore/ConnectionCallback.java b/iotcore/src/main/java/com/google/android/things/iotcore/ConnectionCallback.java index 0e175d3..bd2f4d6 100644 --- a/iotcore/src/main/java/com/google/android/things/iotcore/ConnectionCallback.java +++ b/iotcore/src/main/java/com/google/android/things/iotcore/ConnectionCallback.java @@ -13,7 +13,7 @@ // limitations under the License. package com.google.android.things.iotcore; -import android.support.annotation.IntDef; +import androidx.annotation.IntDef; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/iotcore/src/main/java/com/google/android/things/iotcore/ConnectionParams.java b/iotcore/src/main/java/com/google/android/things/iotcore/ConnectionParams.java index ab74bb8..0350fc5 100644 --- a/iotcore/src/main/java/com/google/android/things/iotcore/ConnectionParams.java +++ b/iotcore/src/main/java/com/google/android/things/iotcore/ConnectionParams.java @@ -14,7 +14,7 @@ package com.google.android.things.iotcore; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.text.TextUtils; import java.time.Duration; diff --git a/iotcore/src/main/java/com/google/android/things/iotcore/IotCoreClient.java b/iotcore/src/main/java/com/google/android/things/iotcore/IotCoreClient.java index 2e04182..9e114c1 100644 --- a/iotcore/src/main/java/com/google/android/things/iotcore/IotCoreClient.java +++ b/iotcore/src/main/java/com/google/android/things/iotcore/IotCoreClient.java @@ -15,10 +15,10 @@ package com.google.android.things.iotcore; import android.os.Process; -import android.support.annotation.GuardedBy; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.VisibleForTesting; +import androidx.annotation.GuardedBy; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.VisibleForTesting; import android.util.Log; import org.eclipse.paho.client.mqttv3.IMqttDeliveryToken; diff --git a/iotcore/src/main/java/com/google/android/things/iotcore/JwtGenerator.java b/iotcore/src/main/java/com/google/android/things/iotcore/JwtGenerator.java index 4aa9a65..b02a071 100644 --- a/iotcore/src/main/java/com/google/android/things/iotcore/JwtGenerator.java +++ b/iotcore/src/main/java/com/google/android/things/iotcore/JwtGenerator.java @@ -14,8 +14,8 @@ package com.google.android.things.iotcore; -import android.support.annotation.NonNull; -import android.support.annotation.VisibleForTesting; +import androidx.annotation.NonNull; +import androidx.annotation.VisibleForTesting; import org.jose4j.jws.AlgorithmIdentifiers; import org.jose4j.jws.JsonWebSignature; diff --git a/iotcore/src/main/java/com/google/android/things/iotcore/TelemetryEvent.java b/iotcore/src/main/java/com/google/android/things/iotcore/TelemetryEvent.java index 20b2076..4001e44 100644 --- a/iotcore/src/main/java/com/google/android/things/iotcore/TelemetryEvent.java +++ b/iotcore/src/main/java/com/google/android/things/iotcore/TelemetryEvent.java @@ -14,9 +14,9 @@ package com.google.android.things.iotcore; -import android.support.annotation.IntDef; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.IntDef; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.text.TextUtils; import java.lang.annotation.Retention; diff --git a/iotcore/src/test/java/com/google/android/things/iotcore/IotCoreClientTest.java b/iotcore/src/test/java/com/google/android/things/iotcore/IotCoreClientTest.java index 4d66400..e43c655 100644 --- a/iotcore/src/test/java/com/google/android/things/iotcore/IotCoreClientTest.java +++ b/iotcore/src/test/java/com/google/android/things/iotcore/IotCoreClientTest.java @@ -14,7 +14,7 @@ package com.google.android.things.iotcore; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import static com.google.common.truth.Truth.assertThat; import static org.junit.Assert.fail;