mirror of
https://github.com/androidx/media.git
synced 2025-04-30 06:46:50 +08:00
Disable publishing block when media3 included in another build.
From https://github.com/androidx/media/pull/127/files PiperOrigin-RevId: 485921271 (cherry picked from commit 48aac9ba90344d960214c2d0364a68c0d74e109e)
This commit is contained in:
parent
99bb183c35
commit
1c18eae18e
@ -30,6 +30,8 @@ Release notes
|
||||
([#10684](https://github.com/google/ExoPlayer/issues/10684)).
|
||||
* Add `Player.getVideoSurfaceSize` that returns the size of the surface on
|
||||
which the video is rendered.
|
||||
* Build:
|
||||
* Avoid publishing block when included in another gradle build.
|
||||
* Downloads:
|
||||
* Fix potential infinite loop in `ProgressiveDownloader` caused by
|
||||
simultaneous download and playback with the same `PriorityTaskManager`
|
||||
|
@ -16,45 +16,47 @@ apply plugin: 'maven-publish'
|
||||
apply from: "$gradle.ext.androidxMediaSettingsDir/missing_aar_type_workaround.gradle"
|
||||
|
||||
afterEvaluate {
|
||||
publishing {
|
||||
repositories {
|
||||
maven {
|
||||
url = findProperty('mavenRepo') ?: "${buildDir}/repo"
|
||||
if (rootProject.name == "media3") {
|
||||
publishing {
|
||||
repositories {
|
||||
maven {
|
||||
url = findProperty('mavenRepo') ?: "${buildDir}/repo"
|
||||
}
|
||||
}
|
||||
}
|
||||
publications {
|
||||
release(MavenPublication) {
|
||||
from components.release
|
||||
artifact androidSourcesJar
|
||||
groupId = 'androidx.media3'
|
||||
artifactId = findProperty('releaseArtifactId') ?: ''
|
||||
version = findProperty('releaseVersion') ?: ''
|
||||
pom {
|
||||
name =
|
||||
findProperty('releaseName')
|
||||
?: ''
|
||||
description =
|
||||
findProperty('releaseDescription')
|
||||
?: findProperty('releaseName')
|
||||
?: ''
|
||||
licenses {
|
||||
license {
|
||||
name = 'The Apache Software License, Version 2.0'
|
||||
url = 'http://www.apache.org/licenses/LICENSE-2.0.txt'
|
||||
distribution = 'repo'
|
||||
publications {
|
||||
release(MavenPublication) {
|
||||
from components.release
|
||||
artifact androidSourcesJar
|
||||
groupId = 'androidx.media3'
|
||||
artifactId = findProperty('releaseArtifactId') ?: ''
|
||||
version = findProperty('releaseVersion') ?: ''
|
||||
pom {
|
||||
name =
|
||||
findProperty('releaseName')
|
||||
?: ''
|
||||
description =
|
||||
findProperty('releaseDescription')
|
||||
?: findProperty('releaseName')
|
||||
?: ''
|
||||
licenses {
|
||||
license {
|
||||
name = 'The Apache Software License, Version 2.0'
|
||||
url = 'http://www.apache.org/licenses/LICENSE-2.0.txt'
|
||||
distribution = 'repo'
|
||||
}
|
||||
}
|
||||
}
|
||||
developers {
|
||||
developer {
|
||||
name = 'The Android Open Source Project'
|
||||
developers {
|
||||
developer {
|
||||
name = 'The Android Open Source Project'
|
||||
}
|
||||
}
|
||||
scm {
|
||||
connection = 'scm:git:https://github.com/androidx/media.git'
|
||||
url = 'https://github.com/androidx/media'
|
||||
}
|
||||
withXml {
|
||||
addMissingAarTypeToXml(it)
|
||||
}
|
||||
}
|
||||
scm {
|
||||
connection = 'scm:git:https://github.com/androidx/media.git'
|
||||
url = 'https://github.com/androidx/media'
|
||||
}
|
||||
withXml {
|
||||
addMissingAarTypeToXml(it)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -18,6 +18,8 @@ if (gradle.ext.has('androidxMediaModulePrefix')) {
|
||||
modulePrefix += gradle.ext.androidxMediaModulePrefix
|
||||
}
|
||||
|
||||
rootProject.name = 'media3'
|
||||
|
||||
include modulePrefix + 'demo'
|
||||
project(modulePrefix + 'demo').projectDir = new File(rootDir, 'demos/main')
|
||||
include modulePrefix + 'demo-cast'
|
||||
|
Loading…
x
Reference in New Issue
Block a user