diff --git a/base-adapter-library/build.gradle b/base-adapter-library/build.gradle index 275ee00..8a7aa37 100644 --- a/base-adapter-library/build.gradle +++ b/base-adapter-library/build.gradle @@ -2,12 +2,12 @@ apply plugin: 'com.android.library' //apply plugin: 'com.novoda.bintray-release' android { - compileSdkVersion 23 - buildToolsVersion "23.0.1" + compileSdkVersion 28 + buildToolsVersion "28.0.3" defaultConfig { - minSdkVersion 10 - targetSdkVersion 23 + minSdkVersion 16 + targetSdkVersion 28 versionCode 1 versionName "1.0" } @@ -21,7 +21,7 @@ android { dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) - compile 'com.android.support:recyclerview-v7:23.2.0' + compile 'androidx.recyclerview:recyclerview:1.0.0' } diff --git a/base-adapter-library/src/main/java/com/zhy/adapter/abslistview/base/ItemViewDelegateManager.java b/base-adapter-library/src/main/java/com/zhy/adapter/abslistview/base/ItemViewDelegateManager.java index 298cccf..b16974a 100644 --- a/base-adapter-library/src/main/java/com/zhy/adapter/abslistview/base/ItemViewDelegateManager.java +++ b/base-adapter-library/src/main/java/com/zhy/adapter/abslistview/base/ItemViewDelegateManager.java @@ -1,6 +1,7 @@ package com.zhy.adapter.abslistview.base; -import android.support.v4.util.SparseArrayCompat; + +import androidx.collection.SparseArrayCompat; import com.zhy.adapter.abslistview.ViewHolder; diff --git a/baseadapter-recyclerview/build.gradle b/baseadapter-recyclerview/build.gradle index a557009..ed6248a 100644 --- a/baseadapter-recyclerview/build.gradle +++ b/baseadapter-recyclerview/build.gradle @@ -2,12 +2,12 @@ apply plugin: 'com.android.library' apply plugin: 'com.novoda.bintray-release' android { - compileSdkVersion 23 - buildToolsVersion "23.0.1" + compileSdkVersion 28 + buildToolsVersion "28.0.3" defaultConfig { - minSdkVersion 10 - targetSdkVersion 23 + minSdkVersion 16 + targetSdkVersion 28 versionCode 1 versionName "1.0" } @@ -21,15 +21,15 @@ android { dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) testCompile 'junit:junit:4.12' - compile 'com.android.support:recyclerview-v7:23.4.0' + compile 'androidx.recyclerview:recyclerview:1.0.0' } publish { userOrg = 'hongyangandroid' groupId = 'com.zhy' artifactId = 'base-rvadapter' - publishVersion = '3.0.3' - desc = 'a easy adapter for recyclerview' + publishVersion = '3.0.4' + desc = 'a easy adapter for recyclerview for androidx' website = 'https://github.com/hongyangAndroid/baseAdapter' licences = ['Apache-2.0'] } diff --git a/baseadapter-recyclerview/src/main/java/com/zhy/adapter/recyclerview/MultiItemTypeAdapter.java b/baseadapter-recyclerview/src/main/java/com/zhy/adapter/recyclerview/MultiItemTypeAdapter.java index e4318a6..85c7a1e 100644 --- a/baseadapter-recyclerview/src/main/java/com/zhy/adapter/recyclerview/MultiItemTypeAdapter.java +++ b/baseadapter-recyclerview/src/main/java/com/zhy/adapter/recyclerview/MultiItemTypeAdapter.java @@ -1,7 +1,7 @@ package com.zhy.adapter.recyclerview; import android.content.Context; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.view.View; import android.view.ViewGroup; diff --git a/baseadapter-recyclerview/src/main/java/com/zhy/adapter/recyclerview/base/ItemViewDelegateManager.java b/baseadapter-recyclerview/src/main/java/com/zhy/adapter/recyclerview/base/ItemViewDelegateManager.java index 3c8dba8..2259c47 100644 --- a/baseadapter-recyclerview/src/main/java/com/zhy/adapter/recyclerview/base/ItemViewDelegateManager.java +++ b/baseadapter-recyclerview/src/main/java/com/zhy/adapter/recyclerview/base/ItemViewDelegateManager.java @@ -1,6 +1,6 @@ package com.zhy.adapter.recyclerview.base; -import android.support.v4.util.SparseArrayCompat; +import androidx.collection.SparseArrayCompat; /** diff --git a/baseadapter-recyclerview/src/main/java/com/zhy/adapter/recyclerview/base/ViewHolder.java b/baseadapter-recyclerview/src/main/java/com/zhy/adapter/recyclerview/base/ViewHolder.java index 1d3ba07..88a7eeb 100755 --- a/baseadapter-recyclerview/src/main/java/com/zhy/adapter/recyclerview/base/ViewHolder.java +++ b/baseadapter-recyclerview/src/main/java/com/zhy/adapter/recyclerview/base/ViewHolder.java @@ -7,7 +7,7 @@ import android.graphics.Typeface; import android.graphics.drawable.Drawable; import android.os.Build; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.text.util.Linkify; import android.util.SparseArray; import android.view.LayoutInflater; diff --git a/baseadapter-recyclerview/src/main/java/com/zhy/adapter/recyclerview/utils/WrapperUtils.java b/baseadapter-recyclerview/src/main/java/com/zhy/adapter/recyclerview/utils/WrapperUtils.java index d0a2d7d..f653fa5 100644 --- a/baseadapter-recyclerview/src/main/java/com/zhy/adapter/recyclerview/utils/WrapperUtils.java +++ b/baseadapter-recyclerview/src/main/java/com/zhy/adapter/recyclerview/utils/WrapperUtils.java @@ -1,8 +1,8 @@ package com.zhy.adapter.recyclerview.utils; -import android.support.v7.widget.GridLayoutManager; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.StaggeredGridLayoutManager; +import androidx.recyclerview.widget.GridLayoutManager; +import androidx.recyclerview.widget.RecyclerView; +import androidx.recyclerview.widget.StaggeredGridLayoutManager; import android.view.ViewGroup; /** diff --git a/baseadapter-recyclerview/src/main/java/com/zhy/adapter/recyclerview/wrapper/EmptyWrapper.java b/baseadapter-recyclerview/src/main/java/com/zhy/adapter/recyclerview/wrapper/EmptyWrapper.java index 2eb35b5..5b2fd0d 100644 --- a/baseadapter-recyclerview/src/main/java/com/zhy/adapter/recyclerview/wrapper/EmptyWrapper.java +++ b/baseadapter-recyclerview/src/main/java/com/zhy/adapter/recyclerview/wrapper/EmptyWrapper.java @@ -1,7 +1,7 @@ package com.zhy.adapter.recyclerview.wrapper; -import android.support.v7.widget.GridLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.GridLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.view.View; import android.view.ViewGroup; diff --git a/baseadapter-recyclerview/src/main/java/com/zhy/adapter/recyclerview/wrapper/HeaderAndFooterWrapper.java b/baseadapter-recyclerview/src/main/java/com/zhy/adapter/recyclerview/wrapper/HeaderAndFooterWrapper.java index fa5fe7d..e6993db 100644 --- a/baseadapter-recyclerview/src/main/java/com/zhy/adapter/recyclerview/wrapper/HeaderAndFooterWrapper.java +++ b/baseadapter-recyclerview/src/main/java/com/zhy/adapter/recyclerview/wrapper/HeaderAndFooterWrapper.java @@ -1,8 +1,8 @@ package com.zhy.adapter.recyclerview.wrapper; -import android.support.v4.util.SparseArrayCompat; -import android.support.v7.widget.GridLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.collection.SparseArrayCompat; +import androidx.recyclerview.widget.GridLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.view.View; import android.view.ViewGroup; diff --git a/baseadapter-recyclerview/src/main/java/com/zhy/adapter/recyclerview/wrapper/LoadmoreWrapper.java b/baseadapter-recyclerview/src/main/java/com/zhy/adapter/recyclerview/wrapper/LoadMoreWrapper.java similarity index 92% rename from baseadapter-recyclerview/src/main/java/com/zhy/adapter/recyclerview/wrapper/LoadmoreWrapper.java rename to baseadapter-recyclerview/src/main/java/com/zhy/adapter/recyclerview/wrapper/LoadMoreWrapper.java index 894b8d7..2f67bd1 100644 --- a/baseadapter-recyclerview/src/main/java/com/zhy/adapter/recyclerview/wrapper/LoadmoreWrapper.java +++ b/baseadapter-recyclerview/src/main/java/com/zhy/adapter/recyclerview/wrapper/LoadMoreWrapper.java @@ -1,11 +1,12 @@ package com.zhy.adapter.recyclerview.wrapper; -import android.support.v7.widget.GridLayoutManager; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.StaggeredGridLayoutManager; import android.view.View; import android.view.ViewGroup; +import androidx.recyclerview.widget.GridLayoutManager; +import androidx.recyclerview.widget.RecyclerView; +import androidx.recyclerview.widget.StaggeredGridLayoutManager; + import com.zhy.adapter.recyclerview.base.ViewHolder; import com.zhy.adapter.recyclerview.utils.WrapperUtils; diff --git a/build.gradle b/build.gradle index bf69489..dad71e5 100644 --- a/build.gradle +++ b/build.gradle @@ -2,11 +2,12 @@ buildscript { repositories { + google() jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.1.0' - classpath 'com.novoda:bintray-release:0.3.4' + classpath "com.android.tools.build:gradle:3.4.0" + classpath 'com.novoda:bintray-release:0.5.0' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files @@ -15,6 +16,7 @@ buildscript { allprojects { repositories { + google() jcenter() } } diff --git a/gradle.properties b/gradle.properties index 9b6ae2a..b7c203c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -15,4 +15,6 @@ # When configured, Gradle will run in incubating parallel mode. # This option should only be used with decoupled projects. More details, visit # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects -# org.gradle.parallel=true \ No newline at end of file +# org.gradle.parallel=true +android.useAndroidX = true +android.enableJetifier = true \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 059382a..0cac2a5 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-2.10-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip diff --git a/sample/build.gradle b/sample/build.gradle index fef61a8..1dfbf93 100644 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -1,13 +1,13 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 23 - buildToolsVersion "23.0.1" + compileSdkVersion 28 + buildToolsVersion "28.0.3" defaultConfig { applicationId "com.zhy.sample" - minSdkVersion 10 - targetSdkVersion 23 + minSdkVersion 16 + targetSdkVersion 28 versionCode 1 versionName "1.0" } @@ -20,11 +20,9 @@ android { } dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) - compile 'com.android.support:appcompat-v7:23.4.0' - compile 'com.android.support:recyclerview-v7:23.4.0' -// compile 'com.zhy:base-adapter:3.0.2' -// compile 'com.zhy:base-rvadapter:3.0.2' - compile project(':base-adapter-library') - compile project(':baseadapter-recyclerview') + implementation fileTree(dir: 'libs', include: ['*.jar']) + implementation 'androidx.appcompat:appcompat:1.0.0' + implementation 'androidx.recyclerview:recyclerview:1.0.0' + implementation project(':base-adapter-library') + implementation project(':baseadapter-recyclerview') } diff --git a/sample/src/main/java/com/zhy/sample/DividerItemDecoration.java b/sample/src/main/java/com/zhy/sample/DividerItemDecoration.java index 82d5e58..aaf5f70 100644 --- a/sample/src/main/java/com/zhy/sample/DividerItemDecoration.java +++ b/sample/src/main/java/com/zhy/sample/DividerItemDecoration.java @@ -10,8 +10,8 @@ import android.graphics.Canvas; import android.graphics.Rect; import android.graphics.drawable.Drawable; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.view.View; diff --git a/sample/src/main/java/com/zhy/sample/MainActivity.java b/sample/src/main/java/com/zhy/sample/MainActivity.java index 57bdd06..ced21d7 100644 --- a/sample/src/main/java/com/zhy/sample/MainActivity.java +++ b/sample/src/main/java/com/zhy/sample/MainActivity.java @@ -2,7 +2,7 @@ import android.content.Intent; import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatActivity; import android.view.View; import android.widget.AdapterView; import android.widget.ListView; diff --git a/sample/src/main/java/com/zhy/sample/MultiItemListViewActivity.java b/sample/src/main/java/com/zhy/sample/MultiItemListViewActivity.java index 9132d76..661d343 100644 --- a/sample/src/main/java/com/zhy/sample/MultiItemListViewActivity.java +++ b/sample/src/main/java/com/zhy/sample/MultiItemListViewActivity.java @@ -1,7 +1,7 @@ package com.zhy.sample; import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatActivity; import android.widget.ListView; import com.zhy.adapter.abslistview.CommonAdapter; diff --git a/sample/src/main/java/com/zhy/sample/MultiItemRvActivity.java b/sample/src/main/java/com/zhy/sample/MultiItemRvActivity.java index 29475ef..39f6be8 100644 --- a/sample/src/main/java/com/zhy/sample/MultiItemRvActivity.java +++ b/sample/src/main/java/com/zhy/sample/MultiItemRvActivity.java @@ -2,9 +2,9 @@ import android.os.Bundle; import android.os.Handler; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.appcompat.app.AppCompatActivity; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.widget.Toast; diff --git a/sample/src/main/java/com/zhy/sample/RecyclerViewActivity.java b/sample/src/main/java/com/zhy/sample/RecyclerViewActivity.java index 5318f89..f962627 100644 --- a/sample/src/main/java/com/zhy/sample/RecyclerViewActivity.java +++ b/sample/src/main/java/com/zhy/sample/RecyclerViewActivity.java @@ -2,11 +2,11 @@ import android.os.Bundle; import android.os.Handler; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.GridLayoutManager; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.StaggeredGridLayoutManager; +import androidx.appcompat.app.AppCompatActivity; +import androidx.recyclerview.widget.GridLayoutManager; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; +import androidx.recyclerview.widget.StaggeredGridLayoutManager; import android.view.LayoutInflater; import android.view.Menu; import android.view.MenuItem; diff --git a/sample/src/main/res/layout/activity_recyclerview.xml b/sample/src/main/res/layout/activity_recyclerview.xml index 2bcec8e..ff74b02 100644 --- a/sample/src/main/res/layout/activity_recyclerview.xml +++ b/sample/src/main/res/layout/activity_recyclerview.xml @@ -8,7 +8,7 @@ android:paddingTop="@dimen/activity_vertical_margin" tools:context="com.zhy.sample.RecyclerViewActivity"> -