update dependencies and cut to Android X

klinker24 · klinker24 · commit ddf661ca4414 · 2018-08-08T08:23:18.000-05:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Changelog
 
+### v0.25.0
+- Update dependencies and Jetify
+
 ### v0.24.9
 - Smooth out drag-dismiss functionality: https://github.com/klinker24/Android-DragDismissActivity/releases/tag/v1.5.1
 
diff --git a/README.md b/README.md
@@ -25,7 +25,7 @@ To include it in your project, add this to your module's `build.gradle` file:
 ```groovy
 dependencies {
 	...
-	compile 'com.klinkerapps:article_viewer:0.24.9'
+	compile 'com.klinkerapps:article_viewer:0.25.0'
 }
 ```
 
diff --git a/gradle.properties b/gradle.properties
@@ -13,15 +13,17 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-GRADLE_PLUGIN_VERSION=3.1.2
+android.useAndroidX=true
+android.enableJetifier=true
 
-ANDROID_SUPPORT_VERSION=27.1.1
+GRADLE_PLUGIN_VERSION=3.2.0-beta04
+ANDROID_X_VERSION=1.0.0-rc01
 
 MIN_SDK=15
-TARGET_SDK=27
-COMPILE_SDK=27
+TARGET_SDK=28
+COMPILE_SDK=28
 
-VERSION_NAME=0.24.10
+VERSION_NAME=0.25.0
 VERSION_CODE=1
 GROUP=com.klinkerapps
 
@@ -38,4 +40,4 @@ POM_DEVELOPER_NAME=Jake Klinker
 
 POM_NAME=Android Article Viewer
 POM_ARTIFACT_ID=article_viewer
-POM_PACKAGING=aar
+POM_PACKAGING=aar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -19,4 +19,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
diff --git a/library/build.gradle b/library/build.gradle
@@ -52,21 +52,21 @@ dependencies {
     annotationProcessor "com.github.bumptech.glide:compiler:4.7.1"
     implementation "com.github.bumptech.glide:glide:4.7.1"
 
-    implementation "com.android.support:appcompat-v7:${ANDROID_SUPPORT_VERSION}"
-    implementation "com.android.support:design:${ANDROID_SUPPORT_VERSION}"
-    implementation "com.android.support:recyclerview-v7:${ANDROID_SUPPORT_VERSION}"
-    implementation "com.android.support:customtabs:${ANDROID_SUPPORT_VERSION}"
+    implementation "androidx.appcompat:appcompat:$ANDROID_X_VERSION"
+    implementation "com.google.android.material:material:$ANDROID_X_VERSION"
+    implementation "androidx.recyclerview:recyclerview:$ANDROID_X_VERSION"
+    implementation "androidx.browser:browser:$ANDROID_X_VERSION"
     implementation 'com.squareup.retrofit2:retrofit:2.4.0'
     implementation 'com.squareup.retrofit2:converter-gson:2.4.0'
     implementation 'org.jsoup:jsoup:1.10.2'
     implementation 'com.fmsirvent:parallaxeverywhere:1.0.4'
-    implementation 'com.klinkerapps:drag-dismiss-activity:1.5.1'
+    implementation 'com.klinkerapps:drag-dismiss-activity:1.6.0'
     implementation 'com.klinkerapps:photo_view:1.3.1'
 
     //noinspection GradleDependency
     testImplementation 'org.mockito:mockito-all:1.10.8'
     testImplementation 'junit:junit:4.12'
-    testImplementation "org.robolectric:robolectric:3.6.1"
+    testImplementation "org.robolectric:robolectric:3.8"
     testImplementation 'org.powermock:powermock-mockito-release-full:1.6.1'
     testImplementation 'org.powermock:powermock-module-junit4-rule:1.6.0'
     testImplementation 'org.powermock:powermock-api-mockito:1.6.1'
diff --git a/library/src/main/java/xyz/klinker/android/article/ArticleActivity.java b/library/src/main/java/xyz/klinker/android/article/ArticleActivity.java
@@ -22,9 +22,9 @@
 import android.net.Uri;
 import android.os.Build;
 import android.os.Handler;
-import android.support.customtabs.CustomTabsIntent;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.browser.customtabs.CustomTabsIntent;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
diff --git a/library/src/main/java/xyz/klinker/android/article/ArticleAdapter.java b/library/src/main/java/xyz/klinker/android/article/ArticleAdapter.java
@@ -25,9 +25,9 @@
 import android.graphics.Color;
 import android.graphics.Point;
 import android.net.Uri;
-import android.support.annotation.Nullable;
-import android.support.annotation.VisibleForTesting;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
+import androidx.recyclerview.widget.RecyclerView;
 import android.util.Log;
 import android.view.Display;
 import android.view.LayoutInflater;
diff --git a/library/src/main/java/xyz/klinker/android/article/ArticleIntent.java b/library/src/main/java/xyz/klinker/android/article/ArticleIntent.java
@@ -25,13 +25,13 @@
 import android.graphics.Color;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.annotation.AnimRes;
-import android.support.annotation.ColorInt;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.customtabs.CustomTabsIntent;
-import android.support.v4.app.ActivityOptionsCompat;
-import android.support.v4.content.ContextCompat;
+import androidx.annotation.AnimRes;
+import androidx.annotation.ColorInt;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.browser.customtabs.CustomTabsIntent;
+import androidx.core.app.ActivityOptionsCompat;
+import androidx.core.content.ContextCompat;
 import android.view.View;
 import android.widget.RemoteViews;
 
diff --git a/library/src/main/java/xyz/klinker/android/article/ArticleScrollListener.java b/library/src/main/java/xyz/klinker/android/article/ArticleScrollListener.java
@@ -20,9 +20,9 @@
 import android.animation.AnimatorListenerAdapter;
 import android.animation.ArgbEvaluator;
 import android.animation.ValueAnimator;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.Toolbar;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.appcompat.widget.Toolbar;
 import android.view.View;
 import android.view.animation.AccelerateInterpolator;
 import android.view.animation.DecelerateInterpolator;
diff --git a/library/src/main/java/xyz/klinker/android/article/ArticleUtils.java b/library/src/main/java/xyz/klinker/android/article/ArticleUtils.java
@@ -21,8 +21,8 @@
 import android.graphics.Point;
 import android.net.Uri;
 import android.os.Handler;
-import android.support.annotation.Nullable;
-import android.support.annotation.VisibleForTesting;
+import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
 import android.util.Log;
 import android.view.Display;
 import android.view.WindowManager;
diff --git a/library/src/main/java/xyz/klinker/android/article/ImageViewActivity.java b/library/src/main/java/xyz/klinker/android/article/ImageViewActivity.java
@@ -20,7 +20,7 @@
 import android.graphics.Color;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/library/src/main/java/xyz/klinker/android/article/Utils.java b/library/src/main/java/xyz/klinker/android/article/Utils.java
@@ -25,8 +25,8 @@
 import android.graphics.PorterDuff;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
-import android.support.v4.graphics.drawable.DrawableCompat;
-import android.support.v7.widget.RecyclerView;
+import androidx.core.graphics.drawable.DrawableCompat;
+import androidx.recyclerview.widget.RecyclerView;
 import android.widget.EdgeEffect;
 import android.widget.ProgressBar;
 import android.widget.TextView;
diff --git a/library/src/main/java/xyz/klinker/android/article/data/DataSource.java b/library/src/main/java/xyz/klinker/android/article/data/DataSource.java
@@ -20,7 +20,7 @@
 import android.content.Context;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
-import android.support.annotation.VisibleForTesting;
+import androidx.annotation.VisibleForTesting;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/library/src/test/java/xyz/klinker/android/article/ArticleRobolectricSuite.java b/library/src/test/java/xyz/klinker/android/article/ArticleRobolectricSuite.java
@@ -17,10 +17,10 @@
 package xyz.klinker.android.article;
 
 import android.app.Activity;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentActivity;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentTransaction;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentActivity;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentTransaction;
 
 import org.junit.Before;
 import org.junit.runner.RunWith;
diff --git a/sample/build.gradle b/sample/build.gradle
@@ -61,6 +61,6 @@ android {
 }
 
 dependencies {
-    implementation "com.android.support:appcompat-v7:${ANDROID_SUPPORT_VERSION}"
+    implementation "androidx.appcompat:appcompat:$ANDROID_X_VERSION"
     implementation project(":library")
 }
diff --git a/sample/src/main/java/xyz/klinker/article/FavoriteService.java b/sample/src/main/java/xyz/klinker/article/FavoriteService.java
@@ -19,7 +19,7 @@
 import android.app.Service;
 import android.content.Intent;
 import android.os.IBinder;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.util.Log;
 
 import xyz.klinker.android.article.data.Article;
diff --git a/sample/src/main/java/xyz/klinker/article/SampleActivity.java b/sample/src/main/java/xyz/klinker/article/SampleActivity.java
@@ -19,7 +19,7 @@
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.util.Patterns;
 import android.view.View;
 import android.widget.Button;

Original file line number	Diff line number	Diff line change
@@ -25,7 +25,7 @@ To include it in your project, add this to your module's `build.gradle` file:
`25`	`25`	```groovy
`26`	`26`	`dependencies {`
`27`	`27`	`...`
`28`		`- compile 'com.klinkerapps:article_viewer:0.24.9'`
	`28`	`+ compile 'com.klinkerapps:article_viewer:0.25.0'`
`29`	`29`	`}`
`30`	`30`	```
`31`	`31`
Original file line number	Diff line number	Diff line change
`@@ -61,6 +61,6 @@ android {`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`dependencies {`
`64`		`- implementation "com.android.support:appcompat-v7:${ANDROID_SUPPORT_VERSION}"`
	`64`	`+ implementation "androidx.appcompat:appcompat:$ANDROID_X_VERSION"`
`65`	`65`	`implementation project(":library")`
`66`	`66`	`}`