Make Cronet extension depend only on common

This also moves DefaultHttpDataSource to common, which seems sensible, else non-player components that need a DataSource don't have any useful concrete implementations. We should think about moving some of the other concrete implementations to common as well. PiperOrigin-RevId: 354738925

Make Cronet extension depend only on common
This also moves DefaultHttpDataSource to common, which seems sensible, else non-player components that need a DataSource don't have any useful concrete implementations. We should think about moving some of the other concrete implementations to common as well. PiperOrigin-RevId: 354738925
6f801819 · olly · Oliver Woodman · 07a3ba1b · 6f801819 · 6f801819
Commit 6f801819 authored Jan 30, 2021 by olly Committed by Oliver Woodman Feb 01, 2021
Showing with 2 additions and 1 deletions
extensions/cronet/build.gradle
library/common/build.gradle
library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultHttpDataSource.java → library/common/src/main/java/com/google/android/exoplayer2/upstream/DefaultHttpDataSource.java
library/core/src/main/java/com/google/android/exoplayer2/util/ConditionVariable.java → library/common/src/main/java/com/google/android/exoplayer2/util/ConditionVariable.java
library/core/src/test/java/com/google/android/exoplayer2/upstream/DefaultHttpDataSourceTest.java → library/common/src/test/java/com/google/android/exoplayer2/upstream/DefaultHttpDataSourceTest.java
library/core/src/test/java/com/google/android/exoplayer2/util/ConditionVariableTest.java → library/common/src/test/java/com/google/android/exoplayer2/util/ConditionVariableTest.java
--- a/extensions/cronet/build.gradle
+++ b/extensions/cronet/build.gradle
@@ -21,7 +21,7 @@ android {

 dependencies {
    api "com.google.android.gms:play-services-cronet:17.0.0"
-    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

--- a/library/common/build.gradle
+++ b/library/common/build.gradle
@@ -35,6 +35,7 @@ dependencies {
    testImplementation 'androidx.test.ext:junit:' + androidxTestJUnitVersion
    testImplementation 'junit:junit:' + junitVersion
    testImplementation 'com.google.truth:truth:' + truthVersion
+    testImplementation 'com.squareup.okhttp3:mockwebserver:' + mockWebServerVersion
    testImplementation 'org.robolectric:robolectric:' + robolectricVersion
    testImplementation project(modulePrefix + 'testutils')
 }

--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultHttpDataSource.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultHttpDataSource.java
--- a/library/core/src/main/java/com/google/android/exoplayer2/util/ConditionVariable.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/util/ConditionVariable.java
--- a/library/core/src/test/java/com/google/android/exoplayer2/upstream/DefaultHttpDataSourceContractTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/upstream/DefaultHttpDataSourceContractTest.java
--- a/library/core/src/test/java/com/google/android/exoplayer2/upstream/DefaultHttpDataSourceTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/upstream/DefaultHttpDataSourceTest.java
--- a/library/core/src/test/java/com/google/android/exoplayer2/util/ConditionVariableTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/util/ConditionVariableTest.java