Migrated to androidX

mdhanif-simformsolutions · mdhanif-simformsolutions · commit 84bbc7d9073b · 2021-04-09T11:26:23.000+05:30
diff --git a/build.gradle b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.1'
+        classpath 'com.android.tools.build:gradle:4.1.3'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
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
@@ -1,6 +1,6 @@
-#Wed Jan 17 19:46:25 CST 2018
+#Fri Apr 09 11:10:36 IST 2021
 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-6.5-bin.zip
diff --git a/library/build.gradle b/library/build.gradle
@@ -1,7 +1,7 @@
 apply plugin: 'com.android.library'
 apply plugin: 'com.novoda.bintray-release'
 android {
-    compileSdkVersion 26
+    compileSdkVersion 28
     defaultConfig {
         minSdkVersion 15
         targetSdkVersion 26
@@ -19,8 +19,8 @@ android {
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     implementation 'io.supercharge:shimmerlayout:2.1.0'
-    implementation 'com.android.support:recyclerview-v7:26.1.0'
-    implementation 'com.android.support:appcompat-v7:26.1.0'
+    implementation 'androidx.recyclerview:recyclerview:1.2.0'
+    implementation 'androidx.appcompat:appcompat:1.2.0'
 }
 
 publish {
diff --git a/library/src/main/java/com/ethanhua/skeleton/RecyclerViewSkeletonScreen.java b/library/src/main/java/com/ethanhua/skeleton/RecyclerViewSkeletonScreen.java
@@ -1,11 +1,11 @@
 package com.ethanhua.skeleton;
 
-import android.support.annotation.ArrayRes;
-import android.support.annotation.ColorRes;
-import android.support.annotation.IntRange;
-import android.support.annotation.LayoutRes;
-import android.support.v4.content.ContextCompat;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.ArrayRes;
+import androidx.annotation.ColorRes;
+import androidx.annotation.IntRange;
+import androidx.annotation.LayoutRes;
+import androidx.core.content.ContextCompat;
+import androidx.recyclerview.widget.RecyclerView;
 
 /**
  * Created by ethanhua on 2017/7/29.
diff --git a/library/src/main/java/com/ethanhua/skeleton/ShimmerViewHolder.java b/library/src/main/java/com/ethanhua/skeleton/ShimmerViewHolder.java
@@ -1,6 +1,6 @@
 package com.ethanhua.skeleton;
 
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/library/src/main/java/com/ethanhua/skeleton/Skeleton.java b/library/src/main/java/com/ethanhua/skeleton/Skeleton.java
@@ -1,6 +1,6 @@
 package com.ethanhua.skeleton;
 
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.View;
 
 /**
diff --git a/library/src/main/java/com/ethanhua/skeleton/SkeletonAdapter.java b/library/src/main/java/com/ethanhua/skeleton/SkeletonAdapter.java
@@ -1,7 +1,7 @@
 package com.ethanhua.skeleton;
 
-import android.support.annotation.IntRange;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.IntRange;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.ViewGroup;
 
diff --git a/library/src/main/java/com/ethanhua/skeleton/ViewSkeletonScreen.java b/library/src/main/java/com/ethanhua/skeleton/ViewSkeletonScreen.java
@@ -1,9 +1,9 @@
 package com.ethanhua.skeleton;
 
-import android.support.annotation.ColorRes;
-import android.support.annotation.IntRange;
-import android.support.annotation.LayoutRes;
-import android.support.v4.content.ContextCompat;
+import androidx.annotation.ColorRes;
+import androidx.annotation.IntRange;
+import androidx.annotation.LayoutRes;
+import androidx.core.content.ContextCompat;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
diff --git a/sample/build.gradle b/sample/build.gradle
@@ -8,7 +8,7 @@ android {
         targetSdkVersion 26
         versionCode 6
         versionName "1.0.0"
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
     }
     buildTypes {
         release {
@@ -20,14 +20,14 @@ android {
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
+    androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
     //implementation project(':library')
     implementation 'com.ethanhua:skeleton:1.1.2'
     implementation 'io.supercharge:shimmerlayout:2.1.0'
-    implementation 'com.android.support.constraint:constraint-layout:1.0.2'
-    implementation 'com.android.support:recyclerview-v7:26.1.0'
-    implementation 'com.android.support:appcompat-v7:26.1.0'
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+    implementation 'androidx.recyclerview:recyclerview:1.0.0'
+    implementation 'androidx.appcompat:appcompat:1.0.0'
     testImplementation 'junit:junit:4.12'
 }
diff --git a/sample/src/main/java/com/ethanhua/skeleton/sample/MainActivity.java b/sample/src/main/java/com/ethanhua/skeleton/sample/MainActivity.java
@@ -2,7 +2,7 @@
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.View;
 
 public class MainActivity extends AppCompatActivity {
diff --git a/sample/src/main/java/com/ethanhua/skeleton/sample/RecyclerViewActivity.java b/sample/src/main/java/com/ethanhua/skeleton/sample/RecyclerViewActivity.java
@@ -3,12 +3,11 @@
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import com.ethanhua.skeleton.Skeleton;
 import com.ethanhua.skeleton.SkeletonScreen;
 import com.ethanhua.skeleton.sample.adapter.NewsAdapter;
diff --git a/sample/src/main/java/com/ethanhua/skeleton/sample/StatusViewActivity.java b/sample/src/main/java/com/ethanhua/skeleton/sample/StatusViewActivity.java
@@ -1,7 +1,7 @@
 package com.ethanhua.skeleton.sample;
 
 import android.content.Intent;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.os.Bundle;
 import android.view.View;
 
diff --git a/sample/src/main/java/com/ethanhua/skeleton/sample/ViewActivity.java b/sample/src/main/java/com/ethanhua/skeleton/sample/ViewActivity.java
@@ -4,9 +4,9 @@
 import android.content.Intent;
 import android.os.Bundle;
 import android.os.Message;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.View;
 
 import com.ethanhua.skeleton.Skeleton;
diff --git a/sample/src/main/java/com/ethanhua/skeleton/sample/adapter/NewsAdapter.java b/sample/src/main/java/com/ethanhua/skeleton/sample/adapter/NewsAdapter.java
@@ -1,6 +1,6 @@
 package com.ethanhua.skeleton.sample.adapter;
 
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.ViewGroup;
 
diff --git a/sample/src/main/java/com/ethanhua/skeleton/sample/adapter/PersonAdapter.java b/sample/src/main/java/com/ethanhua/skeleton/sample/adapter/PersonAdapter.java
@@ -1,6 +1,6 @@
 package com.ethanhua.skeleton.sample.adapter;
 
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.ViewGroup;
 
diff --git a/sample/src/main/java/com/ethanhua/skeleton/sample/adapter/SimpleRcvViewHolder.java b/sample/src/main/java/com/ethanhua/skeleton/sample/adapter/SimpleRcvViewHolder.java
@@ -1,6 +1,6 @@
 package com.ethanhua.skeleton.sample.adapter;
 
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.util.SparseArray;
 import android.view.View;
 
diff --git a/sample/src/main/java/com/ethanhua/skeleton/sample/adapter/TopicAdapter.java b/sample/src/main/java/com/ethanhua/skeleton/sample/adapter/TopicAdapter.java
@@ -1,6 +1,6 @@
 package com.ethanhua.skeleton.sample.adapter;
 
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.ViewGroup;
 
diff --git a/sample/src/main/res/layout/activity_recyclerview.xml b/sample/src/main/res/layout/activity_recyclerview.xml
@@ -7,7 +7,7 @@
     android:background="@android:color/white"
     android:orientation="vertical">
 
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/recyclerView"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"/>
diff --git a/sample/src/main/res/layout/activity_status_view.xml b/sample/src/main/res/layout/activity_status_view.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout 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"
@@ -61,4 +61,4 @@
             android:layout_gravity="center"
             android:layout_height="wrap_content" />
     </FrameLayout>
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/sample/src/main/res/layout/activity_view.xml b/sample/src/main/res/layout/activity_view.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v4.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.core.widget.NestedScrollView 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"
@@ -21,7 +21,7 @@
             android:scaleType="centerCrop"
             android:src="@drawable/girl" />
 
-        <android.support.constraint.ConstraintLayout
+        <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="@android:color/white"
@@ -77,7 +77,7 @@
                 app:layout_constraintLeft_toRightOf="@+id/tv_service"
                 app:layout_constraintRight_toRightOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
-        </android.support.constraint.ConstraintLayout>
+        </androidx.constraintlayout.widget.ConstraintLayout>
 
         <View
             android:id="@+id/divider_1"
@@ -92,11 +92,11 @@
             android:layout_marginTop="10dp"
             android:background="@color/colorLine" />
 
-        <android.support.v7.widget.RecyclerView
+        <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/recyclerView"
             android:layout_width="match_parent"
             android:layout_height="wrap_content" />
 
 
     </LinearLayout>
-</android.support.v4.widget.NestedScrollView>
+</androidx.core.widget.NestedScrollView>
diff --git a/sample/src/main/res/layout/activity_view_skeleton.xml b/sample/src/main/res/layout/activity_view_skeleton.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout 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"
@@ -272,4 +272,4 @@
         android:layout_marginLeft="10dp"
         android:layout_height="0.5dp"
         android:id="@+id/divider2" />
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/sample/src/main/res/layout/item_news.xml b/sample/src/main/res/layout/item_news.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="130dp"
@@ -71,4 +71,4 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintLeft_toRightOf="parent" />
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/sample/src/main/res/layout/item_skeleton_news.xml b/sample/src/main/res/layout/item_skeleton_news.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="130dp"
@@ -67,4 +67,4 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintLeft_toRightOf="parent" />
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/sample/src/main/res/layout/item_title_more.xml b/sample/src/main/res/layout/item_title_more.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:paddingLeft="16dp"
@@ -26,4 +26,4 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/sample/src/main/res/layout/item_topic.xml b/sample/src/main/res/layout/item_topic.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout
+<androidx.constraintlayout.widget.ConstraintLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/layout_root"
     xmlns:app="http://schemas.android.com/apk/res-auto"
@@ -68,4 +68,4 @@
         android:layout_marginLeft="10dp"
         android:layout_height="0.5dp"
         android:id="@+id/divider" />
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ buildscript {`
`6`	`6`	`jcenter()`
`7`	`7`	`}`
`8`	`8`	`dependencies {`
`9`		`- classpath 'com.android.tools.build:gradle:3.0.1'`
	`9`	`+ classpath 'com.android.tools.build:gradle:4.1.3'`
`10`	`10`
`11`	`11`	`// NOTE: Do not place your application dependencies here; they belong`
`12`	`12`	`// in the individual module build.gradle files`