From cafead8a8871e5bff361a9dcda46b61c5fc58917 Mon Sep 17 00:00:00 2001
From: Alexander Capehart <alex@oxycblt.org>
Date: Mon, 15 Aug 2022 19:54:37 -0600
Subject: [PATCH] deps: upgrade to android 13 [#129]

FINALLY upgrade to android 13.

I cannot believe it had to take until the release of the version to
finally update the SDK version, but of course it had to. For some
insane reason that I have no idea why it passed QA, the 33 SDK had
a crippling issue where attributes were not recognized. The only
way to fix this was to:

1. Upgrade to the newer studio version (Chipmunk Patch 2)
2. Upgrade to AGP 7.3.0-beta05.

Funny thing though. AGP 7.3.0 IS NOT COMPATIBLE WITH CHIPMUNK. Okay,
so we can upgrade to Dolphin then and then we can use AGP, right?
HAHAHA NOPE! Dolphin hasn't patched out the XML issue yet despite
every other release channel having a release on August 3rd. Did
some engineer at google just forget to make a release? What?

Okay, so I guess I'm forced to use Electric Eel, the UNSTABLE CANARY
VERSION that IS FILLED WITH BUGS. But oh wait, Electric Eel doesn't
like AGP 7.3.0 EITHER! It wants AGP 7.4.0, which IS ALSO IN ALPHA.
So, I'm forced to use the ALPHA studio and the ALPHA AGP version just
to use the android 13 SDK in a way that is not completely unbearable.

The android SDK, everyone.

(This is not a cry for help, I just want to write down my infinite
frustration with this stupid goose chase somewhere)
---
 app/build.gradle                                | 4 ++--
 app/src/main/java/org/oxycblt/auxio/AuxioApp.kt | 5 ++---
 build.gradle                                    | 2 +-
 gradle/wrapper/gradle-wrapper.properties        | 2 +-
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 4e1a866a1..19e0cf4b4 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -6,7 +6,7 @@ plugins {
 }
 
 android {
-    compileSdk 32
+    compileSdk 33
     namespace "org.oxycblt.auxio"
 
     defaultConfig {
@@ -17,7 +17,7 @@ android {
         minSdk 21
         // API 33 is still busted, waiting until the XML element issue is fixed
         // noinspection OldTargetApi
-        targetSdk 32
+        targetSdk 33
 
         buildFeatures {
             viewBinding true
diff --git a/app/src/main/java/org/oxycblt/auxio/AuxioApp.kt b/app/src/main/java/org/oxycblt/auxio/AuxioApp.kt
index a31893b75..29827448d 100644
--- a/app/src/main/java/org/oxycblt/auxio/AuxioApp.kt
+++ b/app/src/main/java/org/oxycblt/auxio/AuxioApp.kt
@@ -51,8 +51,8 @@ class AuxioApp : Application(), ImageLoaderFactory {
                     .build()))
     }
 
-    override fun newImageLoader(): ImageLoader {
-        return ImageLoader.Builder(applicationContext)
+    override fun newImageLoader() =
+        ImageLoader.Builder(applicationContext)
             .components {
                 add(AlbumCoverFetcher.SongFactory())
                 add(AlbumCoverFetcher.AlbumFactory())
@@ -63,7 +63,6 @@ class AuxioApp : Application(), ImageLoaderFactory {
             .transitionFactory(CrossfadeTransitionFactory())
             .diskCachePolicy(CachePolicy.DISABLED) // Not downloading anything, so no disk-caching
             .build()
-    }
 
     companion object {
         const val SHORTCUT_SHUFFLE_ID = "shortcut_shuffle"
diff --git a/build.gradle b/build.gradle
index cca8f7776..3973b3533 100644
--- a/build.gradle
+++ b/build.gradle
@@ -9,7 +9,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.2.2'
+        classpath 'com.android.tools.build:gradle:7.4.0-alpha09'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "androidx.navigation:navigation-safe-args-gradle-plugin:$navigation_version"
         classpath "com.diffplug.spotless:spotless-plugin-gradle:6.6.1"
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index aa991fcea..8049c684f 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.4.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists