Merge pull request feelfreelinux#201 from otwarty-wykop-mobilny/renov…

…ate/com.google.android.exoplayer chore(deps): update com.google.android.exoplayer to v2.17.0
luk1337 · Mar 1, 2022 · 29a31d7 · 29a31d7
2 parents a89b83a + d79891b
commit 29a31d7
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/build.gradle b/build.gradle
@@ -49,4 +49,12 @@ allprojects {
             setMatchingFallbacks("debug")
         }
     }
+    configurations.configureEach {
+        resolutionStrategy.eachDependency {
+            if (requested.group == "org.checkerframework" && requested.name != "checker-compat-qual") {
+                useVersion(libs.versions.mavencentral.checker.get())
+                because("https://github.com/google/ExoPlayer/issues/10007")
+            }
+        }
+    }
 }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -20,7 +20,7 @@ google-datastore = "1.0.0"
 google-cardview = "1.0.0"
 google-exifinterface = "1.3.3"
 google-startup = "1.1.1"
-google-exoplayer = "2.16.1"
+google-exoplayer = "2.17.0"
 google-espresso = "3.4.0"
 google-annotation = "1.3.0"
 mavencentral-coroutines = "1.6.0"
@@ -40,6 +40,7 @@ mavencentral-leakcanary = "2.7"
 mavencentral-markdown = "0.2.4"
 mavencentral-junit = "5.8.2"
 mavencentral-napier = "2.2.0"
+mavencentral-checker = "3.21.2"
 jitpack-photoview = "2.3.0"
 jitpack-subsampling-scale-image-view = "3.10.0"
 

diff --git a/settings.gradle b/settings.gradle
@@ -3,7 +3,6 @@ plugins {
 }
 
 enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
-enableFeaturePreview("VERSION_CATALOGS")
 
 Closure discoverSubprojects = {
     fileTree(rootDir) { include("**/build.gradle") }