Upgrade Navigation, AppCompat, Fragments, and Lifecycle

Upgrade to the latest releases: - Navigation 2.2.0-alpha01 - AppCompat 1.1.0-rc01 - Fragment 1.2.0-alpha02 - Lifecycle 2.2.0-alpha03 As Navigation and the -ktx modules are built with Java 8 bytecode, many of the projects now also use Java 8. Any times we were using a FrameLayout as a container for fragments, it has been switched to the new FragmentContainerView. This change also involves replacing the deprecated ViewModelProviders.of() with either `by viewModels()` or the `ViewModelProvider` constructor and removing all dependencies on lifecycle-extensions, which only contains deprecated classes at this point. Also took the opportunity to remove support.v4 from all projects as it was not being used anywhere. Test: ./run_all_tests.sh
android · Aug 8, 2019 · 8aa00a6 · arduia · Nov 11, 2019 · 8aa00a6
1 parent 7e86156
commit 8aa00a6
Show file tree

Hide file tree

Showing 39 changed files with 190 additions and 179 deletions.
diff --git a/BasicRxJavaSample/app/build.gradle b/BasicRxJavaSample/app/build.gradle
@@ -29,11 +29,10 @@ android {
 dependencies {
     // Support libraries
     implementation deps.support.app_compat
-    implementation deps.support.v4
+    implementation deps.support.fragment_runtime
     implementation deps.support.design
     // Architecture components
     implementation deps.lifecycle.runtime
-    implementation deps.lifecycle.extensions
     annotationProcessor deps.lifecycle.compiler
     implementation deps.room.runtime
     annotationProcessor deps.room.compiler
@@ -71,7 +70,6 @@ dependencies {
 
     // Resolve conflicts between main and test APK:
     androidTestImplementation deps.support.annotations
-    androidTestImplementation deps.support.v4
     androidTestImplementation deps.support.app_compat
     androidTestImplementation deps.support.design
 }
diff --git a/BasicRxJavaSample/app/src/main/java/com/example/android/observability/ui/UserActivity.java b/BasicRxJavaSample/app/src/main/java/com/example/android/observability/ui/UserActivity.java
@@ -16,15 +16,18 @@
 
 package com.example.android.observability.ui;
 
-import androidx.lifecycle.ViewModelProviders;
 import android.os.Bundle;
-import androidx.appcompat.app.AppCompatActivity;
 import android.util.Log;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.TextView;
+
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.lifecycle.ViewModelProvider;
+
 import com.example.android.observability.Injection;
 import com.example.android.persistence.R;
+
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.disposables.CompositeDisposable;
 import io.reactivex.schedulers.Schedulers;
@@ -59,7 +62,7 @@ protected void onCreate(Bundle savedInstanceState) {
         mUpdateButton = findViewById(R.id.update_user);
 
         mViewModelFactory = Injection.provideViewModelFactory(this);
-        mViewModel = ViewModelProviders.of(this, mViewModelFactory).get(UserViewModel.class);
+        mViewModel = new ViewModelProvider(this, mViewModelFactory).get(UserViewModel.class);
         mUpdateButton.setOnClickListener(v -> updateUserName());
     }
 

diff --git a/BasicRxJavaSample/versions.gradle b/BasicRxJavaSample/versions.gradle
@@ -23,6 +23,7 @@ ext.deps = [:]
 def versions = [:]
 versions.android_gradle_plugin = '3.4.0'
 versions.apache_commons = "2.5"
+versions.appcompat = "1.1.0-rc01"
 versions.arch_core = "2.0.1"
 versions.atsl_core = "1.1.0"
 versions.atsl_rules = "1.1.1"
@@ -34,17 +35,17 @@ versions.core_ktx = "1.0.0"
 versions.dagger = "2.16"
 versions.dexmaker = "2.2.0"
 versions.espresso = "3.1.1"
-versions.fragment = "1.1.0-alpha09"
+versions.fragment = "1.2.0-alpha02"
 versions.glide = "4.8.0"
 versions.hamcrest = "1.3"
 versions.junit = "4.12"
 versions.kotlin = "1.3.40"
-versions.lifecycle = "2.0.0"
+versions.lifecycle = "2.2.0-alpha03"
 versions.mockito = "2.25.0"
 versions.mockito_all = "1.10.19"
 versions.mockito_android = "2.25.0"
 versions.mockwebserver = "3.8.1"
-versions.navigation = "2.1.0-alpha04"
+versions.navigation = "2.2.0-alpha01"
 versions.okhttp_logging_interceptor = "3.9.0"
 versions.paging = "2.1.0-rc01"
 versions.retrofit = "2.3.0"
@@ -63,11 +64,10 @@ deps.benchmark_gradle = "androidx.benchmark:benchmark-gradle-plugin:$versions.be
 
 def support = [:]
 support.annotations = "androidx.annotation:annotation:$versions.support"
-support.app_compat = "androidx.appcompat:appcompat:$versions.support"
+support.app_compat = "androidx.appcompat:appcompat:$versions.appcompat"
 support.recyclerview = "androidx.recyclerview:recyclerview:$versions.support"
 support.cardview = "androidx.cardview:cardview:$versions.support"
 support.design = "com.google.android.material:material:$versions.support"
-support.v4 = "androidx.legacy:legacy-support-v4:$versions.support"
 support.core_utils = "androidx.legacy:legacy-support-core-utils:$versions.support"
 support.core_ktx = "androidx.core:core-ktx:$versions.core_ktx"
 support.fragment_runtime = "androidx.fragment:fragment:${versions.fragment}"
@@ -84,7 +84,6 @@ deps.room = room
 
 def lifecycle = [:]
 lifecycle.runtime = "androidx.lifecycle:lifecycle-runtime:$versions.lifecycle"
-lifecycle.extensions = "androidx.lifecycle:lifecycle-extensions:$versions.lifecycle"
 lifecycle.java8 = "androidx.lifecycle:lifecycle-common-java8:$versions.lifecycle"
 lifecycle.compiler = "androidx.lifecycle:lifecycle-compiler:$versions.lifecycle"
 lifecycle.viewmodel_ktx = "androidx.lifecycle:lifecycle-viewmodel-ktx:$versions.lifecycle"

diff --git a/BasicRxJavaSampleKotlin/app/build.gradle b/BasicRxJavaSampleKotlin/app/build.gradle
@@ -37,17 +37,23 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
 }
 
 dependencies {
     // Support libraries
     implementation deps.support.app_compat
-    implementation deps.support.v4
+    implementation deps.support.fragment_runtime_ktx
     implementation deps.support.design
 
     // Architecture components
     implementation deps.lifecycle.runtime
-    implementation deps.lifecycle.extensions
     kapt deps.lifecycle.compiler
     implementation deps.room.runtime
     kapt deps.room.compiler
@@ -87,7 +93,6 @@ dependencies {
 
     // Resolve conflicts between main and test APK:
     androidTestImplementation deps.support.annotations
-    androidTestImplementation deps.support.v4
     androidTestImplementation deps.support.app_compat
     androidTestImplementation deps.support.design
 }
diff --git a/...RxJavaSampleKotlin/app/src/main/java/com/example/android/observability/ui/UserActivity.kt b/...RxJavaSampleKotlin/app/src/main/java/com/example/android/observability/ui/UserActivity.kt
@@ -16,10 +16,10 @@
 
 package com.example.android.observability.ui
 
-import androidx.lifecycle.ViewModelProviders
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
 import android.util.Log
+import androidx.activity.viewModels
 import com.example.android.observability.Injection
 import com.example.android.observability.R
 import io.reactivex.android.schedulers.AndroidSchedulers
@@ -34,7 +34,7 @@ class UserActivity : AppCompatActivity() {
 
     private lateinit var viewModelFactory: ViewModelFactory
 
-    private lateinit var viewModel: UserViewModel
+    private val viewModel: UserViewModel by viewModels()
 
     private val disposable = CompositeDisposable()
 
@@ -43,7 +43,6 @@ class UserActivity : AppCompatActivity() {
         setContentView(R.layout.activity_user)
 
         viewModelFactory = Injection.provideViewModelFactory(this)
-        viewModel = ViewModelProviders.of(this, viewModelFactory).get(UserViewModel::class.java)
         update_user_button.setOnClickListener { updateUserName() }
     }
 

diff --git a/BasicRxJavaSampleKotlin/versions.gradle b/BasicRxJavaSampleKotlin/versions.gradle
@@ -23,6 +23,7 @@ ext.deps = [:]
 def versions = [:]
 versions.android_gradle_plugin = '3.4.0'
 versions.apache_commons = "2.5"
+versions.appcompat = "1.1.0-rc01"
 versions.arch_core = "2.0.1"
 versions.atsl_core = "1.1.0"
 versions.atsl_rules = "1.1.1"
@@ -34,17 +35,17 @@ versions.core_ktx = "1.0.0"
 versions.dagger = "2.16"
 versions.dexmaker = "2.2.0"
 versions.espresso = "3.1.1"
-versions.fragment = "1.1.0-alpha09"
+versions.fragment = "1.2.0-alpha02"
 versions.glide = "4.8.0"
 versions.hamcrest = "1.3"
 versions.junit = "4.12"
 versions.kotlin = "1.3.40"
-versions.lifecycle = "2.0.0"
+versions.lifecycle = "2.2.0-alpha03"
 versions.mockito = "2.25.0"
 versions.mockito_all = "1.10.19"
 versions.mockito_android = "2.25.0"
 versions.mockwebserver = "3.8.1"
-versions.navigation = "2.1.0-alpha04"
+versions.navigation = "2.2.0-alpha01"
 versions.okhttp_logging_interceptor = "3.9.0"
 versions.paging = "2.1.0-rc01"
 versions.retrofit = "2.3.0"
@@ -63,11 +64,10 @@ deps.benchmark_gradle = "androidx.benchmark:benchmark-gradle-plugin:$versions.be
 
 def support = [:]
 support.annotations = "androidx.annotation:annotation:$versions.support"
-support.app_compat = "androidx.appcompat:appcompat:$versions.support"
+support.app_compat = "androidx.appcompat:appcompat:$versions.appcompat"
 support.recyclerview = "androidx.recyclerview:recyclerview:$versions.support"
 support.cardview = "androidx.cardview:cardview:$versions.support"
 support.design = "com.google.android.material:material:$versions.support"
-support.v4 = "androidx.legacy:legacy-support-v4:$versions.support"
 support.core_utils = "androidx.legacy:legacy-support-core-utils:$versions.support"
 support.core_ktx = "androidx.core:core-ktx:$versions.core_ktx"
 support.fragment_runtime = "androidx.fragment:fragment:${versions.fragment}"
@@ -84,7 +84,6 @@ deps.room = room
 
 def lifecycle = [:]
 lifecycle.runtime = "androidx.lifecycle:lifecycle-runtime:$versions.lifecycle"
-lifecycle.extensions = "androidx.lifecycle:lifecycle-extensions:$versions.lifecycle"
 lifecycle.java8 = "androidx.lifecycle:lifecycle-common-java8:$versions.lifecycle"
 lifecycle.compiler = "androidx.lifecycle:lifecycle-compiler:$versions.lifecycle"
 lifecycle.viewmodel_ktx = "androidx.lifecycle:lifecycle-viewmodel-ktx:$versions.lifecycle"

diff --git a/BasicSample/app/build.gradle b/BasicSample/app/build.gradle
@@ -58,13 +58,12 @@ android {
 dependencies {
     // Support libraries
     implementation deps.support.app_compat
-    implementation deps.support.v4
+    implementation deps.support.fragment_runtime
     implementation deps.support.design
     implementation deps.support.cardview
 
     // Architecture components
     implementation deps.lifecycle.runtime
-    implementation deps.lifecycle.extensions
     annotationProcessor deps.lifecycle.compiler
     implementation deps.room.runtime
     annotationProcessor deps.room.compiler
@@ -83,7 +82,6 @@ dependencies {
 
     // Resolve conflicts between main and test APK:
     androidTestImplementation deps.support.annotations
-    androidTestImplementation deps.support.v4
     androidTestImplementation deps.support.app_compat
     androidTestImplementation deps.support.design
 }
diff --git a/BasicSample/app/src/main/java/com/example/android/persistence/ui/ProductFragment.java b/BasicSample/app/src/main/java/com/example/android/persistence/ui/ProductFragment.java
@@ -16,16 +16,17 @@
 
 package com.example.android.persistence.ui;
 
-import androidx.lifecycle.Observer;
-import androidx.lifecycle.ViewModelProviders;
-import androidx.databinding.DataBindingUtil;
 import android.os.Bundle;
-import androidx.annotation.Nullable;
-import androidx.fragment.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
+import androidx.annotation.Nullable;
+import androidx.databinding.DataBindingUtil;
+import androidx.fragment.app.Fragment;
+import androidx.lifecycle.Observer;
+import androidx.lifecycle.ViewModelProvider;
+
 import com.example.android.persistence.R;
 import com.example.android.persistence.databinding.ProductFragmentBinding;
 import com.example.android.persistence.db.entity.CommentEntity;
@@ -69,9 +70,9 @@ public void onActivityCreated(@Nullable Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
 
         ProductViewModel.Factory factory = new ProductViewModel.Factory(
-                getActivity().getApplication(), getArguments().getInt(KEY_PRODUCT_ID));
+                requireActivity().getApplication(), getArguments().getInt(KEY_PRODUCT_ID));
 
-        final ProductViewModel model = ViewModelProviders.of(this, factory)
+        final ProductViewModel model = new ViewModelProvider(this, factory)
                 .get(ProductViewModel.class);
 
         mBinding.setProductViewModel(model);

diff --git a/BasicSample/app/src/main/java/com/example/android/persistence/ui/ProductListFragment.java b/BasicSample/app/src/main/java/com/example/android/persistence/ui/ProductListFragment.java
@@ -16,19 +16,20 @@
 
 package com.example.android.persistence.ui;
 
+import android.os.Bundle;
 import android.text.Editable;
+import android.view.LayoutInflater;
+import android.view.View;
 import android.view.View.OnClickListener;
+import android.view.ViewGroup;
+
+import androidx.annotation.Nullable;
+import androidx.databinding.DataBindingUtil;
+import androidx.fragment.app.Fragment;
 import androidx.lifecycle.Lifecycle;
 import androidx.lifecycle.LiveData;
 import androidx.lifecycle.Observer;
-import androidx.lifecycle.ViewModelProviders;
-import androidx.databinding.DataBindingUtil;
-import android.os.Bundle;
-import androidx.annotation.Nullable;
-import androidx.fragment.app.Fragment;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
+import androidx.lifecycle.ViewModelProvider;
 
 import com.example.android.persistence.R;
 import com.example.android.persistence.databinding.ListFragmentBinding;
@@ -62,7 +63,7 @@ public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container,
     public void onActivityCreated(@Nullable Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
         final ProductListViewModel viewModel =
-                ViewModelProviders.of(this).get(ProductListViewModel.class);
+                new ViewModelProvider(this).get(ProductListViewModel.class);
 
         mBinding.productsSearchBtn.setOnClickListener(new OnClickListener() {
             @Override

diff --git a/BasicSample/app/src/main/res/layout/main_activity.xml b/BasicSample/app/src/main/res/layout/main_activity.xml
@@ -15,9 +15,9 @@
   ~ limitations under the License.
   -->
 
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.fragment.app.FragmentContainerView xmlns:android="http://schemas.android.com/apk/res/android"
              android:id="@+id/fragment_container"
              android:layout_width="match_parent"
              android:layout_height="match_parent"
              android:orientation="vertical">
-</FrameLayout>
+</androidx.fragment.app.FragmentContainerView>
diff --git a/BasicSample/versions.gradle b/BasicSample/versions.gradle
@@ -23,6 +23,7 @@ ext.deps = [:]
 def versions = [:]
 versions.android_gradle_plugin = '3.4.0'
 versions.apache_commons = "2.5"
+versions.appcompat = "1.1.0-rc01"
 versions.arch_core = "2.0.1"
 versions.atsl_core = "1.1.0"
 versions.atsl_rules = "1.1.1"
@@ -34,17 +35,17 @@ versions.core_ktx = "1.0.0"
 versions.dagger = "2.16"
 versions.dexmaker = "2.2.0"
 versions.espresso = "3.1.1"
-versions.fragment = "1.1.0-alpha09"
+versions.fragment = "1.2.0-alpha02"
 versions.glide = "4.8.0"
 versions.hamcrest = "1.3"
 versions.junit = "4.12"
 versions.kotlin = "1.3.40"
-versions.lifecycle = "2.0.0"
+versions.lifecycle = "2.2.0-alpha03"
 versions.mockito = "2.25.0"
 versions.mockito_all = "1.10.19"
 versions.mockito_android = "2.25.0"
 versions.mockwebserver = "3.8.1"
-versions.navigation = "2.1.0-alpha04"
+versions.navigation = "2.2.0-alpha01"
 versions.okhttp_logging_interceptor = "3.9.0"
 versions.paging = "2.1.0-rc01"
 versions.retrofit = "2.3.0"
@@ -63,11 +64,10 @@ deps.benchmark_gradle = "androidx.benchmark:benchmark-gradle-plugin:$versions.be
 
 def support = [:]
 support.annotations = "androidx.annotation:annotation:$versions.support"
-support.app_compat = "androidx.appcompat:appcompat:$versions.support"
+support.app_compat = "androidx.appcompat:appcompat:$versions.appcompat"
 support.recyclerview = "androidx.recyclerview:recyclerview:$versions.support"
 support.cardview = "androidx.cardview:cardview:$versions.support"
 support.design = "com.google.android.material:material:$versions.support"
-support.v4 = "androidx.legacy:legacy-support-v4:$versions.support"
 support.core_utils = "androidx.legacy:legacy-support-core-utils:$versions.support"
 support.core_ktx = "androidx.core:core-ktx:$versions.core_ktx"
 support.fragment_runtime = "androidx.fragment:fragment:${versions.fragment}"
@@ -84,7 +84,6 @@ deps.room = room
 
 def lifecycle = [:]
 lifecycle.runtime = "androidx.lifecycle:lifecycle-runtime:$versions.lifecycle"
-lifecycle.extensions = "androidx.lifecycle:lifecycle-extensions:$versions.lifecycle"
 lifecycle.java8 = "androidx.lifecycle:lifecycle-common-java8:$versions.lifecycle"
 lifecycle.compiler = "androidx.lifecycle:lifecycle-compiler:$versions.lifecycle"
 lifecycle.viewmodel_ktx = "androidx.lifecycle:lifecycle-viewmodel-ktx:$versions.lifecycle"

diff --git a/GithubBrowserSample/app/build.gradle b/GithubBrowserSample/app/build.gradle
@@ -53,6 +53,9 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
     sourceSets {
         androidTest.java.srcDirs += "src/test-common/java"
         test.java.srcDirs += "src/test-common/java"
@@ -75,7 +78,6 @@ dependencies {
     implementation deps.navigation.fragment_ktx
     implementation deps.room.runtime
     implementation deps.lifecycle.runtime
-    implementation deps.lifecycle.extensions
     implementation deps.lifecycle.java8
     implementation deps.retrofit.runtime
     implementation deps.retrofit.gson