From 7565b902ece870ce83e38418d3bf64c95c0b178f Mon Sep 17 00:00:00 2001 From: Jeff juhui-pc <330132662@qq.com> Date: Mon, 4 Jul 2022 10:05:05 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=81=E7=A7=BB=E5=88=B0androidx=20=20=20?= =?UTF-8?q?=EF=BC=8C=E5=B9=B6=E5=8D=87=E7=BA=A7=E7=9B=B8=E5=85=B3=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E3=80=81=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 2 +- build.gradle | 20 +++++++++++++++---- demo/build.gradle | 19 +++++++++--------- .../ExampleInstrumentedTest.java | 4 ++-- .../com/wangxiandeng/demo/MainActivity.java | 2 +- .../java/com/wangxiandeng/demo/MyAdapter.java | 3 ++- gradle.properties | 2 ++ gradle/wrapper/gradle-wrapper.properties | 4 +++- settings.gradle | 2 +- swipecardrecyclerview/build.gradle | 20 +++++++++---------- .../ExampleInstrumentedTest.java | 4 ++-- .../SwipeCardAdapter.java | 2 +- .../SwipeCardLayoutManager.java | 2 +- .../SwipeCardRecyclerView.java | 6 ++---- 14 files changed, 54 insertions(+), 38 deletions(-) diff --git a/.gitignore b/.gitignore index 39fb081..b00d20e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,7 @@ *.iml .gradle /local.properties -/.idea/workspace.xml +/.idea/* /.idea/libraries .DS_Store /build diff --git a/build.gradle b/build.gradle index 2c30879..365f296 100644 --- a/build.gradle +++ b/build.gradle @@ -2,10 +2,17 @@ buildscript { repositories { - jcenter() + maven {url 'https://maven.aliyun.com/repository/public/'} + maven {url 'https://maven.aliyun.com/repository/google/'} + maven {url 'https://maven.aliyun.com/repository/central/'} + maven {url 'https://maven.aliyun.com/repository/gradle-plugin/'} + mavenLocal() + mavenCentral() + maven { url 'https://jitpack.io' } + google() } dependencies { - classpath 'com.android.tools.build:gradle:2.2.2' + classpath 'com.android.tools.build:gradle:7.0.0' classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5' // NOTE: Do not place your application dependencies here; they belong @@ -15,8 +22,13 @@ buildscript { allprojects { repositories { - jcenter() - maven { url "https://jitpack.io" } + maven {url 'https://maven.aliyun.com/repository/public/'} + maven {url 'https://maven.aliyun.com/repository/google/'} + maven {url 'https://maven.aliyun.com/repository/central/'} + maven {url 'https://maven.aliyun.com/repository/gradle-plugin/'} + mavenLocal() + mavenCentral() + google() } } diff --git a/demo/build.gradle b/demo/build.gradle index c7f6419..e8b7101 100644 --- a/demo/build.gradle +++ b/demo/build.gradle @@ -1,15 +1,14 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 24 - buildToolsVersion "24.0.2" + compileSdkVersion 30 defaultConfig { applicationId "com.wangxiandeng.swipecardrecyclerview" minSdkVersion 19 - targetSdkVersion 24 + targetSdkVersion 30 versionCode 1 versionName "1.0" - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' } buildTypes { release { @@ -20,11 +19,13 @@ android { } dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) - androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', { + implementation fileTree(dir: 'libs', include: ['*.jar']) + androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0', { exclude group: 'com.android.support', module: 'support-annotations' }) - compile 'com.android.support:appcompat-v7:24.2.0' - testCompile 'junit:junit:4.12' - compile 'com.github.HalfStackDeveloper:SwipeCardRecyclerView:v1.0.1' + implementation project(':swipecardrecyclerview') + implementation 'androidx.appcompat:appcompat:1.0.0' + implementation 'junit:junit:4.12' + implementation 'androidx.recyclerview:recyclerview:1.0.0' +// implementation 'com.github.HalfStackDeveloper:SwipeCardRecyclerView:v1.0.1' } diff --git a/demo/src/androidTest/java/com/wangxiandeng/swipecardrecyclerview/ExampleInstrumentedTest.java b/demo/src/androidTest/java/com/wangxiandeng/swipecardrecyclerview/ExampleInstrumentedTest.java index 24d1f01..c4be304 100644 --- a/demo/src/androidTest/java/com/wangxiandeng/swipecardrecyclerview/ExampleInstrumentedTest.java +++ b/demo/src/androidTest/java/com/wangxiandeng/swipecardrecyclerview/ExampleInstrumentedTest.java @@ -1,8 +1,8 @@ package com.wangxiandeng.swipecardrecyclerview; import android.content.Context; -import android.support.test.InstrumentationRegistry; -import android.support.test.runner.AndroidJUnit4; +import androidx.test.platform.app.InstrumentationRegistry; +import androidx.test.ext.junit.runners.AndroidJUnit4; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/demo/src/main/java/com/wangxiandeng/demo/MainActivity.java b/demo/src/main/java/com/wangxiandeng/demo/MainActivity.java index dccc3bc..da0e85a 100644 --- a/demo/src/main/java/com/wangxiandeng/demo/MainActivity.java +++ b/demo/src/main/java/com/wangxiandeng/demo/MainActivity.java @@ -1,7 +1,7 @@ package com.wangxiandeng.demo; import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatActivity; import android.widget.Toast; import com.wangxiandeng.swipecardrecyclerview.ItemRemovedListener; diff --git a/demo/src/main/java/com/wangxiandeng/demo/MyAdapter.java b/demo/src/main/java/com/wangxiandeng/demo/MyAdapter.java index 881a1c0..0b3397a 100644 --- a/demo/src/main/java/com/wangxiandeng/demo/MyAdapter.java +++ b/demo/src/main/java/com/wangxiandeng/demo/MyAdapter.java @@ -1,12 +1,13 @@ package com.wangxiandeng.demo; import android.content.Context; -import android.support.v7.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.TextView; +import androidx.recyclerview.widget.RecyclerView; + import com.wangxiandeng.swipecardrecyclerview.SwipeCardAdapter; import java.util.List; 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 04e285f..ea32a0b 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip +#org.gradle.java.home=E\:\\myprogram\\Java\\jdk1.8.0_91 +org.gradle.java.home=D\:\\mysoftware\\android-studio-2020.3.1.24-windows\\android-studio\\jre \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index db3eaa8..7a88d70 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1 +1 @@ -include ':demo', ':swipecardrecyclerview' +include ':demo', ':swipecardrecyclerview' \ No newline at end of file diff --git a/swipecardrecyclerview/build.gradle b/swipecardrecyclerview/build.gradle index ab2348d..a5eaecd 100644 --- a/swipecardrecyclerview/build.gradle +++ b/swipecardrecyclerview/build.gradle @@ -1,16 +1,16 @@ apply plugin: 'com.android.library' android { - compileSdkVersion 24 - buildToolsVersion "24.0.2" + compileSdkVersion 30 + buildToolsVersion "30.0.3" defaultConfig { minSdkVersion 19 - targetSdkVersion 24 + targetSdkVersion 30 versionCode 1 versionName "1.0" - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' } buildTypes { @@ -21,13 +21,13 @@ android { } } -group='com.github.HalfStackDeveloper' +group = 'com.github.HalfStackDeveloper' dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) - androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', { + implementation fileTree(dir: 'libs', include: ['*.jar']) + androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0', { exclude group: 'com.android.support', module: 'support-annotations' }) - compile 'com.android.support:appcompat-v7:24.2.1' - compile 'com.android.support:recyclerview-v7:24.0.0-alpha1' - testCompile 'junit:junit:4.12' + implementation 'androidx.appcompat:appcompat:1.0.0' + implementation 'androidx.recyclerview:recyclerview:1.0.0' + testImplementation 'junit:junit:4.12' } diff --git a/swipecardrecyclerview/src/androidTest/java/com/wangxiandeng/swipecardrecyclerview/ExampleInstrumentedTest.java b/swipecardrecyclerview/src/androidTest/java/com/wangxiandeng/swipecardrecyclerview/ExampleInstrumentedTest.java index 7e12c7b..9ffc080 100644 --- a/swipecardrecyclerview/src/androidTest/java/com/wangxiandeng/swipecardrecyclerview/ExampleInstrumentedTest.java +++ b/swipecardrecyclerview/src/androidTest/java/com/wangxiandeng/swipecardrecyclerview/ExampleInstrumentedTest.java @@ -1,8 +1,8 @@ package com.wangxiandeng.swipecardrecyclerview; import android.content.Context; -import android.support.test.InstrumentationRegistry; -import android.support.test.runner.AndroidJUnit4; +import androidx.test.platform.app.InstrumentationRegistry; +import androidx.test.ext.junit.runners.AndroidJUnit4; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/swipecardrecyclerview/src/main/java/com/wangxiandeng/swipecardrecyclerview/SwipeCardAdapter.java b/swipecardrecyclerview/src/main/java/com/wangxiandeng/swipecardrecyclerview/SwipeCardAdapter.java index 6a78a11..8eb45b1 100644 --- a/swipecardrecyclerview/src/main/java/com/wangxiandeng/swipecardrecyclerview/SwipeCardAdapter.java +++ b/swipecardrecyclerview/src/main/java/com/wangxiandeng/swipecardrecyclerview/SwipeCardAdapter.java @@ -1,6 +1,6 @@ package com.wangxiandeng.swipecardrecyclerview; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import java.util.List; diff --git a/swipecardrecyclerview/src/main/java/com/wangxiandeng/swipecardrecyclerview/SwipeCardLayoutManager.java b/swipecardrecyclerview/src/main/java/com/wangxiandeng/swipecardrecyclerview/SwipeCardLayoutManager.java index c2b1205..1a3c98c 100644 --- a/swipecardrecyclerview/src/main/java/com/wangxiandeng/swipecardrecyclerview/SwipeCardLayoutManager.java +++ b/swipecardrecyclerview/src/main/java/com/wangxiandeng/swipecardrecyclerview/SwipeCardLayoutManager.java @@ -1,6 +1,6 @@ package com.wangxiandeng.swipecardrecyclerview; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.view.View; import android.view.ViewGroup; diff --git a/swipecardrecyclerview/src/main/java/com/wangxiandeng/swipecardrecyclerview/SwipeCardRecyclerView.java b/swipecardrecyclerview/src/main/java/com/wangxiandeng/swipecardrecyclerview/SwipeCardRecyclerView.java index 50f10d7..abed0c9 100644 --- a/swipecardrecyclerview/src/main/java/com/wangxiandeng/swipecardrecyclerview/SwipeCardRecyclerView.java +++ b/swipecardrecyclerview/src/main/java/com/wangxiandeng/swipecardrecyclerview/SwipeCardRecyclerView.java @@ -6,14 +6,12 @@ import android.app.Activity; import android.content.Context; import android.graphics.Bitmap; -import android.support.annotation.Nullable; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.Nullable; +import androidx.recyclerview.widget.RecyclerView; import android.util.AttributeSet; import android.util.TypedValue; import android.view.MotionEvent; import android.view.View; -import android.view.ViewPropertyAnimator; -import android.view.animation.Animation; import android.view.animation.LinearInterpolator; import android.view.animation.OvershootInterpolator; import android.widget.FrameLayout;