[DONT MERGE]Release/0.7.0 beta01

adapter-toolbox/build.gradle

@@ -2,19 +2,19 @@ import java.text.DateFormat
 import java.text.SimpleDateFormat
 
 group = 'net.cattaka'
-version = '0.6.0'
+version = '0.7.0-beta01'
 
 apply plugin: 'com.android.library'
 apply plugin: 'com.github.dcendents.android-maven'
 apply plugin: 'com.jfrog.bintray'
 
 android {
-    compileSdkVersion 25
+    compileSdkVersion 28
     buildToolsVersion '28.0.2'
 
     defaultConfig {
         minSdkVersion 15
-        targetSdkVersion 25
+        targetSdkVersion 28
         versionCode 1
         versionName "1.0"
     }
@@ -132,13 +132,13 @@ artifacts {
 //}
 
 dependencies {
-    provided fileTree(dir: 'libs', include: ['*.jar'])
-    provided 'com.android.support:recyclerview-v7:25.1.0'
+    compileOnly fileTree(dir: 'libs', include: ['*.jar'])
+    compileOnly 'androidx.recyclerview:recyclerview:1.0.0-beta01'
 
-    androidTestProvided('com.android.support.test.espresso:espresso-core:2.2.1') {
+    androidTestCompileOnly('androidx.test.espresso:espresso-core:3.1.0-alpha4') {
         exclude module: 'support-annotations'
     }
-    androidTestProvided('com.android.support.test.espresso:espresso-contrib:2.2.1') {
+    androidTestCompileOnly('androidx.test.espresso:espresso-contrib:3.1.0-alpha4') {
         exclude group: 'com.android.support', module: 'appcompat'
         exclude group: 'com.android.support', module: 'support-v4'
         exclude group: 'com.android.support', module: 'design'

adapter-toolbox/src/androidTest/java/net/cattaka/android/adaptertoolbox/test/ScrollToExAction.java

@@ -1,23 +1,23 @@
 package net.cattaka.android.adaptertoolbox.test;
 
 import android.graphics.Rect;
-import android.support.test.espresso.PerformException;
-import android.support.test.espresso.UiController;
-import android.support.test.espresso.ViewAction;
-import android.support.test.espresso.matcher.ViewMatchers;
-import android.support.test.espresso.util.HumanReadables;
-import android.support.v4.widget.NestedScrollView;
+import androidx.test.espresso.PerformException;
+import androidx.test.espresso.UiController;
+import androidx.test.espresso.ViewAction;
+import androidx.test.espresso.matcher.ViewMatchers;
+import androidx.test.espresso.util.HumanReadables;
+import androidx.core.widget.NestedScrollView;
 import android.util.Log;
 import android.view.View;
 import android.widget.HorizontalScrollView;
 import android.widget.ScrollView;
 
 import org.hamcrest.Matcher;
 
-import static android.support.test.espresso.matcher.ViewMatchers.isAssignableFrom;
-import static android.support.test.espresso.matcher.ViewMatchers.isDescendantOfA;
-import static android.support.test.espresso.matcher.ViewMatchers.isDisplayingAtLeast;
-import static android.support.test.espresso.matcher.ViewMatchers.withEffectiveVisibility;
+import static androidx.test.espresso.matcher.ViewMatchers.isAssignableFrom;
+import static androidx.test.espresso.matcher.ViewMatchers.isDescendantOfA;
+import static androidx.test.espresso.matcher.ViewMatchers.isDisplayingAtLeast;
+import static androidx.test.espresso.matcher.ViewMatchers.withEffectiveVisibility;
 import static org.hamcrest.Matchers.allOf;
 import static org.hamcrest.Matchers.anyOf;
 

adapter-toolbox/src/main/java/net/cattaka/android/adaptertoolbox/adapter/AbsChoosableTreeItemAdapter.java

@@ -1,9 +1,9 @@
 package net.cattaka.android.adaptertoolbox.adapter;
 
 import android.content.Context;
-import android.support.annotation.IntDef;
-import android.support.annotation.NonNull;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.IntDef;
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
 
 import net.cattaka.android.adaptertoolbox.data.ITreeItem;
 

adapter-toolbox/src/main/java/net/cattaka/android/adaptertoolbox/adapter/AbsCustomRecyclerAdapter.java

@@ -1,8 +1,8 @@
 package net.cattaka.android.adaptertoolbox.adapter;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.View;
 
 import net.cattaka.android.adaptertoolbox.adapter.listener.IForwardingListener;

adapter-toolbox/src/main/java/net/cattaka/android/adaptertoolbox/adapter/AbsScrambleAdapter.java

@@ -1,8 +1,8 @@
 package net.cattaka.android.adaptertoolbox.adapter;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.RecyclerView;
 import android.util.SparseArray;
 import android.view.View;
 import android.view.ViewGroup;

adapter-toolbox/src/main/java/net/cattaka/android/adaptertoolbox/adapter/AbsTreeItemAdapter.java

@@ -1,9 +1,9 @@
 package net.cattaka.android.adaptertoolbox.adapter;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.RecyclerView;
 
 import net.cattaka.android.adaptertoolbox.adapter.listener.ForwardingListener;
 import net.cattaka.android.adaptertoolbox.adapter.listener.ListenerRelay;

adapter-toolbox/src/main/java/net/cattaka/android/adaptertoolbox/adapter/CodeLabelAdapter.java

@@ -1,7 +1,7 @@
 package net.cattaka.android.adaptertoolbox.adapter;
 
 import android.content.Context;
-import android.support.annotation.LayoutRes;
+import androidx.annotation.LayoutRes;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

adapter-toolbox/src/main/java/net/cattaka/android/adaptertoolbox/adapter/CustomRecyclerAdapter.java

@@ -1,8 +1,8 @@
 package net.cattaka.android.adaptertoolbox.adapter;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.RecyclerView;
 
 import net.cattaka.android.adaptertoolbox.adapter.listener.ForwardingListener;
 import net.cattaka.android.adaptertoolbox.adapter.listener.ListenerRelay;

adapter-toolbox/src/main/java/net/cattaka/android/adaptertoolbox/adapter/IHasItemAdapter.java

@@ -1,6 +1,6 @@
 package net.cattaka.android.adaptertoolbox.adapter;
 
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.ViewGroup;
 
 /**

adapter-toolbox/src/main/java/net/cattaka/android/adaptertoolbox/adapter/ScrambleAdapter.java

@@ -1,9 +1,9 @@
 package net.cattaka.android.adaptertoolbox.adapter;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.View;
 
 import net.cattaka.android.adaptertoolbox.adapter.listener.ForwardingListener;

adapter-toolbox/src/main/java/net/cattaka/android/adaptertoolbox/adapter/SingleViewAdapter.java

@@ -1,9 +1,9 @@
 package net.cattaka.android.adaptertoolbox.adapter;
 
 import android.content.Context;
-import android.support.annotation.LayoutRes;
-import android.support.annotation.NonNull;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.LayoutRes;
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

adapter-toolbox/src/main/java/net/cattaka/android/adaptertoolbox/adapter/SingleViewAdapter2.java

@@ -1,9 +1,9 @@
 package net.cattaka.android.adaptertoolbox.adapter;
 
 import android.content.Context;
-import android.support.annotation.LayoutRes;
-import android.support.annotation.NonNull;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.LayoutRes;
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

adapter-toolbox/src/main/java/net/cattaka/android/adaptertoolbox/adapter/listener/ForwardingListener.java

@@ -1,8 +1,8 @@
 package net.cattaka.android.adaptertoolbox.adapter.listener;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.RecyclerView;
 import android.text.Editable;
 import android.text.TextWatcher;
 import android.view.KeyEvent;

adapter-toolbox/src/main/java/net/cattaka/android/adaptertoolbox/adapter/listener/IForwardingListener.java

@@ -1,8 +1,8 @@
 package net.cattaka.android.adaptertoolbox.adapter.listener;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.RecyclerView;
 
 /**
  * Created by cattaka on 2016/05/12.

adapter-toolbox/src/main/java/net/cattaka/android/adaptertoolbox/adapter/listener/ListenerRelay.java

@@ -1,7 +1,7 @@
 package net.cattaka.android.adaptertoolbox.adapter.listener;
 
-import android.support.annotation.NonNull;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
 import android.text.Editable;
 import android.view.KeyEvent;
 import android.view.View;

adapter-toolbox/src/main/java/net/cattaka/android/adaptertoolbox/classic/AdapterConverter.java

@@ -1,10 +1,10 @@
 package net.cattaka.android.adaptertoolbox.classic;
 
 import android.database.DataSetObserver;
-import android.support.annotation.IdRes;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.IdRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.BaseAdapter;

adapter-toolbox/src/main/java/net/cattaka/android/adaptertoolbox/classic/ClassicScrambleAdapter.java

@@ -1,9 +1,9 @@
 package net.cattaka.android.adaptertoolbox.classic;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.View;
 
 import net.cattaka.android.adaptertoolbox.adapter.AbsScrambleAdapter;

adapter-toolbox/src/main/java/net/cattaka/android/adaptertoolbox/classic/listener/ClassicForwardingListener.java

@@ -1,9 +1,9 @@
 package net.cattaka.android.adaptertoolbox.classic.listener;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.util.Pair;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.core.util.Pair;
+import androidx.recyclerview.widget.RecyclerView;
 import android.text.Editable;
 import android.text.TextWatcher;
 import android.view.KeyEvent;

adapter-toolbox/src/main/java/net/cattaka/android/adaptertoolbox/classic/listener/ClassicListenerRelay.java

@@ -1,7 +1,7 @@
 package net.cattaka.android.adaptertoolbox.classic.listener;
 
-import android.support.annotation.NonNull;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
 import android.text.Editable;
 import android.view.KeyEvent;
 import android.view.View;

adapter-toolbox/src/main/java/net/cattaka/android/adaptertoolbox/decoration/VerticalListDividerItemDecoration.java

@@ -5,11 +5,11 @@
 import android.graphics.Canvas;
 import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
-import android.support.annotation.DrawableRes;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.content.ContextCompat;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.DrawableRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.core.content.ContextCompat;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.View;
 import android.view.ViewGroup;
 

adapter-toolbox/src/main/java/net/cattaka/android/adaptertoolbox/thirdparty/MergeRecyclerAdapter.java

@@ -1,7 +1,7 @@
 package net.cattaka.android.adaptertoolbox.thirdparty;
 
 import android.content.Context;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.View;
 import android.view.ViewGroup;
 
@@ -39,12 +39,12 @@
  * these views are then put into an adapter themselves, even if the adapter only holds the
  * one view.
  * <p/>
- * RecyclerView Adapters must implement both the {@link android.support.v7.widget.RecyclerView.Adapter#onCreateViewHolder(android.view.ViewGroup, int)}
- * and {@link android.support.v7.widget.RecyclerView.Adapter#onBindViewHolder(android.support.v7.widget.RecyclerView.ViewHolder,
+ * RecyclerView Adapters must implement both the {@link RecyclerView.Adapter#onCreateViewHolder(android.view.ViewGroup, int)}
+ * and {@link RecyclerView.Adapter#onBindViewHolder( RecyclerView.ViewHolder,
  * int)} methods, as opposed to just the {@link android.widget.BaseAdapter#getView(int, android.view.View,
  * android.view.ViewGroup)} method in a ListView Adapter.
  * <p/>
- * Because the {@link android.support.v7.widget.RecyclerView.Adapter#onCreateViewHolder(android.view.ViewGroup, int)} method only provides us the ViewGroup and a View Type, we must keep a mapping of
+ * Because the {@link RecyclerView.Adapter#onCreateViewHolder(android.view.ViewGroup, int)} method only provides us the ViewGroup and a View Type, we must keep a mapping of
  * (unique) view types in this merge adapter to each sub adapter, so we know which adapters' onCreateViewHolder method to call.
  * <p/>
  * The {@link MergeRecyclerAdapter.LocalAdapter} class

adapter-toolbox/src/main/java/net/cattaka/android/adaptertoolbox/utils/SpinnerUtils.java

@@ -1,6 +1,6 @@
 package net.cattaka.android.adaptertoolbox.utils;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.widget.AdapterView;
 import android.widget.Spinner;
 

build.gradle

@@ -6,7 +6,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.3'
+        classpath 'com.android.tools.build:gradle:3.3.0-alpha07'
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.6'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1'