From 7f4fa00aca49fbb15de5ff5108fcf473623fc651 Mon Sep 17 00:00:00 2001 From: Nuno Rodrigues Date: Thu, 16 Jan 2020 16:43:34 +0000 Subject: [PATCH] migrate to android x --- build.gradle | 4 +++- demo/build.gradle | 12 ++++++------ .../com/daimajia/swipedemo/RecyclerViewExample.java | 5 +++-- .../swipedemo/adapter/RecyclerViewAdapter.java | 3 ++- .../adapter/util/DividerItemDecoration.java | 5 +++-- .../adapter/util/RecyclerItemClickListener.java | 3 ++- gradle.properties | 10 ++++++---- gradle/wrapper/gradle-wrapper.properties | 4 ++-- library/build.gradle | 6 +++--- .../main/java/com/daimajia/swipe/SwipeLayout.java | 6 +++--- .../daimajia/swipe/adapters/CursorSwipeAdapter.java | 2 +- .../swipe/adapters/RecyclerSwipeAdapter.java | 3 ++- .../swipe/adapters/SimpleCursorSwipeAdapter.java | 2 +- 13 files changed, 37 insertions(+), 28 deletions(-) diff --git a/build.gradle b/build.gradle index 82697f55..2da955b2 100644 --- a/build.gradle +++ b/build.gradle @@ -6,9 +6,10 @@ buildscript { maven { url "https://jitpack.io" } + google() } dependencies { - classpath 'com.android.tools.build:gradle:2.3.0' + classpath 'com.android.tools.build:gradle:3.5.3' classpath 'com.github.dcendents:android-maven-plugin:1.2' // NOTE: Do not place your application dependencies here; they belong @@ -22,5 +23,6 @@ allprojects { maven { url "https://jitpack.io" } + google() } } diff --git a/demo/build.gradle b/demo/build.gradle index 09dca2ba..0bd9c1bd 100644 --- a/demo/build.gradle +++ b/demo/build.gradle @@ -25,11 +25,11 @@ android { } dependencies { - compile project(":library") - compile 'com.android.support:recyclerview-v7:25.1.1' - compile 'com.daimajia.easing:library:1.0.0@aar' - compile 'com.daimajia.androidanimations:library:1.1.2@aar' - compile 'com.nineoldandroids:library:2.4.0' + implementation project(":library") + implementation 'androidx.recyclerview:recyclerview:1.1.0' + implementation 'com.daimajia.easing:library:1.0.0@aar' + implementation 'com.daimajia.androidanimations:library:1.1.2@aar' + implementation 'com.nineoldandroids:library:2.4.0' // This dude gave a shoutout to you (daimajia) on his github page: - compile 'jp.wasabeef:recyclerview-animators:1.0.3@aar' + implementation 'jp.wasabeef:recyclerview-animators:1.0.3@aar' } diff --git a/demo/src/main/java/com/daimajia/swipedemo/RecyclerViewExample.java b/demo/src/main/java/com/daimajia/swipedemo/RecyclerViewExample.java index fd42733f..ef85fc07 100644 --- a/demo/src/main/java/com/daimajia/swipedemo/RecyclerViewExample.java +++ b/demo/src/main/java/com/daimajia/swipedemo/RecyclerViewExample.java @@ -5,12 +5,13 @@ import android.content.Intent; import android.os.Build; import android.os.Bundle; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; import android.util.Log; import android.view.Menu; import android.view.MenuItem; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + import com.daimajia.swipe.util.Attributes; import com.daimajia.swipedemo.adapter.RecyclerViewAdapter; import com.daimajia.swipedemo.adapter.util.DividerItemDecoration; diff --git a/demo/src/main/java/com/daimajia/swipedemo/adapter/RecyclerViewAdapter.java b/demo/src/main/java/com/daimajia/swipedemo/adapter/RecyclerViewAdapter.java index 3b4c34d4..ef7f9f7c 100644 --- a/demo/src/main/java/com/daimajia/swipedemo/adapter/RecyclerViewAdapter.java +++ b/demo/src/main/java/com/daimajia/swipedemo/adapter/RecyclerViewAdapter.java @@ -1,7 +1,6 @@ package com.daimajia.swipedemo.adapter; import android.content.Context; -import android.support.v7.widget.RecyclerView; import android.util.Log; import android.view.LayoutInflater; import android.view.View; @@ -10,6 +9,8 @@ import android.widget.TextView; import android.widget.Toast; +import androidx.recyclerview.widget.RecyclerView; + import com.daimajia.androidanimations.library.Techniques; import com.daimajia.androidanimations.library.YoYo; import com.daimajia.swipe.SimpleSwipeListener; diff --git a/demo/src/main/java/com/daimajia/swipedemo/adapter/util/DividerItemDecoration.java b/demo/src/main/java/com/daimajia/swipedemo/adapter/util/DividerItemDecoration.java index 85b5b3d2..e2812ec9 100644 --- a/demo/src/main/java/com/daimajia/swipedemo/adapter/util/DividerItemDecoration.java +++ b/demo/src/main/java/com/daimajia/swipedemo/adapter/util/DividerItemDecoration.java @@ -5,11 +5,12 @@ 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 android.util.AttributeSet; import android.view.View; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + public class DividerItemDecoration extends RecyclerView.ItemDecoration { private Drawable mDivider; diff --git a/demo/src/main/java/com/daimajia/swipedemo/adapter/util/RecyclerItemClickListener.java b/demo/src/main/java/com/daimajia/swipedemo/adapter/util/RecyclerItemClickListener.java index 613e8e52..de2d5725 100644 --- a/demo/src/main/java/com/daimajia/swipedemo/adapter/util/RecyclerItemClickListener.java +++ b/demo/src/main/java/com/daimajia/swipedemo/adapter/util/RecyclerItemClickListener.java @@ -1,11 +1,12 @@ package com.daimajia.swipedemo.adapter.util; import android.content.Context; -import android.support.v7.widget.RecyclerView; import android.view.GestureDetector; import android.view.MotionEvent; import android.view.View; +import androidx.recyclerview.widget.RecyclerView; + public class RecyclerItemClickListener implements RecyclerView.OnItemTouchListener { private OnItemClickListener mListener; diff --git a/gradle.properties b/gradle.properties index beab8970..1d7a413f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -22,7 +22,9 @@ VERSION_NAME=1.2.0 VERSION_CODE=22 GROUP=com.daimajia.swipelayout -ANDROID_BUILD_MIN_SDK_VERSION=9 -ANDROID_BUILD_TARGET_SDK_VERSION=25 -ANDROID_BUILD_SDK_VERSION=25 -ANDROID_BUILD_TOOLS_VERSION=25.0.2 +ANDROID_BUILD_MIN_SDK_VERSION=14 +ANDROID_BUILD_TARGET_SDK_VERSION=28 +ANDROID_BUILD_SDK_VERSION=28 +ANDROID_BUILD_TOOLS_VERSION=28.0.3 +android.useAndroidX=true +android.enableJetifier=true diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 776d2a5a..51c38482 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Thu Mar 09 16:07:03 CST 2017 +#Thu Jan 16 16:28:04 WET 2020 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip diff --git a/library/build.gradle b/library/build.gradle index 906272e1..afd6c551 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -5,14 +5,14 @@ android { buildToolsVersion project.ANDROID_BUILD_TOOLS_VERSION defaultConfig { - minSdkVersion 9 + minSdkVersion Integer.parseInt(project.ANDROID_BUILD_MIN_SDK_VERSION) targetSdkVersion Integer.parseInt(project.ANDROID_BUILD_TARGET_SDK_VERSION) } } dependencies { - compile 'com.android.support:recyclerview-v7:25.2.0' - compile 'com.android.support:support-v4:25.2.0' + implementation 'androidx.recyclerview:recyclerview:1.1.0' + implementation 'androidx.legacy:legacy-support-v4:1.0.0' } apply from: './gradle-mvn-push.gradle' diff --git a/library/src/main/java/com/daimajia/swipe/SwipeLayout.java b/library/src/main/java/com/daimajia/swipe/SwipeLayout.java index 6703123c..cd91eef3 100644 --- a/library/src/main/java/com/daimajia/swipe/SwipeLayout.java +++ b/library/src/main/java/com/daimajia/swipe/SwipeLayout.java @@ -3,9 +3,9 @@ import android.content.Context; import android.content.res.TypedArray; import android.graphics.Rect; -import android.support.v4.view.GravityCompat; -import android.support.v4.view.ViewCompat; -import android.support.v4.widget.ViewDragHelper; +import androidx.core.view.GravityCompat; +import androidx.core.view.ViewCompat; +import androidx.customview.widget.ViewDragHelper; import android.util.AttributeSet; import android.view.GestureDetector; import android.view.Gravity; diff --git a/library/src/main/java/com/daimajia/swipe/adapters/CursorSwipeAdapter.java b/library/src/main/java/com/daimajia/swipe/adapters/CursorSwipeAdapter.java index 3e6a62c7..a9986210 100644 --- a/library/src/main/java/com/daimajia/swipe/adapters/CursorSwipeAdapter.java +++ b/library/src/main/java/com/daimajia/swipe/adapters/CursorSwipeAdapter.java @@ -2,7 +2,7 @@ import android.content.Context; import android.database.Cursor; -import android.support.v4.widget.CursorAdapter; +import androidx.cursoradapter.widget.CursorAdapter; import android.view.View; import android.view.ViewGroup; diff --git a/library/src/main/java/com/daimajia/swipe/adapters/RecyclerSwipeAdapter.java b/library/src/main/java/com/daimajia/swipe/adapters/RecyclerSwipeAdapter.java index f6e9aed3..267deb19 100644 --- a/library/src/main/java/com/daimajia/swipe/adapters/RecyclerSwipeAdapter.java +++ b/library/src/main/java/com/daimajia/swipe/adapters/RecyclerSwipeAdapter.java @@ -1,8 +1,9 @@ package com.daimajia.swipe.adapters; -import android.support.v7.widget.RecyclerView; import android.view.ViewGroup; +import androidx.recyclerview.widget.RecyclerView; + import com.daimajia.swipe.SwipeLayout; import com.daimajia.swipe.implments.SwipeItemMangerImpl; import com.daimajia.swipe.interfaces.SwipeAdapterInterface; diff --git a/library/src/main/java/com/daimajia/swipe/adapters/SimpleCursorSwipeAdapter.java b/library/src/main/java/com/daimajia/swipe/adapters/SimpleCursorSwipeAdapter.java index 19b04ad2..ab510c7c 100644 --- a/library/src/main/java/com/daimajia/swipe/adapters/SimpleCursorSwipeAdapter.java +++ b/library/src/main/java/com/daimajia/swipe/adapters/SimpleCursorSwipeAdapter.java @@ -2,7 +2,7 @@ import android.content.Context; import android.database.Cursor; -import android.support.v4.widget.SimpleCursorAdapter; +import androidx.cursoradapter.widget.SimpleCursorAdapter; import android.view.View; import android.view.ViewGroup;