Browse Source

Use ExoPlayer 2.11.3 (no need for submodule anymore)

yattoz 4 years ago
parent
commit
177acaddfe
5 changed files with 4 additions and 32 deletions
  1. 0 22
      .idea/gradle.xml
  2. 0 1
      .idea/vcs.xml
  3. 0 1
      ExoPlayer
  4. 4 4
      app/build.gradle
  5. 0 4
      settings.gradle

+ 0 - 22
.idea/gradle.xml View File

8
         <option name="modules">
8
         <option name="modules">
9
           <set>
9
           <set>
10
             <option value="$PROJECT_DIR$" />
10
             <option value="$PROJECT_DIR$" />
11
-            <option value="$PROJECT_DIR$/ExoPlayer/extensions/av1" />
12
-            <option value="$PROJECT_DIR$/ExoPlayer/extensions/cast" />
13
-            <option value="$PROJECT_DIR$/ExoPlayer/extensions/cronet" />
14
-            <option value="$PROJECT_DIR$/ExoPlayer/extensions/ffmpeg" />
15
-            <option value="$PROJECT_DIR$/ExoPlayer/extensions/flac" />
16
-            <option value="$PROJECT_DIR$/ExoPlayer/extensions/gvr" />
17
-            <option value="$PROJECT_DIR$/ExoPlayer/extensions/ima" />
18
-            <option value="$PROJECT_DIR$/ExoPlayer/extensions/jobdispatcher" />
19
-            <option value="$PROJECT_DIR$/ExoPlayer/extensions/leanback" />
20
-            <option value="$PROJECT_DIR$/ExoPlayer/extensions/mediasession" />
21
-            <option value="$PROJECT_DIR$/ExoPlayer/extensions/okhttp" />
22
-            <option value="$PROJECT_DIR$/ExoPlayer/extensions/opus" />
23
-            <option value="$PROJECT_DIR$/ExoPlayer/extensions/rtmp" />
24
-            <option value="$PROJECT_DIR$/ExoPlayer/extensions/vp9" />
25
-            <option value="$PROJECT_DIR$/ExoPlayer/extensions/workmanager" />
26
-            <option value="$PROJECT_DIR$/ExoPlayer/library/all" />
27
-            <option value="$PROJECT_DIR$/ExoPlayer/library/core" />
28
-            <option value="$PROJECT_DIR$/ExoPlayer/library/dash" />
29
-            <option value="$PROJECT_DIR$/ExoPlayer/library/hls" />
30
-            <option value="$PROJECT_DIR$/ExoPlayer/library/smoothstreaming" />
31
-            <option value="$PROJECT_DIR$/ExoPlayer/library/ui" />
32
-            <option value="$PROJECT_DIR$/ExoPlayer/testutils" />
33
             <option value="$PROJECT_DIR$/app" />
11
             <option value="$PROJECT_DIR$/app" />
34
           </set>
12
           </set>
35
         </option>
13
         </option>

+ 0 - 1
.idea/vcs.xml View File

2
 <project version="4">
2
 <project version="4">
3
   <component name="VcsDirectoryMappings">
3
   <component name="VcsDirectoryMappings">
4
     <mapping directory="" vcs="Git" />
4
     <mapping directory="" vcs="Git" />
5
-    <mapping directory="$PROJECT_DIR$/ExoPlayer" vcs="Git" />
6
   </component>
5
   </component>
7
 </project>
6
 </project>

+ 0 - 1
ExoPlayer

1
-Subproject commit 24a19264dbf35e326bbd7bb36c232eb180e1e26d

+ 4 - 4
app/build.gradle View File

69
      */
69
      */
70
 
70
 
71
     implementation "androidx.media:media:1.1.0"
71
     implementation "androidx.media:media:1.1.0"
72
-    //implementation 'com.google.android.exoplayer:exoplayer:2.11.1'
73
-    implementation project(':exoplayer-library') // uses local ExoPlayer clone, from dev-v2 branch (fixes ISO-8859-1 ICY metadata
72
+    implementation 'com.google.android.exoplayer:exoplayer:2.11.3'
73
+    //implementation project(':exoplayer-library') // uses local ExoPlayer clone, from dev-v2 branch (fixes ISO-8859-1 ICY metadata
74
 
74
 
75
-    implementation 'androidx.lifecycle:lifecycle-extensions:2.1.0'
76
-    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.1.0'
75
+    implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
76
+    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0'
77
 
77
 
78
     implementation 'androidx.recyclerview:recyclerview:1.1.0'
78
     implementation 'androidx.recyclerview:recyclerview:1.1.0'
79
     implementation 'androidx.preference:preference:1.1.0'
79
     implementation 'androidx.preference:preference:1.1.0'

+ 0 - 4
settings.gradle View File

1
 include ':app'
1
 include ':app'
2
 rootProject.name='Tsumugi-app'
2
 rootProject.name='Tsumugi-app'
3
-
4
-gradle.ext.exoplayerRoot = './ExoPlayer'
5
-gradle.ext.exoplayerModulePrefix = 'exoplayer-'
6
-apply from: new File(gradle.ext.exoplayerRoot, 'core_settings.gradle')