Mirgate to androidx

Author: nekocode

app/build.gradle.kts

@@ -46,10 +46,11 @@ dependencies {
     implementation(kotlin("stdlib-jdk7", KotlinCompilerVersion.VERSION))
 
     // Android support libraries
-    implementation("com.android.support:appcompat-v7:28.0.0")
-    implementation("com.android.support:recyclerview-v7:28.0.0")
-    implementation("com.android.support:support-annotations:28.0.0")
-    implementation("com.android.support.constraint:constraint-layout:1.1.3")
+    implementation("androidx.appcompat:appcompat:1.1.0-alpha05")
+    implementation("androidx.core:core-ktx:1.0.2")
+    implementation("androidx.localbroadcastmanager:localbroadcastmanager:1.1.0-alpha01")
+    implementation("androidx.recyclerview:recyclerview:1.1.0-alpha05")
+    implementation("androidx.constraintlayout:constraintlayout:2.0.0-beta1")
 
     // ReactiveX
     implementation("io.reactivex.rxjava2:rxjava:2.2.2")

app/src/main/AndroidManifest.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          xmlns:tools="http://schemas.android.com/tools"
           package="cn.nekocode.gank">
 
     <uses-permission android:name="android.permission.INTERNET"/>
@@ -12,9 +13,12 @@
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/AppTheme">
-        <activity android:name=".ui.home.MainActivity"
-                  android:launchMode="singleTop"
+        android:theme="@style/AppTheme"
+        tools:ignore="GoogleAppIndexingWarning"
+        >
+        <activity
+            android:name=".ui.home.MainActivity"
+            android:launchMode="singleTop"
             >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>

app/src/main/java/cn/nekocode/gank/GankApplication.kt

@@ -21,7 +21,7 @@ import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import android.content.IntentFilter
-import android.support.v4.content.LocalBroadcastManager
+import androidx.localbroadcastmanager.content.LocalBroadcastManager
 import cn.nekocode.gank.backend.GankIoService
 import cn.nekocode.gank.broadcast.BroadcastCallAdapter
 import cn.nekocode.gank.broadcast.BroadcastConfig

app/src/main/java/cn/nekocode/gank/base/BaseActivity.kt

@@ -17,8 +17,8 @@
 package cn.nekocode.gank.base
 
 import android.annotation.SuppressLint
-import android.support.v4.app.NavUtils
-import android.support.v7.app.AppCompatActivity
+import androidx.core.app.NavUtils
+import androidx.appcompat.app.AppCompatActivity
 import android.view.MenuItem
 import com.uber.autodispose.*
 import com.uber.autodispose.android.lifecycle.AndroidLifecycleScopeProvider

app/src/main/java/cn/nekocode/gank/broadcast/BroadcastCallAdapter.kt

@@ -17,7 +17,7 @@
 package cn.nekocode.gank.broadcast
 
 import android.content.Intent
-import android.support.v4.content.LocalBroadcastManager
+import androidx.localbroadcastmanager.content.LocalBroadcastManager
 
 import cn.nekocode.meepo.CallMethod
 import cn.nekocode.meepo.MeepoUtils

app/src/main/java/cn/nekocode/gank/ui/home/MainActivity.kt

@@ -54,8 +54,8 @@ class MainActivity : BaseActivity() {
         }, BroadcastRouter.FETCH_SUC)
     }
 
-    override fun onSaveInstanceState(outState: Bundle?) {
+    override fun onSaveInstanceState(outState: Bundle) {
         super.onSaveInstanceState(outState)
-        outState?.let { StateSaver.saveInstanceState(this, it) }
+        StateSaver.saveInstanceState(this, outState)
     }
 }

app/src/main/java/cn/nekocode/gank/ui/pic/PicActivity.kt

@@ -72,8 +72,8 @@ class PicActivity : BaseActivity() {
             })
     }
 
-    override fun onSaveInstanceState(outState: Bundle?) {
+    override fun onSaveInstanceState(outState: Bundle) {
         super.onSaveInstanceState(outState)
-        outState?.let { StateSaver.saveInstanceState(this, it) }
+        StateSaver.saveInstanceState(this, outState)
     }
 }

app/src/main/res/layout/activity_main.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout
+<androidx.constraintlayout.widget.ConstraintLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
@@ -20,4 +20,4 @@
         tools:text="@string/fetch_pic"
         />
 
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/activity_pic.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout
+<androidx.constraintlayout.widget.ConstraintLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
@@ -18,4 +18,4 @@
         app:layout_constraintTop_toTopOf="parent"
         />
 
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>

gradle.properties

@@ -1,2 +1,5 @@
 # Enables official code style in IDEA https://kotlinlang.org/docs/reference/coding-conventions.html
 kotlin.code.style=official
+
+android.enableJetifier=true
+android.useAndroidX=true