Migrate to androidx

Hellothuy1 · Jun 11, 2019 · 9aade9d · 9aade9d
1 parent a2a5857
commit 9aade9d
Show file tree

Hide file tree

Showing 213 changed files with 555 additions and 647 deletions.
diff --git a/README.md b/README.md
@@ -31,7 +31,7 @@ features listed in [commonmark-spec] are supported
 ![stable](https://img.shields.io/maven-central/v/io.noties.markwon/core.svg?label=stable)
 ![snapshot](https://img.shields.io/nexus/s/https/oss.sonatype.org/io.noties.markwon/core.svg?label=snapshot)
 
-```groovy
+```kotlin
 implementation "io.noties.markwon:core:${markwonVersion}"
 ```
 

diff --git a/app/src/debug/java/io/noties/markwon/debug/DebugCheckboxDrawableView.java b/app/src/debug/java/io/noties/markwon/debug/DebugCheckboxDrawableView.java
@@ -4,7 +4,7 @@
 import android.content.res.TypedArray;
 import android.graphics.Canvas;
 import android.graphics.drawable.Drawable;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.util.AttributeSet;
 import android.view.View;
 

diff --git a/app/src/main/java/io/noties/markwon/app/App.java b/app/src/main/java/io/noties/markwon/app/App.java
@@ -2,7 +2,8 @@
 
 import android.app.Application;
 import android.content.Context;
-import android.support.annotation.NonNull;
+
+import androidx.annotation.NonNull;
 
 import io.noties.debug.AndroidLogDebugOutput;
 import io.noties.debug.Debug;

diff --git a/app/src/main/java/io/noties/markwon/app/AppBarItem.java b/app/src/main/java/io/noties/markwon/app/AppBarItem.java
@@ -1,10 +1,11 @@
 package io.noties.markwon.app;
 
-import android.support.annotation.NonNull;
 import android.text.TextUtils;
 import android.view.View;
 import android.widget.TextView;
 
+import androidx.annotation.NonNull;
+
 abstract class AppBarItem {
 
     static class State {

diff --git a/app/src/main/java/io/noties/markwon/app/AppModule.java b/app/src/main/java/io/noties/markwon/app/AppModule.java
@@ -16,8 +16,8 @@
 import io.noties.markwon.syntax.Prism4jThemeDefault;
 import okhttp3.Cache;
 import okhttp3.OkHttpClient;
-import ru.noties.prism4j.Prism4j;
-import ru.noties.prism4j.annotations.PrismBundle;
+import io.noties.prism4j.Prism4j;
+import io.noties.prism4j.annotations.PrismBundle;
 
 @Module
 @PrismBundle(includeAll = true)

diff --git a/app/src/main/java/io/noties/markwon/app/MainActivity.java b/app/src/main/java/io/noties/markwon/app/MainActivity.java
@@ -4,16 +4,17 @@
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
 import android.text.Spanned;
 import android.view.View;
 import android.widget.TextView;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 import javax.inject.Inject;
 
-import io.noties.markwon.Markwon;
 import io.noties.debug.Debug;
+import io.noties.markwon.Markwon;
 
 public class MainActivity extends Activity {
 

diff --git a/app/src/main/java/io/noties/markwon/app/MarkdownLoader.java b/app/src/main/java/io/noties/markwon/app/MarkdownLoader.java
@@ -4,10 +4,11 @@
 import android.content.Context;
 import android.net.Uri;
 import android.os.Handler;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
 import android.text.TextUtils;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileInputStream;
@@ -20,11 +21,11 @@
 
 import javax.inject.Inject;
 
+import io.noties.debug.Debug;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.Response;
 import okhttp3.ResponseBody;
-import io.noties.debug.Debug;
 
 @ActivityScope
 public class MarkdownLoader {

diff --git a/app/src/main/java/io/noties/markwon/app/MarkdownRenderer.java b/app/src/main/java/io/noties/markwon/app/MarkdownRenderer.java
@@ -4,10 +4,11 @@
 import android.net.Uri;
 import android.os.Handler;
 import android.os.SystemClock;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
 import android.text.Spanned;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Future;
 
@@ -31,7 +32,7 @@
 import io.noties.markwon.syntax.SyntaxHighlightPlugin;
 import io.noties.markwon.urlprocessor.UrlProcessor;
 import io.noties.markwon.urlprocessor.UrlProcessorRelativeToAbsolute;
-import ru.noties.prism4j.Prism4j;
+import io.noties.prism4j.Prism4j;
 
 @ActivityScope
 public class MarkdownRenderer {

diff --git a/app/src/main/java/io/noties/markwon/app/Themes.java b/app/src/main/java/io/noties/markwon/app/Themes.java
@@ -2,7 +2,8 @@
 
 import android.content.Context;
 import android.content.SharedPreferences;
-import android.support.annotation.NonNull;
+
+import androidx.annotation.NonNull;
 
 import javax.inject.Inject;
 import javax.inject.Singleton;

diff --git a/app/src/main/java/io/noties/markwon/app/UriProcessor.java b/app/src/main/java/io/noties/markwon/app/UriProcessor.java
@@ -1,7 +1,8 @@
 package io.noties.markwon.app;
 
 import android.net.Uri;
-import android.support.annotation.NonNull;
+
+import androidx.annotation.NonNull;
 
 @SuppressWarnings("WeakerAccess")
 public interface UriProcessor {

diff --git a/app/src/main/java/io/noties/markwon/app/UriProcessorImpl.java b/app/src/main/java/io/noties/markwon/app/UriProcessorImpl.java
@@ -1,7 +1,8 @@
 package io.noties.markwon.app;
 
 import android.net.Uri;
-import android.support.annotation.NonNull;
+
+import androidx.annotation.NonNull;
 
 import java.util.List;
 
@@ -32,7 +33,7 @@ public Uri process(@NonNull final Uri uri) {
                         .fragment(uri.getFragment())
                         .query(uri.getQuery());
 
-                for (String segment: segments) {
+                for (String segment : segments) {
                     final String part;
                     if ("blob".equals(segment)) {
                         part = "raw";

diff --git a/app/src/main/java/io/noties/markwon/app/UrlProcessorInitialReadme.java b/app/src/main/java/io/noties/markwon/app/UrlProcessorInitialReadme.java
@@ -1,9 +1,10 @@
 package io.noties.markwon.app;
 
 import android.net.Uri;
-import android.support.annotation.NonNull;
 import android.text.TextUtils;
 
+import androidx.annotation.NonNull;
+
 import io.noties.markwon.urlprocessor.UrlProcessor;
 import io.noties.markwon.urlprocessor.UrlProcessorRelativeToAbsolute;
 

diff --git a/app/src/main/java/io/noties/markwon/app/Views.java b/app/src/main/java/io/noties/markwon/app/Views.java
@@ -1,9 +1,10 @@
 package io.noties.markwon.app;
 
-import android.support.annotation.IntDef;
-import android.support.annotation.NonNull;
 import android.view.View;
 
+import androidx.annotation.IntDef;
+import androidx.annotation.NonNull;
+
 @SuppressWarnings("WeakerAccess")
 public abstract class Views {
 

diff --git a/app/src/main/java/io/noties/markwon/app/gif/GifAwareAsyncDrawable.java b/app/src/main/java/io/noties/markwon/app/gif/GifAwareAsyncDrawable.java
@@ -2,8 +2,9 @@
 
 import android.graphics.Canvas;
 import android.graphics.drawable.Drawable;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import io.noties.markwon.image.AsyncDrawable;
 import io.noties.markwon.image.AsyncDrawableLoader;

diff --git a/app/src/main/java/io/noties/markwon/app/gif/GifAwarePlugin.java b/app/src/main/java/io/noties/markwon/app/gif/GifAwarePlugin.java
@@ -1,9 +1,10 @@
 package io.noties.markwon.app.gif;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
 import android.widget.TextView;
 
+import androidx.annotation.NonNull;
+
 import org.commonmark.node.Image;
 
 import io.noties.markwon.AbstractMarkwonPlugin;

diff --git a/app/src/main/java/io/noties/markwon/app/gif/GifPlaceholder.java b/app/src/main/java/io/noties/markwon/app/gif/GifPlaceholder.java
@@ -6,9 +6,10 @@
 import android.graphics.PixelFormat;
 import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
-import android.support.annotation.ColorInt;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+
+import androidx.annotation.ColorInt;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 public class GifPlaceholder extends Drawable {
 

diff --git a/app/src/main/java/io/noties/markwon/app/gif/GifProcessor.java b/app/src/main/java/io/noties/markwon/app/gif/GifProcessor.java
@@ -1,13 +1,14 @@
 package io.noties.markwon.app.gif;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
 import android.text.Spannable;
 import android.text.Spanned;
 import android.text.style.ClickableSpan;
 import android.view.View;
 import android.widget.TextView;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 import io.noties.markwon.image.AsyncDrawableSpan;
 import pl.droidsonroids.gif.GifDrawable;
 

diff --git a/build.gradle b/build.gradle
@@ -53,22 +53,20 @@ ext {
             'push-aar-gradle': 'https://raw.githubusercontent.com/noties/gradle-mvn-push/master/gradle-mvn-push-aar.gradle'
     ]
 
-    final def supportVersion = '28.0.0'
     final def commonMarkVersion = '0.12.1'
     final def daggerVersion = '2.10'
 
     deps = [
-            'support-annotations'     : "com.android.support:support-annotations:$supportVersion",
-            'support-app-compat'      : "com.android.support:appcompat-v7:$supportVersion",
-            'support-recycler-view'   : "com.android.support:recyclerview-v7:$supportVersion",
+            'x-annotations'           : 'androidx.annotation:annotation:1.1.0',
+            'x-recycler-view'         : 'androidx.recyclerview:recyclerview:1.0.0',
             'commonmark'              : "com.atlassian.commonmark:commonmark:$commonMarkVersion",
             'commonmark-strikethrough': "com.atlassian.commonmark:commonmark-ext-gfm-strikethrough:$commonMarkVersion",
             'commonmark-table'        : "com.atlassian.commonmark:commonmark-ext-gfm-tables:$commonMarkVersion",
             'android-svg'             : 'com.caverock:androidsvg:1.2.1',
             'android-gif'             : 'pl.droidsonroids.gif:android-gif-drawable:1.2.14',
             'jlatexmath-android'      : 'ru.noties:jlatexmath-android:0.1.0',
             'okhttp'                  : 'com.squareup.okhttp3:okhttp:3.9.0',
-            'prism4j'                 : 'ru.noties:prism4j:1.1.0',
+            'prism4j'                 : 'io.noties:prism4j:2.0.0',
             'debug'                   : 'io.noties:debug:5.0.0@jar',
             'adapt'                   : 'io.noties:adapt:2.0.0',
             'dagger'                  : "com.google.dagger:dagger:$daggerVersion",
@@ -77,7 +75,7 @@ ext {
     ]
 
     deps['annotationProcessor'] = [
-            'prism4j-bundler': 'ru.noties:prism4j-bundler:1.1.0',
+            'prism4j-bundler': 'io.noties:prism4j-bundler:2.0.0',
             'dagger-compiler': "com.google.dagger:dagger-compiler:$daggerVersion"
     ]
 

diff --git a/gradle.properties b/gradle.properties
@@ -3,6 +3,8 @@ org.gradle.jvmargs=-Xmx5g -Dfile.encoding=UTF-8
 #org.gradle.parallel=true
 org.gradle.configureondemand=true
 
+android.useAndroidX=true
+android.enableJetifier=true
 android.enableBuildCache=true
 android.buildCacheDir=build/pre-dex-cache
 

diff --git a/markwon-core/build.gradle b/markwon-core/build.gradle
@@ -16,7 +16,7 @@ android {
 dependencies {
 
     deps.with {
-        api it['support-annotations']
+        api it['x-annotations']
         api it['commonmark']
     }
 

diff --git a/markwon-core/src/main/java/io/noties/markwon/AbstractMarkwonPlugin.java b/markwon-core/src/main/java/io/noties/markwon/AbstractMarkwonPlugin.java
@@ -1,9 +1,10 @@
 package io.noties.markwon;
 
-import android.support.annotation.NonNull;
 import android.text.Spanned;
 import android.widget.TextView;
 
+import androidx.annotation.NonNull;
+
 import org.commonmark.node.Node;
 import org.commonmark.parser.Parser;
 

diff --git a/markwon-core/src/main/java/io/noties/markwon/LinkResolverDef.java b/markwon-core/src/main/java/io/noties/markwon/LinkResolverDef.java
@@ -5,10 +5,11 @@
 import android.content.Intent;
 import android.net.Uri;
 import android.provider.Browser;
-import android.support.annotation.NonNull;
 import android.util.Log;
 import android.view.View;
 
+import androidx.annotation.NonNull;
+
 import io.noties.markwon.core.spans.LinkSpan;
 
 public class LinkResolverDef implements LinkSpan.Resolver {

diff --git a/markwon-core/src/main/java/io/noties/markwon/Markwon.java b/markwon-core/src/main/java/io/noties/markwon/Markwon.java
@@ -1,11 +1,12 @@
 package io.noties.markwon;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
 import android.text.Spanned;
 import android.widget.TextView;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 import org.commonmark.node.Node;
 
 import io.noties.markwon.core.CorePlugin;

diff --git a/markwon-core/src/main/java/io/noties/markwon/MarkwonBuilderImpl.java b/markwon-core/src/main/java/io/noties/markwon/MarkwonBuilderImpl.java
@@ -1,9 +1,10 @@
 package io.noties.markwon;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
 import android.widget.TextView;
 
+import androidx.annotation.NonNull;
+
 import org.commonmark.parser.Parser;
 
 import java.util.ArrayList;

diff --git a/markwon-core/src/main/java/io/noties/markwon/MarkwonConfiguration.java b/markwon-core/src/main/java/io/noties/markwon/MarkwonConfiguration.java
@@ -1,6 +1,6 @@
 package io.noties.markwon;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import io.noties.markwon.core.MarkwonTheme;
 import io.noties.markwon.core.spans.LinkSpan;

diff --git a/markwon-core/src/main/java/io/noties/markwon/MarkwonImpl.java b/markwon-core/src/main/java/io/noties/markwon/MarkwonImpl.java
@@ -1,10 +1,11 @@
 package io.noties.markwon;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
 import android.text.Spanned;
 import android.widget.TextView;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 import org.commonmark.node.Node;
 import org.commonmark.parser.Parser;