From 721a42f60f806d380c634ce66e548febf00e9a25 Mon Sep 17 00:00:00 2001 From: austinried <4966622+austinried@users.noreply.github.com> Date: Tue, 7 Sep 2021 12:20:52 +0900 Subject: [PATCH] pull in/rely on exoplayer locally --- .gitmodules | 3 +++ android/app/build.gradle | 8 ++++++++ android/gradle.properties | 4 ++++ android/settings.gradle | 3 +++ submodules/ExoPlayer | 1 + 5 files changed, 19 insertions(+) create mode 100644 .gitmodules create mode 160000 submodules/ExoPlayer diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..bcaa4de --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "submodules/ExoPlayer"] + path = submodules/ExoPlayer + url = https://github.com/google/ExoPlayer.git diff --git a/android/app/build.gradle b/android/app/build.gradle index 285c1ae..52cde2a 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -220,6 +220,14 @@ dependencies { } else { implementation jscFlavor } + + implementation(project(":react-native-track-player")) { + exclude group:'com.google.android.exoplayer' + } + implementation project(':exoplayer-library-core') + compileOnly project(':exoplayer-library-dash') + compileOnly project(':exoplayer-library-hls') + compileOnly project(':exoplayer-library-smoothstreaming') } // Run this once to be able to run the application with BUCK diff --git a/android/gradle.properties b/android/gradle.properties index 6517885..c869321 100644 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -30,3 +30,7 @@ FLIPPER_VERSION=0.75.1 # react-native-async-storage next AsyncStorage_useNextStorage=true AsyncStorage_kotlinVersion=1.4.21 + +# required to override exoplayer used by react-native-track-player, resolves "abstract method" error +# see: https://github.com/google/ExoPlayer/issues/6801#issuecomment-574089568 +android.enableDexingArtifactTransform=false diff --git a/android/settings.gradle b/android/settings.gradle index e7b389a..1e9d166 100644 --- a/android/settings.gradle +++ b/android/settings.gradle @@ -7,3 +7,6 @@ include ':react-native-fs' project(':react-native-fs').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-fs/android') apply from: file("../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesSettingsGradle(settings) include ':app' +gradle.ext.exoplayerRoot = '../submodules/ExoPlayer' +gradle.ext.exoplayerModulePrefix = 'exoplayer-' +apply from: file("$gradle.ext.exoplayerRoot/core_settings.gradle") diff --git a/submodules/ExoPlayer b/submodules/ExoPlayer new file mode 160000 index 0000000..7d3f54a --- /dev/null +++ b/submodules/ExoPlayer @@ -0,0 +1 @@ +Subproject commit 7d3f54a375fac04a746ca76a8f2e1ad32c8b45b2