mograted to androidx

Gundabadec · Dec 27, 2018 · c9bba86 · c9bba86
1 parent 27e72f7
commit c9bba86
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 19 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -14,7 +14,7 @@ android {
 }
 
 dependencies {
-    implementation 'com.android.support:appcompat-v7:'+project.supportVersion
+    implementation 'androidx.appcompat:appcompat:1.0.2'
     implementation 'com.github.florent37:viewtooltip:1.1.8'
     //implementation project(path: ':viewtooltip')
 }
diff --git a/app/src/main/java/florent37/github/com/viewtooltip/MainActivity.java b/app/src/main/java/florent37/github/com/viewtooltip/MainActivity.java
@@ -5,8 +5,9 @@
 import android.graphics.Paint;
 import android.graphics.Shader;
 import android.os.Bundle;
-import android.support.annotation.ColorInt;
-import android.support.v7.app.AppCompatActivity;
+
+import androidx.annotation.ColorInt;
+import androidx.appcompat.app.AppCompatActivity;
 import android.util.Log;
 import android.view.View;
 import android.widget.EditText;

diff --git a/build.gradle b/build.gradle
@@ -4,9 +4,9 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.0'
-        classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'
-        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
+        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
+        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.0'
     }
 }
 
@@ -18,12 +18,11 @@ allprojects {
 }
 
 ext{
-    COMPILE_SDK=27
-    TARGET_SDK=27
+    COMPILE_SDK=28
+    TARGET_SDK=28
     MIN_SDK = 14
-    sourceCompatibilityVersion = JavaVersion.VERSION_1_7
-    targetCompatibilityVersion = JavaVersion.VERSION_1_7
-    supportVersion = "27.0.2"
+    sourceCompatibilityVersion = JavaVersion.VERSION_1_8
+    targetCompatibilityVersion = JavaVersion.VERSION_1_8
 
-    libraryVersion = "1.1.8"
+    libraryVersion = "1.2.0"
 }
diff --git 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
@@ -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-4.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
diff --git a/viewtooltip/build.gradle b/viewtooltip/build.gradle
@@ -12,7 +12,7 @@ android {
 }
 
 dependencies {
-    compileOnly 'com.android.support:appcompat-v7:'+project.supportVersion
+    compileOnly 'androidx.appcompat:appcompat:1.0.2'
 }
 
 ext {

diff --git a/viewtooltip/src/main/java/com/github/florent37/viewtooltip/ViewTooltip.java b/viewtooltip/src/main/java/com/github/florent37/viewtooltip/ViewTooltip.java
@@ -13,11 +13,13 @@
 import android.graphics.Rect;
 import android.graphics.RectF;
 import android.graphics.Typeface;
-import android.support.annotation.ColorInt;
-import android.support.annotation.StringRes;
-import android.support.v4.app.DialogFragment;
-import android.support.v4.app.Fragment;
-import android.support.v4.widget.NestedScrollView;
+
+import androidx.annotation.ColorInt;
+import androidx.annotation.StringRes;
+import androidx.core.widget.NestedScrollView;
+import androidx.fragment.app.DialogFragment;
+import androidx.fragment.app.Fragment;
+
 import android.text.Html;
 import android.view.View;
 import android.view.ViewGroup;
-Original file line number
+Diff line change
@@ Expand Up / @@ -12,7 +12,7 @@ android { @@
     }
     dependencies {
-        compileOnly 'com.android.support:appcompat-v7:'+project.supportVersion
+        compileOnly 'androidx.appcompat:appcompat:1.0.2'
     }
     ext {
@@ Expand Down @@