Merge pull request square#1961 from NightlyNexus/eric.androidx

Move support libraries to androidx.

Author: jrodbx

build.gradle

@@ -7,7 +7,6 @@ buildscript {
     'targetCompatibility': JavaVersion.VERSION_1_7,
     'okhttp': '3.11.0',
     'okio': '2.1.0',
-    'supportLibrary': '28.0.0'
   ]
 
   ext.deps = [
@@ -16,11 +15,11 @@ buildscript {
     okio: "com.squareup.okio:okio:${versions.okio}",
     mockWebServer: "com.squareup.okhttp3:mockwebserver:${versions.okhttp}",
     pollexor: 'com.squareup:pollexor:2.0.4',
-    supportCompat: "com.android.support:support-compat:${versions.supportLibrary}",
-    supportFragment: "com.android.support:support-fragment:${versions.supportLibrary}",
-    supportAnnotations: "com.android.support:support-annotations:${versions.supportLibrary}",
-    supportExifInterface: "com.android.support:exifinterface:${versions.supportLibrary}",
-    archLifecycle: 'android.arch.lifecycle:common:1.1.1',
+    androidxAnnotations: 'androidx.annotation:annotation:1.0.0',
+    androidxCore: 'androidx.core:core:1.0.0',
+    androidxExifInterface: 'androidx.exifinterface:exifinterface:1.0.0',
+    androidxFragment: 'androidx.fragment:fragment:1.0.0',
+    androidxLifecycle: 'androidx.lifecycle:lifecycle-common:2.0.0',
     errorProne: 'com.google.errorprone:error_prone_core:2.3.2',
     junit: 'junit:junit:4.12',
     truth: 'com.google.truth:truth:0.42',

picasso-pollexor/build.gradle

@@ -22,7 +22,7 @@ android {
 dependencies {
   api project(':picasso')
   api deps.pollexor
-  compileOnly deps.supportAnnotations
+  compileOnly deps.androidxAnnotations
   testImplementation deps.junit
   testImplementation deps.robolectric
   testImplementation deps.truth

picasso-pollexor/src/main/java/com/squareup/picasso3/pollexor/PollexorRequestTransformer.java

@@ -2,7 +2,7 @@
 
 import android.net.Uri;
 import android.os.Build;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import com.squareup.picasso3.Request;
 import com.squareup.pollexor.Thumbor;
 import com.squareup.pollexor.ThumborUrlBuilder;

picasso-provider/build.gradle

@@ -21,9 +21,9 @@ android {
 
 dependencies {
   api project(':picasso')
-  compileOnly deps.supportAnnotations
+  compileOnly deps.androidxAnnotations
 
   annotationProcessor deps.nullaway
 }
 
-apply from: rootProject.file('gradle/gradle-mvn-push.gradle')
+apply from: rootProject.file('gradle/gradle-mvn-push.gradle')

picasso-provider/src/main/java/com/squareup/picasso3/provider/PicassoContentProvider.java

@@ -6,11 +6,11 @@
 import android.content.Context;
 import android.database.Cursor;
 import android.net.Uri;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.RestrictTo;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.RestrictTo;
 
-import static android.support.annotation.RestrictTo.Scope.LIBRARY;
+import static androidx.annotation.RestrictTo.Scope.LIBRARY;
 
 @RestrictTo(LIBRARY)
 public final class PicassoContentProvider extends ContentProvider {

picasso-sample/build.gradle

@@ -25,9 +25,9 @@ android {
 }
 
 dependencies {
-  compileOnly deps.supportAnnotations
-  implementation deps.supportCompat
-  implementation deps.supportFragment
+  compileOnly deps.androidxAnnotations
+  implementation deps.androidxCore
+  implementation deps.androidxFragment
   implementation project(':picasso')
   implementation project(':picasso-provider')
 

picasso-sample/src/main/java/com/example/picasso/PicassoSampleActivity.java

@@ -1,14 +1,14 @@
 package com.example.picasso;
 
 import android.os.Bundle;
-import android.support.v4.app.FragmentActivity;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.AdapterView;
 import android.widget.CompoundButton;
 import android.widget.FrameLayout;
 import android.widget.ListView;
 import android.widget.ToggleButton;
+import androidx.fragment.app.FragmentActivity;
 import com.squareup.picasso3.provider.PicassoProvider;
 
 import static android.view.View.GONE;

picasso-sample/src/main/java/com/example/picasso/PicassoSampleAdapter.java

@@ -8,13 +8,13 @@
 import android.content.Context;
 import android.content.Intent;
 import android.os.Build;
-import android.support.v4.app.NotificationCompat;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.BaseAdapter;
 import android.widget.RemoteViews;
 import android.widget.TextView;
+import androidx.core.app.NotificationCompat;
 import com.squareup.picasso3.provider.PicassoProvider;
 import java.util.Random;
 

picasso-sample/src/main/java/com/example/picasso/SampleContactsActivity.java

@@ -20,13 +20,13 @@
 import android.database.Cursor;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v4.app.ActivityCompat;
-import android.support.v4.app.LoaderManager;
-import android.support.v4.content.CursorLoader;
-import android.support.v4.content.Loader;
 import android.widget.ListView;
 import android.widget.Toast;
+import androidx.annotation.NonNull;
+import androidx.core.app.ActivityCompat;
+import androidx.loader.app.LoaderManager;
+import androidx.loader.content.CursorLoader;
+import androidx.loader.content.Loader;
 
 import static android.Manifest.permission.READ_CONTACTS;
 import static android.content.pm.PackageManager.PERMISSION_GRANTED;

picasso-sample/src/main/java/com/example/picasso/SampleContactsAdapter.java

@@ -19,12 +19,12 @@
 import android.content.Context;
 import android.database.Cursor;
 import android.net.Uri;
-import android.support.v4.widget.CursorAdapter;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.QuickContactBadge;
 import android.widget.TextView;
+import androidx.cursoradapter.widget.CursorAdapter;
 import com.squareup.picasso3.provider.PicassoProvider;
 
 import static android.provider.ContactsContract.Contacts;