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
This commit is contained in:
ibaker 2023-05-19 16:38:46 +01:00 committed by Ian Baker
parent 0f8ddd5d1a
commit b3db85133a
40 changed files with 96 additions and 2 deletions

View File

@ -15,6 +15,8 @@ apply from: '../../constants.gradle'
apply plugin: 'com.android.application'
android {
namespace 'androidx.media3.demo.cast'
compileSdkVersion project.ext.compileSdkVersion
compileOptions {

View File

@ -15,6 +15,8 @@ apply from: '../../constants.gradle'
apply plugin: 'com.android.application'
android {
namespace 'androidx.media3.demo.gl'
compileSdkVersion project.ext.compileSdkVersion
compileOptions {

View File

@ -17,6 +17,8 @@ apply plugin: 'com.android.application'
apply plugin: 'kotlin-android'
android {
namespace 'androidx.media3.demo.main'
compileSdkVersion project.ext.compileSdkVersion
compileOptions {

View File

@ -16,6 +16,8 @@ apply plugin: 'com.android.application'
apply plugin: 'kotlin-android'
android {
namespace 'androidx.media3.demo.session'
compileSdkVersion project.ext.compileSdkVersion
compileOptions {

View File

@ -15,6 +15,8 @@ apply from: '../../constants.gradle'
apply plugin: 'com.android.application'
android {
namespace 'androidx.media3.demo.surface'
compileSdkVersion project.ext.compileSdkVersion
compileOptions {

View File

@ -17,6 +17,8 @@ apply from: '../../constants.gradle'
apply plugin: 'com.android.application'
android {
namespace 'androidx.media3.demo.transformer'
compileSdkVersion project.ext.compileSdkVersion
compileOptions {

View File

@ -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

View File

@ -25,6 +25,8 @@ rootProject.allprojects.forEach {
}
android {
namespace 'androidx.media3.common'
buildTypes {
debug {
testCoverageEnabled = true

View File

@ -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

View File

@ -14,6 +14,8 @@
apply from: "$gradle.ext.androidxMediaSettingsDir/common_library_config.gradle"
android {
namespace 'androidx.media3.database'
buildTypes {
debug {
testCoverageEnabled = true

View File

@ -14,6 +14,8 @@
apply from: "$gradle.ext.androidxMediaSettingsDir/common_library_config.gradle"
android {
namespace 'androidx.media3.datasource'
buildTypes {
debug {
testCoverageEnabled = true

View File

@ -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')

View File

@ -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')

View File

@ -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')

View File

@ -14,6 +14,8 @@
apply from: "$gradle.ext.androidxMediaSettingsDir/common_library_config.gradle"
android {
namespace 'androidx.media3.decoder'
buildTypes {
debug {
testCoverageEnabled = true

View File

@ -14,6 +14,8 @@
apply from: "$gradle.ext.androidxMediaSettingsDir/common_library_config.gradle"
android {
namespace 'androidx.media3.decoder.av1'
defaultConfig {
externalNativeBuild {
cmake {

View File

@ -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()) {

View File

@ -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'

View File

@ -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'

View File

@ -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'

View File

@ -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

View File

@ -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

View File

@ -14,6 +14,8 @@
apply from: "$gradle.ext.androidxMediaSettingsDir/common_library_config.gradle"
android {
namespace 'androidx.media3.exoplayer.dash'
buildTypes {
debug {
testCoverageEnabled = true

View File

@ -14,6 +14,8 @@
apply from: "$gradle.ext.androidxMediaSettingsDir/common_library_config.gradle"
android {
namespace 'androidx.media3.exoplayer.hls'
buildTypes {
debug {
testCoverageEnabled = true

View File

@ -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'
}

View File

@ -14,6 +14,8 @@
apply from: "$gradle.ext.androidxMediaSettingsDir/common_library_config.gradle"
android {
namespace 'androidx.media3.exoplayer.rtsp'
buildTypes {
debug {
testCoverageEnabled = true

View File

@ -14,6 +14,8 @@
apply from: "$gradle.ext.androidxMediaSettingsDir/common_library_config.gradle"
android {
namespace 'androidx.media3.exoplayer.smoothstreaming'
buildTypes {
debug {
testCoverageEnabled = true

View File

@ -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'

View File

@ -14,6 +14,8 @@
apply from: "$gradle.ext.androidxMediaSettingsDir/common_library_config.gradle"
android {
namespace 'androidx.media3.extractor'
buildTypes {
debug {
testCoverageEnabled = true

View File

@ -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

View File

@ -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

View File

@ -13,3 +13,4 @@
// limitations under the License.
apply from: "$gradle.ext.androidxMediaSettingsDir/common_library_config.gradle"
android.namespace 'androidx.media3.test.data'

View File

@ -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

View File

@ -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')

View File

@ -18,6 +18,8 @@ apply plugin: 'com.android.application'
group 'androidx.media3'
android {
namespace 'androidx.media3.test.session'
compileSdkVersion project.ext.compileSdkVersion
defaultConfig {

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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")
}

View File

@ -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')