Merge pull request #23 from tumblr/or/update-androidx

Upgrade to AndroidX

Author: Orbar

backboard-example/build.gradle

@@ -24,7 +24,7 @@ android {
 }
 
 dependencies {
-    compile rootProject.ext.facebookRebound
-	compile project(':backboard')
-    compile fileTree(dir: 'libs', include: ['*.jar'])
+    implementation rootProject.ext.facebookRebound
+    implementation project(':backboard')
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
 }

backboard-example/src/main/res/values/colors.xml

@@ -20,4 +20,4 @@
 		<item>@drawable/circle_gray</item>
 	</array>
 
-</resources>
+</resources>

backboard/build.gradle

@@ -41,13 +41,19 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
         }
     }
-}
-
-dependencies {
-    provided rootProject.ext.facebookRebound
-    compile rootProject.ext.supportAnnotation
 
-    compile fileTree(dir: 'libs', include: ['*.jar'])
+    libraryVariants.all { variant ->
+        task("javadoc${variant.name}", type: Javadoc) {
+            source = variant.javaCompile.source
+            ext.androidJar = "${android.sdkDirectory}/platforms/${android.compileSdkVersion}/android.jar"
+            classpath = files(android.sourceSets.main.java.srcDirs) + files(ext.androidJar)
+            options.links("http://docs.oracle.com/javase/7/docs/api/")
+            options.linksOffline("http://developer.android.com/reference/", "${android.sdkDirectory}/docs/reference/")
+            options.links("http://facebook.github.io/rebound/javadocs/")
+            exclude '**/BuildConfig.java'
+            exclude '**/R.java'
+        }
+    }
 }
 
 checkstyle {
@@ -72,19 +78,6 @@ task checkstyle(type: Checkstyle) {
 
 check.dependsOn 'checkstyle'
 
-android.libraryVariants.all { variant ->
-    task("javadoc${variant.name}", type: Javadoc) {
-        source = variant.javaCompile.source
-        ext.androidJar = "${android.sdkDirectory}/platforms/${android.compileSdkVersion}/android.jar"
-        classpath = files(variant.javaCompile.classpath.files) + files(ext.androidJar)
-        options.links("http://docs.oracle.com/javase/7/docs/api/")
-        options.linksOffline("http://developer.android.com/reference/", "${android.sdkDirectory}/docs/reference/")
-        options.links("http://facebook.github.io/rebound/javadocs/")
-        exclude '**/BuildConfig.java'
-        exclude '**/R.java'
-    }
-}
-
 // disable insane, build-breaking doclint tool in Java 8
 if (JavaVersion.current().isJava8Compatible()) {
     tasks.withType(Javadoc) {
@@ -93,5 +86,12 @@ if (JavaVersion.current().isJava8Compatible()) {
     }
 }
 
+dependencies {
+    implementation rootProject.ext.facebookRebound
+    implementation rootProject.ext.supportAnnotation
+
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+}
+
 apply from: 'https://raw.githubusercontent.com/nuuneoi/JCenter/master/installv1.gradle'
 apply from: 'bintrayv1.gradle'

backboard/src/main/java/com/tumblr/backboard/Actor.java

@@ -1,12 +1,14 @@
 package com.tumblr.backboard;
 
 import android.annotation.SuppressLint;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
 import android.util.Property;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewConfiguration;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 import com.facebook.rebound.Spring;
 import com.facebook.rebound.SpringListener;
 import com.facebook.rebound.SpringSystem;

backboard/src/main/java/com/tumblr/backboard/MotionProperty.java

@@ -1,11 +1,12 @@
 package com.tumblr.backboard;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
 import android.util.Property;
 import android.view.MotionEvent;
 import android.view.View;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 /**
  * Used by {@link com.tumblr.backboard.Actor} and
  * {@link com.tumblr.backboard.imitator.MotionImitator} to determine which axis to use when mapping
@@ -130,4 +131,4 @@ public float getOffset(@Nullable final View view) {
 
 		return 0;
 	}
-}
+}

backboard/src/main/java/com/tumblr/backboard/imitator/ConstrainedMotionImitator.java

@@ -1,7 +1,9 @@
 package com.tumblr.backboard.imitator;
 
-import android.support.annotation.NonNull;
 import android.view.MotionEvent;
+
+import androidx.annotation.NonNull;
+
 import com.tumblr.backboard.MotionProperty;
 
 /**

backboard/src/main/java/com/tumblr/backboard/imitator/EventImitator.java

@@ -1,9 +1,11 @@
 package com.tumblr.backboard.imitator;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
 import android.view.MotionEvent;
 import android.view.View;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 import com.facebook.rebound.Spring;
 
 /**

backboard/src/main/java/com/tumblr/backboard/imitator/Imitator.java

@@ -1,6 +1,7 @@
 package com.tumblr.backboard.imitator;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
+
 import com.facebook.rebound.Spring;
 
 /**

backboard/src/main/java/com/tumblr/backboard/imitator/InertialImitator.java

@@ -1,7 +1,9 @@
 package com.tumblr.backboard.imitator;
 
-import android.support.annotation.NonNull;
 import android.view.MotionEvent;
+
+import androidx.annotation.NonNull;
+
 import com.facebook.rebound.Spring;
 import com.facebook.rebound.SpringConfig;
 import com.facebook.rebound.SpringListener;

backboard/src/main/java/com/tumblr/backboard/imitator/MotionImitator.java

@@ -1,8 +1,10 @@
 package com.tumblr.backboard.imitator;
 
-import android.support.annotation.NonNull;
 import android.view.MotionEvent;
 import android.view.View;
+
+import androidx.annotation.NonNull;
+
 import com.facebook.rebound.Spring;
 import com.tumblr.backboard.MotionProperty;