From 3fcc14b3c24305c45d1f18fd3c8a70774d0f2001 Mon Sep 17 00:00:00 2001 From: olly Date: Mon, 25 Jan 2021 16:13:00 +0000 Subject: [PATCH] OkHttp/Rtmp extensions: Remove dependency on core They only require common. This allows their use for non-playback networking without requiring the user to depend on the whole of core. I will also make the same change for Cronet, although this needs a little more work. PiperOrigin-RevId: 353649388 --- extensions/okhttp/build.gradle | 2 +- extensions/rtmp/build.gradle | 3 ++- .../com/google/android/exoplayer2/upstream/BaseDataSource.java | 0 .../google/android/exoplayer2/upstream/BaseDataSourceTest.java | 0 4 files changed, 3 insertions(+), 2 deletions(-) rename library/{core => common}/src/main/java/com/google/android/exoplayer2/upstream/BaseDataSource.java (100%) rename library/{core => common}/src/test/java/com/google/android/exoplayer2/upstream/BaseDataSourceTest.java (100%) diff --git a/extensions/okhttp/build.gradle b/extensions/okhttp/build.gradle index 032fb0fded..758eb646f6 100644 --- a/extensions/okhttp/build.gradle +++ b/extensions/okhttp/build.gradle @@ -14,7 +14,7 @@ apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle" dependencies { - implementation project(modulePrefix + 'library-core') + implementation project(modulePrefix + 'library-common') implementation 'androidx.annotation:annotation:' + androidxAnnotationVersion compileOnly 'org.checkerframework:checker-qual:' + checkerframeworkVersion compileOnly 'org.jetbrains.kotlin:kotlin-annotations-jvm:' + kotlinAnnotationsVersion diff --git a/extensions/rtmp/build.gradle b/extensions/rtmp/build.gradle index 3d912bebf6..7a37396568 100644 --- a/extensions/rtmp/build.gradle +++ b/extensions/rtmp/build.gradle @@ -14,10 +14,11 @@ apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle" dependencies { - implementation project(modulePrefix + 'library-core') + implementation project(modulePrefix + 'library-common') implementation 'net.butterflytv.utils:rtmp-client:3.1.0' implementation 'androidx.annotation:annotation:' + androidxAnnotationVersion compileOnly 'org.jetbrains.kotlin:kotlin-annotations-jvm:' + kotlinAnnotationsVersion + testImplementation project(modulePrefix + 'library-core') testImplementation project(modulePrefix + 'testutils') testImplementation 'org.robolectric:robolectric:' + robolectricVersion } diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/BaseDataSource.java b/library/common/src/main/java/com/google/android/exoplayer2/upstream/BaseDataSource.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/upstream/BaseDataSource.java rename to library/common/src/main/java/com/google/android/exoplayer2/upstream/BaseDataSource.java diff --git a/library/core/src/test/java/com/google/android/exoplayer2/upstream/BaseDataSourceTest.java b/library/common/src/test/java/com/google/android/exoplayer2/upstream/BaseDataSourceTest.java similarity index 100% rename from library/core/src/test/java/com/google/android/exoplayer2/upstream/BaseDataSourceTest.java rename to library/common/src/test/java/com/google/android/exoplayer2/upstream/BaseDataSourceTest.java