Commit dce9fe4c by ibaker Committed by Ian Baker

Remove a copybara stripping tag

PiperOrigin-RevId: 530935437
(cherry picked from commit be9bc328)
parent 3b862ed8
......@@ -32,7 +32,7 @@ allprojects {
}
buildDir = "${externalBuildDir}/${project.name}"
}
group = 'com.google.android.exoplayer'
group = 'com.google.android.exoplayer'
}
apply from: 'javadoc_combined.gradle'
......@@ -11,7 +11,7 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
apply from: "$gradle.ext.exoplayerSettingsDir/constants.gradle"
apply from: "$gradle.ext.exoplayerSettingsDir/constants.gradle"
apply plugin: 'com.android.library'
android {
......
......@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
project.ext {
// ExoPlayer version and version code.
releaseVersion = '2.18.6'
releaseVersionCode = 2_018_006
// ExoPlayer version and version code.
releaseVersion = '2.18.6'
releaseVersionCode = 2_018_006
minSdkVersion = 16
appTargetSdkVersion = 33
// API version before restricting local file access.
......@@ -57,7 +57,7 @@ project.ext {
truthVersion = '1.1.3'
okhttpVersion = '4.9.2'
modulePrefix = ':'
if (gradle.ext.has('exoplayerModulePrefix')) {
modulePrefix += gradle.ext.exoplayerModulePrefix
}
if (gradle.ext.has('exoplayerModulePrefix')) {
modulePrefix += gradle.ext.exoplayerModulePrefix
}
}
......@@ -12,14 +12,14 @@
// See the License for the specific language governing permissions and
// limitations under the License.
def rootDir = file(".")
if (!gradle.ext.has('exoplayerSettingsDir')) {
gradle.ext.exoplayerSettingsDir = rootDir.getCanonicalPath()
}
if (!gradle.ext.has('exoplayerSettingsDir')) {
gradle.ext.exoplayerSettingsDir = rootDir.getCanonicalPath()
}
def modulePrefix = ':'
if (gradle.ext.has('exoplayerModulePrefix')) {
modulePrefix += gradle.ext.exoplayerModulePrefix
}
if (gradle.ext.has('exoplayerModulePrefix')) {
modulePrefix += gradle.ext.exoplayerModulePrefix
}
include modulePrefix + 'library-common'
project(modulePrefix + 'library-common').projectDir = new File(rootDir, 'library/common')
......
......@@ -11,7 +11,7 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle"
apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle"
android {
defaultConfig {
......
......@@ -11,7 +11,7 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle"
apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle"
dependencies {
api 'com.google.android.gms:play-services-cast-framework:21.2.0'
......@@ -30,7 +30,7 @@ ext {
apply from: '../../javadoc_library.gradle'
ext {
releaseArtifactId = 'extension-cast'
releaseDescription = 'Cast extension for ExoPlayer.'
releaseArtifactId = 'extension-cast'
releaseDescription = 'Cast extension for ExoPlayer.'
}
apply from: '../../publish.gradle'
......@@ -11,7 +11,7 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle"
apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle"
android {
defaultConfig {
......@@ -46,7 +46,7 @@ ext {
apply from: '../../javadoc_library.gradle'
ext {
releaseArtifactId = 'extension-cronet'
releaseDescription = 'Cronet extension for ExoPlayer.'
releaseArtifactId = 'extension-cronet'
releaseDescription = 'Cronet extension for ExoPlayer.'
}
apply from: '../../publish.gradle'
......@@ -11,7 +11,7 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle"
apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle"
// 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.
......
......@@ -11,7 +11,7 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle"
apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle"
android {
defaultConfig {
......@@ -22,7 +22,7 @@ android {
jniLibs.srcDir 'src/main/libs'
jni.srcDirs = [] // Disable the automatic ndk-build call by Android Studio.
}
androidTest.assets.srcDir '../../testdata/src/test/assets/'
androidTest.assets.srcDir '../../testdata/src/test/assets/'
}
}
......
......@@ -11,7 +11,7 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle"
apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle"
android {
defaultConfig {
......@@ -20,7 +20,7 @@ android {
}
sourceSets {
androidTest.assets.srcDir '../../testdata/src/test/assets/'
androidTest.assets.srcDir '../../testdata/src/test/assets/'
}
}
......@@ -46,7 +46,7 @@ ext {
apply from: '../../javadoc_library.gradle'
ext {
releaseArtifactId = 'extension-ima'
releaseDescription = 'Interactive Media Ads extension for ExoPlayer.'
releaseArtifactId = 'extension-ima'
releaseDescription = 'Interactive Media Ads extension for ExoPlayer.'
}
apply from: '../../publish.gradle'
......@@ -11,7 +11,7 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle"
apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle"
android.defaultConfig.minSdkVersion 17
......@@ -28,7 +28,7 @@ ext {
apply from: '../../javadoc_library.gradle'
ext {
releaseArtifactId = 'extension-leanback'
releaseDescription = 'Leanback extension for ExoPlayer.'
releaseArtifactId = 'extension-leanback'
releaseDescription = 'Leanback extension for ExoPlayer.'
}
apply from: '../../publish.gradle'
......@@ -11,7 +11,7 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle"
apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle"
dependencies {
implementation project(modulePrefix + 'library-common')
......
......@@ -11,7 +11,7 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle"
apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle"
dependencies {
implementation project(modulePrefix + 'library-common')
......
......@@ -11,7 +11,7 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle"
apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle"
android.defaultConfig.minSdkVersion 21
......@@ -34,7 +34,7 @@ ext {
apply from: '../../javadoc_library.gradle'
ext {
releaseArtifactId = 'extension-okhttp'
releaseDescription = 'OkHttp extension for ExoPlayer.'
releaseArtifactId = 'extension-okhttp'
releaseDescription = 'OkHttp extension for ExoPlayer.'
}
apply from: '../../publish.gradle'
......@@ -11,7 +11,7 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle"
apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle"
android {
sourceSets {
......@@ -19,7 +19,7 @@ android {
jniLibs.srcDir 'src/main/libs'
jni.srcDirs = [] // Disable the automatic ndk-build call by Android Studio.
}
androidTest.assets.srcDir '../../testdata/src/test/assets/'
androidTest.assets.srcDir '../../testdata/src/test/assets/'
}
}
......
......@@ -11,7 +11,7 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle"
apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle"
dependencies {
implementation project(modulePrefix + 'library-common')
......@@ -31,7 +31,7 @@ ext {
apply from: '../../javadoc_library.gradle'
ext {
releaseArtifactId = 'extension-rtmp'
releaseDescription = 'RTMP extension for ExoPlayer.'
releaseArtifactId = 'extension-rtmp'
releaseDescription = 'RTMP extension for ExoPlayer.'
}
apply from: '../../publish.gradle'
......@@ -11,7 +11,7 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle"
apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle"
android {
sourceSets {
......@@ -19,7 +19,7 @@ android {
jniLibs.srcDir 'src/main/libs'
jni.srcDirs = [] // Disable the automatic ndk-build call by Android Studio.
}
androidTest.assets.srcDir '../../testdata/src/test/assets/'
androidTest.assets.srcDir '../../testdata/src/test/assets/'
}
}
......
......@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle"
apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle"
dependencies {
implementation project(modulePrefix + 'library-core')
......@@ -27,7 +27,7 @@ ext {
apply from: '../../javadoc_library.gradle'
ext {
releaseArtifactId = 'extension-workmanager'
releaseDescription = 'WorkManager extension for ExoPlayer.'
releaseArtifactId = 'extension-workmanager'
releaseDescription = 'WorkManager extension for ExoPlayer.'
}
apply from: '../../publish.gradle'
......@@ -11,7 +11,7 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle"
apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle"
dependencies {
api project(modulePrefix + 'library-common')
......
......@@ -11,7 +11,7 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle"
apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle"
android {
buildTypes {
......@@ -63,7 +63,7 @@ ext {
apply from: '../../javadoc_library.gradle'
ext {
releaseArtifactId = 'exoplayer-common'
releaseDescription = 'The ExoPlayer library common module.'
releaseArtifactId = 'exoplayer-common'
releaseDescription = 'The ExoPlayer library common module.'
}
apply from: '../../publish.gradle'
......@@ -11,7 +11,7 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle"
apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle"
android {
defaultConfig {
......@@ -33,8 +33,8 @@ android {
}
sourceSets {
androidTest.assets.srcDir '../../testdata/src/test/assets/'
test.assets.srcDir '../../testdata/src/test/assets/'
androidTest.assets.srcDir '../../testdata/src/test/assets/'
test.assets.srcDir '../../testdata/src/test/assets/'
}
}
......@@ -72,7 +72,7 @@ ext {
apply from: '../../javadoc_library.gradle'
ext {
releaseArtifactId = 'exoplayer-core'
releaseDescription = 'The ExoPlayer library core module.'
releaseArtifactId = 'exoplayer-core'
releaseDescription = 'The ExoPlayer library core module.'
}
apply from: '../../publish.gradle'
......@@ -11,7 +11,7 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle"
apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle"
android {
buildTypes {
......@@ -20,7 +20,7 @@ android {
}
}
sourceSets.test.assets.srcDir '../../testdata/src/test/assets/'
sourceSets.test.assets.srcDir '../../testdata/src/test/assets/'
}
dependencies {
......@@ -41,7 +41,7 @@ ext {
apply from: '../../javadoc_library.gradle'
ext {
releaseArtifactId = 'exoplayer-dash'
releaseDescription = 'The ExoPlayer library DASH module.'
releaseArtifactId = 'exoplayer-dash'
releaseDescription = 'The ExoPlayer library DASH module.'
}
apply from: '../../publish.gradle'
......@@ -11,7 +11,7 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle"
apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle"
android {
buildTypes {
......@@ -38,7 +38,7 @@ ext {
apply from: '../../javadoc_library.gradle'
ext {
releaseArtifactId = 'exoplayer-database'
releaseDescription = 'The ExoPlayer database module.'
releaseArtifactId = 'exoplayer-database'
releaseDescription = 'The ExoPlayer database module.'
}
apply from: '../../publish.gradle'
......@@ -11,7 +11,7 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle"
apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle"
android {
defaultConfig {
......@@ -25,8 +25,8 @@ android {
}
sourceSets {
androidTest.assets.srcDir '../../testdata/src/test/assets/'
test.assets.srcDir '../../testdata/src/test/assets/'
androidTest.assets.srcDir '../../testdata/src/test/assets/'
test.assets.srcDir '../../testdata/src/test/assets/'
}
}
......@@ -62,7 +62,7 @@ ext {
apply from: '../../javadoc_library.gradle'
ext {
releaseArtifactId = 'exoplayer-datasource'
releaseDescription = 'The ExoPlayer library DataSource module.'
releaseArtifactId = 'exoplayer-datasource'
releaseDescription = 'The ExoPlayer library DataSource module.'
}
apply from: '../../publish.gradle'
......@@ -11,7 +11,7 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle"
apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle"
android {
defaultConfig {
......@@ -41,7 +41,7 @@ ext {
apply from: '../../javadoc_library.gradle'
ext {
releaseArtifactId = 'exoplayer-decoder'
releaseDescription = 'The ExoPlayer library decoder module.'
releaseArtifactId = 'exoplayer-decoder'
releaseDescription = 'The ExoPlayer library decoder module.'
}
apply from: '../../publish.gradle'
......@@ -11,7 +11,7 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle"
apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle"
android {
defaultConfig {
......@@ -30,7 +30,7 @@ android {
}
sourceSets {
androidTest.assets.srcDir '../test_data/src/test/assets/' //copybara:media3-only
androidTest.assets.srcDir '../test_data/src/test/assets/' //copybara:media3-only
androidTest.assets.srcDir '../../testdata/src/test/assets/'
test.assets.srcDir '../../testdata/src/test/assets/'
}
......@@ -60,7 +60,7 @@ ext {
apply from: '../../javadoc_library.gradle'
ext {
releaseArtifactId = 'exoplayer-effect'
releaseDescription = 'The ExoPlayer library effect module.'
releaseArtifactId = 'exoplayer-effect'
releaseDescription = 'The ExoPlayer library effect module.'
}
apply from: '../../publish.gradle'
......@@ -11,7 +11,7 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle"
apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle"
android {
buildTypes {
......@@ -20,7 +20,7 @@ android {
}
}
sourceSets.test.assets.srcDir '../../testdata/src/test/assets/'
sourceSets.test.assets.srcDir '../../testdata/src/test/assets/'
}
dependencies {
......@@ -44,7 +44,7 @@ ext {
apply from: '../../javadoc_library.gradle'
ext {
releaseArtifactId = 'exoplayer-extractor'
releaseDescription = 'The ExoPlayer library extractor module.'
releaseArtifactId = 'exoplayer-extractor'
releaseDescription = 'The ExoPlayer library extractor module.'
}
apply from: '../../publish.gradle'
......@@ -11,7 +11,7 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle"
apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle"
android {
buildTypes {
......@@ -20,7 +20,7 @@ android {
}
}
sourceSets.test.assets.srcDir '../../testdata/src/test/assets/'
sourceSets.test.assets.srcDir '../../testdata/src/test/assets/'
}
dependencies {
......@@ -43,7 +43,7 @@ ext {
apply from: '../../javadoc_library.gradle'
ext {
releaseArtifactId = 'exoplayer-hls'
releaseDescription = 'The ExoPlayer library HLS module.'
releaseArtifactId = 'exoplayer-hls'
releaseDescription = 'The ExoPlayer library HLS module.'
}
apply from: '../../publish.gradle'
......@@ -11,7 +11,7 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle"
apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle"
android {
buildTypes {
......@@ -20,7 +20,7 @@ android {
}
}
sourceSets.test.assets.srcDir '../../testdata/src/test/assets/'
sourceSets.test.assets.srcDir '../../testdata/src/test/assets/'
}
dependencies {
......@@ -44,7 +44,7 @@ ext {
apply from: '../../javadoc_library.gradle'
ext {
releaseArtifactId = 'exoplayer-rtsp'
releaseDescription = 'The ExoPlayer library RTSP module.'
releaseArtifactId = 'exoplayer-rtsp'
releaseDescription = 'The ExoPlayer library RTSP module.'
}
apply from: '../../publish.gradle'
......@@ -11,7 +11,7 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle"
apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle"
android {
buildTypes {
......@@ -20,7 +20,7 @@ android {
}
}
sourceSets.test.assets.srcDir '../../testdata/src/test/assets/'
sourceSets.test.assets.srcDir '../../testdata/src/test/assets/'
}
dependencies {
......@@ -41,7 +41,7 @@ ext {
apply from: '../../javadoc_library.gradle'
ext {
releaseArtifactId = 'exoplayer-smoothstreaming'
releaseDescription = 'The ExoPlayer library SmoothStreaming module.'
releaseArtifactId = 'exoplayer-smoothstreaming'
releaseDescription = 'The ExoPlayer library SmoothStreaming module.'
}
apply from: '../../publish.gradle'
......@@ -11,7 +11,7 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle"
apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle"
android {
defaultConfig {
......@@ -30,8 +30,8 @@ android {
}
sourceSets {
androidTest.assets.srcDir '../../testdata/src/test/assets/'
test.assets.srcDir '../../testdata/src/test/assets/'
androidTest.assets.srcDir '../../testdata/src/test/assets/'
test.assets.srcDir '../../testdata/src/test/assets/'
}
}
......@@ -60,7 +60,7 @@ ext {
apply from: '../../javadoc_library.gradle'
ext {
releaseArtifactId = 'exoplayer-transformer'
releaseDescription = 'The ExoPlayer library transformer module.'
releaseArtifactId = 'exoplayer-transformer'
releaseDescription = 'The ExoPlayer library transformer module.'
}
apply from: '../../publish.gradle'
......@@ -11,7 +11,7 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle"
apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle"
android.buildTypes.debug.testCoverageEnabled true
......@@ -23,7 +23,7 @@ android {
dependencies {
implementation project(modulePrefix + 'library-common')
api 'androidx.media:media:' + androidxMediaVersion
api 'androidx.media:media:' + androidxMediaVersion
implementation 'androidx.annotation:annotation:' + androidxAnnotationVersion
implementation 'androidx.recyclerview:recyclerview:' + androidxRecyclerViewVersion
compileOnly 'org.checkerframework:checker-qual:' + checkerframeworkVersion
......@@ -38,7 +38,7 @@ ext {
apply from: '../../javadoc_library.gradle'
ext {
releaseArtifactId = 'exoplayer-ui'
releaseDescription = 'The ExoPlayer library UI module.'
releaseArtifactId = 'exoplayer-ui'
releaseDescription = 'The ExoPlayer library UI module.'
}
apply from: '../../publish.gradle'
......@@ -71,7 +71,7 @@ def addMissingAarTypeToXml(xml) {
.children()[0]
String dependencyName = groupId + ":" + artifactId
boolean isProjectLibrary =
groupId == 'com.google.android.exoplayer'
groupId == 'com.google.android.exoplayer'
boolean hasJar =
jar_only_dependencies.contains(dependencyName)
boolean hasAar =
......
......@@ -11,7 +11,7 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle"
apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle"
android {
defaultConfig {
......
......@@ -11,7 +11,7 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle"
apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle"
dependencies {
compileOnly 'org.checkerframework:checker-qual:' + checkerframeworkVersion
......@@ -26,10 +26,10 @@ dependencies {
ext {
javadocTitle = 'Robolectric utils'
}
apply from: '../javadoc_library.gradle'
apply from: '../javadoc_library.gradle'
ext {
releaseArtifactId = 'exoplayer-robolectricutils'
releaseDescription = 'Robolectric utils for ExoPlayer.'
releaseArtifactId = 'exoplayer-robolectricutils'
releaseDescription = 'Robolectric utils for ExoPlayer.'
}
apply from: '../publish.gradle'
apply from: '../publish.gradle'
......@@ -11,14 +11,14 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
gradle.ext.exoplayerModulePrefix = ''
gradle.ext.exoplayerModulePrefix = ''
def modulePrefix = ':'
if (gradle.ext.has('exoplayerModulePrefix')) {
modulePrefix += gradle.ext.exoplayerModulePrefix
}
if (gradle.ext.has('exoplayerModulePrefix')) {
modulePrefix += gradle.ext.exoplayerModulePrefix
}
rootProject.name = 'media3'
rootProject.name = 'media3'
include modulePrefix + 'demo'
project(modulePrefix + 'demo').projectDir = new File(rootDir, 'demos/main')
......
......@@ -11,5 +11,5 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle"
apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle"
......@@ -11,7 +11,7 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle"
apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle"
dependencies {
api 'org.mockito:mockito-core:' + mockitoVersion
......@@ -33,10 +33,10 @@ dependencies {
ext {
javadocTitle = 'Test utils'
}
apply from: '../javadoc_library.gradle'
apply from: '../javadoc_library.gradle'
ext {
releaseArtifactId = 'exoplayer-testutils'
releaseDescription = 'Test utils for ExoPlayer.'
releaseArtifactId = 'exoplayer-testutils'
releaseDescription = 'Test utils for ExoPlayer.'
}
apply from: '../publish.gradle'
apply from: '../publish.gradle'
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment