Update all libraries to the latest stable version and remove jetifier

evant · Apr 3, 2021 · 71da49d · 71da49d
1 parent a6371b1
commit 71da49d
Show file tree

Hide file tree

Showing 16 changed files with 89 additions and 98 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -11,12 +11,12 @@ repositories {
 }
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 30
 
     defaultConfig {
         applicationId "me.tatarka.bindingcollectionadapter.sample"
         minSdkVersion 14
-        targetSdkVersion 28
+        targetSdkVersion 30
         versionCode 1
         versionName "1.0"
     }
@@ -40,17 +40,17 @@ dependencies {
     implementation project(':bindingcollectionadapter-recyclerview')
     implementation project(':bindingcollectionadapter-paging')
     implementation project(':bindingcollectionadapter-viewpager2')
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
 
-    implementation 'androidx.appcompat:appcompat:1.1.0'
-    implementation 'com.google.android.material:material:1.2.0-alpha01'
+    implementation 'androidx.appcompat:appcompat:1.2.0'
+    implementation 'com.google.android.material:material:1.3.0'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation 'androidx.recyclerview:recyclerview:1.0.0'
-    implementation 'androidx.vectordrawable:vectordrawable-animated:1.0.0'
-    implementation 'androidx.lifecycle:lifecycle-runtime:2.0.0'
-    implementation 'androidx.lifecycle:lifecycle-extensions:2.0.0'
-    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.0.0'
-    implementation 'androidx.paging:paging-runtime:2.0.0'
+    implementation 'androidx.recyclerview:recyclerview:1.1.0'
+    implementation 'androidx.vectordrawable:vectordrawable-animated:1.1.0'
+    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.3.1'
+    implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
+    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.1'
+    implementation 'androidx.paging:paging-runtime-ktx:2.1.2'
 
-    kapt "com.android.databinding:compiler:$agp_version"
+    kapt "androidx.databinding:databinding-compiler:$agp_version"
 }
diff --git a/app/src/main/java/me/tatarka/bindingcollectionadapter/sample/FragmentDiffRecyclerView.kt b/app/src/main/java/me/tatarka/bindingcollectionadapter/sample/FragmentDiffRecyclerView.kt
@@ -5,25 +5,24 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
-import androidx.lifecycle.ViewModelProviders
-import androidx.lifecycle.get
+import androidx.lifecycle.ViewModelProvider
 import me.tatarka.bindingcollectionadapter.sample.databinding.DiffRecyclerViewBinding
 
 class FragmentDiffRecyclerView : Fragment() {
     private lateinit var viewModel: ImmutableViewModel
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        viewModel = ViewModelProviders.of(this).get()
+        viewModel = ViewModelProvider(this).get(ImmutableViewModel::class.java)
     }
 
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
         savedInstanceState: Bundle?
-    ): View? {
+    ): View {
         return DiffRecyclerViewBinding.inflate(inflater, container, false).also {
-            it.setLifecycleOwner(this)
+            it.lifecycleOwner = this
             it.viewModel = viewModel
             it.listeners = viewModel
             it.executePendingBindings()

diff --git a/app/src/main/java/me/tatarka/bindingcollectionadapter/sample/FragmentListView.kt b/app/src/main/java/me/tatarka/bindingcollectionadapter/sample/FragmentListView.kt
@@ -5,26 +5,25 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
-import androidx.lifecycle.ViewModelProviders
-import androidx.lifecycle.get
+import androidx.lifecycle.ViewModelProvider
 import me.tatarka.bindingcollectionadapter.sample.databinding.ListViewBinding
 
 class FragmentListView : Fragment() {
     private lateinit var viewModel: MutableViewModel
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        viewModel = ViewModelProviders.of(this).get()
+        viewModel = ViewModelProvider(this).get(MutableViewModel::class.java)
         viewModel.setCheckable(true)
     }
 
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
         savedInstanceState: Bundle?
-    ): View? {
+    ): View {
         return ListViewBinding.inflate(inflater, container, false).also {
-            it.setLifecycleOwner(this)
+            it.lifecycleOwner = this
             it.viewModel = viewModel
             it.listeners = viewModel
             it.executePendingBindings()

diff --git a/app/src/main/java/me/tatarka/bindingcollectionadapter/sample/FragmentPagedRecyclerView.kt b/app/src/main/java/me/tatarka/bindingcollectionadapter/sample/FragmentPagedRecyclerView.kt
@@ -5,28 +5,27 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
-import androidx.lifecycle.ViewModelProviders
-import androidx.lifecycle.get
+import androidx.lifecycle.ViewModelProvider
 import me.tatarka.bindingcollectionadapter.sample.databinding.PagedRecyclerViewBinding
 
 class FragmentPagedRecyclerView : Fragment() {
     private lateinit var viewModel: ImmutableViewModel
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        viewModel = ViewModelProviders.of(this).get()
+        viewModel = ViewModelProvider(this).get(ImmutableViewModel::class.java)
     }
 
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
         savedInstanceState: Bundle?
-    ): View? {
+    ): View {
         return PagedRecyclerViewBinding.inflate(inflater, container, false).also {
-            it.setLifecycleOwner(this)
+            it.lifecycleOwner = this
             it.viewModel = viewModel
             it.listeners = viewModel
             it.executePendingBindings()
         }.root
     }
-}
+}
diff --git a/app/src/main/java/me/tatarka/bindingcollectionadapter/sample/FragmentRecyclerView.kt b/app/src/main/java/me/tatarka/bindingcollectionadapter/sample/FragmentRecyclerView.kt
@@ -5,26 +5,25 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
-import androidx.lifecycle.ViewModelProviders
-import androidx.lifecycle.get
+import androidx.lifecycle.ViewModelProvider
 import me.tatarka.bindingcollectionadapter.sample.databinding.RecyclerViewBinding
 
 class FragmentRecyclerView : Fragment() {
     private lateinit var viewModel: MutableViewModel
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        viewModel = ViewModelProviders.of(this).get()
+        viewModel = ViewModelProvider(this).get(MutableViewModel::class.java)
         viewModel.setCheckable(true)
     }
 
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
         savedInstanceState: Bundle?
-    ): View? {
+    ): View {
         return RecyclerViewBinding.inflate(inflater, container, false).also {
-            it.setLifecycleOwner(this)
+            it.lifecycleOwner = this
             it.viewModel = viewModel
             it.listeners = viewModel
             it.executePendingBindings()

diff --git a/app/src/main/java/me/tatarka/bindingcollectionadapter/sample/FragmentSpinnerView.kt b/app/src/main/java/me/tatarka/bindingcollectionadapter/sample/FragmentSpinnerView.kt
@@ -1,12 +1,11 @@
 package me.tatarka.bindingcollectionadapter.sample
 
-import androidx.lifecycle.ViewModelProviders
 import android.os.Bundle
 import androidx.fragment.app.Fragment
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import androidx.lifecycle.get
+import androidx.lifecycle.ViewModelProvider
 
 import me.tatarka.bindingcollectionadapter.sample.databinding.SpinnerViewBinding
 
@@ -15,17 +14,17 @@ class FragmentSpinnerView : Fragment() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        viewModel = ViewModelProviders.of(this).get()
+        viewModel = ViewModelProvider(this).get(MutableViewModel::class.java)
         viewModel.setCheckable(false)
     }
 
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
         savedInstanceState: Bundle?
-    ): View? {
+    ): View {
         return SpinnerViewBinding.inflate(inflater, container, false).also {
-            it.setLifecycleOwner(this)
+            it.lifecycleOwner = this
             it.viewModel = viewModel
             it.listeners = viewModel
             it.executePendingBindings()

diff --git a/app/src/main/java/me/tatarka/bindingcollectionadapter/sample/FragmentViewPager2View.kt b/app/src/main/java/me/tatarka/bindingcollectionadapter/sample/FragmentViewPager2View.kt
@@ -5,37 +5,34 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
-import androidx.lifecycle.ViewModelProviders
-import androidx.lifecycle.get
-import com.google.android.material.tabs.TabLayout
+import androidx.lifecycle.ViewModelProvider
 import com.google.android.material.tabs.TabLayoutMediator
 import me.tatarka.bindingcollectionadapter.sample.databinding.Viewpager2ViewBinding
-import me.tatarka.bindingcollectionadapter.sample.databinding.ViewpagerViewBinding
 
 class FragmentViewPager2View : Fragment() {
     private lateinit var viewModel: MutableViewModel
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        viewModel = ViewModelProviders.of(this).get()
+        viewModel = ViewModelProvider(this).get(MutableViewModel::class.java)
         viewModel.setCheckable(true)
     }
 
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
         savedInstanceState: Bundle?
-    ): View? {
+    ): View {
         return Viewpager2ViewBinding.inflate(inflater, container, false).also {
-            it.setLifecycleOwner(this)
+            it.lifecycleOwner = this
             it.viewModel = viewModel
             it.listeners = PagerListeners(viewModel)
             it.executePendingBindings()
 
-            TabLayoutMediator(it.tabs, it.pager, TabLayoutMediator.TabConfigurationStrategy { tab, position ->
+            TabLayoutMediator(it.tabs, it.pager) { tab, position ->
                 val item = viewModel.items[position]
                 tab.text = viewModel.pageTitles.getPageTitle(position, item)
-            }).attach()
+            }.attach()
         }.root
     }
 

diff --git a/app/src/main/java/me/tatarka/bindingcollectionadapter/sample/FragmentViewPagerView.kt b/app/src/main/java/me/tatarka/bindingcollectionadapter/sample/FragmentViewPagerView.kt
@@ -5,8 +5,7 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
-import androidx.lifecycle.ViewModelProviders
-import androidx.lifecycle.get
+import androidx.lifecycle.ViewModelProvider
 import com.google.android.material.tabs.TabLayout
 import me.tatarka.bindingcollectionadapter.sample.databinding.ViewpagerViewBinding
 
@@ -15,17 +14,17 @@ class FragmentViewPagerView : Fragment() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        viewModel = ViewModelProviders.of(this).get()
+        viewModel = ViewModelProvider(this).get(MutableViewModel::class.java)
         viewModel.setCheckable(true)
     }
 
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
         savedInstanceState: Bundle?
-    ): View? {
+    ): View {
         return ViewpagerViewBinding.inflate(inflater, container, false).also {
-            it.setLifecycleOwner(this)
+            it.lifecycleOwner = this
             it.viewModel = viewModel
             it.listeners = PagerListeners(it, viewModel)
             it.executePendingBindings()

diff --git a/bindingcollectionadapter-ktx/build.gradle b/bindingcollectionadapter-ktx/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 30
 
     defaultConfig {
         minSdkVersion 14
@@ -15,8 +15,8 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_7
-        targetCompatibility JavaVersion.VERSION_1_7
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
     }
     sourceSets {
         androidTest {
@@ -32,7 +32,7 @@ android {
 
 dependencies {
     api project(':bindingcollectionadapter')
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
 }
 
 apply from: '../publish.gradle'

diff --git a/bindingcollectionadapter-paging/build.gradle b/bindingcollectionadapter-paging/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
 apply plugin: 'signing'
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 30
 
     defaultConfig {
         minSdkVersion 14
@@ -15,8 +15,8 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_7
-        targetCompatibility JavaVersion.VERSION_1_7
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
     }
     sourceSets {
         androidTest {
@@ -32,17 +32,17 @@ android {
 
 dependencies {
     implementation project(':bindingcollectionadapter-recyclerview')
-    implementation 'androidx.paging:paging-runtime:2.0.0'
+    implementation 'androidx.paging:paging-runtime:2.1.2'
 
-    testImplementation 'junit:junit:4.12'
+    testImplementation 'junit:junit:4.13'
     testImplementation 'org.assertj:assertj-core:3.6.2'
-    testImplementation 'org.mockito:mockito-core:2.19.0'
+    testImplementation 'org.mockito:mockito-core:3.3.0'
 
-    androidTestImplementation 'androidx.test:runner:1.1.0'
-    androidTestImplementation 'androidx.test:rules:1.1.0'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0'
+    androidTestImplementation 'androidx.test:runner:1.3.0'
+    androidTestImplementation 'androidx.test:rules:1.3.0'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
     androidTestImplementation 'com.squareup.assertj:assertj-android:1.1.0'
-    androidTestImplementation 'androidx.core:core:1.0.0'
+    androidTestImplementation 'androidx.core:core:1.3.2'
 }
 
 apply from: '../publish.gradle'
diff --git a/bindingcollectionadapter-recyclerview/build.gradle b/bindingcollectionadapter-recyclerview/build.gradle
@@ -1,7 +1,7 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 30
 
     defaultConfig {
         minSdkVersion 14
@@ -14,8 +14,8 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_7
-        targetCompatibility JavaVersion.VERSION_1_7
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
     }
     sourceSets {
         androidTest {
@@ -31,17 +31,17 @@ android {
 
 dependencies {
     api project(':bindingcollectionadapter')
-    api 'androidx.recyclerview:recyclerview:1.0.0'
+    api 'androidx.recyclerview:recyclerview:1.1.0'
 
-    testImplementation 'junit:junit:4.12'
+    testImplementation 'junit:junit:4.13'
     testImplementation 'org.assertj:assertj-core:3.6.2'
-    testImplementation 'org.mockito:mockito-core:2.19.0'
+    testImplementation 'org.mockito:mockito-core:3.3.0'
 
-    androidTestImplementation 'androidx.test:runner:1.1.0'
-    androidTestImplementation 'androidx.test:rules:1.1.0'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0'
+    androidTestImplementation 'androidx.test:runner:1.3.0'
+    androidTestImplementation 'androidx.test:rules:1.3.0'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
     androidTestImplementation 'com.squareup.assertj:assertj-android:1.1.0'
-    androidTestImplementation 'androidx.core:core:1.0.0'
+    androidTestImplementation 'androidx.core:core:1.3.2'
 }
 
 apply from: '../publish.gradle'