Update all dependencies

application/app/build.gradle

@@ -168,7 +168,7 @@ dependencies {
     testImplementation "org.robolectric:robolectric:$rootProject.ext.robolectric"
     androidTestImplementation "com.android.support:multidex:1.0.3"
     androidTestImplementation "androidx.test.uiautomator:uiautomator:2.2.0"
-    androidTestImplementation 'androidx.test:rules:1.3.0'
+    androidTestImplementation "androidx.test:rules:$rootProject.ext.testCore"
     androidTestImplementation 'com.jraska:falcon:2.2.0'
     androidTestImplementation 'tools.fastlane:screengrab:2.1.0'
 }

application/donations/build.gradle

@@ -72,11 +72,10 @@ dependencies {
     implementation fileTree(dir: "libs", include: ["*.jar"])
     implementation project(':application:tools')
 
-    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    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'
+    implementation "androidx.core:core-ktx:$rootProject.ext.androidxCoreVersion"
+    implementation "androidx.appcompat:appcompat:$rootProject.ext.appCompatVersion"
+    testImplementation "junit:junit:$rootProject.ext.junitVersion"
+    androidTestImplementation "androidx.test.ext:junit:$rootProject.ext.junitVersion"
+    androidTestImplementation "androidx.test.espresso:espresso-core:$rootProject.ext.espressoVersion"
 
 }

application/live-plot-graph/build.gradle

@@ -53,7 +53,7 @@ dependencies {
     implementation project(':application:tools')
     implementation "androidx.constraintlayout:constraintlayout:$rootProject.ext.constraintLayoutVersion"
 
-    testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
+    testImplementation "junit:junit:$rootProject.ext.junitVersion"
+    androidTestImplementation "androidx.test.ext:junit:$rootProject.ext.junitVersion"
+    androidTestImplementation "androidx.test.espresso:espresso-core:$rootProject.ext.espressoVersion"
 }

application/live-plot-graph/src/main/java/org/videolan/liveplotgraph/PlotView.kt

@@ -86,7 +86,7 @@ class PlotView : FrameLayout {
                 invalidate()
                 val listenerValue = ArrayList<Pair<LineGraph, String>>(data.size)
                 data.forEach { lineGraph ->
-                    listenerValue.add(Pair(lineGraph, "${String.format("%.0f", lineGraph.data[lineGraph.data.keys.max()])} kb/s"))
+                    listenerValue.add(Pair(lineGraph, "${String.format("%.0f", lineGraph.data[lineGraph.data.keys.maxOrNull()])} kb/s"))
                 }
                 listeners.forEach { it.onDataChanged(listenerValue) }
             }
@@ -109,19 +109,19 @@ class PlotView : FrameLayout {
         minsX.clear()
 
         data.forEach {
-            maxsY.add(it.data.maxBy { it.value }?.value ?: 0f)
+            maxsY.add(it.data.maxByOrNull { it.value }?.value ?: 0f)
         }
-        val maxY = maxsY.max() ?: 0f
+        val maxY = maxsY.maxOrNull() ?: 0f
 
         data.forEach {
-            maxsX.add(it.data.maxBy { it.key }?.key ?: 0L)
+            maxsX.add(it.data.maxByOrNull { it.key }?.key ?: 0L)
         }
-        val maxX = maxsX.max() ?: 0L
+        val maxX = maxsX.maxOrNull() ?: 0L
 
         data.forEach {
-            minsX.add(it.data.minBy { it.key }?.key ?: 0L)
+            minsX.add(it.data.minByOrNull { it.key }?.key ?: 0L)
         }
-        val minX = minsX.min() ?: 0L
+        val minX = minsX.maxOrNull() ?: 0L
 
         drawLines(maxY, minX, maxX, canvas)
         drawGrid(canvas, maxY, minX, maxX)

application/mediadb/build.gradle

@@ -59,16 +59,15 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 
     implementation "androidx.appcompat:appcompat:$rootProject.ext.appCompatVersion"
     implementation "androidx.core:core-ktx:$rootProject.ext.androidxCoreVersion"
-    testImplementation 'junit:junit:4.13'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.2'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
+    testImplementation "junit:junit:$rootProject.ext.junitVersion"
+    androidTestImplementation "androidx.test.ext:junit:$rootProject.ext.junitVersion"
+    androidTestImplementation "androidx.test.espresso:espresso-core:$rootProject.ext.espressoVersion"
     //Room
     implementation "androidx.room:room-ktx:$rootProject.ext.roomVersion"
-    kapt ('org.xerial:sqlite-jdbc:3.34.0')
+    kapt ('org.xerial:sqlite-jdbc:3.36.0')
     kapt "androidx.room:room-compiler:$rootProject.ext.roomVersion"
     implementation project(':application:tools')
     implementation project(':application:resources')

application/moviepedia/build.gradle

@@ -58,7 +58,7 @@ dependencies {
     //Room
     implementation "androidx.room:room-runtime:$rootProject.ext.roomVersion"
     // Provide proper JDBC version, see https://issuetracker.google.com/issues/174695268
-    kapt ('org.xerial:sqlite-jdbc:3.34.0')
+    kapt ('org.xerial:sqlite-jdbc:3.36.0')
     kapt "androidx.room:room-compiler:$rootProject.ext.roomVersion"
 
 
@@ -68,9 +68,9 @@ dependencies {
     implementation "com.squareup.moshi:moshi-adapters:$rootProject.ext.moshi"
     implementation("com.squareup.okhttp3:logging-interceptor:4.2.1")
 
-    testImplementation 'junit:junit:4.13'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.2'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
+    testImplementation "junit:junit:$rootProject.ext.junitVersion"
+    androidTestImplementation "androidx.test.ext:junit:$rootProject.ext.junitVersion"
+    androidTestImplementation "androidx.test.espresso:espresso-core:$rootProject.ext.espressoVersion"
 }
 
 static def getMoviepediaUrl(project) {

application/resources/build.gradle

@@ -62,7 +62,7 @@ dependencies {
 
     api "com.google.android.material:material:$rootProject.ext.androidxMaterialVersion"
 
-    api "androidx.preference:preference:$androidxPreferencesVersion"
+    api "androidx.preference:preference-ktx:$androidxPreferencesVersion"
     api "androidx.leanback:leanback:$rootProject.ext.androidxLeanbackVersion"
     api "androidx.leanback:leanback-preference:$rootProject.ext.androidxLeanbackVersion"
 

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

@@ -203,7 +203,6 @@ class FileTvItemAdapter(private val eventsHandler: IEventsHandler<MediaLibraryIt
             binding.badgeTV.visibility = if (resolution.isBlank()) View.GONE else View.VISIBLE
         }
 
-        @ObsoleteCoroutinesApi
         override fun setCoverlay(selected: Boolean) {
         }
     }
@@ -284,7 +283,6 @@ class FileTvItemAdapter(private val eventsHandler: IEventsHandler<MediaLibraryIt
             binding.badgeTV.visibility = if (resolution.isBlank()) View.GONE else View.VISIBLE
         }
 
-        @ObsoleteCoroutinesApi
         override fun setCoverlay(selected: Boolean) {
         }
     }

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

@@ -268,7 +268,6 @@ class MediaScrapingTvItemAdapter(
             binding.badgeTV.visibility = if (resolution.isBlank()) View.GONE else View.VISIBLE
         }
 
-        @ObsoleteCoroutinesApi
         override fun setCoverlay(selected: Boolean) {
         }
     }
@@ -343,7 +342,6 @@ class MediaScrapingTvItemAdapter(
             binding.badgeTV.visibility = if (resolution.isBlank()) View.GONE else View.VISIBLE
         }
 
-        @ObsoleteCoroutinesApi
         override fun setCoverlay(selected: Boolean) {
         }
     }

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

@@ -250,7 +250,6 @@ class MediaTvItemAdapter(type: Int, private val eventsHandler: IEventsHandler<Me
             binding.badgeTV.visibility = if (resolution.isBlank()) View.GONE else View.VISIBLE
         }
 
-        @ObsoleteCoroutinesApi
         override fun setCoverlay(selected: Boolean) {
         }
     }
@@ -331,7 +330,6 @@ class MediaTvItemAdapter(type: Int, private val eventsHandler: IEventsHandler<Me
             binding.badgeTV.visibility = if (resolution.isBlank()) View.GONE else View.VISIBLE
         }
 
-        @ObsoleteCoroutinesApi
         override fun setCoverlay(selected: Boolean) {}
     }
 }

application/tools/build.gradle

@@ -28,7 +28,6 @@ dependencies {
     implementation "androidx.preference:preference:$androidxPreferencesVersion"
     api "androidx.tvprovider:tvprovider:$rootProject.ext.androidxLeanbackVersion"
     implementation("com.squareup.okhttp3:logging-interceptor:4.2.1")
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$rootProject.ext.kotlinx_version"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$rootProject.ext.kotlinx_version"
     implementation "androidx.core:core-ktx:$rootProject.ext.androidxCoreVersion"

application/tools/src/main/java/org/videolan/tools/Workers.kt

@@ -41,6 +41,5 @@ fun runIO(runnable: Runnable) {
 }
 
 object AppScope : CoroutineScope {
-    @ExperimentalCoroutinesApi
     override val coroutineContext = Dispatchers.Main.immediate + SupervisorJob()
 }

application/vlc-android/build.gradle

@@ -175,7 +175,7 @@ dependencies {
     api "androidx.lifecycle:lifecycle-common-java8:$rootProject.ext.lifecycleVersion"
     api "androidx.room:room-runtime:$rootProject.ext.roomVersion"
 
-    kapt ('org.xerial:sqlite-jdbc:3.34.0')
+    kapt ('org.xerial:sqlite-jdbc:3.36.0')
     kapt("androidx.room:room-compiler:$rootProject.ext.roomVersion")
 
     api "androidx.paging:paging-runtime-ktx:$rootProject.ext.pagingVersion"
@@ -185,7 +185,6 @@ dependencies {
     api "androidx.tvprovider:tvprovider:$rootProject.ext.androidxLeanbackVersion"
 
     // Kotlin
-    api "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     api "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
     api "org.jetbrains.kotlinx:kotlinx-coroutines-core:$rootProject.ext.kotlinx_version"
     api "org.jetbrains.kotlinx:kotlinx-coroutines-android:$rootProject.ext.kotlinx_version"

application/vlc-android/src/org/videolan/vlc/gui/preferences/PreferencesActivity.kt

@@ -73,7 +73,7 @@ class PreferencesActivity : BaseActivity() {
         mAppBarLayout!!.setExpanded(true)
     }
 
-    override fun onCreateOptionsMenu(menu: Menu?): Boolean {
+    override fun onCreateOptionsMenu(menu: Menu): Boolean {
         menuInflater.inflate(R.menu.activity_prefs, menu)
         return true
     }

build.gradle

@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
-    ext.android_plugin_version = '7.1.0'
-    ext.kotlin_version = '1.4.31'
+    ext.android_plugin_version = '7.1.1'
+    ext.kotlin_version = '1.6.10'
     ext.kotlinx_version = '1.4.1'
     repositories {
         flatDir dirs: "gradle/plugins"
@@ -38,41 +38,41 @@ ext {
     medialibraryVersion = '0.11.0-eap3'
     minSdkVersion = 17
     targetSdkVersion = 30
-    compileSdkVersion = 30
+    compileSdkVersion = 31
     androidxLegacyVersion = '1.0.0'
-    androidxCoreVersion = '1.3.2'
-    appCompatVersion = '1.2.0'
-    lifecycleVersion = '2.3.1'
+    androidxCoreVersion = '1.7.0'
+    appCompatVersion = '1.4.1'
+    lifecycleVersion = '2.4.0'
     androidxPreferencesVersion = '1.1.1'
     androidxVersion = '1.1.0'
-    androidxActivityVersion = '1.2.2'
-    androidxFragmentVersion = '1.3.3'
-    androidxAnnotationVersion = '1.2.0'
-    androidxRecyclerviewVersion = '1.2.0'
+    androidxActivityVersion = '1.4.0'
+    androidxFragmentVersion = '1.4.1'
+    androidxAnnotationVersion = '1.3.0'
+    androidxRecyclerviewVersion = '1.2.1'
     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.4.0'
+    androidxMaterialVersion = '1.5.0'
     //fixme: when updating to 2.1.x+, we should remove the 'layout_optimizationLevel' attribute we added in some layouts as a workaround for this issue: https://issuetracker.google.com/issues/170313444
-    constraintLayoutVersion = '2.0.4'
+    constraintLayoutVersion = '2.1.3'
     viewPager2Version = "1.0.0"
     archVersion = '2.1.0'
-    roomVersion = '2.3.0'
-    pagingVersion = '2.1.2'
-    junitVersion = '4.13'
+    roomVersion = '2.4.1'
+    pagingVersion = '3.1.0'
+    junitVersion = '4.13.2'
     mockito = '2.25.0'
     //Retrofit 2.7 drops Android 5 support
-    retrofit = '2.6.4'
+    retrofit = '2.7.1'
     moshi = '1.8.0'
     powerMock = '2.0.2'
-    espressoVersion = '3.3.0'
+    espressoVersion = '3.4.0'
     livedataTest = '1.2.0'
     robolectric = '4.3.1'
     mockk = '1.9.3'
-    supportTest = '1.1.2'
+    supportTest = '1.1.3'
     orchestrator = '1.1.0'
-    testCore = '1.3.0'
+    testCore = '1.4.0'
 //    versionCode scheme is T M NN RR AA
 //    T: Target/Flavour (1 for Android, 2 for Chrome?)
 //    M: Major version from 0 to 9