Move to AndroidX packages

linisme · Aug 27, 2018 · 7ec1a21 · 7ec1a21
1 parent 58ff4c7
commit 7ec1a21
Show file tree

Hide file tree

Showing 25 changed files with 76 additions and 89 deletions.
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/build.gradle b/build.gradle
@@ -1,12 +1,13 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.1.1'
+    ext.kotlin_version = '1.2.60'
     repositories {
+        google()
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.3'
+        classpath 'com.android.tools.build:gradle:3.3.0-alpha06'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong
@@ -17,6 +18,7 @@ buildscript {
 
 allprojects {
     repositories {
+        google()
         jcenter()
     }
 }

diff --git a/example/build.gradle b/example/build.gradle
@@ -2,15 +2,15 @@ apply plugin: 'com.android.application'
 //apply plugin: 'kotlin-android'
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion "25.0.2"
+    compileSdkVersion 28
+    buildToolsVersion "28.0.2"
     defaultConfig {
         applicationId "net.idik.lib.slimadapter.example"
         minSdkVersion 14
-        targetSdkVersion 25
+        targetSdkVersion 28
         versionCode 1
         versionName "1.0"
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
         release {
@@ -21,17 +21,17 @@ android {
 }
 
 dependencies {
-    compile fileTree(include: ['*.jar'], dir: 'libs')
-    androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
+    implementation fileTree(include: ['*.jar'], dir: 'libs')
+    androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0-alpha4', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
     //    compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
-    compile project(':slimadapter')
-    compile 'com.android.support:appcompat-v7:25.3.1'
-    compile 'com.android.support:recyclerview-v7:25.3.1'
-    compile 'com.github.bumptech.glide:glide:3.7.0'
-    testCompile 'junit:junit:4.12'
-    compile 'com.futuremind.recyclerfastscroll:fastscroll:0.2.5'
+    implementation project(':slimadapter')
+    implementation 'androidx.appcompat:appcompat:1.0.0-rc02'
+    implementation 'androidx.recyclerview:recyclerview:1.0.0-rc02'
+    implementation 'com.github.bumptech.glide:glide:4.7.1'
+    testImplementation 'junit:junit:4.12'
+    implementation 'com.futuremind.recyclerfastscroll:fastscroll:0.2.5'
 }
 repositories {
     mavenCentral()

diff --git a/example/src/androidTest/java/net/idik/lib/slimadapter/example/ExampleInstrumentedTest.java b/example/src/androidTest/java/net/idik/lib/slimadapter/example/ExampleInstrumentedTest.java
@@ -1,8 +1,8 @@
 package net.idik.lib.slimadapter.example;
 
 import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

diff --git a/example/src/main/java/net/idik/lib/slimadapter/example/HeaderFragment.java b/example/src/main/java/net/idik/lib/slimadapter/example/HeaderFragment.java
@@ -1,8 +1,8 @@
 package net.idik.lib.slimadapter.example;
 
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

diff --git a/example/src/main/java/net/idik/lib/slimadapter/example/MainActivity.java b/example/src/main/java/net/idik/lib/slimadapter/example/MainActivity.java
@@ -3,9 +3,9 @@
 import android.graphics.Color;
 import android.os.Bundle;
 import android.os.SystemClock;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.widget.ImageView;
@@ -14,7 +14,6 @@
 
 import net.idik.lib.slimadapter.SlimAdapter;
 import net.idik.lib.slimadapter.SlimInjector;
-import net.idik.lib.slimadapter.SlimAdapterEx;
 import net.idik.lib.slimadapter.ex.loadmore.SimpleLoadMoreViewCreator;
 import net.idik.lib.slimadapter.ex.loadmore.SlimMoreLoader;
 import net.idik.lib.slimadapter.viewinjector.IViewInjector;

diff --git a/example/src/main/res/layout/activity_main.xml b/example/src/main/res/layout/activity_main.xml
@@ -6,7 +6,7 @@
     android:layout_height="match_parent"
     tools:context="net.idik.lib.slimadapter.example.MainActivity">
 
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/recyler_view"
         android:layout_width="match_parent"
         android:layout_height="match_parent" />

diff --git a/exampleforkotlin/build.gradle b/exampleforkotlin/build.gradle
@@ -2,17 +2,17 @@ apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion "25.0.2"
+    compileSdkVersion 28
+    buildToolsVersion "28.0.2"
 
     defaultConfig {
         applicationId "net.idik.lib.slimadapter.exampleforkotlin"
         minSdkVersion 14
-        targetSdkVersion 25
+        targetSdkVersion 28
         versionCode 1
         versionName "1.0"
 
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
     }
     buildTypes {
@@ -24,15 +24,15 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0-alpha4', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
-    compile 'com.android.support:appcompat-v7:25.3.1'
-    compile project(':slimadapter')
-    compile 'com.android.support:recyclerview-v7:25.3.1'
-    testCompile 'junit:junit:4.12'
-    compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
+    implementation 'androidx.appcompat:appcompat:1.0.0-rc02'
+    implementation project(':slimadapter')
+    implementation 'androidx.recyclerview:recyclerview:1.0.0-rc02'
+    testImplementation 'junit:junit:4.12'
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 }
 repositories {
     mavenCentral()

diff --git a/...c/androidTest/java/net/idik/lib/slimadapter/exampleforkotlin/ExampleInstrumentedTest.java b/...c/androidTest/java/net/idik/lib/slimadapter/exampleforkotlin/ExampleInstrumentedTest.java
@@ -1,8 +1,8 @@
 package net.idik.lib.slimadapter.exampleforkotlin;
 
 import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

diff --git a/exampleforkotlin/src/main/java/net/idik/lib/slimadapter/exampleforkotlin/MainActivity.kt b/exampleforkotlin/src/main/java/net/idik/lib/slimadapter/exampleforkotlin/MainActivity.kt
@@ -1,10 +1,10 @@
 package net.idik.lib.slimadapter.exampleforkotlin
 
-import android.support.v7.app.AppCompatActivity
+import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
-import android.support.annotation.IntegerRes
-import android.support.v7.widget.LinearLayoutManager
-import android.support.v7.widget.RecyclerView
+import androidx.annotation.IntegerRes
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
 import android.widget.Toast
 import net.idik.lib.slimadapter.SlimAdapter
 

diff --git a/exampleforkotlin/src/main/res/layout/activity_main.xml b/exampleforkotlin/src/main/res/layout/activity_main.xml
@@ -6,7 +6,7 @@
     android:layout_height="match_parent"
     tools:context="net.idik.lib.slimadapter.exampleforkotlin.MainActivity">
 
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/recyler_view"
         android:layout_width="match_parent"
         android:layout_height="match_parent" />

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-3.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-all.zip
diff --git a/slimadapter/build.gradle b/slimadapter/build.gradle
@@ -5,16 +5,16 @@ plugins {
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion "25.0.2"
+    compileSdkVersion 28
+    buildToolsVersion "28.0.2"
 
     defaultConfig {
-        minSdkVersion 9
-        targetSdkVersion 25
+        minSdkVersion 14
+        targetSdkVersion 28
         versionCode 17
-        versionName "2.1.2"
+        versionName "3.0.0"
 
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
     }
     buildTypes {
@@ -58,14 +58,13 @@ bintray {
 }
 
 dependencies {
-    compile fileTree(include: ['*.jar'], dir: 'libs')
-    androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
+    implementation fileTree(include: ['*.jar'], dir: 'libs')
+    androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0-alpha4', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
-    testCompile 'junit:junit:4.12'
-    compile 'com.android.support:recyclerview-v7:25.3.1'
-//    compile 'com.android.support:support-fragment:25.3.1'
-    provided 'com.google.code.findbugs:jsr305:3.0.2'
+    testImplementation 'junit:junit:4.12'
+    implementation 'androidx.recyclerview:recyclerview:1.0.0-rc02'
+    compileOnly 'com.google.code.findbugs:jsr305:3.0.2'
 }
 repositories {
     mavenCentral()

diff --git a/slimadapter/src/androidTest/java/net/idik/lib/slimadapter/ExampleInstrumentedTest.java b/slimadapter/src/androidTest/java/net/idik/lib/slimadapter/ExampleInstrumentedTest.java
@@ -1,8 +1,8 @@
 package net.idik.lib.slimadapter;
 
 import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

diff --git a/slimadapter/src/main/java/net/idik/lib/slimadapter/AbstractSlimAdapter.java b/slimadapter/src/main/java/net/idik/lib/slimadapter/AbstractSlimAdapter.java
@@ -1,6 +1,6 @@
 package net.idik.lib.slimadapter;
 
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 
 /**
  * Created by linshuaibin on 22/12/2016.

diff --git a/slimadapter/src/main/java/net/idik/lib/slimadapter/SlimAdapter.java b/slimadapter/src/main/java/net/idik/lib/slimadapter/SlimAdapter.java
@@ -3,8 +3,8 @@
 import android.os.Handler;
 import android.os.Looper;
 import android.os.Message;
-import android.support.v7.util.DiffUtil;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.DiffUtil;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.ViewGroup;
 
 import net.idik.lib.slimadapter.diff.DefaultDiffCallback;

diff --git a/slimadapter/src/main/java/net/idik/lib/slimadapter/SlimAdapterEx.java b/slimadapter/src/main/java/net/idik/lib/slimadapter/SlimAdapterEx.java
@@ -1,14 +1,12 @@
 package net.idik.lib.slimadapter;
 
 import android.content.Context;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
 import net.idik.lib.slimadapter.diff.SlimDiffUtil;
-import net.idik.lib.slimadapter.ex.loadmore.SlimExLoadMoreViewHolder;
-import net.idik.lib.slimadapter.ex.loadmore.SlimMoreLoader;
 import net.idik.lib.slimadapter.viewinjector.IViewInjector;
 
 import java.util.ArrayList;

diff --git a/slimadapter/src/main/java/net/idik/lib/slimadapter/SlimViewHolder.java b/slimadapter/src/main/java/net/idik/lib/slimadapter/SlimViewHolder.java
@@ -1,6 +1,6 @@
 package net.idik.lib.slimadapter;
 
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.util.SparseArray;
 import android.view.LayoutInflater;
 import android.view.View;

diff --git a/slimadapter/src/main/java/net/idik/lib/slimadapter/diff/SlimDiffUtil.java b/slimadapter/src/main/java/net/idik/lib/slimadapter/diff/SlimDiffUtil.java
@@ -1,6 +1,6 @@
 package net.idik.lib.slimadapter.diff;
 
-import android.support.v7.util.DiffUtil;
+import androidx.recyclerview.widget.DiffUtil;
 
 import java.util.List;
 

diff --git a/slimadapter/src/main/java/net/idik/lib/slimadapter/ex/loadmore/SlimLoadMoreView.java b/slimadapter/src/main/java/net/idik/lib/slimadapter/ex/loadmore/SlimLoadMoreView.java
@@ -1,7 +1,7 @@
 package net.idik.lib.slimadapter.ex.loadmore;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.FrameLayout;

diff --git a/slimadapter/src/main/java/net/idik/lib/slimadapter/ex/loadmore/SlimMoreLoader.java b/slimadapter/src/main/java/net/idik/lib/slimadapter/ex/loadmore/SlimMoreLoader.java
@@ -3,14 +3,14 @@
 import android.content.Context;
 import android.os.HandlerThread;
 import android.os.Message;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 
 import net.idik.lib.slimadapter.SlimAdapter;
 
 import java.util.List;
 
-import static android.support.v7.widget.RecyclerView.NO_POSITION;
+import static androidx.recyclerview.widget.RecyclerView.NO_POSITION;
 
 /**
  * Created by linshuaibin on 16/05/2017.

diff --git a/slimadapter/src/main/java/net/idik/lib/slimadapter/viewinjector/CustomViewInjector.java b/slimadapter/src/main/java/net/idik/lib/slimadapter/viewinjector/CustomViewInjector.java
@@ -3,9 +3,9 @@
 import android.graphics.Typeface;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
-import android.support.annotation.NonNull;
-import android.support.annotation.RequiresApi;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+import androidx.annotation.RequiresApi;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Adapter;