diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index c4dc5b9..d923aa1 100644 Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ diff --git a/app/build.gradle b/app/build.gradle index 289f75a..e68691a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,7 +9,7 @@ android { targetSdkVersion build_versions.targetSdk versionCode app_version.versionCode versionName app_version.versionName - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } buildTypes { release { diff --git a/app/src/androidTest/java/com/king/zxing/app/ExampleInstrumentedTest.java b/app/src/androidTest/java/com/king/zxing/app/ExampleInstrumentedTest.java index 7aaa60a..8290673 100644 --- a/app/src/androidTest/java/com/king/zxing/app/ExampleInstrumentedTest.java +++ b/app/src/androidTest/java/com/king/zxing/app/ExampleInstrumentedTest.java @@ -1,13 +1,14 @@ package com.king.zxing.app; import android.content.Context; -import android.support.test.InstrumentationRegistry; -import android.support.test.runner.AndroidJUnit4; import org.junit.Test; import org.junit.runner.RunWith; -import static org.junit.Assert.*; +import androidx.test.InstrumentationRegistry; +import androidx.test.runner.AndroidJUnit4; + +import static org.junit.Assert.assertEquals; /** * Instrumented test, which will execute on an Android device. diff --git a/lib/build.gradle b/lib/build.gradle index be23fad..c71305d 100644 --- a/lib/build.gradle +++ b/lib/build.gradle @@ -10,7 +10,7 @@ android { versionCode app_version.versionCode versionName app_version.versionName - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } buildTypes { diff --git a/lib/src/androidTest/java/com/king/zxing/ExampleInstrumentedTest.java b/lib/src/androidTest/java/com/king/zxing/ExampleInstrumentedTest.java index cf1f38c..cdd5ac9 100644 --- a/lib/src/androidTest/java/com/king/zxing/ExampleInstrumentedTest.java +++ b/lib/src/androidTest/java/com/king/zxing/ExampleInstrumentedTest.java @@ -1,12 +1,13 @@ package com.king.zxing; import android.content.Context; -import android.support.test.InstrumentationRegistry; -import android.support.test.runner.AndroidJUnit4; import org.junit.Test; import org.junit.runner.RunWith; +import androidx.test.InstrumentationRegistry; +import androidx.test.runner.AndroidJUnit4; + import static org.junit.Assert.*; /** diff --git a/versions.gradle b/versions.gradle index 3d217be..ad01cd3 100644 --- a/versions.gradle +++ b/versions.gradle @@ -21,17 +21,17 @@ versions.supportLibrary = "1.0.0+" versions.constraintLayout = "1.1.3" //test -versions.junit = "4.12" -versions.runner = "1.0.2" -versions.rules = "1.0.2" -versions.espresso = "3.0.2" +versions.junit = "1.1.0" +versions.test = "1.2.0" +versions.runner = "1.2.0" +versions.espresso = "3.2.0" //zxing versions.zxing = "3.3.3" versions.easypermissions = "3.0.0" - +ext.versions = versions //support def support = [:] @@ -42,9 +42,10 @@ deps.support = support //test def test = [:] -test.junit = "junit:junit:$versions.junit" -test.runner = "com.android.support.test:runner:$versions.runner" -test.espresso = "com.android.support.test.espresso:espresso-core:$versions.espresso" +test.junit = "androidx.test.ext:junit:$versions.junit" +test.test = "androidx.test:core:$versions.test" +test.runner = "androidx.test:runner:$versions.runner" +test.espresso = "androidx.test.espresso:espresso-core:$versions.espresso" deps.test = test //zxing