diff --git a/app/build.gradle b/app/build.gradle
index 82e24f7..1c8d48f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,12 +1,12 @@
apply plugin: 'com.android.application'
android {
- compileSdkVersion 27
- buildToolsVersion '27.0.2'
+ compileSdkVersion 29
+ buildToolsVersion '28.0.3'
defaultConfig {
applicationId "com.example.slideup"
minSdkVersion 14
- targetSdkVersion 27
+ targetSdkVersion 29
versionCode 1
versionName "1.0"
@@ -24,7 +24,7 @@ android {
}
dependencies {
- implementation "com.android.support:appcompat-v7:${versions.support}"
- implementation "com.android.support:design:${versions.support}"
+ implementation 'androidx.appcompat:appcompat:1.1.0'
+ implementation 'com.google.android.material:material:1.0.0'
implementation project(path: ':library')
}
diff --git a/app/src/main/java/com/example/slideup/SlideDownViewActivity.java b/app/src/main/java/com/example/slideup/SlideDownViewActivity.java
index c959ef5..bb8c7dc 100644
--- a/app/src/main/java/com/example/slideup/SlideDownViewActivity.java
+++ b/app/src/main/java/com/example/slideup/SlideDownViewActivity.java
@@ -2,9 +2,9 @@
import android.content.Intent;
import android.os.Bundle;
-import android.support.design.widget.FloatingActionButton;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
import android.view.Gravity;
import android.view.Menu;
import android.view.MenuItem;
diff --git a/app/src/main/java/com/example/slideup/SlideEndViewActivity.java b/app/src/main/java/com/example/slideup/SlideEndViewActivity.java
index 181d601..63ab50e 100644
--- a/app/src/main/java/com/example/slideup/SlideEndViewActivity.java
+++ b/app/src/main/java/com/example/slideup/SlideEndViewActivity.java
@@ -2,9 +2,9 @@
import android.content.Intent;
import android.os.Bundle;
-import android.support.design.widget.FloatingActionButton;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
import android.view.Gravity;
import android.view.Menu;
import android.view.MenuItem;
diff --git a/app/src/main/java/com/example/slideup/SlideStartViewActivity.java b/app/src/main/java/com/example/slideup/SlideStartViewActivity.java
index 3b4a6e8..4fbaebb 100644
--- a/app/src/main/java/com/example/slideup/SlideStartViewActivity.java
+++ b/app/src/main/java/com/example/slideup/SlideStartViewActivity.java
@@ -2,9 +2,9 @@
import android.content.Intent;
import android.os.Bundle;
-import android.support.design.widget.FloatingActionButton;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
import android.view.Gravity;
import android.view.Menu;
import android.view.MenuItem;
diff --git a/app/src/main/java/com/example/slideup/SlideUpViewActivity.java b/app/src/main/java/com/example/slideup/SlideUpViewActivity.java
index fe8708b..eed3c2d 100644
--- a/app/src/main/java/com/example/slideup/SlideUpViewActivity.java
+++ b/app/src/main/java/com/example/slideup/SlideUpViewActivity.java
@@ -2,9 +2,9 @@
import android.content.Intent;
import android.os.Bundle;
-import android.support.design.widget.FloatingActionButton;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
import android.view.Gravity;
import android.view.Menu;
import android.view.MenuItem;
diff --git a/app/src/main/res/layout/activity_slide_down_view.xml b/app/src/main/res/layout/activity_slide_down_view.xml
index 77e5ce3..b2c0077 100644
--- a/app/src/main/res/layout/activity_slide_down_view.xml
+++ b/app/src/main/res/layout/activity_slide_down_view.xml
@@ -16,12 +16,12 @@
android:layout_height="match_parent"
android:background="@color/dimBg" />
-
-
-
-
+
-
-
+
diff --git a/app/src/main/res/layout/activity_slide_end_view.xml b/app/src/main/res/layout/activity_slide_end_view.xml
index b360ddd..e35b76e 100644
--- a/app/src/main/res/layout/activity_slide_end_view.xml
+++ b/app/src/main/res/layout/activity_slide_end_view.xml
@@ -16,13 +16,13 @@
android:layout_height="match_parent"
android:background="@color/dimBg" />
-
-
-
-
+
-
-
+
diff --git a/app/src/main/res/layout/activity_slide_start_view.xml b/app/src/main/res/layout/activity_slide_start_view.xml
index e8cc078..817826e 100644
--- a/app/src/main/res/layout/activity_slide_start_view.xml
+++ b/app/src/main/res/layout/activity_slide_start_view.xml
@@ -16,12 +16,12 @@
android:layout_height="match_parent"
android:background="@color/dimBg" />
-
-
-
-
+
-
-
+
diff --git a/app/src/main/res/layout/activity_slide_up_view.xml b/app/src/main/res/layout/activity_slide_up_view.xml
index a3e7c17..ba5d0ff 100644
--- a/app/src/main/res/layout/activity_slide_up_view.xml
+++ b/app/src/main/res/layout/activity_slide_up_view.xml
@@ -16,32 +16,32 @@
android:layout_height="match_parent"
android:background="@color/dimBg" />
-
-
-
-
+
-
-
+
diff --git a/build.gradle b/build.gradle
index ce8908c..30bd9f8 100644
--- a/build.gradle
+++ b/build.gradle
@@ -10,7 +10,7 @@ buildscript {
jcenter()
}
dependencies {
- classpath 'com.android.tools.build:gradle:3.0.1'
+ classpath 'com.android.tools.build:gradle:3.5.0'
}
}
diff --git a/gradle.properties b/gradle.properties
index aac7c9b..9e6fce1 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -9,6 +9,8 @@
# Specifies the JVM arguments used for the daemon process.
# The setting is particularly useful for tweaking memory settings.
+android.enableJetifier=true
+android.useAndroidX=true
org.gradle.jvmargs=-Xmx1536m
# When configured, Gradle will run in incubating parallel mode.
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 3f625dc..242c46b 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Thu Oct 05 10:36:33 CEST 2017
+#Wed Oct 02 09:49:22 CEST 2019
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-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 c5b96e4..ce34fae 100644
--- a/library/build.gradle
+++ b/library/build.gradle
@@ -1,12 +1,12 @@
apply plugin: 'com.android.library'
android {
- compileSdkVersion 27
- buildToolsVersion '27.0.2'
+ compileSdkVersion 29
+ buildToolsVersion '28.0.3'
defaultConfig {
minSdkVersion 14
- targetSdkVersion 27
+ targetSdkVersion 29
versionCode 9
versionName "2.2.8"
}
@@ -27,7 +27,7 @@ android {
}
dependencies {
- implementation "com.android.support:support-annotations:${versions.support}"
+ implementation 'androidx.annotation:annotation:1.1.0'
}
task androidJavadocs(type: Javadoc) {
diff --git a/library/src/main/java/com/mancj/slideup/SlideUp.java b/library/src/main/java/com/mancj/slideup/SlideUp.java
index b6a625a..36bee5d 100644
--- a/library/src/main/java/com/mancj/slideup/SlideUp.java
+++ b/library/src/main/java/com/mancj/slideup/SlideUp.java
@@ -6,8 +6,8 @@
import android.content.Context;
import android.os.Bundle;
import android.os.IBinder;
-import android.support.annotation.IntDef;
-import android.support.annotation.NonNull;
+import androidx.annotation.IntDef;
+import androidx.annotation.NonNull;
import android.util.Log;
import android.view.MotionEvent;
import android.view.View;
diff --git a/library/src/main/java/com/mancj/slideup/SlideUpBuilder.java b/library/src/main/java/com/mancj/slideup/SlideUpBuilder.java
index 4a1d188..bd00393 100644
--- a/library/src/main/java/com/mancj/slideup/SlideUpBuilder.java
+++ b/library/src/main/java/com/mancj/slideup/SlideUpBuilder.java
@@ -2,8 +2,8 @@
import android.animation.TimeInterpolator;
import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
import android.view.Gravity;
import android.view.View;
import android.view.animation.DecelerateInterpolator;