From 19426b719e11da9f5850b9e1116948db62f15d73 Mon Sep 17 00:00:00 2001
From: Ryan Heise <ryan@ryanheise.com>
Date: Sat, 18 May 2024 00:24:30 +1000
Subject: [PATCH] Gradle and multidex changes.

---
 just_audio/android/build.gradle               | 19 +++++++-------
 just_audio/example/android/app/build.gradle   |  6 ++---
 .../app/FlutterMultiDexApplication.java       | 25 -------------------
 3 files changed, 13 insertions(+), 37 deletions(-)
 delete mode 100644 just_audio/example/android/app/src/main/java/io/flutter/app/FlutterMultiDexApplication.java

diff --git a/just_audio/android/build.gradle b/just_audio/android/build.gradle
index 2194fc675..eed1f8cca 100644
--- a/just_audio/android/build.gradle
+++ b/just_audio/android/build.gradle
@@ -31,10 +31,10 @@ android {
     if (project.android.hasProperty("namespace")) {
         namespace 'com.ryanheise.just_audio'
     }
-    compileSdkVersion 33
+    compileSdk 34
 
     defaultConfig {
-        minSdkVersion 16
+        minSdk 16
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
@@ -46,12 +46,13 @@ android {
         sourceCompatibility 1.8
         targetCompatibility 1.8
     }
-}
 
-dependencies {
-    def exoplayer_version = "2.18.7"
-    implementation "com.google.android.exoplayer:exoplayer-core:$exoplayer_version"
-    implementation "com.google.android.exoplayer:exoplayer-dash:$exoplayer_version"
-    implementation "com.google.android.exoplayer:exoplayer-hls:$exoplayer_version"
-    implementation "com.google.android.exoplayer:exoplayer-smoothstreaming:$exoplayer_version"
+    dependencies {
+        def exoplayer_version = "2.18.7"
+        implementation "com.google.android.exoplayer:exoplayer-core:$exoplayer_version"
+        implementation "com.google.android.exoplayer:exoplayer-dash:$exoplayer_version"
+        implementation "com.google.android.exoplayer:exoplayer-hls:$exoplayer_version"
+        implementation "com.google.android.exoplayer:exoplayer-smoothstreaming:$exoplayer_version"
+    }
 }
+
diff --git a/just_audio/example/android/app/build.gradle b/just_audio/example/android/app/build.gradle
index 2c1c06f3f..73918b483 100644
--- a/just_audio/example/android/app/build.gradle
+++ b/just_audio/example/android/app/build.gradle
@@ -26,7 +26,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
     namespace 'com.ryanheise.just_audio_example'
-    compileSdkVersion 33
+    compileSdk 34
 
     lintOptions {
         disable 'InvalidPackage'
@@ -35,8 +35,8 @@ android {
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "com.ryanheise.just_audio_example"
-        minSdkVersion 19
-        targetSdkVersion 33
+        minSdk flutter.minSdkVersion
+        targetSdk 34
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
diff --git a/just_audio/example/android/app/src/main/java/io/flutter/app/FlutterMultiDexApplication.java b/just_audio/example/android/app/src/main/java/io/flutter/app/FlutterMultiDexApplication.java
deleted file mode 100644
index 752fc185d..000000000
--- a/just_audio/example/android/app/src/main/java/io/flutter/app/FlutterMultiDexApplication.java
+++ /dev/null
@@ -1,25 +0,0 @@
-// Generated file.
-//
-// If you wish to remove Flutter's multidex support, delete this entire file.
-//
-// Modifications to this file should be done in a copy under a different name
-// as this file may be regenerated.
-
-package io.flutter.app;
-
-import android.app.Application;
-import android.content.Context;
-import androidx.annotation.CallSuper;
-import androidx.multidex.MultiDex;
-
-/**
- * Extension of {@link android.app.Application}, adding multidex support.
- */
-public class FlutterMultiDexApplication extends Application {
-  @Override
-  @CallSuper
-  protected void attachBaseContext(Context base) {
-    super.attachBaseContext(base);
-    MultiDex.install(this);
-  }
-}