From d5f9cf4f193d20d2ccc2a466a09cc1b1717a0e81 Mon Sep 17 00:00:00 2001 From: ibaker Date: Fri, 19 May 2023 16:42:28 +0100 Subject: [PATCH] Add `singleVariant` publishing config to all published gradle files Docs: * https://developer.android.com/build/publish-library/configure-pub-variants#single-pub-var * https://developer.android.com/reference/tools/gradle-api/8.0/com/android/build/api/dsl/PublishingOptions This resolves the following warning from Android Gradle Plugin 7.2.2 and helps unblock the upgrade to AGP 8.0.1: > Software Components will not be created automatically for Maven > publishing from Android Gradle Plugin 8.0. To opt-in to the future > behavior, set the Gradle property > `android.disableAutomaticComponentCreation=true` in the > `gradle.properties` file or use the new publishing DSL. > > Affected Modules: `lib-cast`, `lib-common`, `lib-container`, > `lib-database`, `lib-datasource`, `lib-datasource-cronet`, > `lib-datasource-okhttp`, `lib-datasource-rtmp`, `lib-decoder`, > `lib-effect`, `lib-exoplayer`, `lib-exoplayer-all (legacy)`, > `lib-exoplayer-dash`, `lib-exoplayer-hls`, `lib-exoplayer-ima`, > `lib-exoplayer-rtsp`, `lib-exoplayer-smoothstreaming`, > `lib-exoplayer-workmanager`, `lib-extractor`, `lib-media2 (legacy)`, > `lib-mediasession (legacy)`, `lib-muxer`, `lib-session`, > `lib-transformer`, `lib-ui`, `lib-ui-leanback`, `test-utils`, > `test-utils-robolectric` Issue: androidx/media#409 PiperOrigin-RevId: 533464133 --- libraries/cast/build.gradle | 6 ++++++ libraries/common/build.gradle | 5 +++++ libraries/container/build.gradle | 6 ++++++ libraries/database/build.gradle | 6 ++++++ libraries/datasource/build.gradle | 6 ++++++ libraries/datasource_cronet/build.gradle | 6 ++++++ libraries/datasource_okhttp/build.gradle | 6 ++++++ libraries/datasource_rtmp/build.gradle | 6 ++++++ libraries/decoder/build.gradle | 6 ++++++ libraries/effect/build.gradle | 6 ++++++ libraries/exoplayer/build.gradle | 6 ++++++ libraries/exoplayer_dash/build.gradle | 6 ++++++ libraries/exoplayer_hls/build.gradle | 6 ++++++ libraries/exoplayer_ima/build.gradle | 6 ++++++ libraries/exoplayer_rtsp/build.gradle | 6 ++++++ libraries/exoplayer_smoothstreaming/build.gradle | 6 ++++++ libraries/exoplayer_workmanager/build.gradle | 6 ++++++ libraries/extractor/build.gradle | 6 ++++++ libraries/muxer/build.gradle | 6 ++++++ libraries/session/build.gradle | 5 +++++ libraries/test_utils/build.gradle | 6 ++++++ libraries/test_utils_robolectric/build.gradle | 6 ++++++ libraries/transformer/build.gradle | 6 ++++++ libraries/ui/build.gradle | 6 ++++++ libraries/ui_leanback/build.gradle | 6 ++++++ publish.gradle | 6 ------ 26 files changed, 148 insertions(+), 6 deletions(-) diff --git a/libraries/cast/build.gradle b/libraries/cast/build.gradle index 3918cc4e02..8d72ba141e 100644 --- a/libraries/cast/build.gradle +++ b/libraries/cast/build.gradle @@ -15,6 +15,12 @@ apply from: "$gradle.ext.androidxMediaSettingsDir/common_library_config.gradle" android { namespace 'androidx.media3.cast' + + publishing { + singleVariant('release') { + withSourcesJar() + } + } } dependencies { diff --git a/libraries/common/build.gradle b/libraries/common/build.gradle index 14bfb11c04..e86d9d4ba8 100644 --- a/libraries/common/build.gradle +++ b/libraries/common/build.gradle @@ -35,6 +35,11 @@ android { lint { baseline = file("lint-baseline.xml") } + publishing { + singleVariant('release') { + withSourcesJar() + } + } } dependencies { diff --git a/libraries/container/build.gradle b/libraries/container/build.gradle index 8f0c8d1478..0397606f9d 100644 --- a/libraries/container/build.gradle +++ b/libraries/container/build.gradle @@ -33,6 +33,12 @@ android { androidTest.assets.srcDir '../test_data/src/test/assets/' test.assets.srcDir '../test_data/src/test/assets/' } + + publishing { + singleVariant('release') { + withSourcesJar() + } + } } ext { diff --git a/libraries/database/build.gradle b/libraries/database/build.gradle index abe13bd079..b76f025068 100644 --- a/libraries/database/build.gradle +++ b/libraries/database/build.gradle @@ -21,6 +21,12 @@ android { testCoverageEnabled = true } } + + publishing { + singleVariant('release') { + withSourcesJar() + } + } } dependencies { diff --git a/libraries/datasource/build.gradle b/libraries/datasource/build.gradle index 543f463097..d2ca01a333 100644 --- a/libraries/datasource/build.gradle +++ b/libraries/datasource/build.gradle @@ -26,6 +26,12 @@ android { androidTest.assets.srcDir '../test_data/src/test/assets' test.assets.srcDir '../test_data/src/test/assets' } + + publishing { + singleVariant('release') { + withSourcesJar() + } + } } dependencies { diff --git a/libraries/datasource_cronet/build.gradle b/libraries/datasource_cronet/build.gradle index b867045565..1670d42829 100644 --- a/libraries/datasource_cronet/build.gradle +++ b/libraries/datasource_cronet/build.gradle @@ -15,6 +15,12 @@ apply from: "$gradle.ext.androidxMediaSettingsDir/common_library_config.gradle" android { namespace 'androidx.media3.datasource.cronet' + + publishing { + singleVariant('release') { + withSourcesJar() + } + } } dependencies { diff --git a/libraries/datasource_okhttp/build.gradle b/libraries/datasource_okhttp/build.gradle index 3f33af3dd7..252f1dec79 100644 --- a/libraries/datasource_okhttp/build.gradle +++ b/libraries/datasource_okhttp/build.gradle @@ -17,6 +17,12 @@ android { namespace 'androidx.media3.datasource.okhttp' defaultConfig.minSdkVersion 21 + + publishing { + singleVariant('release') { + withSourcesJar() + } + } } dependencies { diff --git a/libraries/datasource_rtmp/build.gradle b/libraries/datasource_rtmp/build.gradle index 7fe128a23b..4738fec2b6 100644 --- a/libraries/datasource_rtmp/build.gradle +++ b/libraries/datasource_rtmp/build.gradle @@ -15,6 +15,12 @@ apply from: "$gradle.ext.androidxMediaSettingsDir/common_library_config.gradle" android { namespace 'androidx.media3.datasource.rtmp' + + publishing { + singleVariant('release') { + withSourcesJar() + } + } } dependencies { diff --git a/libraries/decoder/build.gradle b/libraries/decoder/build.gradle index 04e78baedf..b4fa29b95c 100644 --- a/libraries/decoder/build.gradle +++ b/libraries/decoder/build.gradle @@ -21,6 +21,12 @@ android { testCoverageEnabled = true } } + + publishing { + singleVariant('release') { + withSourcesJar() + } + } } dependencies { diff --git a/libraries/effect/build.gradle b/libraries/effect/build.gradle index e4a06bb28d..9a3d3da01e 100644 --- a/libraries/effect/build.gradle +++ b/libraries/effect/build.gradle @@ -33,6 +33,12 @@ android { androidTest.assets.srcDir '../test_data/src/test/assets/' test.assets.srcDir '../test_data/src/test/assets/' } + + publishing { + singleVariant('release') { + withSourcesJar() + } + } } dependencies { diff --git a/libraries/exoplayer/build.gradle b/libraries/exoplayer/build.gradle index c859073117..3299e8069e 100644 --- a/libraries/exoplayer/build.gradle +++ b/libraries/exoplayer/build.gradle @@ -33,6 +33,12 @@ android { androidTest.assets.srcDir '../test_data/src/test/assets' test.assets.srcDir '../test_data/src/test/assets/' } + + publishing { + singleVariant('release') { + withSourcesJar() + } + } } dependencies { diff --git a/libraries/exoplayer_dash/build.gradle b/libraries/exoplayer_dash/build.gradle index cdcf1082c1..c4baa07b8a 100644 --- a/libraries/exoplayer_dash/build.gradle +++ b/libraries/exoplayer_dash/build.gradle @@ -23,6 +23,12 @@ android { } sourceSets.test.assets.srcDir '../test_data/src/test/assets/' + + publishing { + singleVariant('release') { + withSourcesJar() + } + } } dependencies { diff --git a/libraries/exoplayer_hls/build.gradle b/libraries/exoplayer_hls/build.gradle index ba00724293..93ba75b5b9 100644 --- a/libraries/exoplayer_hls/build.gradle +++ b/libraries/exoplayer_hls/build.gradle @@ -23,6 +23,12 @@ android { } sourceSets.test.assets.srcDir '../test_data/src/test/assets/' + + publishing { + singleVariant('release') { + withSourcesJar() + } + } } dependencies { diff --git a/libraries/exoplayer_ima/build.gradle b/libraries/exoplayer_ima/build.gradle index 14c1ee1104..e5d4e054b4 100644 --- a/libraries/exoplayer_ima/build.gradle +++ b/libraries/exoplayer_ima/build.gradle @@ -19,6 +19,12 @@ android { sourceSets { androidTest.assets.srcDir '../test_data/src/test/assets' } + + publishing { + singleVariant('release') { + withSourcesJar() + } + } } dependencies { diff --git a/libraries/exoplayer_rtsp/build.gradle b/libraries/exoplayer_rtsp/build.gradle index ddda98f976..e4941cc53e 100644 --- a/libraries/exoplayer_rtsp/build.gradle +++ b/libraries/exoplayer_rtsp/build.gradle @@ -23,6 +23,12 @@ android { } sourceSets.test.assets.srcDir '../test_data/src/test/assets/' + + publishing { + singleVariant('release') { + withSourcesJar() + } + } } dependencies { diff --git a/libraries/exoplayer_smoothstreaming/build.gradle b/libraries/exoplayer_smoothstreaming/build.gradle index 3020702c76..94d99999ae 100644 --- a/libraries/exoplayer_smoothstreaming/build.gradle +++ b/libraries/exoplayer_smoothstreaming/build.gradle @@ -23,6 +23,12 @@ android { } sourceSets.test.assets.srcDir '../test_data/src/test/assets/' + + publishing { + singleVariant('release') { + withSourcesJar() + } + } } dependencies { diff --git a/libraries/exoplayer_workmanager/build.gradle b/libraries/exoplayer_workmanager/build.gradle index 922191def0..bf19ddb756 100644 --- a/libraries/exoplayer_workmanager/build.gradle +++ b/libraries/exoplayer_workmanager/build.gradle @@ -17,6 +17,12 @@ apply from: "$gradle.ext.androidxMediaSettingsDir/common_library_config.gradle" android { namespace 'androidx.media3.exoplayer.workmanager' + + publishing { + singleVariant('release') { + withSourcesJar() + } + } } dependencies { diff --git a/libraries/extractor/build.gradle b/libraries/extractor/build.gradle index 9d001c187b..042ee511ad 100644 --- a/libraries/extractor/build.gradle +++ b/libraries/extractor/build.gradle @@ -23,6 +23,12 @@ android { } sourceSets.test.assets.srcDir '../test_data/src/test/assets/' + + publishing { + singleVariant('release') { + withSourcesJar() + } + } } dependencies { diff --git a/libraries/muxer/build.gradle b/libraries/muxer/build.gradle index 5e13723432..ed81a405cb 100644 --- a/libraries/muxer/build.gradle +++ b/libraries/muxer/build.gradle @@ -33,6 +33,12 @@ android { androidTest.assets.srcDir '../test_data/src/test/assets/' test.assets.srcDir '../test_data/src/test/assets/' } + + publishing { + singleVariant('release') { + withSourcesJar() + } + } } ext { diff --git a/libraries/session/build.gradle b/libraries/session/build.gradle index 521a1d897c..254f6d1eb8 100644 --- a/libraries/session/build.gradle +++ b/libraries/session/build.gradle @@ -28,6 +28,11 @@ android { lint { baseline = file("lint-baseline.xml") } + publishing { + singleVariant('release') { + withSourcesJar() + } + } } dependencies { api project(modulePrefix + 'lib-common') diff --git a/libraries/test_utils/build.gradle b/libraries/test_utils/build.gradle index 9a43cc1e3f..8093218550 100644 --- a/libraries/test_utils/build.gradle +++ b/libraries/test_utils/build.gradle @@ -15,6 +15,12 @@ apply from: "$gradle.ext.androidxMediaSettingsDir/common_library_config.gradle" android { namespace 'androidx.media3.test.utils' + + publishing { + singleVariant('release') { + withSourcesJar() + } + } } dependencies { diff --git a/libraries/test_utils_robolectric/build.gradle b/libraries/test_utils_robolectric/build.gradle index 66ac05555d..e24e05cbb6 100644 --- a/libraries/test_utils_robolectric/build.gradle +++ b/libraries/test_utils_robolectric/build.gradle @@ -16,6 +16,12 @@ apply from: "$gradle.ext.androidxMediaSettingsDir/common_library_config.gradle" android { namespace 'androidx.media3.test.utils.robolectric' + + publishing { + singleVariant('release') { + withSourcesJar() + } + } } dependencies { diff --git a/libraries/transformer/build.gradle b/libraries/transformer/build.gradle index 03c9d1edac..00c06da8f8 100644 --- a/libraries/transformer/build.gradle +++ b/libraries/transformer/build.gradle @@ -33,6 +33,12 @@ android { androidTest.assets.srcDir '../test_data/src/test/assets/' test.assets.srcDir '../test_data/src/test/assets/' } + + publishing { + singleVariant('release') { + withSourcesJar() + } + } } dependencies { diff --git a/libraries/ui/build.gradle b/libraries/ui/build.gradle index 8ea3e301a3..78bf86314c 100644 --- a/libraries/ui/build.gradle +++ b/libraries/ui/build.gradle @@ -21,6 +21,12 @@ android { lint { baseline = file("lint-baseline.xml") } + + publishing { + singleVariant('release') { + withSourcesJar() + } + } } dependencies { diff --git a/libraries/ui_leanback/build.gradle b/libraries/ui_leanback/build.gradle index 0142954bd7..8f1954cb25 100644 --- a/libraries/ui_leanback/build.gradle +++ b/libraries/ui_leanback/build.gradle @@ -17,6 +17,12 @@ android { namespace 'androidx.media3.ui.leanback' defaultConfig.minSdkVersion 17 + + publishing { + singleVariant('release') { + withSourcesJar() + } + } } dependencies { diff --git a/publish.gradle b/publish.gradle index 366a380acd..bd59d32492 100644 --- a/publish.gradle +++ b/publish.gradle @@ -44,7 +44,6 @@ afterEvaluate { variant.attributes.attribute( DocsType.DOCS_TYPE_ATTRIBUTE, project.objects.named(DocsType, DocsType.SOURCES)) - variant.outgoing.artifact(androidSourcesJar) components.release.addVariantsFromConfiguration(variant) {} } pom { @@ -81,8 +80,3 @@ afterEvaluate { } } tasks.withType(PublishToMavenRepository) { it.dependsOn lint, test } - -task androidSourcesJar(type: Jar) { - archiveClassifier.set('sources') - from android.sourceSets.main.java.srcDirs -}