Merge pull request #1228 from Tlaster/AndroidX

Migrate to AndroidX and make it works

.clabot

@@ -0,0 +1,3 @@
+{
+  "contributors": ["Tlaster"]
+}

.travis.yml

@@ -8,8 +8,12 @@ jdk: oraclejdk8
 android:
   components:
     - tools
-    - build-tools-28.0.3
+    - platform-tools
+    - build-tools-29.0.2
     - android-29
+    - extra-android-m2repository
+    - extra-google-m2repository
+    - extra-android-support
 
 env:
   global:

build.gradle

@@ -21,7 +21,11 @@ allprojects {
         projectVersionName = '3.7.8'
 
         globalCompileSdkVersion = 29
-        globalBuildToolsVersion = '28.0.3'
+        globalBuildToolsVersion = '29.0.2'
+
+
+        globalMinSdkVersion = 19
+        globalTargetSdkVersion = 29
     }
 
     repositories {
@@ -29,6 +33,7 @@ allprojects {
         jcenter()
         maven { url 'https://maven.google.com' }
         maven { url 'https://jitpack.io' }
+        google()
     }
 
 }
@@ -36,7 +41,7 @@ allprojects {
 subprojects {
     buildscript {
         ext {
-            kotlinVersion = '1.3.50'
+            kotlinVersion = '1.3.61'
             pluginVersions = [
                     AndroidSvgDrawable: '3.0.0',
                     PlayServices      : '3.1.1',
@@ -60,7 +65,7 @@ subprojects {
                     OkHttp               : '3.8.1',
                     Stetho               : '1.5.0',
                     OSMDroid             : '5.6.5',
-                    LeakCanary           : '1.5.1',
+                    LeakCanary           : '2.1',
                     TwitterText          : '1.14.7',
                     MediaViewerLibrary   : '0.9.23',
                     MultiValueSwitch     : '0.9.8',
@@ -69,7 +74,7 @@ subprojects {
                     KPreferences         : '0.9.7',
                     Kovenant             : '3.3.0',
                     ParcelablePlease     : '1.0.2',
-                    Chameleon            : '0.9.22',
+                    Chameleon            : '0.9.27',
                     UniqR                : '0.9.4',
                     SQLiteQB             : '0.9.15',
                     Glide                : '3.7.0',

gradle.properties

@@ -1,3 +1,5 @@
 org.gradle.jvmargs=-Xmx3584m
 #https://github.com/TwidereProject/Twidere-Android/issues/963
-android.enableAapt2=false
+android.enableAapt2=false
+android.useAndroidX=true
+android.enableJetifier=true

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-bin.zip

travis/configs/gradle.properties

@@ -18,4 +18,6 @@
 org.gradle.jvmargs=-Xmx3584m
 org.gradle.parallel=false
 kotlin.incremental=false
-kotlin.compiler.execution.strategy=in-process
+kotlin.compiler.execution.strategy=in-process
+android.useAndroidX=true
+android.enableJetifier=true

twidere.component.common/build.gradle

@@ -49,8 +49,8 @@ android {
     buildToolsVersion globalBuildToolsVersion
 
     defaultConfig {
-        minSdkVersion 14
+        minSdkVersion globalMinSdkVersion
-        targetSdkVersion 29
+        targetSdkVersion globalTargetSdkVersion
         versionCode projectVersionCode
         versionName projectVersionName
     }
@@ -73,7 +73,7 @@ dependencies {
     annotationProcessor "com.github.mariotaku.ObjectCursor:processor:${libVersions['ObjectCursor']}"
     annotationProcessor "com.github.mariotaku.ExportablePreferences:processor:${libVersions['ExportablePreferences']}"
 
-    implementation "com.android.support:support-annotations:${libVersions['SupportLib']}"
+    implementation 'androidx.annotation:annotation:1.1.0'
     implementation "com.bluelinelabs:logansquare:${libVersions['LoganSquare']}"
     implementation "com.fasterxml.jackson.core:jackson-core:2.7.4"
     implementation "com.github.mariotaku.RestFu:library:${libVersions['RestFu']}"

twidere.component.common/src/main/java/org/mariotaku/microblog/library/fanfou/callback/FanfouUserStreamCallback.java

@@ -18,8 +18,8 @@
 
 package org.mariotaku.microblog.library.fanfou.callback;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.text.TextUtils;
 
 import org.mariotaku.microblog.library.MicroBlogException;

twidere.component.common/src/main/java/org/mariotaku/microblog/library/fanfou/callback/SimpleFanfouUserStreamCallback.java

@@ -18,8 +18,8 @@
 
 package org.mariotaku.microblog.library.fanfou.callback;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import org.mariotaku.microblog.library.twitter.model.Status;
 import org.mariotaku.microblog.library.twitter.model.User;

twidere.component.common/src/main/java/org/mariotaku/microblog/library/fanfou/model/FanfouStreamObject.java

@@ -18,7 +18,7 @@
 
 package org.mariotaku.microblog.library.fanfou.model;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.bluelinelabs.logansquare.annotation.JsonField;
 import com.bluelinelabs.logansquare.annotation.JsonObject;

twidere.component.common/src/main/java/org/mariotaku/microblog/library/mastodon/annotation/AuthScope.java

@@ -18,7 +18,7 @@
 
 package org.mariotaku.microblog.library.mastodon.annotation;
 
-import android.support.annotation.StringDef;
+import androidx.annotation.StringDef;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;

twidere.component.common/src/main/java/org/mariotaku/microblog/library/mastodon/annotation/StatusVisibility.java

@@ -18,7 +18,7 @@
 
 package org.mariotaku.microblog.library.mastodon.annotation;
 
-import android.support.annotation.StringDef;
+import androidx.annotation.StringDef;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;

twidere.component.common/src/main/java/org/mariotaku/microblog/library/mastodon/api/AccountsResources.java

@@ -18,7 +18,7 @@
 
 package org.mariotaku.microblog.library.mastodon.api;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import org.mariotaku.microblog.library.MicroBlogException;
 import org.mariotaku.microblog.library.mastodon.model.Account;

twidere.component.common/src/main/java/org/mariotaku/microblog/library/mastodon/api/AppsResources.java

@@ -18,7 +18,7 @@
 
 package org.mariotaku.microblog.library.mastodon.api;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import org.mariotaku.microblog.library.MicroBlogException;
 import org.mariotaku.microblog.library.mastodon.model.RegisteredApplication;

twidere.component.common/src/main/java/org/mariotaku/microblog/library/mastodon/callback/MastodonUserStreamCallback.java

@@ -18,7 +18,7 @@
 
 package org.mariotaku.microblog.library.mastodon.callback;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.text.TextUtils;
 
 import org.mariotaku.microblog.library.MicroBlogException;

twidere.component.common/src/main/java/org/mariotaku/microblog/library/mastodon/model/LinkHeaderList$$JsonObjectMapper.java

@@ -18,7 +18,7 @@
 
 package org.mariotaku.microblog.library.mastodon.model;
 
-import android.support.annotation.Keep;
+import androidx.annotation.Keep;
 
 import com.bluelinelabs.logansquare.JsonMapper;
 import com.bluelinelabs.logansquare.LoganSquare;

twidere.component.common/src/main/java/org/mariotaku/microblog/library/mastodon/model/LinkHeaderList.java

@@ -18,8 +18,8 @@
 
 package org.mariotaku.microblog.library.mastodon.model;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import org.mariotaku.restfu.http.HttpResponse;
 

twidere.component.common/src/main/java/org/mariotaku/microblog/library/mastodon/model/LinkHeaderResponse.java

@@ -18,8 +18,8 @@
 
 package org.mariotaku.microblog.library.mastodon.model;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.text.TextUtils;
 
 import org.mariotaku.restfu.http.HttpResponse;

twidere.component.common/src/main/java/org/mariotaku/microblog/library/mastodon/model/Notification.java

@@ -18,8 +18,8 @@
 
 package org.mariotaku.microblog.library.mastodon.model;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
-import android.support.annotation.StringDef;
+import androidx.annotation.StringDef;
 
 import com.bluelinelabs.logansquare.annotation.JsonField;
 import com.bluelinelabs.logansquare.annotation.JsonObject;

twidere.component.common/src/main/java/org/mariotaku/microblog/library/mastodon/model/Results.java

@@ -18,8 +18,8 @@
 
 package org.mariotaku.microblog.library.mastodon.model;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import com.bluelinelabs.logansquare.annotation.JsonField;
 import com.bluelinelabs.logansquare.annotation.JsonObject;

twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/annotation/MediaCategory.java

@@ -18,7 +18,7 @@
 
 package org.mariotaku.microblog.library.twitter.annotation;
 
-import android.support.annotation.StringDef;
+import androidx.annotation.StringDef;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;

twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/annotation/StreamWith.java

@@ -18,7 +18,7 @@
 
 package org.mariotaku.microblog.library.twitter.annotation;
 
-import android.support.annotation.StringDef;
+import androidx.annotation.StringDef;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;

twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/auth/BasicAuthorization.java

@@ -18,7 +18,7 @@
 
 package org.mariotaku.microblog.library.twitter.auth;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.util.Base64;
 
 import org.mariotaku.restfu.RestRequest;

twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/auth/BearerAuthorization.java

@@ -18,7 +18,7 @@
 
 package org.mariotaku.microblog.library.twitter.auth;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import org.mariotaku.restfu.RestRequest;
 import org.mariotaku.restfu.http.Authorization;

twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/auth/EmptyAuthorization.java

@@ -18,7 +18,7 @@
 
 package org.mariotaku.microblog.library.twitter.auth;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import org.mariotaku.restfu.RestRequest;
 import org.mariotaku.restfu.http.Authorization;

twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/callback/SimpleUserStreamCallback.java

@@ -18,7 +18,7 @@
 
 package org.mariotaku.microblog.library.twitter.callback;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import org.mariotaku.microblog.library.twitter.model.DeletionEvent;
 import org.mariotaku.microblog.library.twitter.model.DirectMessage;

twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/callback/UserStreamCallback.java

@@ -18,7 +18,7 @@
 
 package org.mariotaku.microblog.library.twitter.callback;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.text.TextUtils;
 
 import org.mariotaku.microblog.library.MicroBlogException;

twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/Activity.java

@@ -20,8 +20,8 @@ package org.mariotaku.microblog.library.twitter.model;
 
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.StringDef;
+import androidx.annotation.StringDef;
 
 import com.bluelinelabs.logansquare.JsonMapper;
 import com.bluelinelabs.logansquare.LoganSquare;

twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/CardDataMap.java

@@ -18,7 +18,7 @@
 
 package org.mariotaku.microblog.library.twitter.model;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.bluelinelabs.logansquare.LoganSquare;
 import com.fasterxml.jackson.core.JsonGenerator;

twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/DMResponse.java

@@ -20,7 +20,7 @@ package org.mariotaku.microblog.library.twitter.model;
 
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.StringDef;
+import androidx.annotation.StringDef;
 
 import com.bluelinelabs.logansquare.annotation.JsonField;
 import com.bluelinelabs.logansquare.annotation.JsonObject;

twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/ExtendedProfile.java

@@ -20,7 +20,7 @@ package org.mariotaku.microblog.library.twitter.model;
 
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.StringDef;
+import androidx.annotation.StringDef;
 
 import com.bluelinelabs.logansquare.annotation.JsonField;
 import com.bluelinelabs.logansquare.annotation.JsonObject;

twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/GeoLocation.java

@@ -20,7 +20,7 @@ package org.mariotaku.microblog.library.twitter.model;
 
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.hannesdorfmann.parcelableplease.annotation.ParcelablePlease;
 

twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/GeoQuery.java

@@ -18,7 +18,7 @@
 
 package org.mariotaku.microblog.library.twitter.model;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import org.mariotaku.restfu.http.ValueMap;
 

twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/IDs$$JsonObjectMapper.java

@@ -18,7 +18,7 @@
 
 package org.mariotaku.microblog.library.twitter.model;
 
-import android.support.annotation.Keep;
+import androidx.annotation.Keep;
 
 import com.bluelinelabs.logansquare.JsonMapper;
 import com.fasterxml.jackson.core.JsonGenerator;

twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/IDs.java

@@ -20,7 +20,7 @@ package org.mariotaku.microblog.library.twitter.model;
 
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.Keep;
+import androidx.annotation.Keep;
 
 import com.bluelinelabs.logansquare.JsonMapper;
 import com.bluelinelabs.logansquare.LoganSquare;

twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/MediaEntity.java

@@ -20,8 +20,8 @@ package org.mariotaku.microblog.library.twitter.model;
 
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.IntDef;
+import androidx.annotation.IntDef;
-import android.support.annotation.StringDef;
+import androidx.annotation.StringDef;
 
 import com.bluelinelabs.logansquare.annotation.JsonField;
 import com.bluelinelabs.logansquare.annotation.JsonObject;

twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/MediaUploadResponse.java

@@ -18,8 +18,8 @@
 
 package org.mariotaku.microblog.library.twitter.model;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
-import android.support.annotation.StringDef;
+import androidx.annotation.StringDef;
 
 import com.bluelinelabs.logansquare.annotation.JsonField;
 import com.bluelinelabs.logansquare.annotation.JsonObject;

twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/PageableResponseList$$JsonObjectMapper.java

@@ -18,7 +18,7 @@
 
 package org.mariotaku.microblog.library.twitter.model;
 
-import android.support.annotation.Keep;
+import androidx.annotation.Keep;
 
 import com.bluelinelabs.logansquare.JsonMapper;
 import com.bluelinelabs.logansquare.LoganSquare;

twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/PageableResponseList.java

@@ -18,7 +18,7 @@
 
 package org.mariotaku.microblog.library.twitter.model;
 
-import android.support.annotation.Keep;
+import androidx.annotation.Keep;
 
 /**
  * Response list supports cursor pagination

twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/Place.java

@@ -20,7 +20,7 @@ package org.mariotaku.microblog.library.twitter.model;
 
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.bluelinelabs.logansquare.annotation.JsonField;
 import com.bluelinelabs.logansquare.annotation.JsonObject;

twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/ResponseCode.java

@@ -18,7 +18,7 @@
 
 package org.mariotaku.microblog.library.twitter.model;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import org.mariotaku.microblog.library.MicroBlogException;
 import org.mariotaku.restfu.RestConverter;

twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/ResponseList.java

@@ -18,7 +18,7 @@
 
 package org.mariotaku.microblog.library.twitter.model;
 
-import android.support.annotation.Keep;
+import androidx.annotation.Keep;
 
 import org.mariotaku.microblog.library.twitter.util.InternalParseUtil;
 import org.mariotaku.restfu.http.HttpResponse;

twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/SavedSearch.java

@@ -18,7 +18,7 @@
 
 package org.mariotaku.microblog.library.twitter.model;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.bluelinelabs.logansquare.annotation.JsonField;
 import com.bluelinelabs.logansquare.annotation.JsonObject;

twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/ScheduledStatus.java

@@ -18,7 +18,7 @@
 
 package org.mariotaku.microblog.library.twitter.model;
 
-import android.support.annotation.StringDef;
+import androidx.annotation.StringDef;
 
 import com.bluelinelabs.logansquare.annotation.JsonField;
 import com.bluelinelabs.logansquare.annotation.JsonObject;

twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/SearchQuery.java

@@ -18,7 +18,7 @@
 
 package org.mariotaku.microblog.library.twitter.model;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import org.mariotaku.restfu.http.SimpleValueMap;
 

twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/Status.java

@@ -20,8 +20,8 @@ package org.mariotaku.microblog.library.twitter.model;
 
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.text.TextUtils;
 
 import com.bluelinelabs.logansquare.annotation.JsonField;

twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/StatusUpdate.java

@@ -18,8 +18,8 @@
 
 package org.mariotaku.microblog.library.twitter.model;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import org.mariotaku.restfu.RestFuUtils;
 import org.mariotaku.restfu.http.SimpleValueMap;

twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/Trends.java

@@ -20,7 +20,7 @@ package org.mariotaku.microblog.library.twitter.model;
 
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.bluelinelabs.logansquare.annotation.JsonField;
 import com.bluelinelabs.logansquare.annotation.JsonObject;

twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/TwitterResponse.java

@@ -18,7 +18,7 @@
 
 package org.mariotaku.microblog.library.twitter.model;
 
-import android.support.annotation.IntDef;
+import androidx.annotation.IntDef;
 
 import org.mariotaku.restfu.http.HttpResponse;
 

twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/TwitterStreamObject.java

@@ -18,7 +18,7 @@
 
 package org.mariotaku.microblog.library.twitter.model;
 
-import android.support.annotation.StringDef;
+import androidx.annotation.StringDef;
 
 import com.bluelinelabs.logansquare.annotation.JsonField;
 import com.bluelinelabs.logansquare.annotation.JsonObject;

twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/UniversalSearchQuery.java

@@ -18,7 +18,7 @@
 
 package org.mariotaku.microblog.library.twitter.model;
 
-import android.support.annotation.StringDef;
+import androidx.annotation.StringDef;
 
 import org.mariotaku.microblog.library.twitter.util.InternalArrayUtil;
 import org.mariotaku.restfu.http.SimpleValueMap;

twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/UniversalSearchResult.java

@@ -18,7 +18,7 @@
 
 package org.mariotaku.microblog.library.twitter.model;
 
-import android.support.annotation.StringDef;
+import androidx.annotation.StringDef;
 
 import com.bluelinelabs.logansquare.annotation.JsonField;
 import com.bluelinelabs.logansquare.annotation.JsonObject;

twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/User.java

@@ -21,8 +21,8 @@ package org.mariotaku.microblog.library.twitter.model;
 
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import com.bluelinelabs.logansquare.annotation.JsonField;
 import com.bluelinelabs.logansquare.annotation.JsonObject;

twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/UserList.java

@@ -20,8 +20,8 @@ package org.mariotaku.microblog.library.twitter.model;
 
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.StringDef;
+import androidx.annotation.StringDef;
 
 import com.bluelinelabs.logansquare.annotation.JsonField;
 import com.bluelinelabs.logansquare.annotation.JsonObject;

twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/util/OAuthTokenResponseConverter.java

@@ -18,7 +18,7 @@
 
 package org.mariotaku.microblog.library.twitter.util;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import org.mariotaku.microblog.library.MicroBlogException;
 import org.mariotaku.restfu.RestConverter;

twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/util/ThreadLocalSimpleDateFormat.java

@@ -18,7 +18,7 @@
 
 package org.mariotaku.microblog.library.twitter.util;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import java.text.AttributedCharacterIterator;
 import java.text.DateFormat;

twidere.component.common/src/main/java/org/mariotaku/twidere/annotation/AccountType.java

@@ -18,7 +18,7 @@
 
 package org.mariotaku.twidere.annotation;
 
-import android.support.annotation.StringDef;
+import androidx.annotation.StringDef;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;

twidere.component.common/src/main/java/org/mariotaku/twidere/annotation/AuthTypeInt.java

@@ -18,7 +18,7 @@
 
 package org.mariotaku.twidere.annotation;
 
-import android.support.annotation.IntDef;
+import androidx.annotation.IntDef;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;

twidere.component.common/src/main/java/org/mariotaku/twidere/annotation/CustomTabType.java

@@ -18,7 +18,7 @@
 
 package org.mariotaku.twidere.annotation;
 
-import android.support.annotation.StringDef;
+import androidx.annotation.StringDef;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;

twidere.component.common/src/main/java/org/mariotaku/twidere/annotation/FilterScope.java

@@ -19,7 +19,7 @@
 
 package org.mariotaku.twidere.annotation;
 
-import android.support.annotation.IntDef;
+import androidx.annotation.IntDef;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;

twidere.component.common/src/main/java/org/mariotaku/twidere/model/AccountDetails.java

@@ -21,8 +21,8 @@ package org.mariotaku.twidere.model;
 import android.accounts.Account;
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.ColorInt;
+import androidx.annotation.ColorInt;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.bluelinelabs.logansquare.LoganSquare;
 import com.bluelinelabs.logansquare.annotation.JsonField;

twidere.component.common/src/main/java/org/mariotaku/twidere/model/ConsumerKeyType.java

@@ -18,7 +18,7 @@
 
 package org.mariotaku.twidere.model;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 /**
  * Created by mariotaku on 15/4/20.

twidere.component.common/src/main/java/org/mariotaku/twidere/model/Draft.java

@@ -20,8 +20,8 @@ package org.mariotaku.twidere.model;
 
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
-import android.support.annotation.StringDef;
+import androidx.annotation.StringDef;
 
 import com.hannesdorfmann.parcelableplease.annotation.ParcelableNoThanks;
 import com.hannesdorfmann.parcelableplease.annotation.ParcelablePlease;

twidere.component.common/src/main/java/org/mariotaku/twidere/model/FiltersData.java

@@ -18,7 +18,7 @@
 
 package org.mariotaku.twidere.model;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import com.bluelinelabs.logansquare.annotation.JsonField;
 import com.bluelinelabs.logansquare.annotation.JsonObject;

twidere.component.common/src/main/java/org/mariotaku/twidere/model/ParcelableActivity.java

@@ -20,7 +20,7 @@ package org.mariotaku.twidere.model;
 
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import com.bluelinelabs.logansquare.annotation.JsonField;
 import com.bluelinelabs.logansquare.annotation.JsonObject;

twidere.component.common/src/main/java/org/mariotaku/twidere/model/ParcelableCardEntity.java

@@ -21,8 +21,8 @@ package org.mariotaku.twidere.model;
 
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import com.bluelinelabs.logansquare.annotation.JsonField;
 import com.bluelinelabs.logansquare.annotation.JsonObject;

twidere.component.common/src/main/java/org/mariotaku/twidere/model/ParcelableGroup.java

@@ -20,7 +20,7 @@ package org.mariotaku.twidere.model;
 
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.bluelinelabs.logansquare.annotation.JsonField;
 import com.bluelinelabs.logansquare.annotation.JsonObject;

twidere.component.common/src/main/java/org/mariotaku/twidere/model/ParcelableLocation.java

@@ -22,8 +22,8 @@ import android.content.ContentValues;
 import android.database.Cursor;
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import com.bluelinelabs.logansquare.annotation.JsonField;
 import com.bluelinelabs.logansquare.annotation.JsonObject;

twidere.component.common/src/main/java/org/mariotaku/twidere/model/ParcelableMedia.java

@@ -20,9 +20,9 @@ package org.mariotaku.twidere.model;
 
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.IntDef;
+import androidx.annotation.IntDef;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import com.bluelinelabs.logansquare.annotation.JsonField;
 import com.bluelinelabs.logansquare.annotation.JsonObject;

twidere.component.common/src/main/java/org/mariotaku/twidere/model/ParcelableMediaUpdate.java

@@ -20,8 +20,8 @@ package org.mariotaku.twidere.model;
 
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import com.bluelinelabs.logansquare.annotation.JsonField;
 import com.bluelinelabs.logansquare.annotation.JsonObject;

twidere.component.common/src/main/java/org/mariotaku/twidere/model/ParcelableMessage.java

@@ -20,7 +20,7 @@ package org.mariotaku.twidere.model;
 
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.StringDef;
+import androidx.annotation.StringDef;
 
 import com.bluelinelabs.logansquare.annotation.JsonField;
 import com.bluelinelabs.logansquare.annotation.JsonObject;

twidere.component.common/src/main/java/org/mariotaku/twidere/model/ParcelableMessageConversation.java

@@ -21,8 +21,8 @@ package org.mariotaku.twidere.model;
 import android.content.ContentValues;
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
-import android.support.annotation.StringDef;
+import androidx.annotation.StringDef;
 
 import com.bluelinelabs.logansquare.annotation.JsonField;
 import com.bluelinelabs.logansquare.annotation.JsonObject;

twidere.component.common/src/main/java/org/mariotaku/twidere/model/ParcelableStatus.java

@@ -20,9 +20,10 @@ package org.mariotaku.twidere.model;
 
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.IntDef;
+import androidx.annotation.IntDef;
-import android.support.annotation.NonNull;
+import androidx.annotation.LongDef;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.text.TextUtils;
 
 import com.bluelinelabs.logansquare.annotation.JsonField;
@@ -582,7 +583,7 @@ public class ParcelableStatus implements Parcelable, Comparable<ParcelableStatus
      * <p>
      * DO NOT CHANGE ONCE DEFINED!
      */
-    @IntDef(value = {
+    @LongDef(value = {
             FilterFlags.QUOTE_NOT_AVAILABLE,
             FilterFlags.BLOCKING_USER,
             FilterFlags.BLOCKED_BY_USER,

twidere.component.common/src/main/java/org/mariotaku/twidere/model/ParcelableStatusUpdate.java

@@ -20,8 +20,8 @@ package org.mariotaku.twidere.model;
 
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import com.bluelinelabs.logansquare.annotation.JsonField;
 import com.bluelinelabs.logansquare.annotation.JsonObject;

twidere.component.common/src/main/java/org/mariotaku/twidere/model/ParcelableUser.java

@@ -20,8 +20,8 @@ package org.mariotaku.twidere.model;
 
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import com.bluelinelabs.logansquare.annotation.JsonField;
 import com.bluelinelabs.logansquare.annotation.JsonObject;

twidere.component.common/src/main/java/org/mariotaku/twidere/model/ParcelableUserList.java

@@ -20,7 +20,7 @@ package org.mariotaku.twidere.model;
 
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.bluelinelabs.logansquare.annotation.JsonField;
 import com.bluelinelabs.logansquare.annotation.JsonObject;

twidere.component.common/src/main/java/org/mariotaku/twidere/model/SpanItem.java

@@ -20,7 +20,7 @@ package org.mariotaku.twidere.model;
 
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.IntDef;
+import androidx.annotation.IntDef;
 
 import com.bluelinelabs.logansquare.annotation.JsonField;
 import com.bluelinelabs.logansquare.annotation.JsonObject;

twidere.component.common/src/main/java/org/mariotaku/twidere/model/Tab.java

@@ -20,7 +20,7 @@ package org.mariotaku.twidere.model;
 
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import com.bluelinelabs.logansquare.annotation.JsonField;
 import com.bluelinelabs.logansquare.annotation.JsonObject;

twidere.component.common/src/main/java/org/mariotaku/twidere/model/UserKey.java

@@ -20,8 +20,8 @@ package org.mariotaku.twidere.model;
 
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import com.bluelinelabs.logansquare.annotation.JsonField;
 import com.bluelinelabs.logansquare.annotation.JsonObject;

twidere.component.common/src/main/java/org/mariotaku/twidere/model/account/AccountExtras.java

@@ -19,8 +19,8 @@
 package org.mariotaku.twidere.model.account;
 
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import com.bluelinelabs.logansquare.annotation.JsonField;
 import com.bluelinelabs.logansquare.annotation.JsonObject;

twidere.component.common/src/main/java/org/mariotaku/twidere/model/account/cred/Credentials.java

@@ -20,7 +20,7 @@ package org.mariotaku.twidere.model.account.cred;
 
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.StringDef;
+import androidx.annotation.StringDef;
 
 import com.bluelinelabs.logansquare.annotation.JsonField;
 import com.bluelinelabs.logansquare.annotation.JsonObject;

twidere.component.common/src/main/java/org/mariotaku/twidere/model/message/MessageExtras.java

@@ -19,8 +19,8 @@
 package org.mariotaku.twidere.model.message;
 
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import com.bluelinelabs.logansquare.LoganSquare;
 import com.bluelinelabs.logansquare.annotation.JsonObject;

twidere.component.common/src/main/java/org/mariotaku/twidere/model/message/StickerExtras.java

@@ -20,7 +20,7 @@ package org.mariotaku.twidere.model.message;
 
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.bluelinelabs.logansquare.annotation.JsonField;
 import com.bluelinelabs.logansquare.annotation.JsonObject;

twidere.component.common/src/main/java/org/mariotaku/twidere/model/message/conversation/ConversationExtras.java

@@ -19,8 +19,8 @@
 package org.mariotaku.twidere.model.message.conversation;
 
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import com.bluelinelabs.logansquare.LoganSquare;
 

twidere.component.common/src/main/java/org/mariotaku/twidere/model/tab/argument/TabArguments.java

@@ -19,9 +19,9 @@
 package org.mariotaku.twidere.model.tab.argument;
 
 import android.os.Bundle;
-import android.support.annotation.CallSuper;
+import androidx.annotation.CallSuper;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import com.bluelinelabs.logansquare.LoganSquare;
 import com.bluelinelabs.logansquare.annotation.JsonField;

twidere.component.common/src/main/java/org/mariotaku/twidere/model/tab/argument/TextQueryArguments.java

@@ -21,7 +21,7 @@ package org.mariotaku.twidere.model.tab.argument;
 import android.os.Bundle;
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.bluelinelabs.logansquare.annotation.JsonField;
 import com.bluelinelabs.logansquare.annotation.JsonObject;

twidere.component.common/src/main/java/org/mariotaku/twidere/model/tab/argument/UserArguments.java

@@ -21,7 +21,7 @@ package org.mariotaku.twidere.model.tab.argument;
 import android.os.Bundle;
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.bluelinelabs.logansquare.annotation.JsonField;
 import com.bluelinelabs.logansquare.annotation.JsonObject;

twidere.component.common/src/main/java/org/mariotaku/twidere/model/tab/argument/UserListArguments.java

@@ -21,7 +21,7 @@ package org.mariotaku.twidere.model.tab.argument;
 import android.os.Bundle;
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.bluelinelabs.logansquare.annotation.JsonField;
 import com.bluelinelabs.logansquare.annotation.JsonObject;

twidere.component.common/src/main/java/org/mariotaku/twidere/model/tab/extra/TabExtras.java

@@ -20,9 +20,9 @@ package org.mariotaku.twidere.model.tab.extra;
 
 import android.os.Bundle;
 import android.os.Parcelable;
-import android.support.annotation.CallSuper;
+import androidx.annotation.CallSuper;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import com.bluelinelabs.logansquare.LoganSquare;
 import com.bluelinelabs.logansquare.annotation.JsonObject;

twidere.component.common/src/main/java/org/mariotaku/twidere/model/util/DraftExtrasFieldConverter.java

@@ -20,7 +20,7 @@ package org.mariotaku.twidere.model.util;
 
 import android.content.ContentValues;
 import android.database.Cursor;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.text.TextUtils;
 
 import com.bluelinelabs.logansquare.LoganSquare;

twidere.component.common/src/main/java/org/mariotaku/twidere/provider/TwidereDataStore.java

@@ -21,7 +21,7 @@ package org.mariotaku.twidere.provider;
 import android.content.ContentResolver;
 import android.net.Uri;
 import android.provider.BaseColumns;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import org.mariotaku.twidere.model.DraftTableInfo;
 import org.mariotaku.twidere.model.FiltersData$BaseItemTableInfo;

twidere.component.common/src/main/java/org/mariotaku/twidere/util/JsonSerializer.java

@@ -18,8 +18,8 @@
 
 package org.mariotaku.twidere.util;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import com.bluelinelabs.logansquare.JsonMapper;
 import com.bluelinelabs.logansquare.ParameterizedType;

twidere.component.common/src/main/java/org/mariotaku/twidere/util/filter/FiltersSubscriptionProvider.java

@@ -18,7 +18,7 @@
 
 package org.mariotaku.twidere.util.filter;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import org.mariotaku.twidere.model.FiltersData;
 

twidere.component.nyan/build.gradle

@@ -27,8 +27,8 @@ android {
     buildToolsVersion globalBuildToolsVersion
 
     defaultConfig {
-        minSdkVersion 14
+        minSdkVersion globalMinSdkVersion
-        targetSdkVersion 29
+        targetSdkVersion globalTargetSdkVersion
         versionCode 1
         versionName "1.0"
     }
@@ -41,5 +41,5 @@ android {
 }
 
 dependencies {
-    implementation "com.android.support:support-compat:${libVersions['SupportLib']}"
+    implementation 'androidx.core:core:1.2.0'
 }

twidere.component.nyan/src/main/java/org/mariotaku/twidere/nyan/NyanDrawingHelper.java

@@ -33,7 +33,7 @@ import android.graphics.Shader.TileMode;
 import android.graphics.drawable.AnimationDrawable;
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
-import android.support.v4.content.ContextCompat;
+import androidx.core.content.ContextCompat;
 
 import java.util.ArrayList;
 import java.util.Calendar;

twidere/build.gradle

@@ -33,8 +33,8 @@ android {
 
     defaultConfig {
         applicationId "org.mariotaku.twidere"
-        minSdkVersion 14
+        minSdkVersion globalMinSdkVersion
-        targetSdkVersion 29
+        targetSdkVersion globalTargetSdkVersion
         versionCode projectVersionCode
         versionName projectVersionName
         multiDexEnabled true
@@ -42,7 +42,7 @@ android {
         buildConfigField 'boolean', 'LEAK_CANARY_ENABLED', 'Boolean.parseBoolean("false")'
         buildConfigField 'boolean', 'SHOW_CUSTOM_TOKEN_DIALOG', 'Boolean.parseBoolean("false")'
 
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
     compileOptions {
@@ -186,32 +186,32 @@ dependencies {
         exclude group: 'net.minidev', module: 'json-smart'
     }
     // Stetho dependency, see https://g.co/androidstudio/app-test-app-conflict
-    debugImplementation "com.google.code.findbugs:jsr305:3.0.1"
+    debugImplementation "com.google.code.findbugs:jsr305:3.0.2"
 
     compileOnly 'javax.annotation:jsr250-api:1.0'
 
     testImplementation 'junit:junit:4.12'
 
-    androidTestImplementation "com.android.support:support-annotations:${libVersions['SupportLib']}"
+    androidTestImplementation 'androidx.annotation:annotation:1.1.0'
-    androidTestImplementation "com.android.support.test:runner:${libVersions['SupportTest']}"
+    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
-    androidTestImplementation "com.android.support.test:rules:${libVersions['SupportTest']}"
+    androidTestImplementation 'androidx.test:rules:1.2.0'
     // https://g.co/androidstudio/app-test-app-conflict
-    androidTestImplementation "com.google.code.findbugs:jsr305:3.0.1"
+    androidTestImplementation "com.google.code.findbugs:jsr305:3.0.2"
 
-    implementation 'com.android.support:multidex:1.0.2'
+    implementation 'androidx.multidex:multidex:2.0.1'
-    implementation "com.android.support:support-annotations:${libVersions['SupportLib']}"
+    implementation 'androidx.annotation:annotation:1.1.0'
-    implementation "com.android.support:support-compat:${libVersions['SupportLib']}"
+    implementation 'androidx.core:core:1.2.0'
-    implementation "com.android.support:support-core-utils:${libVersions['SupportLib']}"
+    implementation 'androidx.legacy:legacy-support-core-utils:1.0.0'
-    implementation "com.android.support:support-core-ui:${libVersions['SupportLib']}"
+    implementation 'androidx.legacy:legacy-support-core-ui:1.0.0'
-    implementation "com.android.support:support-v13:${libVersions['SupportLib']}"
+    implementation 'androidx.legacy:legacy-support-v13:1.0.0'
-    implementation "com.android.support:appcompat-v7:${libVersions['SupportLib']}"
+    implementation 'androidx.appcompat:appcompat:1.1.0'
-    implementation "com.android.support:cardview-v7:${libVersions['SupportLib']}"
+    implementation 'androidx.cardview:cardview:1.0.0'
-    implementation "com.android.support:recyclerview-v7:${libVersions['SupportLib']}"
+    implementation 'androidx.recyclerview:recyclerview:1.1.0'
-    implementation "com.android.support:palette-v7:${libVersions['SupportLib']}"
+    implementation 'androidx.palette:palette:1.0.0'
-    implementation "com.android.support:preference-v14:${libVersions['SupportLib']}"
+    implementation 'androidx.legacy:legacy-preference-v14:1.0.0'
-    implementation "com.android.support:customtabs:${libVersions['SupportLib']}"
+    implementation 'androidx.browser:browser:1.2.0'
-    implementation "com.android.support:design:${libVersions['SupportLib']}"
+    implementation 'com.google.android.material:material:1.1.0'
-    implementation "com.android.support:exifinterface:${libVersions['SupportLib']}"
+    implementation 'androidx.exifinterface:exifinterface:1.1.0'
     implementation "com.twitter:twitter-text:${libVersions['TwitterText']}"
     implementation 'com.davemorrissey.labs:subsampling-scale-image-view:3.6.0'
     implementation 'com.squareup:otto:1.3.8'
@@ -237,6 +237,7 @@ dependencies {
     implementation "com.github.mariotaku.RestFu:okhttp3:${libVersions['RestFu']}"
     implementation "com.github.mariotaku.RestFu:logansquare:${libVersions['RestFu']}"
     implementation "com.squareup.okhttp3:okhttp:${libVersions['OkHttp']}"
+    implementation("com.squareup.okio:okio:2.4.3")
     implementation 'com.lnikkila:extendedtouchview:0.1.1'
     implementation "com.google.dagger:dagger:${libVersions['Dagger']}"
     implementation 'org.attoparser:attoparser:2.0.4.RELEASE'

twidere/proguard-rules.pro

@@ -18,6 +18,7 @@
 
 -dontobfuscate
 
+-dontwarn org.codehaus.mojo.animal_sniffer.*
 -dontwarn com.squareup.haha.**
 -dontwarn com.makeramen.roundedimageview.**
 -dontwarn jnamed**

twidere/src/androidTest/kotlin/org/mariotaku/twidere/activity/ComposeActivityTest.kt

@@ -21,8 +21,8 @@ package org.mariotaku.twidere.activity
 
 import android.annotation.SuppressLint
 import android.content.Intent
-import android.support.test.InstrumentationRegistry
+import androidx.test.platform.app.InstrumentationRegistry
-import android.support.test.runner.AndroidJUnit4
+import androidx.test.ext.junit.runners.AndroidJUnit4
 import kotlinx.android.synthetic.main.activity_compose.*
 import org.junit.Assert
 import org.junit.Rule

twidere/src/androidTest/kotlin/org/mariotaku/twidere/activity/ComposeActivityTestRule.kt

@@ -19,7 +19,7 @@
 
 package org.mariotaku.twidere.activity
 
-import android.support.test.rule.ActivityTestRule
+import androidx.test.rule.ActivityTestRule
 import org.mariotaku.twidere.util.TestAccountUtils
 
 /**

twidere/src/androidTest/kotlin/org/mariotaku/twidere/extension/FileExtensionsTest.kt

@@ -19,8 +19,8 @@
 
 package org.mariotaku.twidere.extension
 
-import android.support.test.InstrumentationRegistry
+import androidx.test.platform.app.InstrumentationRegistry
-import android.support.test.runner.AndroidJUnit4
+import androidx.test.ext.junit.runners.AndroidJUnit4
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith