Update all dependencies

application/donations/build.gradle

@@ -73,8 +73,8 @@ dependencies {
     implementation project(':application:tools')
 
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    implementation 'androidx.core:core-ktx:1.3.0'
-    implementation 'androidx.appcompat:appcompat:1.1.0'
+    implementation 'androidx.core:core-ktx:1.3.2'
+    implementation 'androidx.appcompat:appcompat:1.2.0'
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'androidx.test.ext:junit:1.1.1'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'

application/live-plot-graph/build.gradle

@@ -50,7 +50,7 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation 'androidx.appcompat:appcompat:1.1.0'
+    implementation "androidx.appcompat:appcompat:$rootProject.ext.appCompatVersion"
     implementation "androidx.core:core-ktx:$rootProject.ext.androidxCoreVersion"
     implementation project(':application:tools')
     implementation "androidx.constraintlayout:constraintlayout:$rootProject.ext.constraintLayoutVersion"

application/mediadb/build.gradle

@@ -61,8 +61,7 @@ dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 
-    // fixme When we update to 1.2.0 remember to remove the workaround in SecondaryActivity.applyOverrideConfiguration
-    implementation 'androidx.appcompat:appcompat:1.1.0'
+    implementation "androidx.appcompat:appcompat:$rootProject.ext.appCompatVersion"
     implementation "androidx.core:core-ktx:$rootProject.ext.androidxCoreVersion"
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'androidx.test.ext:junit:1.1.1'

application/moviepedia/src/main/java/org/videolan/moviepedia/ui/MediaScrapingActivity.kt

@@ -32,7 +32,7 @@ import android.view.View
 import android.view.inputmethod.EditorInfo
 import android.widget.TextView
 import androidx.databinding.DataBindingUtil
-import androidx.lifecycle.ViewModelProviders
+import androidx.lifecycle.ViewModelProvider
 import androidx.recyclerview.widget.GridLayoutManager
 import org.videolan.medialibrary.interfaces.media.MediaWrapper
 import org.videolan.moviepedia.R
@@ -70,7 +70,7 @@ open class MediaScrapingActivity : BaseActivity(), TextWatcher, TextView.OnEdito
 
         binding.searchEditText.addTextChangedListener(this)
         binding.searchEditText.setOnEditorActionListener(this)
-        viewModel = ViewModelProviders.of(this).get(media.uri.path
+        viewModel = ViewModelProvider(this).get(media.uri.path
                 ?: "", MediaScrapingModel::class.java)
         viewModel.apiResult.observe(this, {
             mediaScrapingResultAdapter.setItems(it.getAllResults())

application/television/src/main/java/org/videolan/television/ui/MediaItemDetailsFragment.kt

@@ -33,7 +33,7 @@ import androidx.leanback.app.BackgroundManager
 import androidx.leanback.app.DetailsSupportFragment
 import androidx.leanback.widget.*
 import androidx.lifecycle.ViewModel
-import androidx.lifecycle.ViewModelProviders
+import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.lifecycleScope
 import kotlinx.coroutines.*
 import org.videolan.libvlc.util.AndroidUtil
@@ -136,7 +136,7 @@ class MediaItemDetailsFragment : DetailsSupportFragment(), CoroutineScope by Mai
         mediaStarted = false
         buildDetails()
 
-        mediaMetadataModel = ViewModelProviders.of(this, MediaMetadataModel.Factory(requireActivity(), mlId = media.id)).get(media.uri.path
+        mediaMetadataModel = ViewModelProvider(this, MediaMetadataModel.Factory(requireActivity(), mlId = media.id)).get(media.uri.path
                 ?: "", MediaMetadataModel::class.java)
 
         mediaMetadataModel.updateLiveData.observe(this, {

application/television/src/main/java/org/videolan/television/ui/MediaScrapingTvFragment.kt

@@ -52,7 +52,7 @@ import android.os.Build
 import android.os.Bundle
 import androidx.leanback.app.SearchSupportFragment
 import androidx.leanback.widget.*
-import androidx.lifecycle.ViewModelProviders
+import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.lifecycleScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.ExperimentalCoroutinesApi
@@ -106,7 +106,7 @@ class MediaScrapingTvFragment : SearchSupportFragment(), SearchSupportFragment.S
         val extras = requireActivity().intent.extras ?: savedInstanceState ?: return
         media = extras.getParcelable(MediaScrapingTvActivity.MEDIA) ?: return
 
-        viewModel = ViewModelProviders.of(this).get(media.uri.path
+        viewModel = ViewModelProvider(this).get(media.uri.path
                 ?: "", MediaScrapingModel::class.java)
         val cp = CardPresenter(requireActivity(), true)
         val videoAdapter = ArrayObjectAdapter(cp)

application/television/src/main/java/org/videolan/television/ui/MediaScrapingTvshowDetailsFragment.kt

@@ -51,7 +51,7 @@ import androidx.core.content.ContextCompat
 import androidx.leanback.app.BackgroundManager
 import androidx.leanback.app.DetailsSupportFragment
 import androidx.leanback.widget.*
-import androidx.lifecycle.ViewModelProviders
+import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.lifecycleScope
 import kotlinx.coroutines.*
 import org.videolan.moviepedia.database.models.*
@@ -106,7 +106,7 @@ class MediaScrapingTvshowDetailsFragment : DetailsSupportFragment(), CoroutineSc
 
         val extras = requireActivity().intent.extras ?: savedInstanceState ?: return
         showId = extras.getString(org.videolan.television.ui.TV_SHOW_ID) ?: return
-        viewModel = ViewModelProviders.of(this, MediaMetadataModel.Factory(requireActivity(), showId = showId)).get(showId, MediaMetadataModel::class.java)
+        viewModel = ViewModelProvider(this, MediaMetadataModel.Factory(requireActivity(), showId = showId)).get(showId, MediaMetadataModel::class.java)
 
 
         viewModel.updateLiveData.observe(this, {

application/television/src/main/java/org/videolan/television/ui/audioplayer/AudioPlayerActivity.kt

@@ -32,7 +32,7 @@ import android.view.KeyEvent
 import android.view.MotionEvent
 import android.view.View
 import androidx.databinding.DataBindingUtil
-import androidx.lifecycle.ViewModelProviders
+import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.DividerItemDecoration
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -75,7 +75,7 @@ class AudioPlayerActivity : BaseTvActivity() {
         binding = DataBindingUtil.setContentView(this, R.layout.tv_audio_player)
         settings = Settings.getInstance(this)
 
-        model = ViewModelProviders.of(this).get(PlaylistModel::class.java)
+        model = ViewModelProvider(this).get(PlaylistModel::class.java)
         binding.playlist.layoutManager = LinearLayoutManager(this)
         binding.playlist.addItemDecoration(DividerItemDecoration(this, DividerItemDecoration.VERTICAL))
         adapter = PlaylistAdapter(this, model)

application/television/src/main/java/org/videolan/television/ui/details/MediaListActivity.kt

@@ -7,7 +7,7 @@ import android.view.View
 import androidx.core.content.ContextCompat
 import androidx.databinding.DataBindingUtil
 import androidx.leanback.app.BackgroundManager
-import androidx.lifecycle.ViewModelProviders
+import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.DividerItemDecoration
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -163,4 +163,4 @@ class MediaListActivity : BaseTvActivity(), ITVEventsHandler {
 
 @ObsoleteCoroutinesApi
 @ExperimentalCoroutinesApi
-internal fun MediaListActivity.getViewModel(playlist: MediaLibraryItem) = ViewModelProviders.of(this, PlaylistViewModel.Factory(this, playlist)).get(PlaylistViewModel::class.java)
+internal fun MediaListActivity.getViewModel(playlist: MediaLibraryItem) = ViewModelProvider(this, PlaylistViewModel.Factory(this, playlist)).get(PlaylistViewModel::class.java)

application/television/src/main/java/org/videolan/television/viewmodel/MainTvModel.kt

@@ -309,7 +309,7 @@ class MainTvModel(app: Application) : AndroidViewModel(app), Medialibrary.OnMedi
     }
 
     companion object {
-        fun Fragment.getMainTvModel() = ViewModelProviders.of(requireActivity(), Factory(requireActivity().application)).get(MainTvModel::class.java)
+        fun Fragment.getMainTvModel() = ViewModelProvider(requireActivity(), Factory(requireActivity().application)).get(MainTvModel::class.java)
     }
 
     class Factory(private val app: Application) : ViewModelProvider.NewInstanceFactory() {

application/television/src/main/java/org/videolan/television/viewmodel/MediaBrowserViewModel.kt

@@ -4,7 +4,6 @@ import android.content.Context
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider
-import androidx.lifecycle.ViewModelProviders
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import org.videolan.medialibrary.media.MediaLibraryItem
 import org.videolan.vlc.providers.medialibrary.*
@@ -50,4 +49,4 @@ class MediaBrowserViewModel(context: Context, val category: Long, val parent : M
 }
 
 @ExperimentalCoroutinesApi
-fun Fragment.getMediaBrowserModel(category: Long, parent : MediaLibraryItem? = null) = ViewModelProviders.of(requireActivity(), MediaBrowserViewModel.Factory(requireContext(), category, parent)).get(MediaBrowserViewModel::class.java)
+fun Fragment.getMediaBrowserModel(category: Long, parent : MediaLibraryItem? = null) = ViewModelProvider(requireActivity(), MediaBrowserViewModel.Factory(requireContext(), category, parent)).get(MediaBrowserViewModel::class.java)

application/television/src/main/java/org/videolan/television/viewmodel/MediaScrapingBrowserViewModel.kt

@@ -28,7 +28,6 @@ import android.content.Context
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider
-import androidx.lifecycle.ViewModelProviders
 import androidx.lifecycle.viewModelScope
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import org.videolan.medialibrary.interfaces.Medialibrary
@@ -84,4 +83,4 @@ class MediaScrapingBrowserViewModel(context: Context, val category: Long) : Sort
 }
 
 @ExperimentalCoroutinesApi
-fun Fragment.getMoviepediaBrowserModel(category: Long) = ViewModelProviders.of(requireActivity(), MediaScrapingBrowserViewModel.Factory(requireContext(), category)).get(MediaScrapingBrowserViewModel::class.java)
+fun Fragment.getMoviepediaBrowserModel(category: Long) = ViewModelProvider(requireActivity(), MediaScrapingBrowserViewModel.Factory(requireContext(), category)).get(MediaScrapingBrowserViewModel::class.java)

application/tools/build.gradle

@@ -25,8 +25,8 @@ android {
 }
 
 dependencies {
-    api "androidx.appcompat:appcompat:$rootProject.ext.androidxAppcompatVersion"
-    implementation "androidx.lifecycle:lifecycle-extensions:$rootProject.ext.lifecycleVersion"
+    api "androidx.appcompat:appcompat:$rootProject.ext.appCompatVersion"
+    implementation "androidx.lifecycle:lifecycle-process:$rootProject.ext.lifecycleVersion"
     implementation "androidx.preference:preference:$androidxPreferencesVersion"
     api "androidx.tvprovider:tvprovider:$rootProject.ext.androidxLeanbackVersion"
     implementation("com.squareup.okhttp3:logging-interceptor:4.2.1")

application/vlc-android/build.gradle

@@ -166,11 +166,12 @@ dependencies {
     api "androidx.constraintlayout:constraintlayout:$rootProject.ext.constraintLayoutVersion"
     api "androidx.viewpager2:viewpager2:$rootProject.ext.viewPager2Version"
     api 'androidx.multidex:multidex:2.0.1'
-    api "androidx.lifecycle:lifecycle-extensions:$rootProject.ext.lifecycleVersion"
+    api "androidx.lifecycle:lifecycle-process:$rootProject.ext.lifecycleVersion"
+    api "androidx.lifecycle:lifecycle-service:$rootProject.ext.lifecycleVersion"
     api "androidx.lifecycle:lifecycle-viewmodel-ktx:$rootProject.ext.lifecycleVersion"
     api "androidx.lifecycle:lifecycle-runtime-ktx:$rootProject.ext.lifecycleVersion"
     api "androidx.lifecycle:lifecycle-livedata-ktx:$rootProject.ext.lifecycleVersion"
-    kapt "androidx.lifecycle:lifecycle-compiler:$rootProject.ext.lifecycleVersion"
+    api "androidx.lifecycle:lifecycle-common-java8:$rootProject.ext.lifecycleVersion"
     api "androidx.room:room-runtime:$rootProject.ext.roomVersion"
     kapt "androidx.room:room-compiler:$rootProject.ext.roomVersion"
     api "androidx.paging:paging-runtime-ktx:$rootProject.ext.pagingVersion"

application/vlc-android/res/layout/audioplayer.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<fragment 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/audio_player"
         android:name="org.videolan.vlc.gui.audio.AudioPlayer"
         android:layout_width="match_parent"

application/vlc-android/src/org/videolan/vlc/gui/HistoryFragment.kt

@@ -22,7 +22,7 @@ package org.videolan.vlc.gui
 import android.os.Bundle
 import android.view.*
 import androidx.appcompat.view.ActionMode
-import androidx.lifecycle.ViewModelProviders
+import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.lifecycleScope
 import androidx.lifecycle.observe
 import androidx.recyclerview.widget.ItemTouchHelper
@@ -67,7 +67,7 @@ class HistoryFragment : MediaBrowserFragment<HistoryModel>(), IRefreshable, IHis
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        viewModel = ViewModelProviders.of(requireActivity(), HistoryModel.Factory(requireContext())).get(HistoryModel::class.java)
+        viewModel = ViewModelProvider(requireActivity(), HistoryModel.Factory(requireContext())).get(HistoryModel::class.java)
         viewModel.dataset.observe(viewLifecycleOwner, { list ->
             list?.let {
                 historyAdapter.update(it)

application/vlc-android/src/org/videolan/vlc/gui/SecondaryActivity.kt

@@ -93,14 +93,6 @@ class SecondaryActivity : ContentActivity() {
         }
     }
 
-    //Workaround to avoid a crash with webviews. See https://stackoverflow.com/a/60854445/2732052 and https://stackoverflow.com/a/58131421/2732052
-    override fun applyOverrideConfiguration(overrideConfiguration: Configuration?) {
-        if (Build.VERSION.SDK_INT in 21..25 && (resources.configuration.uiMode ==  applicationContext.resources.configuration.uiMode)) {
-            return
-        }
-        super.applyOverrideConfiguration(overrideConfiguration)
-    }
-
     override fun forceLoadVideoFragment() {
         val fragmentId = intent.getStringExtra(KEY_FRAGMENT)
         fetchSecondaryFragment(fragmentId)

application/vlc-android/src/org/videolan/vlc/gui/audio/AudioPlayer.kt

@@ -51,6 +51,7 @@ import androidx.vectordrawable.graphics.drawable.AnimatedVectorDrawableCompat
 import com.google.android.material.bottomsheet.BottomSheetBehavior
 import kotlinx.coroutines.*
 import kotlinx.coroutines.flow.conflate
+import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import org.videolan.medialibrary.Tools
 import org.videolan.medialibrary.interfaces.media.MediaWrapper

application/vlc-android/src/org/videolan/vlc/gui/browser/FilePickerFragment.kt

@@ -30,7 +30,7 @@ import android.view.View
 import androidx.core.net.toUri
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentManager
-import androidx.lifecycle.ViewModelProviders
+import androidx.lifecycle.ViewModelProvider
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.ObsoleteCoroutinesApi
@@ -72,7 +72,7 @@ class FilePickerFragment : FileBrowserFragment(), BrowserContainer<MediaLibraryI
     }
 
     override fun setupBrowser() {
-        viewModel = ViewModelProviders.of(this, BrowserModel.Factory(requireContext(), mrl, TYPE_PICKER, false, pickerType = pickerType)).get(BrowserModel::class.java)
+        viewModel = ViewModelProvider(this, BrowserModel.Factory(requireContext(), mrl, TYPE_PICKER, false, pickerType = pickerType)).get(BrowserModel::class.java)
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {

application/vlc-android/src/org/videolan/vlc/gui/network/MRLPanelFragment.kt

@@ -34,7 +34,7 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.core.net.toUri
 import androidx.core.view.doOnLayout
 import androidx.fragment.app.Fragment
-import androidx.lifecycle.ViewModelProviders
+import androidx.lifecycle.ViewModelProvider
 import androidx.recyclerview.widget.DividerItemDecoration
 import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -66,7 +66,7 @@ class MRLPanelFragment : Fragment(), View.OnKeyListener, TextView.OnEditorAction
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        viewModel = ViewModelProviders.of(requireActivity(), StreamsModel.Factory(requireContext())).get(StreamsModel::class.java)
+        viewModel = ViewModelProvider(requireActivity(), StreamsModel.Factory(requireContext())).get(StreamsModel::class.java)
         setup(this, viewModel, this)
     }
 

application/vlc-android/src/org/videolan/vlc/gui/onboarding/OnboardingViewModel.kt

@@ -4,7 +4,7 @@ import androidx.appcompat.app.AppCompatDelegate
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentActivity
 import androidx.lifecycle.ViewModel
-import androidx.lifecycle.ViewModelProviders
+import androidx.lifecycle.ViewModelProvider
 import org.videolan.resources.AndroidDevices
 
 class OnboardingViewModel : ViewModel() {
@@ -15,5 +15,5 @@ class OnboardingViewModel : ViewModel() {
     var theme = if (AndroidDevices.canUseSystemNightMode()) AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM else AppCompatDelegate.MODE_NIGHT_AUTO
 }
 
-fun FragmentActivity.getOnboardingModel() = ViewModelProviders.of(this).get(OnboardingViewModel::class.java)
+fun FragmentActivity.getOnboardingModel() = ViewModelProvider(this).get(OnboardingViewModel::class.java)
 fun Fragment.getOnboardingModel() = requireActivity().getOnboardingModel()

application/vlc-android/src/org/videolan/vlc/util/Kextensions.kt

@@ -68,9 +68,9 @@ fun String.validateLocation(): Boolean {
     return true
 }
 
-inline fun <reified T : ViewModel> Fragment.getModelWithActivity() = ViewModelProviders.of(requireActivity()).get(T::class.java)
-inline fun <reified T : ViewModel> Fragment.getModel() = ViewModelProviders.of(this).get(T::class.java)
-inline fun <reified T : ViewModel> FragmentActivity.getModel() = ViewModelProviders.of(this).get(T::class.java)
+inline fun <reified T : ViewModel> Fragment.getModelWithActivity() = ViewModelProvider(requireActivity()).get(T::class.java)
+inline fun <reified T : ViewModel> Fragment.getModel() = ViewModelProvider(this).get(T::class.java)
+inline fun <reified T : ViewModel> FragmentActivity.getModel() = ViewModelProvider(this).get(T::class.java)
 
 fun Media?.canExpand() = this != null && (type == IMedia.Type.Directory || type == IMedia.Type.Playlist)
 suspend fun AppCompatActivity.share(media: MediaWrapper) {

application/vlc-android/src/org/videolan/vlc/viewmodels/PlaylistModel.kt

@@ -250,7 +250,7 @@ class PlaylistModel : ViewModel(), PlaybackService.Callback by EmptyPBSCallback
     }
 
     companion object {
-        fun get(fragment: Fragment) = ViewModelProviders.of(fragment.requireActivity()).get(PlaylistModel::class.java)
+        fun get(fragment: Fragment) = ViewModelProvider(fragment.requireActivity()).get(PlaylistModel::class.java)
     }
 }
 

application/vlc-android/src/org/videolan/vlc/viewmodels/mobile/AlbumSongsViewModel.kt

@@ -23,7 +23,6 @@ package org.videolan.vlc.viewmodels.mobile
 import android.content.Context
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider
-import androidx.lifecycle.ViewModelProviders
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.ObsoleteCoroutinesApi
 import org.videolan.medialibrary.interfaces.media.Album
@@ -67,4 +66,4 @@ class AlbumSongsViewModel(context: Context, val parent: MediaLibraryItem) : Medi
 
 @ExperimentalCoroutinesApi
 @ObsoleteCoroutinesApi
-internal fun AudioAlbumsSongsFragment.getViewModel(item : MediaLibraryItem) = ViewModelProviders.of(requireActivity(), AlbumSongsViewModel.Factory(requireContext(), item)).get(AlbumSongsViewModel::class.java)
+internal fun AudioAlbumsSongsFragment.getViewModel(item : MediaLibraryItem) = ViewModelProvider(requireActivity(), AlbumSongsViewModel.Factory(requireContext(), item)).get(AlbumSongsViewModel::class.java)

application/vlc-android/src/org/videolan/vlc/viewmodels/mobile/AudioBrowserViewModel.kt

@@ -23,7 +23,6 @@ package org.videolan.vlc.viewmodels.mobile
 import android.content.Context
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider
-import androidx.lifecycle.ViewModelProviders
 import androidx.lifecycle.viewModelScope
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.ObsoleteCoroutinesApi
@@ -87,4 +86,4 @@ class AudioBrowserViewModel(context: Context) : MedialibraryViewModel(context) {
 
 @ExperimentalCoroutinesApi
 @ObsoleteCoroutinesApi
-internal fun AudioBrowserFragment.getViewModel() = ViewModelProviders.of(requireActivity(), AudioBrowserViewModel.Factory(requireContext())).get(AudioBrowserViewModel::class.java)
+internal fun AudioBrowserFragment.getViewModel() = ViewModelProvider(requireActivity(), AudioBrowserViewModel.Factory(requireContext())).get(AudioBrowserViewModel::class.java)

application/vlc-android/src/org/videolan/vlc/viewmodels/mobile/PlaylistViewModel.kt

@@ -23,7 +23,6 @@ package org.videolan.vlc.viewmodels.mobile
 import android.content.Context
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider
-import androidx.lifecycle.ViewModelProviders
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.ObsoleteCoroutinesApi
@@ -67,4 +66,4 @@ class PlaylistViewModel(context: Context, val playlist: MediaLibraryItem) : Medi
 
 @ObsoleteCoroutinesApi
 @ExperimentalCoroutinesApi
-internal fun PlaylistActivity.getViewModel(playlist: MediaLibraryItem) = ViewModelProviders.of(this, PlaylistViewModel.Factory(this, playlist)).get(PlaylistViewModel::class.java)
+internal fun PlaylistActivity.getViewModel(playlist: MediaLibraryItem) = ViewModelProvider(this, PlaylistViewModel.Factory(this, playlist)).get(PlaylistViewModel::class.java)

application/vlc-android/src/org/videolan/vlc/viewmodels/mobile/PlaylistsViewModel.kt

@@ -23,7 +23,6 @@ package org.videolan.vlc.viewmodels.mobile
 import android.content.Context
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider
-import androidx.lifecycle.ViewModelProviders
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.ObsoleteCoroutinesApi
 import org.videolan.medialibrary.media.MediaLibraryItem
@@ -57,4 +56,4 @@ class PlaylistsViewModel(context: Context) : MedialibraryViewModel(context) {
 
 @ExperimentalCoroutinesApi
 @ObsoleteCoroutinesApi
-internal fun PlaylistFragment.getViewModel() = ViewModelProviders.of(requireActivity(), PlaylistsViewModel.Factory(requireContext())).get(PlaylistsViewModel::class.java)
+internal fun PlaylistFragment.getViewModel() = ViewModelProvider(requireActivity(), PlaylistsViewModel.Factory(requireContext())).get(PlaylistsViewModel::class.java)

application/vlc-android/src/org/videolan/vlc/viewmodels/mobile/VideosViewModel.kt

@@ -25,7 +25,6 @@ import android.content.Context
 import androidx.fragment.app.FragmentActivity
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider
-import androidx.lifecycle.ViewModelProviders
 import androidx.lifecycle.viewModelScope
 import kotlinx.coroutines.*
 import org.videolan.medialibrary.interfaces.media.Folder
@@ -227,5 +226,5 @@ enum class VideoGroupingType {
 
 @ExperimentalCoroutinesApi
 @ObsoleteCoroutinesApi
-internal fun VideoGridFragment.getViewModel(type: VideoGroupingType = VideoGroupingType.NONE, folder: Folder?, group: VideoGroup?) = ViewModelProviders.of(requireActivity(), VideosViewModel.Factory(requireContext(), type, folder, group)).get(VideosViewModel::class.java)
+internal fun VideoGridFragment.getViewModel(type: VideoGroupingType = VideoGroupingType.NONE, folder: Folder?, group: VideoGroup?) = ViewModelProvider(requireActivity(), VideosViewModel.Factory(requireContext(), type, folder, group)).get(VideosViewModel::class.java)
 

build.gradle

@@ -1,8 +1,8 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
     ext.android_plugin_version = '4.1.1'
-    ext.kotlin_version = '1.4.10'
-    ext.kotlinx_version = '1.3.6'
+    ext.kotlin_version = '1.4.20'
+    ext.kotlinx_version = '1.4.1'
     repositories {
         flatDir dirs: "gradle/plugins"
         google()
@@ -42,24 +42,24 @@ ext {
     targetSdkVersion = 29
     compileSdkVersion = 29
     androidxLegacyVersion = '1.0.0'
-    androidxCoreVersion = '1.3.0'
-    lifecycleVersion = '2.2.0'
+    androidxCoreVersion = '1.3.2'
+    appCompatVersion = '1.2.0'
+    lifecycleVersion = '2.3.0'
     androidxPreferencesVersion = '1.1.1'
     androidxVersion = '1.1.0'
-    androidxActivityVersion = '1.1.0'
-    androidxFragmentVersion = '1.2.4'
+    androidxActivityVersion = '1.2.0'
+    androidxFragmentVersion = '1.3.0'
     androidxAnnotationVersion = '1.1.0'
-    androidxAppcompatVersion = '1.1.0'
     androidxRecyclerviewVersion = '1.1.0'
     androidxMediaVersion = '1.1.0'
     androidxLeanbackVersion = '1.0.0'
     //fixme : When we update this dep, please verify of this issue is fixed: https://github.com/material-components/material-components-android/issues/1086
     // if so, revert application/vlc-android/res/values[-v21]/styles.xml -> AppModalStyle
-    androidxMaterialVersion = '1.1.0'
-    constraintLayoutVersion = '1.1.3'
+    androidxMaterialVersion = '1.3.0'
+    constraintLayoutVersion = '2.0.4'
     viewPager2Version = "1.0.0"
     archVersion = '2.1.0'
-    roomVersion = '2.2.5'
+    roomVersion = '2.2.6'
     pagingVersion = '2.1.2'
     junitVersion = '4.13'
     mockito = '2.25.0'

extension-api/build.gradle

@@ -51,7 +51,7 @@ android {
 }
 
 dependencies {
-    api "androidx.appcompat:appcompat:$rootProject.ext.androidxAppcompatVersion"
+    api "androidx.appcompat:appcompat:$rootProject.ext.appCompatVersion"
     testImplementation "junit:junit:$rootProject.ext.junitVersion"
 }