From f31994939d141a354bfc1401f8e604f2afba23ae Mon Sep 17 00:00:00 2001 From: leyan95 <18231926271@163.com> Date: Mon, 19 Aug 2019 12:42:05 +0800 Subject: [PATCH 1/6] update for AndroidX. --- android-zxingLibrary.iml | 2 +- app/app.iml | 152 +++++++++++++----- app/build.gradle | 22 +-- .../ExampleInstrumentedTest.java | 4 +- .../android_zxinglibrary/BaseActivity.java | 10 +- .../android_zxinglibrary/MainActivity.java | 4 +- .../android_zxinglibrary/SecondActivity.java | 2 +- .../android_zxinglibrary/ThreeActivity.java | 7 +- .../utils/CheckPermissionUtils.java | 2 +- build.gradle | 10 +- gradle.properties | 2 + gradle/wrapper/gradle-wrapper.properties | 2 +- lib-zxing/build.gradle | 18 +-- lib-zxing/lib-zxing.iml | 132 ++++++++++----- .../lib_zxing/ExampleInstrumentedTest.java | 4 +- lib-zxing/src/main/AndroidManifest.xml | 1 + .../lib_zxing/activity/CaptureActivity.java | 2 +- .../lib_zxing/activity/CaptureFragment.java | 4 +- local.properties | 9 +- 19 files changed, 251 insertions(+), 138 deletions(-) diff --git a/android-zxingLibrary.iml b/android-zxingLibrary.iml index e065fcc..ca79456 100644 --- a/android-zxingLibrary.iml +++ b/android-zxingLibrary.iml @@ -1,5 +1,5 @@ - + diff --git a/app/app.iml b/app/app.iml index 5b769b5..43b7c80 100644 --- a/app/app.iml +++ b/app/app.iml @@ -17,29 +17,29 @@ - - + + - + - - + - + @@ -54,6 +54,13 @@ + + + + + + + @@ -61,13 +68,6 @@ - - - - - - - @@ -75,17 +75,59 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + @@ -93,35 +135,57 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 3dba215..a34ed69 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,15 +1,15 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 25 - buildToolsVersion '25.0.2' + compileSdkVersion 28 + buildToolsVersion '28.0.3' defaultConfig { applicationId "com.uuch.android_zxinglibrary" minSdkVersion 14 - targetSdkVersion 25 + targetSdkVersion 28 versionCode 1 versionName "1.0" - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } buildTypes { release { @@ -20,14 +20,14 @@ android { } dependencies { - compile fileTree(include: ['*.jar'], dir: 'libs') - androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', { + implementation fileTree(include: ['*.jar'], dir: 'libs') + androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0', { exclude group: 'com.android.support', module: 'support-annotations' }) // compile project(':lib-zxing') - compile 'cn.yipianfengye.android:zxing-library:2.2' - compile 'com.android.support:appcompat-v7:25.1.1' - compile 'com.android.support:design:25.1.1' - compile 'pub.devrel:easypermissions:0.2.0' - testCompile 'junit:junit:4.12' + implementation 'cn.yipianfengye.android:zxing-library:2.2' + implementation 'androidx.appcompat:appcompat:1.0.0' + implementation 'com.google.android.material:material:1.0.0' + implementation 'pub.devrel:easypermissions:0.2.0' + testImplementation 'junit:junit:4.12' } \ No newline at end of file diff --git a/app/src/androidTest/java/com/uuch/android_zxinglibrary/ExampleInstrumentedTest.java b/app/src/androidTest/java/com/uuch/android_zxinglibrary/ExampleInstrumentedTest.java index 4a8b8a8..44b74c7 100644 --- a/app/src/androidTest/java/com/uuch/android_zxinglibrary/ExampleInstrumentedTest.java +++ b/app/src/androidTest/java/com/uuch/android_zxinglibrary/ExampleInstrumentedTest.java @@ -1,8 +1,8 @@ package com.uuch.android_zxinglibrary; import android.content.Context; -import android.support.test.InstrumentationRegistry; -import android.support.test.runner.AndroidJUnit4; +import androidx.test.InstrumentationRegistry; +import androidx.test.runner.AndroidJUnit4; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/app/src/main/java/com/uuch/android_zxinglibrary/BaseActivity.java b/app/src/main/java/com/uuch/android_zxinglibrary/BaseActivity.java index 4d6779e..530347c 100644 --- a/app/src/main/java/com/uuch/android_zxinglibrary/BaseActivity.java +++ b/app/src/main/java/com/uuch/android_zxinglibrary/BaseActivity.java @@ -1,11 +1,9 @@ package com.uuch.android_zxinglibrary; -import android.content.pm.PackageManager; -import android.os.Build; -import android.support.annotation.NonNull; -import android.support.v4.app.ActivityCompat; -import android.support.v7.app.AlertDialog; -import android.support.v7.app.AppCompatActivity; +import androidx.annotation.NonNull; +import androidx.core.app.ActivityCompat; +import androidx.appcompat.app.AlertDialog; +import androidx.appcompat.app.AppCompatActivity; import android.os.Bundle; public class BaseActivity extends AppCompatActivity { diff --git a/app/src/main/java/com/uuch/android_zxinglibrary/MainActivity.java b/app/src/main/java/com/uuch/android_zxinglibrary/MainActivity.java index e0f4d30..391385b 100644 --- a/app/src/main/java/com/uuch/android_zxinglibrary/MainActivity.java +++ b/app/src/main/java/com/uuch/android_zxinglibrary/MainActivity.java @@ -5,8 +5,8 @@ import android.graphics.Bitmap; import android.net.Uri; import android.os.Bundle; -import android.support.v4.app.ActivityCompat; -import android.support.v7.app.AppCompatActivity; +import androidx.core.app.ActivityCompat; +import androidx.appcompat.app.AppCompatActivity; import android.view.View; import android.widget.Button; import android.widget.Toast; diff --git a/app/src/main/java/com/uuch/android_zxinglibrary/SecondActivity.java b/app/src/main/java/com/uuch/android_zxinglibrary/SecondActivity.java index 2af91c4..4611ae8 100644 --- a/app/src/main/java/com/uuch/android_zxinglibrary/SecondActivity.java +++ b/app/src/main/java/com/uuch/android_zxinglibrary/SecondActivity.java @@ -3,7 +3,7 @@ import android.content.Intent; import android.graphics.Bitmap; import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatActivity; import android.view.View; import android.widget.LinearLayout; diff --git a/app/src/main/java/com/uuch/android_zxinglibrary/ThreeActivity.java b/app/src/main/java/com/uuch/android_zxinglibrary/ThreeActivity.java index 232ee52..dd64a12 100644 --- a/app/src/main/java/com/uuch/android_zxinglibrary/ThreeActivity.java +++ b/app/src/main/java/com/uuch/android_zxinglibrary/ThreeActivity.java @@ -3,10 +3,9 @@ import android.graphics.Bitmap; import android.graphics.BitmapFactory; import android.os.Bundle; -import android.support.design.widget.FloatingActionButton; -import android.support.design.widget.Snackbar; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.Toolbar; + +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.Toolbar; import android.text.TextUtils; import android.view.View; import android.widget.Button; diff --git a/app/src/main/java/com/uuch/android_zxinglibrary/utils/CheckPermissionUtils.java b/app/src/main/java/com/uuch/android_zxinglibrary/utils/CheckPermissionUtils.java index ffe0dbf..7d2dadb 100644 --- a/app/src/main/java/com/uuch/android_zxinglibrary/utils/CheckPermissionUtils.java +++ b/app/src/main/java/com/uuch/android_zxinglibrary/utils/CheckPermissionUtils.java @@ -3,7 +3,7 @@ import android.Manifest; import android.content.Context; import android.content.pm.PackageManager; -import android.support.v4.content.ContextCompat; +import androidx.core.content.ContextCompat; import java.util.ArrayList; import java.util.List; diff --git a/build.gradle b/build.gradle index b78a0b8..0366ab0 100644 --- a/build.gradle +++ b/build.gradle @@ -3,9 +3,13 @@ buildscript { repositories { jcenter() + maven { + url 'https://maven.google.com/' + name 'Google' + } } dependencies { - classpath 'com.android.tools.build:gradle:2.3.1' + classpath 'com.android.tools.build:gradle:3.2.0' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files @@ -15,6 +19,10 @@ buildscript { allprojects { repositories { jcenter() + maven { + url 'https://maven.google.com/' + name 'Google' + } } } 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/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 9c31301..f1dc26b 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip diff --git a/lib-zxing/build.gradle b/lib-zxing/build.gradle index 1bf2e58..cdc2021 100644 --- a/lib-zxing/build.gradle +++ b/lib-zxing/build.gradle @@ -1,16 +1,16 @@ apply plugin: 'com.android.library' android { - compileSdkVersion 25 - buildToolsVersion '25.0.2' + compileSdkVersion 28 + buildToolsVersion '28.0.2' defaultConfig { minSdkVersion 14 - targetSdkVersion 25 + targetSdkVersion 28 versionCode 1 versionName "1.0" - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } buildTypes { @@ -22,13 +22,13 @@ android { } dependencies { - compile fileTree(include: ['*.jar'], dir: 'libs') - androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', { + implementation fileTree(include: ['*.jar'], dir: 'libs') + androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0', { exclude group: 'com.android.support', module: 'support-annotations' }) - compile 'com.android.support:appcompat-v7:25.1.1' - compile 'com.android.support:support-v4:25.1.1' - testCompile 'junit:junit:4.12' + implementation 'androidx.appcompat:appcompat:1.0.0' + implementation 'androidx.legacy:legacy-support-v4:1.0.0' + testImplementation 'junit:junit:4.12' } ext { diff --git a/lib-zxing/lib-zxing.iml b/lib-zxing/lib-zxing.iml index de1f70c..706645e 100644 --- a/lib-zxing/lib-zxing.iml +++ b/lib-zxing/lib-zxing.iml @@ -1,5 +1,5 @@ - + @@ -17,30 +17,30 @@ - - + + - + - - + - + @@ -55,6 +55,13 @@ + + + + + + + @@ -62,13 +69,6 @@ - - - - - - - @@ -76,56 +76,100 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/lib-zxing/src/androidTest/java/com/uuzuche/lib_zxing/ExampleInstrumentedTest.java b/lib-zxing/src/androidTest/java/com/uuzuche/lib_zxing/ExampleInstrumentedTest.java index 8d6d5d2..47c92fe 100644 --- a/lib-zxing/src/androidTest/java/com/uuzuche/lib_zxing/ExampleInstrumentedTest.java +++ b/lib-zxing/src/androidTest/java/com/uuzuche/lib_zxing/ExampleInstrumentedTest.java @@ -1,8 +1,8 @@ package com.uuzuche.lib_zxing; import android.content.Context; -import android.support.test.InstrumentationRegistry; -import android.support.test.runner.AndroidJUnit4; +import androidx.test.InstrumentationRegistry; +import androidx.test.runner.AndroidJUnit4; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/lib-zxing/src/main/AndroidManifest.xml b/lib-zxing/src/main/AndroidManifest.xml index 35948b6..34bfced 100644 --- a/lib-zxing/src/main/AndroidManifest.xml +++ b/lib-zxing/src/main/AndroidManifest.xml @@ -1,6 +1,7 @@ + diff --git a/lib-zxing/src/main/java/com/uuzuche/lib_zxing/activity/CaptureActivity.java b/lib-zxing/src/main/java/com/uuzuche/lib_zxing/activity/CaptureActivity.java index 567af8e..dc476aa 100644 --- a/lib-zxing/src/main/java/com/uuzuche/lib_zxing/activity/CaptureActivity.java +++ b/lib-zxing/src/main/java/com/uuzuche/lib_zxing/activity/CaptureActivity.java @@ -3,7 +3,7 @@ import android.content.Intent; import android.graphics.Bitmap; import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatActivity; import android.util.Log; import com.uuzuche.lib_zxing.R; diff --git a/lib-zxing/src/main/java/com/uuzuche/lib_zxing/activity/CaptureFragment.java b/lib-zxing/src/main/java/com/uuzuche/lib_zxing/activity/CaptureFragment.java index 46bfa75..981a007 100644 --- a/lib-zxing/src/main/java/com/uuzuche/lib_zxing/activity/CaptureFragment.java +++ b/lib-zxing/src/main/java/com/uuzuche/lib_zxing/activity/CaptureFragment.java @@ -8,8 +8,8 @@ import android.os.Bundle; import android.os.Handler; import android.os.Vibrator; -import android.support.annotation.Nullable; -import android.support.v4.app.Fragment; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; import android.text.TextUtils; import android.view.LayoutInflater; import android.view.SurfaceHolder; diff --git a/local.properties b/local.properties index d539fd5..e6a50fd 100644 --- a/local.properties +++ b/local.properties @@ -1,11 +1,8 @@ -## This file is automatically generated by Android Studio. -# Do not modify this file -- YOUR CHANGES WILL BE ERASED! -# -# This file must *NOT* be checked into Version Control Systems, +## This file must *NOT* be checked into Version Control Systems, # as it contains information specific to your local configuration. # # Location of the SDK. This is only used by Gradle. # For customization when using a Version Control System, please read the # header note. -#Tue Jul 04 10:15:38 CST 2017 -sdk.dir=/Users/aaron/document/sdk +#Thu Aug 01 17:09:32 CST 2019 +sdk.dir=D\:\\Dev\\AndroidSDk From 1522f0d3aa6814abdc83edf06d0a7081cd943bbd Mon Sep 17 00:00:00 2001 From: leyan95 <18231926271@163.com> Date: Mon, 19 Aug 2019 23:39:41 +0800 Subject: [PATCH 2/6] update for AndroidX. --- lib-zxing/build.gradle | 7 ++----- lib-zxing/lib-zxing.iml | 8 +++----- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/lib-zxing/build.gradle b/lib-zxing/build.gradle index cdc2021..0220df2 100644 --- a/lib-zxing/build.gradle +++ b/lib-zxing/build.gradle @@ -2,7 +2,7 @@ apply plugin: 'com.android.library' android { compileSdkVersion 28 - buildToolsVersion '28.0.2' + buildToolsVersion '28.0.3' defaultConfig { minSdkVersion 14 @@ -26,8 +26,7 @@ dependencies { androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0', { exclude group: 'com.android.support', module: 'support-annotations' }) - implementation 'androidx.appcompat:appcompat:1.0.0' - implementation 'androidx.legacy:legacy-support-v4:1.0.0' + implementation 'androidx.appcompat:appcompat:1.0.2' testImplementation 'junit:junit:4.12' } @@ -36,5 +35,3 @@ ext { PUBLISH_ARTIFACT_ID = 'zxing-library' PUBLISH_VERSION = '2.2' } - -apply from: 'https://raw.githubusercontent.com/blundell/release-android-library/master/android-release-aar.gradle' diff --git a/lib-zxing/lib-zxing.iml b/lib-zxing/lib-zxing.iml index 706645e..5fc6f47 100644 --- a/lib-zxing/lib-zxing.iml +++ b/lib-zxing/lib-zxing.iml @@ -134,6 +134,7 @@ + @@ -141,9 +142,9 @@ - + @@ -155,19 +156,16 @@ - - - - + From 6e9384826235f22c7a0eef40d0af6ef8f333c572 Mon Sep 17 00:00:00 2001 From: leyan95 <18231926271@163.com> Date: Tue, 20 Aug 2019 00:11:52 +0800 Subject: [PATCH 3/6] update for AndroidX. --- app/app.iml | 24 +++++++++++++------ build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- lib-zxing/build.gradle | 2 ++ lib-zxing/lib-zxing.iml | 20 +++++----------- .../uuzuche/lib_zxing/activity/CodeUtils.java | 2 -- .../decoding/CaptureActivityHandler.java | 1 - .../lib_zxing/decoding/DecodeHandler.java | 1 - 8 files changed, 27 insertions(+), 27 deletions(-) diff --git a/app/app.iml b/app/app.iml index 43b7c80..8e7a99a 100644 --- a/app/app.iml +++ b/app/app.iml @@ -17,7 +17,7 @@ \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 7a4b565..96d089a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,9 +21,9 @@ android { dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') - androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0', { - exclude group: 'com.android.support', module: 'support-annotations' - }) +// androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0', { +// exclude group: 'com.android.support', module: 'support-annotations' +// }) implementation project(':lib-zxing') implementation 'androidx.appcompat:appcompat:1.1.0' implementation 'com.google.android.material:material:1.0.0' diff --git a/lib-zxing/build.gradle b/lib-zxing/build.gradle index c90fe17..28773f9 100644 --- a/lib-zxing/build.gradle +++ b/lib-zxing/build.gradle @@ -23,9 +23,9 @@ android { dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') - androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0', { - exclude group: 'com.android.support', module: 'support-annotations' - }) +// androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0', { +// exclude group: 'com.android.support', module: 'support-annotations' +// }) implementation 'androidx.appcompat:appcompat:1.1.0' testImplementation 'junit:junit:4.12' } @@ -33,7 +33,7 @@ dependencies { ext { PUBLISH_GROUP_ID = 'com.github.leyan95' PUBLISH_ARTIFACT_ID = 'zxing-library' - PUBLISH_VERSION = '0.1.2-PRE' + PUBLISH_VERSION = '0.1.3-PRE' } apply from: 'https://raw.githubusercontent.com/blundell/release-android-library/master/android-release-aar.gradle' diff --git a/lib-zxing/lib-zxing.iml b/lib-zxing/lib-zxing.iml index 25a1e49..7424456 100644 --- a/lib-zxing/lib-zxing.iml +++ b/lib-zxing/lib-zxing.iml @@ -91,24 +91,29 @@ - + + + - - + + + + + - + - + @@ -118,48 +123,32 @@ - - + + + - - - - - + - + + - + - - - + - - - - - - - - - - + + + - - - - - + + + + - - - - \ No newline at end of file From 10193e886523d8fa4a218577be7d0175ef5df9a1 Mon Sep 17 00:00:00 2001 From: leyan95 <18231926271@163.com> Date: Mon, 14 Oct 2019 09:59:51 +0800 Subject: [PATCH 6/6] update. --- app/src/main/res/layout/content_three.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/res/layout/content_three.xml b/app/src/main/res/layout/content_three.xml index 19b46d2..1e22c09 100644 --- a/app/src/main/res/layout/content_three.xml +++ b/app/src/main/res/layout/content_three.xml @@ -1,5 +1,5 @@ - - +