From b3db85133a2eee5aa3435c3898e1655cda334372 Mon Sep 17 00:00:00 2001 From: ibaker Date: Fri, 19 May 2023 16:38:46 +0100 Subject: [PATCH] Add `android.namespace` to all `build.gradle` files This is a pre-requisite for the Android Studio upgrade assistant to upgrade from AGP 7.2.2 to 8.0.1, otherwise it fails and complains this is missing. Issue: androidx/media#409 PiperOrigin-RevId: 533463246 --- demos/cast/build.gradle | 2 ++ demos/gl/build.gradle | 2 ++ demos/main/build.gradle | 2 ++ demos/session/build.gradle | 2 ++ demos/surface/build.gradle | 2 ++ demos/transformer/build.gradle | 2 ++ libraries/cast/build.gradle | 4 ++++ libraries/common/build.gradle | 2 ++ libraries/container/build.gradle | 1 + libraries/database/build.gradle | 2 ++ libraries/datasource/build.gradle | 2 ++ libraries/datasource_cronet/build.gradle | 4 ++++ libraries/datasource_okhttp/build.gradle | 6 +++++- libraries/datasource_rtmp/build.gradle | 4 ++++ libraries/decoder/build.gradle | 2 ++ libraries/decoder_av1/build.gradle | 2 ++ libraries/decoder_ffmpeg/build.gradle | 2 ++ libraries/decoder_flac/build.gradle | 2 ++ libraries/decoder_opus/build.gradle | 2 ++ libraries/decoder_vp9/build.gradle | 2 ++ libraries/effect/build.gradle | 1 + libraries/exoplayer/build.gradle | 2 ++ libraries/exoplayer_dash/build.gradle | 2 ++ libraries/exoplayer_hls/build.gradle | 2 ++ libraries/exoplayer_ima/build.gradle | 2 ++ libraries/exoplayer_rtsp/build.gradle | 2 ++ libraries/exoplayer_smoothstreaming/build.gradle | 2 ++ libraries/exoplayer_workmanager/build.gradle | 4 ++++ libraries/extractor/build.gradle | 2 ++ libraries/muxer/build.gradle | 1 + libraries/session/build.gradle | 2 ++ libraries/test_data/build.gradle | 1 + libraries/test_exoplayer_playback/build.gradle | 2 ++ libraries/test_session_common/build.gradle | 4 ++++ libraries/test_session_current/build.gradle | 2 ++ libraries/test_utils/build.gradle | 4 ++++ libraries/test_utils_robolectric/build.gradle | 5 +++++ libraries/transformer/build.gradle | 1 + libraries/ui/build.gradle | 2 ++ libraries/ui_leanback/build.gradle | 6 +++++- 40 files changed, 96 insertions(+), 2 deletions(-) diff --git a/demos/cast/build.gradle b/demos/cast/build.gradle index 641ecddedc..7f41b8e0be 100644 --- a/demos/cast/build.gradle +++ b/demos/cast/build.gradle @@ -15,6 +15,8 @@ apply from: '../../constants.gradle' apply plugin: 'com.android.application' android { + namespace 'androidx.media3.demo.cast' + compileSdkVersion project.ext.compileSdkVersion compileOptions { diff --git a/demos/gl/build.gradle b/demos/gl/build.gradle index 8666c45aa0..85fc09b1e4 100644 --- a/demos/gl/build.gradle +++ b/demos/gl/build.gradle @@ -15,6 +15,8 @@ apply from: '../../constants.gradle' apply plugin: 'com.android.application' android { + namespace 'androidx.media3.demo.gl' + compileSdkVersion project.ext.compileSdkVersion compileOptions { diff --git a/demos/main/build.gradle b/demos/main/build.gradle index 45b67670e3..bccdf2f6dd 100644 --- a/demos/main/build.gradle +++ b/demos/main/build.gradle @@ -17,6 +17,8 @@ apply plugin: 'com.android.application' apply plugin: 'kotlin-android' android { + namespace 'androidx.media3.demo.main' + compileSdkVersion project.ext.compileSdkVersion compileOptions { diff --git a/demos/session/build.gradle b/demos/session/build.gradle index fb5ff78288..fcd3c99d8f 100644 --- a/demos/session/build.gradle +++ b/demos/session/build.gradle @@ -16,6 +16,8 @@ apply plugin: 'com.android.application' apply plugin: 'kotlin-android' android { + namespace 'androidx.media3.demo.session' + compileSdkVersion project.ext.compileSdkVersion compileOptions { diff --git a/demos/surface/build.gradle b/demos/surface/build.gradle index 09bb045308..c15c6c929c 100644 --- a/demos/surface/build.gradle +++ b/demos/surface/build.gradle @@ -15,6 +15,8 @@ apply from: '../../constants.gradle' apply plugin: 'com.android.application' android { + namespace 'androidx.media3.demo.surface' + compileSdkVersion project.ext.compileSdkVersion compileOptions { diff --git a/demos/transformer/build.gradle b/demos/transformer/build.gradle index 16eb6c6101..a260eee977 100644 --- a/demos/transformer/build.gradle +++ b/demos/transformer/build.gradle @@ -17,6 +17,8 @@ apply from: '../../constants.gradle' apply plugin: 'com.android.application' android { + namespace 'androidx.media3.demo.transformer' + compileSdkVersion project.ext.compileSdkVersion compileOptions { diff --git a/libraries/cast/build.gradle b/libraries/cast/build.gradle index e22afd8dc7..3918cc4e02 100644 --- a/libraries/cast/build.gradle +++ b/libraries/cast/build.gradle @@ -13,6 +13,10 @@ // limitations under the License. apply from: "$gradle.ext.androidxMediaSettingsDir/common_library_config.gradle" +android { + namespace 'androidx.media3.cast' +} + dependencies { api 'com.google.android.gms:play-services-cast-framework:21.3.0' implementation 'androidx.annotation:annotation:' + androidxAnnotationVersion diff --git a/libraries/common/build.gradle b/libraries/common/build.gradle index 476d299f73..14bfb11c04 100644 --- a/libraries/common/build.gradle +++ b/libraries/common/build.gradle @@ -25,6 +25,8 @@ rootProject.allprojects.forEach { } android { + namespace 'androidx.media3.common' + buildTypes { debug { testCoverageEnabled = true diff --git a/libraries/container/build.gradle b/libraries/container/build.gradle index fb0b1619b9..8f0c8d1478 100644 --- a/libraries/container/build.gradle +++ b/libraries/container/build.gradle @@ -14,6 +14,7 @@ apply from: "$gradle.ext.androidxMediaSettingsDir/common_library_config.gradle" android { + namespace 'androidx.media3.container' defaultConfig { // The following argument makes the Android Test Orchestrator run its diff --git a/libraries/database/build.gradle b/libraries/database/build.gradle index 9fb8893816..abe13bd079 100644 --- a/libraries/database/build.gradle +++ b/libraries/database/build.gradle @@ -14,6 +14,8 @@ apply from: "$gradle.ext.androidxMediaSettingsDir/common_library_config.gradle" android { + namespace 'androidx.media3.database' + buildTypes { debug { testCoverageEnabled = true diff --git a/libraries/datasource/build.gradle b/libraries/datasource/build.gradle index 6f95395801..543f463097 100644 --- a/libraries/datasource/build.gradle +++ b/libraries/datasource/build.gradle @@ -14,6 +14,8 @@ apply from: "$gradle.ext.androidxMediaSettingsDir/common_library_config.gradle" android { + namespace 'androidx.media3.datasource' + buildTypes { debug { testCoverageEnabled = true diff --git a/libraries/datasource_cronet/build.gradle b/libraries/datasource_cronet/build.gradle index 06803f41f9..b867045565 100644 --- a/libraries/datasource_cronet/build.gradle +++ b/libraries/datasource_cronet/build.gradle @@ -13,6 +13,10 @@ // limitations under the License. apply from: "$gradle.ext.androidxMediaSettingsDir/common_library_config.gradle" +android { + namespace 'androidx.media3.datasource.cronet' +} + dependencies { api "com.google.android.gms:play-services-cronet:18.0.1" implementation project(modulePrefix + 'lib-common') diff --git a/libraries/datasource_okhttp/build.gradle b/libraries/datasource_okhttp/build.gradle index 4eb8e6a69d..3f33af3dd7 100644 --- a/libraries/datasource_okhttp/build.gradle +++ b/libraries/datasource_okhttp/build.gradle @@ -13,7 +13,11 @@ // limitations under the License. apply from: "$gradle.ext.androidxMediaSettingsDir/common_library_config.gradle" -android.defaultConfig.minSdkVersion 21 +android { + namespace 'androidx.media3.datasource.okhttp' + + defaultConfig.minSdkVersion 21 +} dependencies { implementation project(modulePrefix + 'lib-common') diff --git a/libraries/datasource_rtmp/build.gradle b/libraries/datasource_rtmp/build.gradle index 5bd1725cda..7fe128a23b 100644 --- a/libraries/datasource_rtmp/build.gradle +++ b/libraries/datasource_rtmp/build.gradle @@ -13,6 +13,10 @@ // limitations under the License. apply from: "$gradle.ext.androidxMediaSettingsDir/common_library_config.gradle" +android { + namespace 'androidx.media3.datasource.rtmp' +} + dependencies { implementation project(modulePrefix + 'lib-common') implementation project(modulePrefix + 'lib-datasource') diff --git a/libraries/decoder/build.gradle b/libraries/decoder/build.gradle index c085f93c31..04e78baedf 100644 --- a/libraries/decoder/build.gradle +++ b/libraries/decoder/build.gradle @@ -14,6 +14,8 @@ apply from: "$gradle.ext.androidxMediaSettingsDir/common_library_config.gradle" android { + namespace 'androidx.media3.decoder' + buildTypes { debug { testCoverageEnabled = true diff --git a/libraries/decoder_av1/build.gradle b/libraries/decoder_av1/build.gradle index 4534116d3e..aa2e3fce8b 100644 --- a/libraries/decoder_av1/build.gradle +++ b/libraries/decoder_av1/build.gradle @@ -14,6 +14,8 @@ apply from: "$gradle.ext.androidxMediaSettingsDir/common_library_config.gradle" android { + namespace 'androidx.media3.decoder.av1' + defaultConfig { externalNativeBuild { cmake { diff --git a/libraries/decoder_ffmpeg/build.gradle b/libraries/decoder_ffmpeg/build.gradle index b404aba0d4..6d79254af6 100644 --- a/libraries/decoder_ffmpeg/build.gradle +++ b/libraries/decoder_ffmpeg/build.gradle @@ -13,6 +13,8 @@ // limitations under the License. apply from: "$gradle.ext.androidxMediaSettingsDir/common_library_config.gradle" +android.namespace = 'androidx.media3.decoder.ffmpeg' + // Configure the native build only if ffmpeg is present to avoid gradle sync // failures if ffmpeg hasn't been built according to the README instructions. if (project.file('src/main/jni/ffmpeg').exists()) { diff --git a/libraries/decoder_flac/build.gradle b/libraries/decoder_flac/build.gradle index 522cd160c6..a263c4aff8 100644 --- a/libraries/decoder_flac/build.gradle +++ b/libraries/decoder_flac/build.gradle @@ -14,6 +14,8 @@ apply from: "$gradle.ext.androidxMediaSettingsDir/common_library_config.gradle" android { + namespace 'androidx.media3.decoder.flac' + sourceSets { main { jniLibs.srcDir 'src/main/libs' diff --git a/libraries/decoder_opus/build.gradle b/libraries/decoder_opus/build.gradle index 1f3f7d8d53..806babeebc 100644 --- a/libraries/decoder_opus/build.gradle +++ b/libraries/decoder_opus/build.gradle @@ -14,6 +14,8 @@ apply from: "$gradle.ext.androidxMediaSettingsDir/common_library_config.gradle" android { + namespace 'androidx.media3.decoder.opus' + sourceSets { main { jniLibs.srcDir 'src/main/libs' diff --git a/libraries/decoder_vp9/build.gradle b/libraries/decoder_vp9/build.gradle index e723f74fd7..909c50d245 100644 --- a/libraries/decoder_vp9/build.gradle +++ b/libraries/decoder_vp9/build.gradle @@ -14,6 +14,8 @@ apply from: "$gradle.ext.androidxMediaSettingsDir/common_library_config.gradle" android { + namespace 'androidx.media3.decoder.vp9' + sourceSets { main { jniLibs.srcDir 'src/main/libs' diff --git a/libraries/effect/build.gradle b/libraries/effect/build.gradle index 0c9d651da5..e4a06bb28d 100644 --- a/libraries/effect/build.gradle +++ b/libraries/effect/build.gradle @@ -13,6 +13,7 @@ // limitations under the License. apply from: "$gradle.ext.androidxMediaSettingsDir/common_library_config.gradle" android { + namespace 'androidx.media3.effect' defaultConfig { minSdkVersion 18 diff --git a/libraries/exoplayer/build.gradle b/libraries/exoplayer/build.gradle index 61f13db560..c859073117 100644 --- a/libraries/exoplayer/build.gradle +++ b/libraries/exoplayer/build.gradle @@ -14,6 +14,8 @@ apply from: "$gradle.ext.androidxMediaSettingsDir/common_library_config.gradle" android { + namespace 'androidx.media3.exoplayer' + defaultConfig { // The following argument makes the Android Test Orchestrator run its // "pm clear" command after each test invocation. This command ensures diff --git a/libraries/exoplayer_dash/build.gradle b/libraries/exoplayer_dash/build.gradle index 61965c2851..cdcf1082c1 100644 --- a/libraries/exoplayer_dash/build.gradle +++ b/libraries/exoplayer_dash/build.gradle @@ -14,6 +14,8 @@ apply from: "$gradle.ext.androidxMediaSettingsDir/common_library_config.gradle" android { + namespace 'androidx.media3.exoplayer.dash' + buildTypes { debug { testCoverageEnabled = true diff --git a/libraries/exoplayer_hls/build.gradle b/libraries/exoplayer_hls/build.gradle index fde8db9e4a..ba00724293 100644 --- a/libraries/exoplayer_hls/build.gradle +++ b/libraries/exoplayer_hls/build.gradle @@ -14,6 +14,8 @@ apply from: "$gradle.ext.androidxMediaSettingsDir/common_library_config.gradle" android { + namespace 'androidx.media3.exoplayer.hls' + buildTypes { debug { testCoverageEnabled = true diff --git a/libraries/exoplayer_ima/build.gradle b/libraries/exoplayer_ima/build.gradle index afe16f7312..14c1ee1104 100644 --- a/libraries/exoplayer_ima/build.gradle +++ b/libraries/exoplayer_ima/build.gradle @@ -14,6 +14,8 @@ apply from: "$gradle.ext.androidxMediaSettingsDir/common_library_config.gradle" android { + namespace 'androidx.media3.exoplayer.ima' + sourceSets { androidTest.assets.srcDir '../test_data/src/test/assets' } diff --git a/libraries/exoplayer_rtsp/build.gradle b/libraries/exoplayer_rtsp/build.gradle index 0d53ded1d0..ddda98f976 100644 --- a/libraries/exoplayer_rtsp/build.gradle +++ b/libraries/exoplayer_rtsp/build.gradle @@ -14,6 +14,8 @@ apply from: "$gradle.ext.androidxMediaSettingsDir/common_library_config.gradle" android { + namespace 'androidx.media3.exoplayer.rtsp' + buildTypes { debug { testCoverageEnabled = true diff --git a/libraries/exoplayer_smoothstreaming/build.gradle b/libraries/exoplayer_smoothstreaming/build.gradle index 8ac10f2835..3020702c76 100644 --- a/libraries/exoplayer_smoothstreaming/build.gradle +++ b/libraries/exoplayer_smoothstreaming/build.gradle @@ -14,6 +14,8 @@ apply from: "$gradle.ext.androidxMediaSettingsDir/common_library_config.gradle" android { + namespace 'androidx.media3.exoplayer.smoothstreaming' + buildTypes { debug { testCoverageEnabled = true diff --git a/libraries/exoplayer_workmanager/build.gradle b/libraries/exoplayer_workmanager/build.gradle index dc9b0e4a3c..922191def0 100644 --- a/libraries/exoplayer_workmanager/build.gradle +++ b/libraries/exoplayer_workmanager/build.gradle @@ -15,6 +15,10 @@ */ apply from: "$gradle.ext.androidxMediaSettingsDir/common_library_config.gradle" +android { + namespace 'androidx.media3.exoplayer.workmanager' +} + dependencies { implementation project(modulePrefix + 'lib-exoplayer') implementation 'androidx.work:work-runtime:2.8.1' diff --git a/libraries/extractor/build.gradle b/libraries/extractor/build.gradle index 80ebd2a69f..9d001c187b 100644 --- a/libraries/extractor/build.gradle +++ b/libraries/extractor/build.gradle @@ -14,6 +14,8 @@ apply from: "$gradle.ext.androidxMediaSettingsDir/common_library_config.gradle" android { + namespace 'androidx.media3.extractor' + buildTypes { debug { testCoverageEnabled = true diff --git a/libraries/muxer/build.gradle b/libraries/muxer/build.gradle index 6d9ce162aa..5e13723432 100644 --- a/libraries/muxer/build.gradle +++ b/libraries/muxer/build.gradle @@ -14,6 +14,7 @@ apply from: "$gradle.ext.androidxMediaSettingsDir/common_library_config.gradle" android { + namespace 'androidx.media3.muxer' defaultConfig { // The following argument makes the Android Test Orchestrator run its diff --git a/libraries/session/build.gradle b/libraries/session/build.gradle index 5cdcf67f55..521a1d897c 100644 --- a/libraries/session/build.gradle +++ b/libraries/session/build.gradle @@ -17,6 +17,8 @@ apply from: "$gradle.ext.androidxMediaSettingsDir/common_library_config.gradle" group 'androidx.media3' android { + namespace 'androidx.media3.session' + buildTypes { debug { testCoverageEnabled = true diff --git a/libraries/test_data/build.gradle b/libraries/test_data/build.gradle index d193150248..38b53a1153 100644 --- a/libraries/test_data/build.gradle +++ b/libraries/test_data/build.gradle @@ -13,3 +13,4 @@ // limitations under the License. apply from: "$gradle.ext.androidxMediaSettingsDir/common_library_config.gradle" +android.namespace 'androidx.media3.test.data' diff --git a/libraries/test_exoplayer_playback/build.gradle b/libraries/test_exoplayer_playback/build.gradle index 4a5ef3824c..85b533380c 100644 --- a/libraries/test_exoplayer_playback/build.gradle +++ b/libraries/test_exoplayer_playback/build.gradle @@ -13,6 +13,8 @@ // limitations under the License. apply from: "$gradle.ext.androidxMediaSettingsDir/common_library_config.gradle" +android.namespace 'androidx.media3.test.exoplayer.playback' + dependencies { androidTestImplementation 'androidx.test:rules:' + androidxTestRulesVersion androidTestImplementation 'androidx.test:runner:' + androidxTestRunnerVersion diff --git a/libraries/test_session_common/build.gradle b/libraries/test_session_common/build.gradle index f33b43603e..0b35e0b1aa 100644 --- a/libraries/test_session_common/build.gradle +++ b/libraries/test_session_common/build.gradle @@ -13,6 +13,10 @@ // limitations under the License. apply from: "$gradle.ext.androidxMediaSettingsDir/common_library_config.gradle" +android { + namespace 'androidx.media3.test.session.common' +} + dependencies { api 'com.google.truth:truth:' + truthVersion implementation project(modulePrefix + 'lib-common') diff --git a/libraries/test_session_current/build.gradle b/libraries/test_session_current/build.gradle index f3fd3ef1ec..75fb36ee48 100644 --- a/libraries/test_session_current/build.gradle +++ b/libraries/test_session_current/build.gradle @@ -18,6 +18,8 @@ apply plugin: 'com.android.application' group 'androidx.media3' android { + namespace 'androidx.media3.test.session' + compileSdkVersion project.ext.compileSdkVersion defaultConfig { diff --git a/libraries/test_utils/build.gradle b/libraries/test_utils/build.gradle index 239104ad53..9a43cc1e3f 100644 --- a/libraries/test_utils/build.gradle +++ b/libraries/test_utils/build.gradle @@ -13,6 +13,10 @@ // limitations under the License. apply from: "$gradle.ext.androidxMediaSettingsDir/common_library_config.gradle" +android { + namespace 'androidx.media3.test.utils' +} + dependencies { api 'org.mockito:mockito-core:' + mockitoVersion api 'androidx.test:core:' + androidxTestCoreVersion diff --git a/libraries/test_utils_robolectric/build.gradle b/libraries/test_utils_robolectric/build.gradle index aafdce151a..66ac05555d 100644 --- a/libraries/test_utils_robolectric/build.gradle +++ b/libraries/test_utils_robolectric/build.gradle @@ -13,6 +13,11 @@ // limitations under the License. apply from: "$gradle.ext.androidxMediaSettingsDir/common_library_config.gradle" + +android { + namespace 'androidx.media3.test.utils.robolectric' +} + dependencies { compileOnly 'org.checkerframework:checker-qual:' + checkerframeworkVersion compileOnly 'org.checkerframework:checker-compat-qual:' + checkerframeworkCompatVersion diff --git a/libraries/transformer/build.gradle b/libraries/transformer/build.gradle index 790effdffd..03c9d1edac 100644 --- a/libraries/transformer/build.gradle +++ b/libraries/transformer/build.gradle @@ -13,6 +13,7 @@ // limitations under the License. apply from: "$gradle.ext.androidxMediaSettingsDir/common_library_config.gradle" android { + namespace 'androidx.media3.transformer' defaultConfig { minSdkVersion 21 diff --git a/libraries/ui/build.gradle b/libraries/ui/build.gradle index 35dba78fb3..8ea3e301a3 100644 --- a/libraries/ui/build.gradle +++ b/libraries/ui/build.gradle @@ -16,6 +16,8 @@ apply from: "$gradle.ext.androidxMediaSettingsDir/common_library_config.gradle" android.buildTypes.debug.testCoverageEnabled true android { + namespace 'androidx.media3.ui' + lint { baseline = file("lint-baseline.xml") } diff --git a/libraries/ui_leanback/build.gradle b/libraries/ui_leanback/build.gradle index 8c3e0bbdcf..0142954bd7 100644 --- a/libraries/ui_leanback/build.gradle +++ b/libraries/ui_leanback/build.gradle @@ -13,7 +13,11 @@ // limitations under the License. apply from: "$gradle.ext.androidxMediaSettingsDir/common_library_config.gradle" -android.defaultConfig.minSdkVersion 17 +android { + namespace 'androidx.media3.ui.leanback' + + defaultConfig.minSdkVersion 17 +} dependencies { implementation project(modulePrefix + 'lib-common')