diff --git a/Library/build.gradle b/Library/build.gradle index 268566c..ca32b97 100644 --- a/Library/build.gradle +++ b/Library/build.gradle @@ -1,20 +1,19 @@ buildscript { repositories { + google() jcenter() mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:2.1.0' + classpath 'com.android.tools.build:gradle:4.0.1' classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.2' - classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3' } } apply plugin: 'com.android.library' -apply plugin: 'com.github.dcendents.android-maven' dependencies { - compile 'com.android.support:support-v4:23.0.1' + implementation('androidx.core:core:1.3.1') } ext { @@ -43,12 +42,12 @@ ext { } android { - compileSdkVersion 23 - buildToolsVersion "23.0.1" + compileSdkVersion 30 + buildToolsVersion "29.0.3" defaultConfig { minSdkVersion 8 - targetSdkVersion 23 + targetSdkVersion 30 versionCode 2 versionName "1.2.5" } @@ -59,6 +58,5 @@ android { } apply from: 'https://raw.github.com/chrisbanes/gradle-mvn-push/master/gradle-mvn-push.gradle' -apply from: 'https://raw.githubusercontent.com/nuuneoi/JCenter/master/installv1.gradle' apply from: 'https://raw.githubusercontent.com/nuuneoi/JCenter/master/bintrayv1.gradle' diff --git a/Library/src/main/java/com/wunderlist/slidinglayer/SlidingLayer.java b/Library/src/main/java/com/wunderlist/slidinglayer/SlidingLayer.java index a044e59..55f0437 100644 --- a/Library/src/main/java/com/wunderlist/slidinglayer/SlidingLayer.java +++ b/Library/src/main/java/com/wunderlist/slidinglayer/SlidingLayer.java @@ -33,10 +33,6 @@ import android.os.Bundle; import android.os.Parcel; import android.os.Parcelable; -import android.support.v4.view.MotionEventCompat; -import android.support.v4.view.VelocityTrackerCompat; -import android.support.v4.view.ViewCompat; -import android.support.v4.view.ViewConfigurationCompat; import android.util.AttributeSet; import android.view.Gravity; import android.view.MotionEvent; @@ -49,6 +45,10 @@ import android.widget.RelativeLayout; import android.widget.Scroller; +import androidx.core.view.MotionEventCompat; +import androidx.core.view.VelocityTrackerCompat; +import androidx.core.view.ViewCompat; +import androidx.core.view.ViewConfigurationCompat; public class SlidingLayer extends FrameLayout { @@ -1473,4 +1473,4 @@ public SavedState[] newArray(int size) { } }; } -} \ No newline at end of file +} diff --git a/SlidingLayerSample/build.gradle b/SlidingLayerSample/build.gradle index a84eb67..366220e 100644 --- a/SlidingLayerSample/build.gradle +++ b/SlidingLayerSample/build.gradle @@ -5,17 +5,17 @@ android { sourceCompatibility JavaVersion.VERSION_1_7 targetCompatibility JavaVersion.VERSION_1_7 } - compileSdkVersion 23 - buildToolsVersion "23.0.1" + compileSdkVersion 30 + buildToolsVersion "29.0.3" defaultConfig { - minSdkVersion 8 - targetSdkVersion 23 + minSdkVersion 21 + targetSdkVersion 30 versionCode 3 versionName "2.0.0" } } dependencies { - compile project(':Library') - compile 'com.android.support:appcompat-v7:23.0.1' + implementation(project(':Library')) + implementation('androidx.appcompat:appcompat:1.2.0') } diff --git a/SlidingLayerSample/src/main/java/com/slidinglayersample/InitSelectionActivity.java b/SlidingLayerSample/src/main/java/com/slidinglayersample/InitSelectionActivity.java index 78976eb..2ff3d56 100644 --- a/SlidingLayerSample/src/main/java/com/slidinglayersample/InitSelectionActivity.java +++ b/SlidingLayerSample/src/main/java/com/slidinglayersample/InitSelectionActivity.java @@ -30,7 +30,7 @@ import android.preference.Preference.OnPreferenceClickListener; import android.preference.PreferenceActivity; import android.preference.PreferenceManager; -import android.support.v7.widget.Toolbar; +import androidx.appcompat.widget.Toolbar; public class InitSelectionActivity extends PreferenceActivity { diff --git a/SlidingLayerSample/src/main/java/com/slidinglayersample/MainActivity.java b/SlidingLayerSample/src/main/java/com/slidinglayersample/MainActivity.java index 54ef36f..5ec8bd7 100644 --- a/SlidingLayerSample/src/main/java/com/slidinglayersample/MainActivity.java +++ b/SlidingLayerSample/src/main/java/com/slidinglayersample/MainActivity.java @@ -29,14 +29,15 @@ import android.graphics.drawable.Drawable; import android.os.Bundle; import android.preference.PreferenceManager; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.Toolbar; import android.view.KeyEvent; import android.view.MenuItem; import android.view.View; import android.widget.RelativeLayout.LayoutParams; import android.widget.TextView; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.Toolbar; + import com.wunderlist.slidinglayer.LayerTransformer; import com.wunderlist.slidinglayer.SlidingLayer; import com.wunderlist.slidinglayer.transformer.AlphaTransformer; diff --git a/SlidingLayerSample/src/main/res/layout/toolbar.xml b/SlidingLayerSample/src/main/res/layout/toolbar.xml index b47c432..45ba935 100644 --- a/SlidingLayerSample/src/main/res/layout/toolbar.xml +++ b/SlidingLayerSample/src/main/res/layout/toolbar.xml @@ -1,9 +1,9 @@ - \ No newline at end of file + android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"/> diff --git a/build.gradle b/build.gradle index 57ec573..c1663f7 100644 --- a/build.gradle +++ b/build.gradle @@ -3,15 +3,21 @@ apply plugin: 'android-reporting' buildscript { repositories { + google() jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.1.0' + classpath 'com.android.tools.build:gradle:4.0.1' } } allprojects { group = 'com.wunderlist.slidinglayer' - version = '1.2.5' + version = '2.0.0' + + repositories { + google() + jcenter() + } } diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..fcfd4f4 --- /dev/null +++ b/gradle.properties @@ -0,0 +1,2 @@ +android.enableJetifier=false +android.useAndroidX=true diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 828e75c..442ab8b 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.6-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-all.zip