loliball/media
1
0
Fork 0
mirror of https://github.com/androidx/media.git synced 2025-04-30 06:46:50 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update the root project name check in publish.gradle

Browse Source 
The name was changed in 25581384e9
and this check wasn't updated, meaning publishing no longer worked
(it didn't publish anything, just printed lots of warnings like
`Skipping task ':test-utils-robolectric:publish' as it has no
actions.`). This change means the check is now using the same
source-of-truth as the root project name, so it shouldn't go out of
sync again.

PiperOrigin-RevId: 531457952
(cherry picked from commit 4c1eb8aec7258324134913db521cd0a005ece31b)
This commit is contained in:
ibaker 2023-05-12 10:31:39 +00:00 committed by Ian Baker
parent f71370af75
commit 0888dfbd05
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core_settings.gradle
View File

@ -21,6 +21,8 @@ if (gradle.ext.has('androidxMediaModulePrefix')) {
modulePrefix += gradle.ext.androidxMediaModulePrefix modulePrefix += gradle.ext.androidxMediaModulePrefix
} }
rootProject.name = gradle.ext.androidxMediaProjectName
include modulePrefix + 'lib-common' include modulePrefix + 'lib-common'
project(modulePrefix + 'lib-common').projectDir = new File(rootDir, 'libraries/common') project(modulePrefix + 'lib-common').projectDir = new File(rootDir, 'libraries/common')

2
publish.gradle
View File

@ -16,7 +16,7 @@ apply plugin: 'maven-publish'
apply from: "$gradle.ext.androidxMediaSettingsDir/missing_aar_type_workaround.gradle" apply from: "$gradle.ext.androidxMediaSettingsDir/missing_aar_type_workaround.gradle"
afterEvaluate { afterEvaluate {
if (rootProject.name == "media3") { if (rootProject.name == gradle.ext.androidxMediaProjectName) {
publishing { publishing {
repositories { repositories {
maven { maven {

2
settings.gradle
View File

@ -18,7 +18,7 @@ if (gradle.ext.has('androidxMediaModulePrefix')) {
modulePrefix += gradle.ext.androidxMediaModulePrefix modulePrefix += gradle.ext.androidxMediaModulePrefix
} }
rootProject.name = 'media3' gradle.ext.androidxMediaProjectName = 'media3'
include modulePrefix + 'demo' include modulePrefix + 'demo'
project(modulePrefix + 'demo').projectDir = new File(rootDir, 'demos/main') project(modulePrefix + 'demo').projectDir = new File(rootDir, 'demos/main')