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

Use Refactor | Migrate to AndroidX #8

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Use Refactor | Migrate to AndroidX #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
8 changes: 4 additions & 4 deletions iotcore/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ android {
versionCode 1
versionName "1.0"

testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
}

buildTypes {
Expand All @@ -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') {
Expand Down
4 changes: 2 additions & 2 deletions iotcore/src/main/java/com/google/android/things/iotcore/CapacityQueue.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion iotcore/src/main/java/com/google/android/things/iotcore/ConnectionCallback.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion iotcore/src/main/java/com/google/android/things/iotcore/ConnectionParams.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
8 changes: 4 additions & 4 deletions iotcore/src/main/java/com/google/android/things/iotcore/IotCoreClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions iotcore/src/main/java/com/google/android/things/iotcore/JwtGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions iotcore/src/main/java/com/google/android/things/iotcore/TelemetryEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion iotcore/src/test/java/com/google/android/things/iotcore/IotCoreClientTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down