Merge pull request TheWidlarzGroup#2724 from iFeelSmart/fix/remove_de…

…precated_MediaPlayer_2 Remove Android MediaPlayer support TheWidlarzGroup#2656
mizutani256 · Jun 19, 2022 · 08c2220 · 08c2220
2 parents 2fdbc4b + 877b55c
commit 08c2220
Show file tree

Hide file tree

Showing 33 changed files with 128 additions and 1,977 deletions.
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
@@ -10,8 +10,7 @@ Describe what you wanted to happen
 ### Platform
 Which player are you experiencing the problem on:
 * iOS
-* Android ExoPlayer
-* Android MediaPlayer
+* Android
 * Windows UWP
 * Windows WPF
 

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -18,12 +18,11 @@ assignees: ''
 
 ## Platform
 <!--
-  Platform where your bug is happening. If Android, report if using Android or Android Exoplayer
+  Platform where your bug is happening.
 -->
 Which player are you experiencing the problem on:
 * iOS
-* Android ExoPlayer
-* Android MediaPlayer
+* Android
 * Windows UWP
 * Windows WPF
 

diff --git a/API.md b/API.md
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,9 +1,10 @@
 ## Changelog
 
-### Version 6.0.0-alpha.1
+### Version 6.0.0-alpha1
 
+- Remove Android MediaPlayer support [#2724](https://github.com/react-native-video/react-native-video/pull/2724)
 - Replace Image.propTypes with ImagePropTypes. [#2718](https://github.com/react-native-video/react-native-video/pull/2718)
-- 
+
 ### Version 6.0.0-alpha.0
 - Support disabling buffering [#2689](https://github.com/react-native-video/react-native-video/pull/2689)
 - Fix AudioFocus bug that could cause the player to stop responding to play/pause in some instances. [#2689](https://github.com/react-native-video/react-native-video/pull/2689)

diff --git a/Video.js b/Video.js
@@ -473,7 +473,6 @@ Video.propTypes = {
     bufferForPlaybackAfterRebufferMs: PropTypes.number,
     maxHeapAllocationPercent: PropTypes.number,
   }),
-  stereoPan: PropTypes.number,
   rate: PropTypes.number,
   pictureInPicture: PropTypes.bool,
   playInBackground: PropTypes.bool,

diff --git a/android-exoplayer/build.gradle b/android-exoplayer/build.gradle
diff --git a/android-exoplayer/src/main/AndroidManifest.xml b/android-exoplayer/src/main/AndroidManifest.xml
diff --git a/android-exoplayer/src/main/java/com/brentvatne/react/ReactVideoPackage.java b/android-exoplayer/src/main/java/com/brentvatne/react/ReactVideoPackage.java
diff --git a/android-exoplayer/README.md → android/README.md b/android-exoplayer/README.md → android/README.md
diff --git a/android/build.gradle b/android/build.gradle
@@ -8,19 +8,43 @@ android {
     compileSdkVersion safeExtGet('compileSdkVersion', 31)
     buildToolsVersion safeExtGet('buildToolsVersion', '30.0.2')
 
+    compileOptions {
+        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_1_8
+    }
+
     defaultConfig {
         minSdkVersion safeExtGet('minSdkVersion', 21)
         targetSdkVersion safeExtGet('targetSdkVersion', 28)
         versionCode 1
         versionName "1.0"
-        ndk {
-            abiFilters "armeabi-v7a", "x86"
-        }
     }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+}
+
+repositories {
+    // Remove this repository line after google releases to google() or mavenCentral()
+    maven { url "https://dl.google.com/android/maven2" }
 }
 
 dependencies {
-    //noinspection GradleDynamicVersion
     implementation "com.facebook.react:react-native:${safeExtGet('reactNativeVersion', '+')}"
-    implementation 'com.github.thang2162:Android-ScalableVideoView:v1.1.1'
+    implementation('com.google.android.exoplayer:exoplayer:2.17.1') {
+        exclude group: 'com.android.support'
+    }
+
+    // All support libs must use the same version
+    implementation "androidx.annotation:annotation:1.1.0"
+    implementation "androidx.core:core:1.1.0"
+    implementation "androidx.media:media:1.1.0"
+
+    implementation('com.google.android.exoplayer:extension-okhttp:2.17.1') {
+        exclude group: 'com.squareup.okhttp3', module: 'okhttp'
+    }
+    implementation 'com.squareup.okhttp3:okhttp:${OKHTTP_VERSION}'
+
 }