From fc4c7714a2541a8e6ea06cd11b5560522f6d4cb3 Mon Sep 17 00:00:00 2001
From: OxygenCobalt <oxycblt@abstractr.net>
Date: Thu, 24 Feb 2022 15:17:31 -0700
Subject: [PATCH] deps: upgrade

Wheeeeeee
ExoPlayer -> 2.17.0
Coil -> 2.0.0-alpha09
Ktlint -> 0.44.0
---
 app/build.gradle                                   | 13 +++++--------
 .../java/org/oxycblt/auxio/coil/AuxioFetcher.kt    |  2 +-
 gradle/wrapper/gradle-wrapper.properties           |  2 +-
 prebuild.py                                        | 14 +++++---------
 4 files changed, 12 insertions(+), 19 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index b540261d0..5884b7570 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -93,17 +93,14 @@ dependencies {
     // --- THIRD PARTY ---
 
     // Exoplayer
-    // WARNING: THE EXOPLAYER VERSION MUST BE KEPT IN LOCK-STEP WITH THE CUSTOM AAR BLOBS.
+    // WARNING: THE EXOPLAYER VERSION MUST BE KEPT IN LOCK-STEP WITH THE FLAC EXTENSION.
     // IF NOT, VERY UNFRIENDLY BUILD FAILURES AND CRASHES MAY ENSUE.
-    def exoplayerVersion = '2.16.1'
-    implementation("com.google.android.exoplayer:exoplayer-core:$exoplayerVersion") {
-        exclude group: "com.google.android.exoplayer", module: "exoplayer-extractor"
-    }
-    implementation fileTree(dir: "libs", include: ["library-*.aar"])
+    def exoplayerVersion = '2.17.0'
+    implementation("com.google.android.exoplayer:exoplayer-core:$exoplayerVersion")
     implementation fileTree(dir: "libs", include: ["extension-*.aar"])
 
     // Image loading
-    implementation 'io.coil-kt:coil:2.0.0-alpha06'
+    implementation 'io.coil-kt:coil:2.0.0-alpha09'
 
     // Material
     implementation 'com.google.android.material:material:1.6.0-alpha02'
@@ -111,7 +108,7 @@ dependencies {
     // --- DEBUG ---
 
     // Lint
-    ktlint 'com.pinterest:ktlint:0.43.2'
+    ktlint 'com.pinterest:ktlint:0.44.0'
 }
 
 task ktlint(type: JavaExec, group: "verification") {
diff --git a/app/src/main/java/org/oxycblt/auxio/coil/AuxioFetcher.kt b/app/src/main/java/org/oxycblt/auxio/coil/AuxioFetcher.kt
index 65f964af3..312194d34 100644
--- a/app/src/main/java/org/oxycblt/auxio/coil/AuxioFetcher.kt
+++ b/app/src/main/java/org/oxycblt/auxio/coil/AuxioFetcher.kt
@@ -18,8 +18,8 @@ import coil.size.pxOrElse
 import com.google.android.exoplayer2.MediaItem
 import com.google.android.exoplayer2.MediaMetadata
 import com.google.android.exoplayer2.MetadataRetriever
+import com.google.android.exoplayer2.metadata.flac.PictureFrame
 import com.google.android.exoplayer2.metadata.id3.ApicFrame
-import com.google.android.exoplayer2.metadata.vorbis.PictureFrame
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import okio.buffer
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index ffed3a254..2e6e5897b 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/prebuild.py b/prebuild.py
index 48b3c5582..7dd0d8f4f 100755
--- a/prebuild.py
+++ b/prebuild.py
@@ -8,6 +8,9 @@ import sys
 import subprocess
 import re
 
+# WARNING: THE EXOPLAYER VERSION MUST BE KEPT IN LOCK-STEP WITH THE FLAC EXTENSION.
+# IF NOT, VERY UNFRIENDLY BUILD FAILURES AND CRASHES MAY ENSUE.
+EXO_VERSION = "2.17.0"
 FLAC_VERSION = "1.3.2"
 
 FATAL="\033[1;31m"
@@ -75,9 +78,9 @@ sh("rm -rf " + exoplayer_path)
 sh("rm -rf " + libs_path)
 
 print(INFO + "info:" + NC + " cloning exoplayer...")
-sh("git clone https://github.com/oxygencobalt/ExoPlayer.git " + exoplayer_path)
+sh("git clone https://github.com/google/ExoPlayer.git " + exoplayer_path)
 os.chdir(exoplayer_path)
-sh("git checkout auxio")
+sh("git checkout r" + EXO_VERSION)
 
 print(INFO + "info:" + NC + " installing flac extension...")
 flac_ext_jni_path = os.path.join("extensions", "flac", "src", "main", "jni")
@@ -87,23 +90,16 @@ sh('curl "https://ftp.osuosl.org/pub/xiph/releases/flac/flac-' + FLAC_VERSION +
 sh(ndk_build_path + " APP_ABI=all -j4")
 
 print(INFO + "info:" + NC + " assembling libraries")
-extractor_aar_path = os.path.join(
-    exoplayer_path, "library", "extractor", "buildout",
-    "outputs", "aar", "library-extractor-release.aar"
-)
-
 flac_ext_aar_path = os.path.join(
     exoplayer_path, "extensions", "flac", "buildout",
     "outputs", "aar", "extension-flac-release.aar"
 )
 
 os.chdir(exoplayer_path)
-sh("./gradlew library-extractor:bundleReleaseAar")
 sh("./gradlew extension-flac:bundleReleaseAar")
 
 os.chdir(start_path)
 sh("mkdir " + libs_path)
-sh("cp " + extractor_aar_path + " " + libs_path)
 sh("cp " + flac_ext_aar_path + " " + libs_path)
 
 print(OK + "success:" + NC + " completed pre-build.")