From d7ace3e27fedc6b40abb8da2b81f6adf65ff0e17 Mon Sep 17 00:00:00 2001 From: Murat Bilir Date: Sun, 8 Sep 2019 21:46:12 +0300 Subject: [PATCH 1/2] Dependency and sdk versions updated. --- build.gradle | 5 ++++- demo/build.gradle | 17 +++++++++-------- gradle/wrapper/gradle-wrapper.properties | 4 ++-- swipe-reveal-layout/build.gradle | 12 ++++++------ 4 files changed, 21 insertions(+), 17 deletions(-) diff --git a/build.gradle b/build.gradle index dfbb282..b3e6c2a 100644 --- a/build.gradle +++ b/build.gradle @@ -3,9 +3,11 @@ buildscript { repositories { jcenter() + google() } + dependencies { - classpath 'com.android.tools.build:gradle:2.1.3' + classpath 'com.android.tools.build:gradle:3.4.2' classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.6' classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5' @@ -17,6 +19,7 @@ buildscript { allprojects { repositories { jcenter() + google() } } diff --git a/demo/build.gradle b/demo/build.gradle index 030e912..634057e 100644 --- a/demo/build.gradle +++ b/demo/build.gradle @@ -1,16 +1,17 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 24 - buildToolsVersion "23.0.3" + compileSdkVersion 28 + buildToolsVersion "28.0.3" defaultConfig { applicationId "com.chauthai.swipereveallayout" minSdkVersion 14 - targetSdkVersion 24 + targetSdkVersion 28 versionCode 7 versionName "1.4.0" } + buildTypes { release { minifyEnabled false @@ -20,9 +21,9 @@ android { } dependencies { - compile fileTree(include: ['*.jar'], dir: 'libs') - compile 'com.android.support:appcompat-v7:24.2.0' - compile 'com.android.support:design:24.2.0' - compile 'com.android.support:recyclerview-v7:24.2.0' - compile project(':swipe-reveal-layout') + implementation fileTree(include: ['*.jar'], dir: 'libs') + implementation 'com.android.support:appcompat-v7:28.0.0' + implementation 'com.android.support:design:28.0.0' + implementation 'com.android.support:recyclerview-v7:28.0.0' + implementation project(':swipe-reveal-layout') } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 7ab7b63..bdc9167 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Mon Aug 29 11:23:47 EDT 2016 +#Sun Sep 08 21:08:58 EET 2019 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-5.1.1-all.zip diff --git a/swipe-reveal-layout/build.gradle b/swipe-reveal-layout/build.gradle index 81b09d4..4809781 100644 --- a/swipe-reveal-layout/build.gradle +++ b/swipe-reveal-layout/build.gradle @@ -3,12 +3,12 @@ apply plugin: 'com.github.dcendents.android-maven' apply plugin: 'com.jfrog.bintray' android { - compileSdkVersion 24 - buildToolsVersion "23.0.3" + compileSdkVersion 28 + buildToolsVersion "28.0.3" defaultConfig { - minSdkVersion 9 - targetSdkVersion 24 + minSdkVersion 14 + targetSdkVersion 28 versionCode 8 versionName "1.4.1" } @@ -21,8 +21,8 @@ android { } dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) - compile 'com.android.support:support-v4:24.2.0' + implementation fileTree(dir: 'libs', include: ['*.jar']) + implementation 'com.android.support:support-v4:28.0.0' } ext { From 367ad332ce6ceab68f740b2dc9bc898840ab6983 Mon Sep 17 00:00:00 2001 From: Murat Bilir Date: Tue, 10 Sep 2019 08:42:36 +0300 Subject: [PATCH 2/2] Project migrated to AndroidX. --- demo/build.gradle | 6 +++--- .../com/chauthai/swipereveallayoutdemo/GridActivity.java | 6 +++--- .../chauthai/swipereveallayoutdemo/ListDemoActivity.java | 6 +++--- .../com/chauthai/swipereveallayoutdemo/MainActivity.java | 4 ++-- .../chauthai/swipereveallayoutdemo/RecyclerAdapter.java | 2 +- .../swipereveallayoutdemo/RecyclerDemoActivity.java | 8 ++++---- demo/src/main/res/layout/activity_grid.xml | 2 +- demo/src/main/res/layout/activity_list.xml | 2 +- demo/src/main/res/layout/activity_main.xml | 2 +- demo/src/main/res/layout/activity_recycler.xml | 4 ++-- gradle.properties | 4 +++- swipe-reveal-layout/build.gradle | 3 ++- .../com/chauthai/swipereveallayout/SwipeRevealLayout.java | 8 ++++---- 13 files changed, 30 insertions(+), 27 deletions(-) diff --git a/demo/build.gradle b/demo/build.gradle index 634057e..6725988 100644 --- a/demo/build.gradle +++ b/demo/build.gradle @@ -22,8 +22,8 @@ android { dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') - implementation 'com.android.support:appcompat-v7:28.0.0' - implementation 'com.android.support:design:28.0.0' - implementation 'com.android.support:recyclerview-v7:28.0.0' + implementation 'androidx.appcompat:appcompat:1.1.0' + implementation 'com.google.android.material:material:1.0.0' + implementation 'androidx.recyclerview:recyclerview:1.0.0' implementation project(':swipe-reveal-layout') } diff --git a/demo/src/main/java/com/chauthai/swipereveallayoutdemo/GridActivity.java b/demo/src/main/java/com/chauthai/swipereveallayoutdemo/GridActivity.java index baf88b5..380fece 100644 --- a/demo/src/main/java/com/chauthai/swipereveallayoutdemo/GridActivity.java +++ b/demo/src/main/java/com/chauthai/swipereveallayoutdemo/GridActivity.java @@ -1,9 +1,9 @@ package com.chauthai.swipereveallayoutdemo; import android.os.Bundle; -import android.support.annotation.Nullable; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.Toolbar; +import androidx.annotation.Nullable; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.Toolbar; import android.view.View; import android.widget.GridView; diff --git a/demo/src/main/java/com/chauthai/swipereveallayoutdemo/ListDemoActivity.java b/demo/src/main/java/com/chauthai/swipereveallayoutdemo/ListDemoActivity.java index 6221bd3..1d9650d 100644 --- a/demo/src/main/java/com/chauthai/swipereveallayoutdemo/ListDemoActivity.java +++ b/demo/src/main/java/com/chauthai/swipereveallayoutdemo/ListDemoActivity.java @@ -1,9 +1,9 @@ package com.chauthai.swipereveallayoutdemo; import android.os.Bundle; -import android.support.annotation.Nullable; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.Toolbar; +import androidx.annotation.Nullable; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.Toolbar; import android.view.View; import android.widget.ListView; diff --git a/demo/src/main/java/com/chauthai/swipereveallayoutdemo/MainActivity.java b/demo/src/main/java/com/chauthai/swipereveallayoutdemo/MainActivity.java index fdcf9c1..88e5222 100644 --- a/demo/src/main/java/com/chauthai/swipereveallayoutdemo/MainActivity.java +++ b/demo/src/main/java/com/chauthai/swipereveallayoutdemo/MainActivity.java @@ -2,8 +2,8 @@ import android.content.Intent; import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.Toolbar; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.Toolbar; import android.view.Menu; import android.view.MenuItem; import android.view.View; diff --git a/demo/src/main/java/com/chauthai/swipereveallayoutdemo/RecyclerAdapter.java b/demo/src/main/java/com/chauthai/swipereveallayoutdemo/RecyclerAdapter.java index 52ecfd0..c50fd9f 100644 --- a/demo/src/main/java/com/chauthai/swipereveallayoutdemo/RecyclerAdapter.java +++ b/demo/src/main/java/com/chauthai/swipereveallayoutdemo/RecyclerAdapter.java @@ -2,7 +2,7 @@ import android.content.Context; import android.os.Bundle; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.util.Log; import android.view.LayoutInflater; import android.view.View; diff --git a/demo/src/main/java/com/chauthai/swipereveallayoutdemo/RecyclerDemoActivity.java b/demo/src/main/java/com/chauthai/swipereveallayoutdemo/RecyclerDemoActivity.java index 7578452..a394c86 100644 --- a/demo/src/main/java/com/chauthai/swipereveallayoutdemo/RecyclerDemoActivity.java +++ b/demo/src/main/java/com/chauthai/swipereveallayoutdemo/RecyclerDemoActivity.java @@ -1,10 +1,10 @@ package com.chauthai.swipereveallayoutdemo; import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.Toolbar; +import androidx.appcompat.app.AppCompatActivity; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; +import androidx.appcompat.widget.Toolbar; import android.view.View; import java.util.ArrayList; diff --git a/demo/src/main/res/layout/activity_grid.xml b/demo/src/main/res/layout/activity_grid.xml index a4fffbf..f9c4d26 100644 --- a/demo/src/main/res/layout/activity_grid.xml +++ b/demo/src/main/res/layout/activity_grid.xml @@ -5,7 +5,7 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - - - - - diff --git a/gradle.properties b/gradle.properties index 1d3591c..2a8e7cc 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.enableJetifier=false +android.useAndroidX=true \ No newline at end of file diff --git a/swipe-reveal-layout/build.gradle b/swipe-reveal-layout/build.gradle index 4809781..bab78f8 100644 --- a/swipe-reveal-layout/build.gradle +++ b/swipe-reveal-layout/build.gradle @@ -22,7 +22,8 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation 'com.android.support:support-v4:28.0.0' + implementation 'androidx.core:core:1.1.0' + implementation 'androidx.customview:customview:1.0.0' } ext { diff --git a/swipe-reveal-layout/src/main/java/com/chauthai/swipereveallayout/SwipeRevealLayout.java b/swipe-reveal-layout/src/main/java/com/chauthai/swipereveallayout/SwipeRevealLayout.java index c9ec3b5..de8fd8e 100644 --- a/swipe-reveal-layout/src/main/java/com/chauthai/swipereveallayout/SwipeRevealLayout.java +++ b/swipe-reveal-layout/src/main/java/com/chauthai/swipereveallayout/SwipeRevealLayout.java @@ -29,17 +29,17 @@ of this software and associated documentation files (the "Software"), to deal import android.content.res.Resources; import android.content.res.TypedArray; import android.graphics.Rect; -import android.support.v4.view.GestureDetectorCompat; -import android.support.v4.view.ViewCompat; -import android.support.v4.widget.ViewDragHelper; import android.util.AttributeSet; import android.util.DisplayMetrics; -import android.util.Log; import android.view.GestureDetector; import android.view.MotionEvent; import android.view.View; import android.view.ViewGroup; +import androidx.core.view.GestureDetectorCompat; +import androidx.core.view.ViewCompat; +import androidx.customview.widget.ViewDragHelper; + @SuppressLint("RtlHardcoded") public class SwipeRevealLayout extends ViewGroup { // These states are used only for ViewBindHelper