aqhby/ZXingLite
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

支持AndroidX对应版本

Browse Source
This commit is contained in:
jenly1314
2019-06-27 18:09:12 +08:00
parent d85da52e84
commit 61a40d70e7
6 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
.idea/caches/build_file_checksums.ser generated
View File

Binary file not shown.

2
app/build.gradle
View File

@@ -9,7 +9,7 @@ android {
targetSdkVersion build_versions.targetSdk targetSdkVersion build_versions.targetSdk
versionCode app_version.versionCode versionCode app_version.versionCode
versionName app_version.versionName versionName app_version.versionName
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
} }
buildTypes { buildTypes {
release { release {

7
app/src/androidTest/java/com/king/zxing/app/ExampleInstrumentedTest.java
View File

@@ -1,13 +1,14 @@
package com.king.zxing.app; package com.king.zxing.app;
import android.content.Context; import android.content.Context;
import android.support.test.InstrumentationRegistry;
import android.support.test.runner.AndroidJUnit4;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; 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. * Instrumented test, which will execute on an Android device.

2
lib/build.gradle
View File

@@ -10,7 +10,7 @@ android {
versionCode app_version.versionCode versionCode app_version.versionCode
versionName app_version.versionName versionName app_version.versionName
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
} }
buildTypes { buildTypes {

5
lib/src/androidTest/java/com/king/zxing/ExampleInstrumentedTest.java
View File

@@ -1,12 +1,13 @@
package com.king.zxing; package com.king.zxing;
import android.content.Context; import android.content.Context;
import android.support.test.InstrumentationRegistry;
import android.support.test.runner.AndroidJUnit4;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import androidx.test.InstrumentationRegistry;
import androidx.test.runner.AndroidJUnit4;
import static org.junit.Assert.*; import static org.junit.Assert.*;
/** /**

17
versions.gradle
View File

@@ -21,17 +21,17 @@ versions.supportLibrary = "1.0.0+"
versions.constraintLayout = "1.1.3" versions.constraintLayout = "1.1.3"
//test //test
versions.junit = "4.12" versions.junit = "1.1.0"
versions.runner = "1.0.2" versions.test = "1.2.0"
versions.rules = "1.0.2" versions.runner = "1.2.0"
versions.espresso = "3.0.2" versions.espresso = "3.2.0"
//zxing //zxing
versions.zxing = "3.3.3" versions.zxing = "3.3.3"
versions.easypermissions = "3.0.0" versions.easypermissions = "3.0.0"
ext.versions = versions
//support //support
def support = [:] def support = [:]
@@ -42,9 +42,10 @@ deps.support = support
//test //test
def test = [:] def test = [:]
test.junit = "junit:junit:$versions.junit" test.junit = "androidx.test.ext:junit:$versions.junit"
test.runner = "com.android.support.test:runner:$versions.runner" test.test = "androidx.test:core:$versions.test"
test.espresso = "com.android.support.test.espresso:espresso-core:$versions.espresso" test.runner = "androidx.test:runner:$versions.runner"
test.espresso = "androidx.test.espresso:espresso-core:$versions.espresso"
deps.test = test deps.test = test
//zxing //zxing