Jetifier support (#749)

uber · Nov 5, 2018 · 77699c4 · 77699c4
1 parent d8d3247
commit 77699c4
Show file tree

Hide file tree

Showing 48 changed files with 330 additions and 143 deletions.
diff --git a/another-app/build.gradle b/another-app/build.gradle
@@ -34,8 +34,7 @@ android {
 }
 
 dependencies {
-    implementation deps.support.appCompat
-    implementation deps.support.v4
+    implementation deps.androidx.appCompat
     implementation project(":libraries:javalibrary")
     implementation project(":libraries:emptylibrary")
     implementation project(":libraries:parcelable")

diff --git a/another-app/proguard-android.txt b/another-app/proguard-android.txt
@@ -27,13 +27,6 @@
 -keepattributes SourceFile,LineNumberTable
 -renamesourcefileattribute SourceFile
 
--keep public class com.google.vending.licensing.ILicensingService
--keep public class com.android.vending.licensing.ILicensingService
--keep public class com.google.android.vending.licensing.ILicensingService
--dontnote com.android.vending.licensing.ILicensingService
--dontnote com.google.vending.licensing.ILicensingService
--dontnote com.google.android.vending.licensing.ILicensingService
-
 # For native methods, see http://proguard.sourceforge.net/manual/examples.html#native
 -keepclasseswithmembernames class * {
     native <methods>;
@@ -73,27 +66,4 @@
     @android.webkit.JavascriptInterface <methods>;
 }
 
-# The support libraries contains references to newer platform versions.
-# Don't warn about those in case this app is linking against an older
-# platform version. We know about them, and they are safe.
--dontnote android.support.**
--dontwarn android.support.**
-
-# Understand the @Keep support annotation.
--keep class android.support.annotation.Keep
-
--keep @android.support.annotation.Keep class * {*;}
-
--keepclasseswithmembers class * {
-    @android.support.annotation.Keep <methods>;
-}
-
--keepclasseswithmembers class * {
-    @android.support.annotation.Keep <fields>;
-}
-
--keepclasseswithmembers class * {
-    @android.support.annotation.Keep <init>(...);
-}
-
 -dontwarn java.lang.invoke.**
diff --git a/another-app/src/com/uber/okbuck/example/anotherapp/CustomView.java b/another-app/src/com/uber/okbuck/example/anotherapp/CustomView.java
@@ -1,7 +1,7 @@
 package com.uber.okbuck.example.anotherapp;
 
 import android.content.Context;
-import android.support.v7.widget.AppCompatTextView;
+import androidx.appcompat.widget.AppCompatTextView;
 import android.util.AttributeSet;
 
 public class CustomView extends AppCompatTextView {

diff --git a/another-app/src/com/uber/okbuck/example/anotherapp/MainActivity.java b/another-app/src/com/uber/okbuck/example/anotherapp/MainActivity.java
@@ -1,7 +1,7 @@
 package com.uber.okbuck.example.anotherapp;
 
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -27,7 +27,7 @@ protected void onCreate(Bundle savedInstanceState) {
   }
 
   void mTvTest() {
-    Log.d("TEST", "" + android.support.v7.appcompat.R.color.button_material_light);
+    Log.d("TEST", "" + androidx.appcompat.R.color.button_material_light);
     mTvTest.setText(
         new StringBuilder()
             .append("1 + 2 = ")

diff --git a/app/build.gradle b/app/build.gradle
@@ -1,6 +1,5 @@
 apply plugin: "com.android.application"
 apply plugin: "com.jakewharton.butterknife"
-apply plugin: "com.squareup.sqldelight"
 
 android {
     defaultConfig {
@@ -9,7 +8,7 @@ android {
         buildConfigField "boolean", "CAN_JUMP", "true"
         buildConfigField "boolean", "XLOG_ENABLED", "true"
         buildConfigField "int", "EXOPACKAGE_FLAGS", "0"
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
         // If app doesn"t specify dimensions, use missingDimensionStrategy
         // https://developer.android.com/studio/build/gradle-plugin-3-0-0-migration.html#resolve_matching_errors
@@ -61,10 +60,10 @@ dependencies {
     implementation deps.external.rxjava
     implementation deps.external.rxandroid
     implementation deps.external.rxPermissions
-    implementation deps.support.multidex
+    implementation deps.androidx.multidex
     implementation deps.external.butterKnife
-    implementation deps.support.design
-    implementation deps.support.recyclerView
+    implementation deps.androidx.material
+    implementation deps.androidx.recyclerView
     implementation deps.external.leakCanary
     implementation deps.external.xlogAndroidIdle
 
@@ -80,9 +79,10 @@ dependencies {
 
     testImplementation deps.test.junit
     testImplementation deps.test.mockito
-    testImplementation deps.support.annotations
+    testImplementation deps.androidx.annotations
 
     androidTestImplementation deps.test.espressoCore
+    androidTestImplementation deps.test.espressoRules
     androidTestImplementation deps.test.espressoRunner
 }
 

diff --git a/app/src/androidTest/AndroidManifest.xml b/app/src/androidTest/AndroidManifest.xml
@@ -3,7 +3,7 @@
     <application />
 
     <instrumentation
-        android:name="android.support.test.runner.AndroidJUnitRunner"
+        android:name="androidx.test.runner.AndroidJUnitRunner"
         android:targetPackage="com.uber.okbuck.example.demo.debug" />
 
 </manifest>
diff --git a/app/src/androidTest/java/com/uber/okbuck/example/test/MainActivityTest.java b/app/src/androidTest/java/com/uber/okbuck/example/test/MainActivityTest.java
@@ -1,13 +1,13 @@
 package com.uber.okbuck.example.test;
 
-import static android.support.test.espresso.Espresso.onView;
-import static android.support.test.espresso.assertion.ViewAssertions.matches;
-import static android.support.test.espresso.matcher.ViewMatchers.withId;
-import static android.support.test.espresso.matcher.ViewMatchers.withText;
+import static androidx.test.espresso.Espresso.onView;
+import static androidx.test.espresso.assertion.ViewAssertions.matches;
+import static androidx.test.espresso.matcher.ViewMatchers.withId;
+import static androidx.test.espresso.matcher.ViewMatchers.withText;
 import static junit.framework.Assert.assertEquals;
 
-import android.support.test.rule.ActivityTestRule;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.rule.ActivityTestRule;
+import androidx.test.runner.AndroidJUnit4;
 import com.uber.okbuck.example.MainActivity;
 import com.uber.okbuck.example.R;
 import org.junit.Rule;

diff --git a/app/src/main/java/com/uber/okbuck/example/AppShell.java b/app/src/main/java/com/uber/okbuck/example/AppShell.java
@@ -1,6 +1,6 @@
 package com.uber.okbuck.example;
 
-import android.support.multidex.MultiDex;
+import androidx.multidex.MultiDex;
 import android.widget.Toast;
 import com.facebook.buck.android.support.exopackage.ExopackageApplication;
 import com.uber.okbuck.example.common.Calc;

diff --git a/app/src/main/java/com/uber/okbuck/example/CollapsingAppBarActivity.java b/app/src/main/java/com/uber/okbuck/example/CollapsingAppBarActivity.java
@@ -2,18 +2,21 @@
 
 import android.content.Context;
 import android.os.Bundle;
-import android.support.design.widget.AppBarLayout;
-import android.support.design.widget.CoordinatorLayout;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.coordinatorlayout.widget.CoordinatorLayout;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import com.google.android.material.appbar.AppBarLayout;
+
 public class CollapsingAppBarActivity extends AppCompatActivity {
   private final float APP_BAR_AUTO_COLLAPSE_RATION = 0.3F;
   RecyclerView mRecyclerView;

diff --git a/app/src/main/java/com/uber/okbuck/example/CustomView.java b/app/src/main/java/com/uber/okbuck/example/CustomView.java
@@ -1,7 +1,7 @@
 package com.uber.okbuck.example;
 
 import android.content.Context;
-import android.support.v7.widget.AppCompatTextView;
+import androidx.appcompat.widget.AppCompatTextView;
 import android.util.AttributeSet;
 
 public class CustomView extends AppCompatTextView {

diff --git a/app/src/main/java/com/uber/okbuck/example/MainActivity.java b/app/src/main/java/com/uber/okbuck/example/MainActivity.java
@@ -5,7 +5,7 @@
 import android.content.ServiceConnection;
 import android.os.Bundle;
 import android.os.IBinder;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.util.Log;
 import android.view.View;
 import android.widget.TextView;
@@ -21,8 +21,6 @@
 import com.uber.okbuck.example.dummylibrary.DummyActivity;
 import com.uber.okbuck.example.dummylibrary.DummyAndroidClass;
 import com.uber.okbuck.example.javalib.DummyJavaClass;
-import com.uber.okbuck.example.sqldelightmodel.GithubRepo;
-import com.uber.okbuck.example.sqldelightmodel.GithubUser;
 import com.uber.okbuck.java.Pojo;
 import com.uber.okbuck.kotlin.KotlinDataClass;
 import io.reactivex.Observer;
@@ -107,10 +105,6 @@ public void onNext(String path) {
               @Override
               public void onSubscribe(Disposable disposable) {}
             });
-    GithubUser user = GithubUser.create(100, "OkBuck");
-    Toast.makeText(this, user.login(), Toast.LENGTH_SHORT).show();
-    GithubRepo repo = GithubRepo.create(100, "OkBuck", "auto buck");
-    Toast.makeText(this, repo.name() + ": " + repo.description(), Toast.LENGTH_SHORT).show();
 
     KotlinDataClass data = new KotlinDataClass("foo", com.uber.okbuck.kotlin.android.R.string.foo);
     Pojo pojo = new Pojo();

diff --git a/app/src/main/java/com/uber/okbuck/example/MyApp.java b/app/src/main/java/com/uber/okbuck/example/MyApp.java
@@ -1,7 +1,7 @@
 package com.uber.okbuck.example;
 
 import android.app.Application;
-import android.support.v7.app.AppCompatDelegate;
+import androidx.appcompat.app.AppCompatDelegate;
 import com.facebook.buck.android.support.exopackage.DefaultApplicationLike;
 import com.github.promeg.xlog_android.lib.XLogConfig;
 import com.squareup.leakcanary.LeakCanary;

diff --git a/app/src/main/res/layout/activity_collapsing_app_bar.xml b/app/src/main/res/layout/activity_collapsing_app_bar.xml
@@ -14,13 +14,13 @@
         android:layout_height="44dp"
         app:layout_scrollFlags="scroll|enterAlways" />
 
-    <android.support.design.widget.CoordinatorLayout
+    <androidx.coordinatorlayout.widget.CoordinatorLayout
         android:id="@+id/mCoordinatorLayout"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical">
 
-        <android.support.design.widget.AppBarLayout
+        <com.google.android.material.appbar.AppBarLayout
             android:id="@+id/mAppBarLayout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -32,13 +32,13 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 app:layout_scrollFlags="scroll" />
-        </android.support.design.widget.AppBarLayout>
+        </com.google.android.material.appbar.AppBarLayout>
 
-        <android.support.v7.widget.RecyclerView
+        <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/mRecyclerView"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             app:layout_behavior="@string/appbar_scrolling_view_behavior"
             tools:listitem="@layout/ui_recycler_view_horizontal_item" />
-    </android.support.design.widget.CoordinatorLayout>
+    </androidx.coordinatorlayout.widget.CoordinatorLayout>
 </LinearLayout>
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -4,7 +4,7 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <android.support.v7.widget.AppCompatTextView
+    <androidx.appcompat.widget.AppCompatTextView
         android:id="@+id/mTextView"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"

diff --git a/build.gradle b/build.gradle
@@ -18,6 +18,9 @@ buildscript {
     }
     configurations.all {
         exclude group:"com.android.tools.build", module: "transform-api"
+        resolutionStrategy {
+            force "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${deps.versions.kotlin}"
+        }
     }
 }
 
@@ -33,6 +36,9 @@ allprojects { project ->
     }
     configurations.all {
         exclude group:"com.android.tools.build", module: "transform-api"
+        resolutionStrategy {
+            force "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${deps.versions.kotlin}"
+        }
     }
 }
 
@@ -113,10 +119,15 @@ def addCommonConfigurationForAndroidModules(Project project) {
 
     if (project.plugins.hasPlugin("com.squareup.sqldelight")) {
         variants.all {
-            Task okbuckTask = project.tasks.getByName("okbuck")
-            Task sqlDelightTask = project.tasks.getByName("generate${it.name.capitalize()}SqlDelightInterface")
-            okbuckTask.dependsOn(sqlDelightTask)
-            project.android.sourceSets."${it.name}".java.srcDirs += [sqlDelightTask.outputs.files[0] as String]
+
+            project.android.sourceSets."${it.name}".java.srcDir project.file("build/generated/source/sqldelight")
+            project.android.sourceSets."${it.name}".kotlin.srcDir project.file("build/generated/source/sqldelight")
+
+            project.afterEvaluate { proj ->
+                Task okbuckTask = proj.tasks.getByName("okbuck")
+                Task sqlDelightTask = proj.tasks.getByName("generate${it.name.capitalize()}SqlDelightInterface")
+                okbuckTask.dependsOn(sqlDelightTask)
+            }
         }
     }
 }
@@ -131,7 +142,7 @@ okbuck {
             "app": [
                     "^com/uber/okbuck/example/AppShell^",
                     "^com/uber/okbuck/example/BuildConfig^",
-                    "^android/support/multidex/",
+                    "^androidx/multidex/",
                     "^com/facebook/buck/android/support/exopackage/",
                     "^com/github/promeg/xlog_android/lib/XLogConfig^",
                     "^com/squareup/leakcanary/LeakCanary^",
@@ -145,19 +156,19 @@ okbuck {
     appLibDependencies = [
             "appProd": [
                     "buck-android-support",
-                    "com.android.support:multidex",
+                    "androidx.multidex:multidex",
                     "libraries/javalibrary:main",
                     "libraries/common:paidRelease",
             ],
             "appDev" : [
                     "buck-android-support",
-                    "com.android.support:multidex",
+                    "androidx.multidex:multidex",
                     "libraries/javalibrary:main",
                     "libraries/common:freeDebug",
             ],
             "appDemo": [
                     "buck-android-support",
-                    "com.android.support:multidex",
+                    "androidx.multidex:multidex",
                     "libraries/javalibrary:main",
                     "libraries/common:paidRelease",
             ]
@@ -207,6 +218,7 @@ okbuck {
             "com.android.tools.build:manifest-merger",
             "com.android.tools:dvlib",
             "org.ow2.asm:asm",
+            "org.ow2.asm:asm-commons",
             "com.google.protobuf:protobuf-java",
             "commons-codec:commons-codec",
             "com.google.errorprone:error_prone_annotations",
@@ -232,6 +244,7 @@ okbuck {
             "com.android.tools:annotations",
             "com.android.tools.build:builder-test-api",
             "org.apache.httpcomponents:httpmime",
+            "androidx.annotation:annotation",
         ]
         allowAllVersions = [
             "org.robolectric:android-all",