Fix instrumentation tests not working via Gradle

PiperOrigin-RevId: 475560401
DiceTechnology · Oct 19, 2022 · 6015f05 · 6015f05
1 parent fd6b0d1
commit 6015f05
Show file tree

Hide file tree

Showing 17 changed files with 20 additions and 19 deletions.
diff --git a/extensions/cronet/build.gradle b/extensions/cronet/build.gradle
@@ -27,9 +27,9 @@ dependencies {
     compileOnly 'com.google.errorprone:error_prone_annotations:' + errorProneVersion
     compileOnly 'org.checkerframework:checker-qual:' + checkerframeworkVersion
     compileOnly 'org.jetbrains.kotlin:kotlin-annotations-jvm:' + kotlinAnnotationsVersion
+    androidTestImplementation 'androidx.multidex:multidex:' + androidxMultidexVersion
     androidTestImplementation 'androidx.test:rules:' + androidxTestRulesVersion
     androidTestImplementation 'androidx.test:runner:' + androidxTestRunnerVersion
-    androidTestImplementation 'androidx.multidex:multidex:' + androidxMultidexVersion
     androidTestImplementation 'com.linkedin.dexmaker:dexmaker-mockito:' + dexmakerVersion
     // Instrumentation tests assume that an app-packaged version of cronet is
     // available.

diff --git a/extensions/cronet/src/androidTest/AndroidManifest.xml b/extensions/cronet/src/androidTest/AndroidManifest.xml
@@ -22,9 +22,8 @@
   <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
   <uses-sdk/>
 
-  <!-- TODO(b/243799715): Use android:name="androidx.multidex.MultiDexApplication" instead. -->
   <application
-    android:name="android.support.multidex.MultiDexApplication"
+    android:name="androidx.multidex.MultiDexApplication"
     android:allowBackup="false"
     android:usesCleartextTraffic="true"
     tools:ignore="MissingApplicationIcon,HardcodedDebugMode"/>

diff --git a/extensions/flac/build.gradle b/extensions/flac/build.gradle
@@ -14,6 +14,9 @@
 apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle"
 
 android {
+    defaultConfig {
+        multiDexEnabled true
+    }
     sourceSets {
         main {
             jniLibs.srcDir 'src/main/libs'
@@ -31,6 +34,7 @@ dependencies {
     compileOnly 'org.checkerframework:checker-qual:' + checkerframeworkVersion
     compileOnly 'org.jetbrains.kotlin:kotlin-annotations-jvm:' + kotlinAnnotationsVersion
     androidTestImplementation project(modulePrefix + 'testutils')
+    androidTestImplementation 'androidx.multidex:multidex:' + androidxMultidexVersion
     androidTestImplementation 'androidx.test:runner:' + androidxTestRunnerVersion
     testImplementation 'androidx.test:core:' + androidxTestCoreVersion
     testImplementation 'androidx.test.ext:junit:' + androidxTestJUnitVersion

diff --git a/extensions/flac/src/androidTest/AndroidManifest.xml b/extensions/flac/src/androidTest/AndroidManifest.xml
@@ -21,9 +21,8 @@
   <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
   <uses-sdk/>
 
-  <!-- TODO(b/243799715): Use android:name="androidx.multidex.MultiDexApplication" instead. -->
   <application
-      android:name="android.support.multidex.MultiDexApplication"
+      android:name="androidx.multidex.MultiDexApplication"
       android:allowBackup="false"
       tools:ignore="MissingApplicationIcon,HardcodedDebugMode"/>
 

diff --git a/extensions/ima/src/androidTest/AndroidManifest.xml b/extensions/ima/src/androidTest/AndroidManifest.xml
@@ -23,9 +23,8 @@
   <uses-permission android:name="android.permission.WAKE_LOCK"/>
   <uses-sdk/>
 
-  <!-- TODO(b/243799715): Use android:name="androidx.multidex.MultiDexApplication" instead. -->
   <application
-      android:name="android.support.multidex.MultiDexApplication"
+      android:name="androidx.multidex.MultiDexApplication"
       android:allowBackup="false"
       tools:ignore="MissingApplicationIcon,HardcodedDebugMode">
     <activity android:name="com.google.android.exoplayer2.testutil.HostActivity"

diff --git a/extensions/media2/build.gradle b/extensions/media2/build.gradle
@@ -23,6 +23,7 @@ dependencies {
     compileOnly 'org.checkerframework:checker-qual:' + checkerframeworkVersion
     compileOnly 'org.jetbrains.kotlin:kotlin-annotations-jvm:' + kotlinAnnotationsVersion
     androidTestImplementation project(modulePrefix + 'library-core')
+    androidTestImplementation 'androidx.multidex:multidex:' + androidxMultidexVersion
     androidTestImplementation 'androidx.test.ext:junit:' + androidxTestJUnitVersion
     androidTestImplementation 'androidx.test:core:' + androidxTestCoreVersion
     androidTestImplementation 'androidx.test:runner:' + androidxTestRunnerVersion

diff --git a/extensions/media2/src/androidTest/AndroidManifest.xml b/extensions/media2/src/androidTest/AndroidManifest.xml
@@ -22,9 +22,8 @@
   <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
   <uses-sdk/>
 
-  <!-- TODO(b/243799715): Use android:name="androidx.multidex.MultiDexApplication" instead. -->
   <application
-    android:name="android.support.multidex.MultiDexApplication"
+    android:name="androidx.multidex.MultiDexApplication"
     android:allowBackup="false"
     tools:ignore="MissingApplicationIcon,HardcodedDebugMode"/>
 

diff --git a/extensions/opus/build.gradle b/extensions/opus/build.gradle
@@ -31,6 +31,7 @@ dependencies {
     compileOnly 'org.jetbrains.kotlin:kotlin-annotations-jvm:' + kotlinAnnotationsVersion
     testImplementation project(modulePrefix + 'testutils')
     testImplementation 'org.robolectric:robolectric:' + robolectricVersion
+    androidTestImplementation 'androidx.multidex:multidex:' + androidxMultidexVersion
     androidTestImplementation 'androidx.test:runner:' + androidxTestRunnerVersion
     androidTestImplementation 'androidx.test.ext:junit:' + androidxTestJUnitVersion
 }

diff --git a/extensions/opus/src/androidTest/AndroidManifest.xml b/extensions/opus/src/androidTest/AndroidManifest.xml
@@ -21,9 +21,8 @@
   <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
   <uses-sdk/>
 
-  <!-- TODO(b/243799715): Use android:name="androidx.multidex.MultiDexApplication" instead. -->
   <application
-      android:name="android.support.multidex.MultiDexApplication"
+      android:name="androidx.multidex.MultiDexApplication"
       android:allowBackup="false"
       tools:ignore="MissingApplicationIcon,HardcodedDebugMode"/>
 

diff --git a/extensions/vp9/build.gradle b/extensions/vp9/build.gradle
@@ -31,6 +31,7 @@ dependencies {
     compileOnly 'org.jetbrains.kotlin:kotlin-annotations-jvm:' + kotlinAnnotationsVersion
     testImplementation project(modulePrefix + 'testutils')
     testImplementation 'org.robolectric:robolectric:' + robolectricVersion
+    androidTestImplementation 'androidx.multidex:multidex:' + androidxMultidexVersion
     androidTestImplementation 'androidx.test:runner:' + androidxTestRunnerVersion
     androidTestImplementation 'androidx.test.ext:junit:' + androidxTestJUnitVersion
     androidTestImplementation 'com.google.truth:truth:' + truthVersion

diff --git a/extensions/vp9/src/androidTest/AndroidManifest.xml b/extensions/vp9/src/androidTest/AndroidManifest.xml
@@ -21,9 +21,8 @@
   <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
   <uses-sdk/>
 
-  <!-- TODO(b/243799715): Use android:name="androidx.multidex.MultiDexApplication" instead. -->
   <application
-      android:name="android.support.multidex.MultiDexApplication"
+      android:name="androidx.multidex.MultiDexApplication"
       android:allowBackup="false"
       tools:ignore="MissingApplicationIcon,HardcodedDebugMode"/>
 

diff --git a/library/core/build.gradle b/library/core/build.gradle
@@ -48,6 +48,7 @@ dependencies {
     compileOnly 'org.checkerframework:checker-compat-qual:' + checkerframeworkCompatVersion
     compileOnly 'org.jetbrains.kotlin:kotlin-annotations-jvm:' + kotlinAnnotationsVersion
     compileOnly 'com.google.errorprone:error_prone_annotations:' + errorProneVersion
+    androidTestImplementation 'androidx.multidex:multidex:' + androidxMultidexVersion
     androidTestImplementation 'androidx.test:runner:' + androidxTestRunnerVersion
     androidTestImplementation 'com.linkedin.dexmaker:dexmaker:' + dexmakerVersion
     androidTestImplementation 'com.linkedin.dexmaker:dexmaker-mockito:' + dexmakerVersion

diff --git a/library/core/src/androidTest/AndroidManifest.xml b/library/core/src/androidTest/AndroidManifest.xml
@@ -22,9 +22,8 @@
   <uses-permission android:name="android.permission.INTERNET"/>
   <uses-sdk/>
 
-  <!-- TODO(b/243799715): Use android:name="androidx.multidex.MultiDexApplication" instead. -->
   <application
-      android:name="android.support.multidex.MultiDexApplication"
+      android:name="androidx.multidex.MultiDexApplication"
       android:allowBackup="false"
       tools:ignore="MissingApplicationIcon,HardcodedDebugMode"
       android:usesCleartextTraffic="true"/>

diff --git a/library/datasource/build.gradle b/library/datasource/build.gradle
@@ -39,6 +39,7 @@ dependencies {
     compileOnly 'org.checkerframework:checker-compat-qual:' + checkerframeworkCompatVersion
     compileOnly 'org.checkerframework:checker-qual:' + checkerframeworkVersion
     compileOnly 'org.jetbrains.kotlin:kotlin-annotations-jvm:' + kotlinAnnotationsVersion
+    androidTestImplementation 'androidx.multidex:multidex:' + androidxMultidexVersion
     androidTestImplementation 'androidx.test:runner:' + androidxTestRunnerVersion
     androidTestImplementation 'com.linkedin.dexmaker:dexmaker:' + dexmakerVersion
     androidTestImplementation 'com.linkedin.dexmaker:dexmaker-mockito:' + dexmakerVersion

diff --git a/library/datasource/src/androidTest/AndroidManifest.xml b/library/datasource/src/androidTest/AndroidManifest.xml
@@ -21,9 +21,8 @@
   <uses-permission android:name="android.permission.INTERNET"/>
   <uses-sdk/>
 
-  <!-- TODO(b/243799715): Use android:name="androidx.multidex.MultiDexApplication" instead. -->
   <application
-      android:name="android.support.multidex.MultiDexApplication"
+      android:name="androidx.multidex.MultiDexApplication"
       android:allowBackup="false"
       android:usesCleartextTraffic="true"
       tools:ignore="MissingApplicationIcon,HardcodedDebugMode">

diff --git a/playbacktests/build.gradle b/playbacktests/build.gradle
@@ -20,6 +20,7 @@ android {
 }
 
 dependencies {
+    androidTestImplementation 'androidx.multidex:multidex:' + androidxMultidexVersion
     androidTestImplementation 'androidx.test:rules:' + androidxTestRulesVersion
     androidTestImplementation 'androidx.test:runner:' + androidxTestRunnerVersion
     androidTestImplementation 'androidx.annotation:annotation:' + androidxAnnotationVersion

diff --git a/playbacktests/src/androidTest/AndroidManifest.xml b/playbacktests/src/androidTest/AndroidManifest.xml
@@ -23,9 +23,8 @@
   <uses-permission android:name="android.permission.WAKE_LOCK"/>
   <uses-sdk/>
 
-  <!-- TODO(b/243799715): Use android:name="androidx.multidex.MultiDexApplication" instead. -->
   <application
-      android:name="android.support.multidex.MultiDexApplication"
+      android:name="androidx.multidex.MultiDexApplication"
       android:allowBackup="false"
       tools:ignore="MissingApplicationIcon,HardcodedDebugMode">
     <activity android:name="com.google.android.exoplayer2.testutil.HostActivity"