From 177acaddfea199b51c3d2133885e45b9dc564e72 Mon Sep 17 00:00:00 2001
From: yattoz <12408848+yattoz@users.noreply.github.com>
Date: Thu, 27 Feb 2020 20:47:25 +0100
Subject: [PATCH] Use ExoPlayer 2.11.3 (no need for submodule anymore)

---
 .idea/gradle.xml | 22 ----------------------
 .idea/vcs.xml    |  1 -
 ExoPlayer        |  1 -
 app/build.gradle |  8 ++++----
 settings.gradle  |  4 ----
 5 files changed, 4 insertions(+), 32 deletions(-)
 delete mode 160000 ExoPlayer

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index add6ddc..169fd0d 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -8,28 +8,6 @@
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
-            <option value="$PROJECT_DIR$/ExoPlayer/extensions/av1" />
-            <option value="$PROJECT_DIR$/ExoPlayer/extensions/cast" />
-            <option value="$PROJECT_DIR$/ExoPlayer/extensions/cronet" />
-            <option value="$PROJECT_DIR$/ExoPlayer/extensions/ffmpeg" />
-            <option value="$PROJECT_DIR$/ExoPlayer/extensions/flac" />
-            <option value="$PROJECT_DIR$/ExoPlayer/extensions/gvr" />
-            <option value="$PROJECT_DIR$/ExoPlayer/extensions/ima" />
-            <option value="$PROJECT_DIR$/ExoPlayer/extensions/jobdispatcher" />
-            <option value="$PROJECT_DIR$/ExoPlayer/extensions/leanback" />
-            <option value="$PROJECT_DIR$/ExoPlayer/extensions/mediasession" />
-            <option value="$PROJECT_DIR$/ExoPlayer/extensions/okhttp" />
-            <option value="$PROJECT_DIR$/ExoPlayer/extensions/opus" />
-            <option value="$PROJECT_DIR$/ExoPlayer/extensions/rtmp" />
-            <option value="$PROJECT_DIR$/ExoPlayer/extensions/vp9" />
-            <option value="$PROJECT_DIR$/ExoPlayer/extensions/workmanager" />
-            <option value="$PROJECT_DIR$/ExoPlayer/library/all" />
-            <option value="$PROJECT_DIR$/ExoPlayer/library/core" />
-            <option value="$PROJECT_DIR$/ExoPlayer/library/dash" />
-            <option value="$PROJECT_DIR$/ExoPlayer/library/hls" />
-            <option value="$PROJECT_DIR$/ExoPlayer/library/smoothstreaming" />
-            <option value="$PROJECT_DIR$/ExoPlayer/library/ui" />
-            <option value="$PROJECT_DIR$/ExoPlayer/testutils" />
             <option value="$PROJECT_DIR$/app" />
           </set>
         </option>
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index 257ba1f..35eb1dd 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -2,6 +2,5 @@
 <project version="4">
   <component name="VcsDirectoryMappings">
     <mapping directory="" vcs="Git" />
-    <mapping directory="$PROJECT_DIR$/ExoPlayer" vcs="Git" />
   </component>
 </project>
\ No newline at end of file
diff --git a/ExoPlayer b/ExoPlayer
deleted file mode 160000
index 24a1926..0000000
--- a/ExoPlayer
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 24a19264dbf35e326bbd7bb36c232eb180e1e26d
diff --git a/app/build.gradle b/app/build.gradle
index d658187..19669a3 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -69,11 +69,11 @@ dependencies {
      */
 
     implementation "androidx.media:media:1.1.0"
-    //implementation 'com.google.android.exoplayer:exoplayer:2.11.1'
-    implementation project(':exoplayer-library') // uses local ExoPlayer clone, from dev-v2 branch (fixes ISO-8859-1 ICY metadata
+    implementation 'com.google.android.exoplayer:exoplayer:2.11.3'
+    //implementation project(':exoplayer-library') // uses local ExoPlayer clone, from dev-v2 branch (fixes ISO-8859-1 ICY metadata
 
-    implementation 'androidx.lifecycle:lifecycle-extensions:2.1.0'
-    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.1.0'
+    implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
+    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0'
 
     implementation 'androidx.recyclerview:recyclerview:1.1.0'
     implementation 'androidx.preference:preference:1.1.0'
diff --git a/settings.gradle b/settings.gradle
index 79be6ca..6bfed1f 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,6 +1,2 @@
 include ':app'
 rootProject.name='Tsumugi-app'
-
-gradle.ext.exoplayerRoot = './ExoPlayer'
-gradle.ext.exoplayerModulePrefix = 'exoplayer-'
-apply from: new File(gradle.ext.exoplayerRoot, 'core_settings.gradle')