migration to AndroidX

oli107 · Oct 30, 2019 · 813025e · 813025e
1 parent 403aa0f
commit 813025e
Show file tree

Hide file tree

Showing 11 changed files with 62 additions and 59 deletions.
diff --git a/RangeBarSample/build.gradle b/RangeBarSample/build.gradle
@@ -3,19 +3,19 @@ apply plugin: 'com.android.application'
 dependencies {
     implementation project(':materialrangebar')
 //  implementation 'com.appyvet:materialrangebar:1.4.7'
-    implementation 'com.android.support:cardview-v7:28.0.0'
-    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 'com.android.support:support-compat:28.0.0'
+    implementation 'androidx.cardview:cardview:1.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 'androidx.core:core:1.1.0'
 }
 android {
-    compileSdkVersion 28
-    buildToolsVersion '28.0.3'
+    compileSdkVersion 29
+    buildToolsVersion '29.0.2'
 
     defaultConfig {
         minSdkVersion 14
-        targetSdkVersion 28
+        targetSdkVersion 29
     }
     signingConfigs {
         release {
@@ -39,7 +39,7 @@ android {
 
 def propFile = file('../keystore.properties')
 if (propFile.canRead()) {
-    def Properties p = new Properties()
+    Properties p = new Properties()
     p.load(new FileInputStream(propFile))
 
     if (p != null

diff --git a/RangeBarSample/src/main/java/com/appyvet/rangebarsample/RecyclerViewActivity.java b/RangeBarSample/src/main/java/com/appyvet/rangebarsample/RecyclerViewActivity.java
@@ -2,11 +2,11 @@
 
 import android.app.Activity;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.Toolbar;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.appcompat.widget.Toolbar;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

diff --git a/RangeBarSample/src/main/java/com/appyvet/rangebarsample/colorpicker/ColorPickerSwatch.java b/RangeBarSample/src/main/java/com/appyvet/rangebarsample/colorpicker/ColorPickerSwatch.java
@@ -18,7 +18,7 @@
 
 import android.content.Context;
 import android.graphics.drawable.Drawable;
-import android.support.v4.content.ContextCompat;
+import androidx.core.content.ContextCompat;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.FrameLayout;

diff --git a/RangeBarSample/src/main/res/layout/activity_main.xml b/RangeBarSample/src/main/res/layout/activity_main.xml
@@ -125,7 +125,7 @@
                 android:baselineAligned="false"
                 android:orientation="horizontal">
 
-                <android.support.v7.widget.CardView
+                <androidx.cardview.widget.CardView
                     android:layout_width="0dp"
                     android:layout_height="48dp"
                     android:layout_margin="6dp"
@@ -146,9 +146,9 @@
                         android:textAllCaps="true"
                         android:textColor="@color/accent"
                         android:textSize="16sp" />
-                </android.support.v7.widget.CardView>
+                </androidx.cardview.widget.CardView>
 
-                <android.support.v7.widget.CardView
+                <androidx.cardview.widget.CardView
                     android:layout_width="0dp"
                     android:layout_height="48dp"
                     android:layout_margin="6dp"
@@ -169,7 +169,7 @@
                         android:textAllCaps="true"
                         android:textColor="@color/accent"
                         android:textSize="16sp" />
-                </android.support.v7.widget.CardView>
+                </androidx.cardview.widget.CardView>
             </LinearLayout>
 
             <TextView
@@ -271,21 +271,21 @@
                 android:baselineAligned="false"
                 android:orientation="horizontal">
 
-                <android.support.v7.widget.CardView style="@style/button_holder">
+                <androidx.cardview.widget.CardView style="@style/button_holder">
 
                     <TextView
                         android:id="@+id/tickColor"
                         style="@style/button"
                         android:text="@string/tickColorNormal" />
-                </android.support.v7.widget.CardView>
+                </androidx.cardview.widget.CardView>
 
-                <android.support.v7.widget.CardView style="@style/button_holder">
+                <androidx.cardview.widget.CardView style="@style/button_holder">
 
                     <TextView
                         android:id="@+id/pinColor"
                         style="@style/button"
                         android:text="@string/thumbColorNormal" />
-                </android.support.v7.widget.CardView>
+                </androidx.cardview.widget.CardView>
             </LinearLayout>
 
             <LinearLayout
@@ -294,21 +294,21 @@
                 android:baselineAligned="false"
                 android:orientation="horizontal">
 
-                <android.support.v7.widget.CardView style="@style/button_holder">
+                <androidx.cardview.widget.CardView style="@style/button_holder">
 
                     <TextView
                         android:id="@+id/selectorColor"
                         style="@style/button"
                         android:text="@string/selectorColorNormal" />
-                </android.support.v7.widget.CardView>
+                </androidx.cardview.widget.CardView>
 
-                <android.support.v7.widget.CardView style="@style/button_holder">
+                <androidx.cardview.widget.CardView style="@style/button_holder">
 
                     <TextView
                         android:id="@+id/textColor"
                         style="@style/button"
                         android:text="@string/textColorNormal" />
-                </android.support.v7.widget.CardView>
+                </androidx.cardview.widget.CardView>
             </LinearLayout>
 
             <LinearLayout
@@ -317,21 +317,21 @@
                 android:baselineAligned="false"
                 android:orientation="horizontal">
 
-                <android.support.v7.widget.CardView style="@style/button_holder">
+                <androidx.cardview.widget.CardView style="@style/button_holder">
 
                     <TextView
                         android:id="@+id/connectingLineColor"
                         style="@style/button"
                         android:text="@string/connectingLineColor" />
-                </android.support.v7.widget.CardView>
+                </androidx.cardview.widget.CardView>
 
-                <android.support.v7.widget.CardView style="@style/button_holder">
+                <androidx.cardview.widget.CardView style="@style/button_holder">
 
                     <TextView
                         android:id="@+id/barColor"
                         style="@style/button"
                         android:text="@string/barColor" />
-                </android.support.v7.widget.CardView>
+                </androidx.cardview.widget.CardView>
             </LinearLayout>
 
             <LinearLayout
@@ -340,7 +340,7 @@
                 android:baselineAligned="false"
                 android:orientation="horizontal">
 
-                <android.support.v7.widget.CardView
+                <androidx.cardview.widget.CardView
                     android:layout_width="0dp"
                     android:layout_height="48dp"
                     android:layout_margin="6dp"
@@ -361,9 +361,9 @@
                         android:textAllCaps="true"
                         android:textColor="@color/accent"
                         android:textSize="16sp" />
-                </android.support.v7.widget.CardView>
+                </androidx.cardview.widget.CardView>
 
-                <android.support.v7.widget.CardView
+                <androidx.cardview.widget.CardView
                     android:layout_width="0dp"
                     android:layout_height="48dp"
                     android:layout_margin="6dp"
@@ -384,7 +384,7 @@
                         android:textAllCaps="true"
                         android:textColor="@color/accent"
                         android:textSize="16sp" />
-                </android.support.v7.widget.CardView>
+                </androidx.cardview.widget.CardView>
             </LinearLayout>
 
             <LinearLayout
@@ -393,21 +393,21 @@
                 android:baselineAligned="false"
                 android:orientation="horizontal">
 
-                <android.support.v7.widget.CardView style="@style/button_holder">
+                <androidx.cardview.widget.CardView style="@style/button_holder">
 
                     <TextView
                         android:id="@+id/tickLabelColor"
                         style="@style/button"
                         android:text="@string/tickLabelColor" />
-                </android.support.v7.widget.CardView>
+                </androidx.cardview.widget.CardView>
 
-                <android.support.v7.widget.CardView style="@style/button_holder">
+                <androidx.cardview.widget.CardView style="@style/button_holder">
 
                     <TextView
                         android:id="@+id/tickLabelSelectColor"
                         style="@style/button"
                         android:text="@string/tickLabelSelectedColor" />
-                </android.support.v7.widget.CardView>
+                </androidx.cardview.widget.CardView>
             </LinearLayout>
 
             <LinearLayout
@@ -416,13 +416,13 @@
                 android:baselineAligned="false"
                 android:orientation="horizontal">
 
-                <android.support.v7.widget.CardView style="@style/button_holder">
+                <androidx.cardview.widget.CardView style="@style/button_holder">
 
                     <TextView
                         android:id="@+id/selectorBoundaryColor"
                         style="@style/button"
                         android:text="@string/selectorBoundaryColor" />
-                </android.support.v7.widget.CardView>
+                </androidx.cardview.widget.CardView>
             </LinearLayout>
 
             <LinearLayout
@@ -431,13 +431,13 @@
                 android:baselineAligned="false"
                 android:orientation="horizontal">
 
-                <android.support.v7.widget.CardView style="@style/button_holder">
+                <androidx.cardview.widget.CardView style="@style/button_holder">
 
                     <TextView
                         android:id="@+id/selectorRecyclerView"
                         style="@style/button"
                         android:text="@string/recyclerview_text" />
-                </android.support.v7.widget.CardView>
+                </androidx.cardview.widget.CardView>
             </LinearLayout>
         </LinearLayout>
     </ScrollView>

diff --git a/RangeBarSample/src/main/res/layout/activity_recyclerview.xml b/RangeBarSample/src/main/res/layout/activity_recyclerview.xml
@@ -1,15 +1,15 @@
-<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <android.support.design.widget.AppBarLayout
+    <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-        <android.support.v7.widget.Toolbar
+        <androidx.appcompat.widget.Toolbar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
@@ -18,13 +18,13 @@
             app:navigationIcon="@drawable/ic_back"
             app:title="@string/title_recyclerview" />
 
-    </android.support.design.widget.AppBarLayout>
+    </com.google.android.material.appbar.AppBarLayout>
 
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/recyclerView"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         app:layout_behavior="@string/appbar_scrolling_view_behavior"
         tools:listitem="@layout/recyclerview_item" />
 
-</android.support.design.widget.CoordinatorLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/build.gradle b/build.gradle
@@ -4,7 +4,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.1'
+        classpath 'com.android.tools.build:gradle:3.5.1'
         classpath "org.jfrog.buildinfo:build-info-extractor-gradle:3.1.1"
     }
 }
@@ -19,6 +19,7 @@ allprojects {
         maven {
             url "https://maven.google.com"
         }
+        google()
     }
 }
 

diff --git a/gradle.properties b/gradle.properties
@@ -0,0 +1,2 @@
+android.enableJetifier=true
+android.useAndroidX=true
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Feb 11 11:25:27 CET 2019
+#Thu Oct 31 00:09:02 EAT 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
diff --git a/materialrangebar/build.gradle b/materialrangebar/build.gradle
@@ -36,12 +36,12 @@ ext {
  * This is needed because we want to compile this as android library so that we can test it before publishing
  */
 android {
-    compileSdkVersion 28
-    buildToolsVersion '28.0.3'
+    compileSdkVersion 29
+    buildToolsVersion '29.0.2'
 
     defaultConfig {
         minSdkVersion 14
-        targetSdkVersion 28
+        targetSdkVersion 29
         versionCode 1
         versionName libraryVersion
     }
@@ -54,7 +54,7 @@ android {
 }
 
 dependencies {
-    implementation 'com.android.support:support-compat:28.0.0'
+    implementation 'androidx.core:core:1.1.0'
 }
 
 /**

diff --git a/materialrangebar/src/main/java/com/appyvet/materialrangebar/Bar.java b/materialrangebar/src/main/java/com/appyvet/materialrangebar/Bar.java
@@ -18,7 +18,7 @@
 import android.graphics.Canvas;
 import android.graphics.Paint;
 import android.graphics.Rect;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.util.TypedValue;
 
 import java.util.ArrayList;

diff --git a/materialrangebar/src/main/java/com/appyvet/materialrangebar/PinView.java b/materialrangebar/src/main/java/com/appyvet/materialrangebar/PinView.java
@@ -19,8 +19,8 @@
 import android.graphics.Paint;
 import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
-import android.support.v4.content.ContextCompat;
-import android.support.v4.graphics.drawable.DrawableCompat;
+import androidx.core.content.ContextCompat;
+import androidx.core.graphics.drawable.DrawableCompat;
 import android.util.TypedValue;
 import android.view.View;