From d2ac19665fb227c721393e754763ab5b8e4e54c4 Mon Sep 17 00:00:00 2001 From: TimScriptov Date: Mon, 22 Jul 2019 15:16:23 +0300 Subject: [PATCH] Migrating to AndroidX --- library/build.gradle | 4 ++-- library/src/main/java/com/daimajia/swipe/SwipeLayout.java | 6 +++--- .../com/daimajia/swipe/adapters/CursorSwipeAdapter.java | 2 +- .../com/daimajia/swipe/adapters/RecyclerSwipeAdapter.java | 2 +- .../daimajia/swipe/adapters/SimpleCursorSwipeAdapter.java | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/library/build.gradle b/library/build.gradle index 906272e1..3b5b17e7 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -11,8 +11,8 @@ android { } dependencies { - compile 'com.android.support:recyclerview-v7:25.2.0' - compile 'com.android.support:support-v4:25.2.0' + implementation 'androidx.recyclerview:recyclerview:1.0.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..4e534ce3 100644 --- a/library/src/main/java/com/daimajia/swipe/adapters/RecyclerSwipeAdapter.java +++ b/library/src/main/java/com/daimajia/swipe/adapters/RecyclerSwipeAdapter.java @@ -1,6 +1,6 @@ package com.daimajia.swipe.adapters; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.view.ViewGroup; import com.daimajia.swipe.SwipeLayout; 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;