From 35b99d634fc551552aea3330096395359eccaa97 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Sat, 30 Jan 2021 23:50:20 +0000
Subject: [PATCH] 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
---
 extensions/cronet/build.gradle                                  | 2 +-
 library/common/build.gradle                                     | 1 +
 .../android/exoplayer2/upstream/DefaultHttpDataSource.java      | 0
 .../com/google/android/exoplayer2/util/ConditionVariable.java   | 0
 .../exoplayer2/upstream/DefaultHttpDataSourceContractTest.java  | 0
 .../android/exoplayer2/upstream/DefaultHttpDataSourceTest.java  | 0
 .../google/android/exoplayer2/util/ConditionVariableTest.java   | 0
 7 files changed, 2 insertions(+), 1 deletion(-)
 rename library/{core => common}/src/main/java/com/google/android/exoplayer2/upstream/DefaultHttpDataSource.java (100%)
 rename library/{core => common}/src/main/java/com/google/android/exoplayer2/util/ConditionVariable.java (100%)
 rename library/{core => common}/src/test/java/com/google/android/exoplayer2/upstream/DefaultHttpDataSourceContractTest.java (100%)
 rename library/{core => common}/src/test/java/com/google/android/exoplayer2/upstream/DefaultHttpDataSourceTest.java (100%)
 rename library/{core => common}/src/test/java/com/google/android/exoplayer2/util/ConditionVariableTest.java (100%)

diff --git a/extensions/cronet/build.gradle b/extensions/cronet/build.gradle
index 975bf4a6e8..19526461ff 100644
--- 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
diff --git a/library/common/build.gradle b/library/common/build.gradle
index 2b0a1b27ff..d1d0d86f42 100644
--- 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')
 }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultHttpDataSource.java b/library/common/src/main/java/com/google/android/exoplayer2/upstream/DefaultHttpDataSource.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultHttpDataSource.java
rename to library/common/src/main/java/com/google/android/exoplayer2/upstream/DefaultHttpDataSource.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/util/ConditionVariable.java b/library/common/src/main/java/com/google/android/exoplayer2/util/ConditionVariable.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/util/ConditionVariable.java
rename to library/common/src/main/java/com/google/android/exoplayer2/util/ConditionVariable.java
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/upstream/DefaultHttpDataSourceContractTest.java b/library/common/src/test/java/com/google/android/exoplayer2/upstream/DefaultHttpDataSourceContractTest.java
similarity index 100%
rename from library/core/src/test/java/com/google/android/exoplayer2/upstream/DefaultHttpDataSourceContractTest.java
rename to library/common/src/test/java/com/google/android/exoplayer2/upstream/DefaultHttpDataSourceContractTest.java
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/upstream/DefaultHttpDataSourceTest.java b/library/common/src/test/java/com/google/android/exoplayer2/upstream/DefaultHttpDataSourceTest.java
similarity index 100%
rename from library/core/src/test/java/com/google/android/exoplayer2/upstream/DefaultHttpDataSourceTest.java
rename to library/common/src/test/java/com/google/android/exoplayer2/upstream/DefaultHttpDataSourceTest.java
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/util/ConditionVariableTest.java b/library/common/src/test/java/com/google/android/exoplayer2/util/ConditionVariableTest.java
similarity index 100%
rename from library/core/src/test/java/com/google/android/exoplayer2/util/ConditionVariableTest.java
rename to library/common/src/test/java/com/google/android/exoplayer2/util/ConditionVariableTest.java