Merge pull request #67 from livefront/update-to-androidx

Update to AndroidX
livefront · Mar 16, 2021 · c55d4a1 · c55d4a1
2 parents 15a55e6 + 475b3cb
commit c55d4a1
Show file tree

Hide file tree

Showing 45 changed files with 119 additions and 97 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,10 +4,15 @@ android:
   components:
     - tools
     - platform-tools
-    - build-tools-28.0.3
-    - android-28
+    - build-tools-30.0.3
+    - android-30
     - android-22
     - sys-img-armeabi-v7a-android-22
+  licenses:
+    - 'android-sdk-license-.+'
+
+before_install:
+  - yes | sdkmanager "platforms;android-30"
 
 # Emulator Management: Create, Start and Wait
 before_script:

diff --git a/bridge/build.gradle b/bridge/build.gradle
@@ -1,11 +1,11 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 28
-    buildToolsVersion "28.0.3"
+    compileSdkVersion 30
+    buildToolsVersion "30.0.3"
     defaultConfig {
         minSdkVersion 14
-        targetSdkVersion 28
+        targetSdkVersion 30
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
@@ -18,10 +18,10 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'com.android.support:appcompat-v7:28.0.0'
+    implementation 'androidx.annotation:annotation:1.1.0'
 
-    androidTestImplementation 'androidx.test:runner:1.2.0'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
+    androidTestImplementation 'androidx.test:runner:1.3.0'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.2'
 }
 
 // build a jar with source files

diff --git a/bridge/src/androidTest/java/com/livefront/bridge/BridgeTest.java b/bridge/src/androidTest/java/com/livefront/bridge/BridgeTest.java
@@ -5,9 +5,9 @@
 import static org.junit.Assert.assertTrue;
 
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.test.platform.app.InstrumentationRegistry;
 
 import com.livefront.bridge.helper.Data;

diff --git a/bridge/src/androidTest/java/com/livefront/bridge/helper/Data.java b/bridge/src/androidTest/java/com/livefront/bridge/helper/Data.java
@@ -2,7 +2,8 @@
 
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
+
+import androidx.annotation.NonNull;
 
 import java.util.Objects;
 

diff --git a/bridge/src/androidTest/java/com/livefront/bridge/helper/SampleTarget.java b/bridge/src/androidTest/java/com/livefront/bridge/helper/SampleTarget.java
@@ -1,8 +1,9 @@
 package com.livefront.bridge.helper;
 
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import java.util.Objects;
 

diff --git a/bridge/src/androidTest/java/com/livefront/bridge/helper/Saveable.java b/bridge/src/androidTest/java/com/livefront/bridge/helper/Saveable.java
@@ -1,8 +1,9 @@
 package com.livefront.bridge.helper;
 
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 /**
  * Simple interface that can be implemented by test classes and checked inside a

diff --git a/bridge/src/main/java/com/livefront/bridge/ActivityLifecycleCallbacksAdapter.java b/bridge/src/main/java/com/livefront/bridge/ActivityLifecycleCallbacksAdapter.java
@@ -2,9 +2,7 @@
 
 import android.app.Activity;
 import android.app.Application.ActivityLifecycleCallbacks;
-import android.os.Build;
 import android.os.Bundle;
-import android.support.annotation.RequiresApi;
 
 abstract class ActivityLifecycleCallbacksAdapter implements ActivityLifecycleCallbacks {
 

diff --git a/bridge/src/main/java/com/livefront/bridge/Bridge.java b/bridge/src/main/java/com/livefront/bridge/Bridge.java
@@ -4,10 +4,11 @@
 import android.os.Build.VERSION_CODES;
 import android.os.Bundle;
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
 import android.view.View;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 public class Bridge {
 
     private static volatile BridgeDelegate sDelegate;

diff --git a/bridge/src/main/java/com/livefront/bridge/BridgeDelegate.java b/bridge/src/main/java/com/livefront/bridge/BridgeDelegate.java
@@ -9,10 +9,11 @@
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
 import android.view.View;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 import com.livefront.bridge.disk.DiskHandler;
 import com.livefront.bridge.disk.FileDiskHandler;
 import com.livefront.bridge.util.BundleUtil;

diff --git a/bridge/src/main/java/com/livefront/bridge/NoOpSavedStateHandler.java b/bridge/src/main/java/com/livefront/bridge/NoOpSavedStateHandler.java
@@ -1,8 +1,9 @@
 package com.livefront.bridge;
 
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 class NoOpSavedStateHandler implements SavedStateHandler {
 

diff --git a/bridge/src/main/java/com/livefront/bridge/SavedStateHandler.java b/bridge/src/main/java/com/livefront/bridge/SavedStateHandler.java
@@ -1,8 +1,9 @@
 package com.livefront.bridge;
 
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 /**
  * A handler for generic, non-{@link android.view.View} objects. To save the state of Views, see

diff --git a/bridge/src/main/java/com/livefront/bridge/ViewSavedStateHandler.java b/bridge/src/main/java/com/livefront/bridge/ViewSavedStateHandler.java
@@ -1,10 +1,11 @@
 package com.livefront.bridge;
 
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
 import android.view.View;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 /**
  * A handler specifically for saving and restoring the state of {@link android.view.View} objects.
  */

diff --git a/bridge/src/main/java/com/livefront/bridge/disk/DiskHandler.java b/bridge/src/main/java/com/livefront/bridge/disk/DiskHandler.java
@@ -1,7 +1,7 @@
 package com.livefront.bridge.disk;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 /**
  * A simple interface for managing the storage and retrieval of data to and from disk. All calls

diff --git a/bridge/src/main/java/com/livefront/bridge/disk/FileDiskHandler.java b/bridge/src/main/java/com/livefront/bridge/disk/FileDiskHandler.java
@@ -1,8 +1,9 @@
 package com.livefront.bridge.disk;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import java.io.File;
 import java.io.FileInputStream;

diff --git a/bridge/src/main/java/com/livefront/bridge/util/BundleUtil.java b/bridge/src/main/java/com/livefront/bridge/util/BundleUtil.java
@@ -2,9 +2,10 @@
 
 import android.os.Bundle;
 import android.os.Parcel;
-import android.support.annotation.NonNull;
 import android.util.Base64;
 
+import androidx.annotation.NonNull;
+
 /**
  * Helper class for converting {@link Bundle} instances to and from bytes and encoded Strings.
  */

diff --git a/bridge/src/main/java/com/livefront/bridge/wrapper/BitmapWrapper.java b/bridge/src/main/java/com/livefront/bridge/wrapper/BitmapWrapper.java
@@ -3,7 +3,8 @@
 import android.graphics.Bitmap;
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
+
+import androidx.annotation.NonNull;
 
 import java.nio.ByteBuffer;
 

diff --git a/bridge/src/main/java/com/livefront/bridge/wrapper/WrapperUtils.java b/bridge/src/main/java/com/livefront/bridge/wrapper/WrapperUtils.java
@@ -3,7 +3,8 @@
 import android.graphics.Bitmap;
 import android.os.Bundle;
 import android.os.Parcel;
-import android.support.annotation.NonNull;
+
+import androidx.annotation.NonNull;
 
 import java.util.Set;
 

diff --git a/bridgesample/build.gradle b/bridgesample/build.gradle
@@ -4,11 +4,11 @@ apply plugin: 'kotlin-android-extensions'
 apply plugin: 'kotlin-kapt'
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 30
     defaultConfig {
         applicationId "com.livefront.bridgesample"
         minSdkVersion 21
-        targetSdkVersion 28
+        targetSdkVersion 30
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -26,8 +26,7 @@ androidExtensions {
     experimental = true
 }
 
-def stateSaverVersion = "1.3.1"
-def supportLibraryVersion = '28.0.0'
+def stateSaverVersion = "1.4.1"
 
 dependencies {
     // Kotlin
@@ -40,14 +39,17 @@ dependencies {
     implementation "com.evernote:android-state:$stateSaverVersion"
     kapt "com.evernote:android-state-processor:$stateSaverVersion"
 
-    // Support Library
-    implementation "com.android.support:appcompat-v7:$supportLibraryVersion"
-    implementation "com.android.support:design:$supportLibraryVersion"
-    implementation "com.android.support:recyclerview-v7:$supportLibraryVersion"
+    // AndroidX
+    implementation 'androidx.appcompat:appcompat:1.2.0'
+    implementation 'androidx.fragment:fragment:1.3.1'
+    implementation 'androidx.recyclerview:recyclerview:1.1.0'
 
-    androidTestImplementation 'com.android.support.test.uiautomator:uiautomator-v18:2.1.3'
-    androidTestImplementation 'androidx.test:runner:1.2.0'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
-    androidTestImplementation 'androidx.test.ext:junit-ktx:1.1.1'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
+    // Material
+    implementation 'com.google.android.material:material:1.3.0'
+
+    androidTestImplementation 'androidx.test:runner:1.3.0'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.2'
+    androidTestImplementation 'androidx.test.ext:junit-ktx:1.1.2'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
+    androidTestImplementation 'androidx.test.uiautomator:uiautomator:2.2.0'
 }
diff --git a/...rc/androidTest/java/com/livefront/bridgesample/scenario/activity/LargeDataActivityTest.kt b/...rc/androidTest/java/com/livefront/bridgesample/scenario/activity/LargeDataActivityTest.kt
@@ -1,18 +1,17 @@
 package com.livefront.bridgesample.scenario.activity
 
 import android.graphics.Bitmap
-import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.espresso.Espresso.onView
 import androidx.test.espresso.Espresso.pressBack
 import androidx.test.espresso.action.ViewActions.click
 import androidx.test.espresso.matcher.ViewMatchers.withId
 import androidx.test.ext.junit.rules.ActivityScenarioRule
+import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.platform.app.InstrumentationRegistry
 import com.livefront.bridgesample.R
 import com.livefront.bridgesample.util.getCurrentActivity
 import org.junit.Assert.assertTrue
 import org.junit.Rule
-
 import org.junit.Test
 import org.junit.runner.RunWith
 

diff --git a/...dTest/java/com/livefront/bridgesample/scenario/activity/LargeDataBackstackActivityTest.kt b/...dTest/java/com/livefront/bridgesample/scenario/activity/LargeDataBackstackActivityTest.kt
@@ -1,14 +1,14 @@
 package com.livefront.bridgesample.scenario.activity
 
 import android.graphics.Bitmap
-import android.support.test.uiautomator.UiDevice
 import androidx.test.espresso.Espresso.onView
 import androidx.test.espresso.Espresso.pressBack
 import androidx.test.espresso.action.ViewActions.click
 import androidx.test.espresso.matcher.ViewMatchers.withId
 import androidx.test.ext.junit.rules.ActivityScenarioRule
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.platform.app.InstrumentationRegistry
+import androidx.test.uiautomator.UiDevice
 import com.livefront.bridgesample.R
 import com.livefront.bridgesample.util.getCurrentActivity
 import org.junit.Assert.assertTrue

diff --git a/bridgesample/src/main/java/com/livefront/bridgesample/base/BridgeBaseActivity.kt b/bridgesample/src/main/java/com/livefront/bridgesample/base/BridgeBaseActivity.kt
@@ -1,7 +1,7 @@
 package com.livefront.bridgesample.base
 
 import android.os.Bundle
-import android.support.v7.app.AppCompatActivity
+import androidx.appcompat.app.AppCompatActivity
 import com.livefront.bridge.Bridge
 
 abstract class BridgeBaseActivity : AppCompatActivity() {

diff --git a/bridgesample/src/main/java/com/livefront/bridgesample/base/BridgeBaseFragment.kt b/bridgesample/src/main/java/com/livefront/bridgesample/base/BridgeBaseFragment.kt
@@ -1,8 +1,8 @@
 package com.livefront.bridgesample.base
 
 import android.os.Bundle
-import android.support.v4.app.Fragment
-import android.support.v4.app.FragmentStatePagerAdapter
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.FragmentStatePagerAdapter
 import com.livefront.bridge.Bridge
 
 abstract class BridgeBaseFragment : Fragment() {

diff --git a/bridgesample/src/main/java/com/livefront/bridgesample/base/NonBridgeBaseActivity.kt b/bridgesample/src/main/java/com/livefront/bridgesample/base/NonBridgeBaseActivity.kt
@@ -1,7 +1,7 @@
 package com.livefront.bridgesample.base
 
 import android.os.Bundle
-import android.support.v7.app.AppCompatActivity
+import androidx.appcompat.app.AppCompatActivity
 import com.evernote.android.state.StateSaver
 
 abstract class NonBridgeBaseActivity : AppCompatActivity() {

diff --git a/bridgesample/src/main/java/com/livefront/bridgesample/base/NonBridgeBaseFragment.kt b/bridgesample/src/main/java/com/livefront/bridgesample/base/NonBridgeBaseFragment.kt
@@ -1,7 +1,7 @@
 package com.livefront.bridgesample.base
 
 import android.os.Bundle
-import android.support.v4.app.Fragment
+import androidx.fragment.app.Fragment
 import com.evernote.android.state.StateSaver
 
 open class NonBridgeBaseFragment : Fragment() {

diff --git a/bridgesample/src/main/java/com/livefront/bridgesample/common/view/BitmapGeneratorView.kt b/bridgesample/src/main/java/com/livefront/bridgesample/common/view/BitmapGeneratorView.kt
@@ -4,9 +4,9 @@ import android.app.Activity
 import android.content.Context
 import android.content.Intent
 import android.graphics.Bitmap
-import android.support.annotation.StringRes
 import android.util.AttributeSet
 import android.widget.RelativeLayout
+import androidx.annotation.StringRes
 import com.livefront.bridgesample.R
 import com.livefront.bridgesample.scenario.activity.SuccessActivity
 import com.livefront.bridgesample.util.generateNoisyStripedBitmap

diff --git a/bridgesample/src/main/java/com/livefront/bridgesample/main/adapter/MainAdapter.kt b/bridgesample/src/main/java/com/livefront/bridgesample/main/adapter/MainAdapter.kt
@@ -1,7 +1,7 @@
 package com.livefront.bridgesample.main.adapter
 
-import android.support.v7.widget.RecyclerView
 import android.view.ViewGroup
+import androidx.recyclerview.widget.RecyclerView
 import com.livefront.bridgesample.R
 import com.livefront.bridgesample.main.adapter.MainAdapter.MainViewHolder
 import com.livefront.bridgesample.main.model.MainItem

diff --git a/bridgesample/src/main/java/com/livefront/bridgesample/main/model/MainItem.kt b/bridgesample/src/main/java/com/livefront/bridgesample/main/model/MainItem.kt
@@ -2,7 +2,7 @@ package com.livefront.bridgesample.main.model
 
 import android.content.Intent
 import android.os.Parcelable
-import android.support.annotation.StringRes
+import androidx.annotation.StringRes
 import kotlinx.android.parcel.Parcelize
 
 @Parcelize

diff --git a/bridgesample/src/main/java/com/livefront/bridgesample/main/view/MainItemView.kt b/bridgesample/src/main/java/com/livefront/bridgesample/main/view/MainItemView.kt
@@ -1,9 +1,9 @@
 package com.livefront.bridgesample.main.view
 
 import android.content.Context
-import android.support.annotation.DrawableRes
 import android.util.AttributeSet
 import android.widget.RelativeLayout
+import androidx.annotation.DrawableRes
 import com.livefront.bridgesample.R
 import com.livefront.bridgesample.util.layoutInflater
 import kotlinx.android.synthetic.main.view_main_item_content.view.descriptionView

diff --git a/bridgesample/src/main/java/com/livefront/bridgesample/scenario/activity/DeeplinkActivity.kt b/bridgesample/src/main/java/com/livefront/bridgesample/scenario/activity/DeeplinkActivity.kt
@@ -2,7 +2,7 @@ package com.livefront.bridgesample.scenario.activity
 
 import android.content.Intent
 import android.os.Bundle
-import android.support.v7.app.AppCompatActivity
+import androidx.appcompat.app.AppCompatActivity
 
 class DeeplinkActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {