Migrate to AndroidX

minSdkVersion:14 targetSdkVersion:30 compileSdkVersion:30 buildToolsVersion:30.0.2
AndroidKnife · Oct 20, 2020 · 66133ca · 66133ca
1 parent 414496b
commit 66133ca
Show file tree

Hide file tree

Showing 7 changed files with 35 additions and 33 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -20,11 +20,11 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile project(path: ':rxbus')
-    compile deps.androidannotations
-    compile deps.appcompatV7
-    compile deps.design
-
-    testCompile deps.junit
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation project(path: ':rxbus')
+    implementation deps.androidannotations
+    implementation deps.appcompatV7
+    implementation deps.design
+    implementation deps.timber
+    testImplementation deps.junit
 }
diff --git a/app/src/main/java/com/hwangjr/rxbus/app/MainActivity.java b/app/src/main/java/com/hwangjr/rxbus/app/MainActivity.java
@@ -1,10 +1,10 @@
 package com.hwangjr.rxbus.app;
 
 import android.os.Bundle;
-import android.support.design.widget.FloatingActionButton;
-import android.support.design.widget.Snackbar;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
+import com.google.android.material.snackbar.Snackbar;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -1,34 +1,34 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout 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"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:fitsSystemWindows="true"
     tools:context="com.hwangjr.rxbus.MainActivity">
 
-    <android.support.design.widget.AppBarLayout
+    <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:theme="@style/AppTheme.AppBarOverlay">
 
-        <android.support.v7.widget.Toolbar
+        <androidx.appcompat.widget.Toolbar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
             android:background="?attr/colorPrimary"
             app:popupTheme="@style/AppTheme.PopupOverlay" />
 
-    </android.support.design.widget.AppBarLayout>
+    </com.google.android.material.appbar.AppBarLayout>
 
     <include layout="@layout/content_main" />
 
-    <android.support.design.widget.FloatingActionButton
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/fab"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="bottom|end"
         android:layout_margin="@dimen/fab_margin"
         android:src="@android:drawable/ic_dialog_email" />
 
-</android.support.design.widget.CoordinatorLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/build.gradle b/build.gradle
@@ -25,10 +25,10 @@ task clean(type: Delete) {
 }
 
 ext {
-    minSdkVersion = 9
-    targetSdkVersion = 26
-    compileSdkVersion = 26
-    buildToolsVersion = '27.0.3'
+    minSdkVersion = 14
+    targetSdkVersion = 30
+    compileSdkVersion = 30
+    buildToolsVersion = '30.0.2'
     sourceCompatibilityVersion = JavaVersion.VERSION_1_8
     targetCompatibilityVersion = JavaVersion.VERSION_1_8
 }
@@ -40,9 +40,9 @@ ext.deps = [
         robolectric       : 'org.robolectric:robolectric:3.0',
 
         // dependencies
-        appcompatV7       : 'com.android.support:appcompat-v7:25.4.0',
-        androidannotations: 'com.android.support:support-annotations:25.4.0',
-        design            : 'com.android.support:design:25.4.0',
+        appcompatV7       : 'androidx.appcompat:appcompat:1.0.0',
+        androidannotations: 'androidx.annotation:annotation:1.0.0',
+        design            : 'com.google.android.material:material:1.0.0',
 
         rxandroid         : 'io.reactivex:rxandroid:1.2.1',
         rxjava            : 'io.reactivex:rxjava:1.3.4',

diff --git a/gradle.properties b/gradle.properties
@@ -13,4 +13,6 @@ POM_LICENCE_URL=http://www.apache.org/licenses/LICENSE-2.0.txt
 POM_LICENCE_DIST=repo
 
 POM_DEVELOPER_ID=hwangjr
-POM_DEVELOPER_NAME=HwangJR
+POM_DEVELOPER_NAME=HwangJR
+android.useAndroidX=true
+android.enableJetifier=true
diff --git a/rxbus/build.gradle b/rxbus/build.gradle
@@ -12,14 +12,14 @@ android {
 }
 
 dependencies {
-    testCompile deps.junit
-    testCompile deps.assertjcore
-    testCompile deps.robolectric
+    testImplementation deps.junit
+    testImplementation deps.assertjcore
+    testImplementation deps.robolectric
 
-    compile deps.rxjava
-    compile deps.rxandroid
-    compile deps.timber
-    compile deps.androidannotations
+    implementation deps.rxjava
+    implementation deps.rxandroid
+    implementation deps.timber
+    implementation deps.androidannotations
 }
 
 apply from: rootProject.file('gradle/gradle-mvn-push.gradle')
diff --git a/rxbus/src/main/java/com/hwangjr/rxbus/RxBusOlder.java b/rxbus/src/main/java/com/hwangjr/rxbus/RxBusOlder.java
@@ -1,6 +1,6 @@
 package com.hwangjr.rxbus;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import java.util.ArrayList;
 import java.util.List;