diff --git a/build.gradle b/build.gradle index 3d91579992b..b667b2ab3bd 100644 --- a/build.gradle +++ b/build.gradle @@ -32,7 +32,7 @@ allprojects { } buildDir = "${externalBuildDir}/${project.name}" } - group = 'com.google.android.exoplayer' + group = 'com.google.android.exoplayer' } apply from: 'javadoc_combined.gradle' diff --git a/common_library_config.gradle b/common_library_config.gradle index 002502299b1..a739fddfa91 100644 --- a/common_library_config.gradle +++ b/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/constants.gradle" + apply from: "$gradle.ext.exoplayerSettingsDir/constants.gradle" apply plugin: 'com.android.library' android { diff --git a/constants.gradle b/constants.gradle index c4159f2d58a..8ebac1ab5bd 100644 --- a/constants.gradle +++ b/constants.gradle @@ -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 + } } diff --git a/core_settings.gradle b/core_settings.gradle index 65300d3a674..e774df6230a 100644 --- a/core_settings.gradle +++ b/core_settings.gradle @@ -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') diff --git a/extensions/av1/build.gradle b/extensions/av1/build.gradle index 56e296bf0ca..f4d0c03b228 100644 --- a/extensions/av1/build.gradle +++ b/extensions/av1/build.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 { diff --git a/extensions/cast/build.gradle b/extensions/cast/build.gradle index a7489a9eebd..e4ede6c7cf6 100644 --- a/extensions/cast/build.gradle +++ b/extensions/cast/build.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 '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' diff --git a/extensions/cronet/build.gradle b/extensions/cronet/build.gradle index ae825705b91..06fa5c3985a 100644 --- a/extensions/cronet/build.gradle +++ b/extensions/cronet/build.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' diff --git a/extensions/ffmpeg/build.gradle b/extensions/ffmpeg/build.gradle index 44480210b06..e36b51567b8 100644 --- a/extensions/ffmpeg/build.gradle +++ b/extensions/ffmpeg/build.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. diff --git a/extensions/flac/build.gradle b/extensions/flac/build.gradle index 28a6f420c63..053aa0f2575 100644 --- a/extensions/flac/build.gradle +++ b/extensions/flac/build.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 { @@ -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/' } } diff --git a/extensions/ima/build.gradle b/extensions/ima/build.gradle index c9e191d4848..320092cccac 100644 --- a/extensions/ima/build.gradle +++ b/extensions/ima/build.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 { @@ -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' diff --git a/extensions/leanback/build.gradle b/extensions/leanback/build.gradle index 3a1a3fb78ca..c8efa3df0a7 100644 --- a/extensions/leanback/build.gradle +++ b/extensions/leanback/build.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' diff --git a/extensions/media2/build.gradle b/extensions/media2/build.gradle index 8deada9d3b1..abbefb82692 100644 --- a/extensions/media2/build.gradle +++ b/extensions/media2/build.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') diff --git a/extensions/mediasession/build.gradle b/extensions/mediasession/build.gradle index 056526e8a18..99abf54a367 100644 --- a/extensions/mediasession/build.gradle +++ b/extensions/mediasession/build.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') diff --git a/extensions/okhttp/build.gradle b/extensions/okhttp/build.gradle index a3d4605c206..8ca8041bda9 100644 --- a/extensions/okhttp/build.gradle +++ b/extensions/okhttp/build.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 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' diff --git a/extensions/opus/build.gradle b/extensions/opus/build.gradle index eb5dbe289f9..2bbf0c12092 100644 --- a/extensions/opus/build.gradle +++ b/extensions/opus/build.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/' } } diff --git a/extensions/rtmp/build.gradle b/extensions/rtmp/build.gradle index bc74e1445f2..19c10d8c047 100644 --- a/extensions/rtmp/build.gradle +++ b/extensions/rtmp/build.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') @@ -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' diff --git a/extensions/vp9/build.gradle b/extensions/vp9/build.gradle index bc7e17570b3..567e6048dc1 100644 --- a/extensions/vp9/build.gradle +++ b/extensions/vp9/build.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/' } } diff --git a/extensions/workmanager/build.gradle b/extensions/workmanager/build.gradle index 1327cab7fe9..692003953c0 100644 --- a/extensions/workmanager/build.gradle +++ b/extensions/workmanager/build.gradle @@ -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' diff --git a/library/all/build.gradle b/library/all/build.gradle index 739ff6289e2..2a1ae172dc7 100644 --- a/library/all/build.gradle +++ b/library/all/build.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') diff --git a/library/common/build.gradle b/library/common/build.gradle index dfe6ab9596a..8c5ecbc8557 100644 --- a/library/common/build.gradle +++ b/library/common/build.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 { @@ -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' diff --git a/library/core/build.gradle b/library/core/build.gradle index f0d160e1566..d287277ce6c 100644 --- a/library/core/build.gradle +++ b/library/core/build.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' diff --git a/library/dash/build.gradle b/library/dash/build.gradle index ed27b412846..50ece06017b 100644 --- a/library/dash/build.gradle +++ b/library/dash/build.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' diff --git a/library/database/build.gradle b/library/database/build.gradle index 9c73e24c68e..45e1bdf7bcb 100644 --- a/library/database/build.gradle +++ b/library/database/build.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' diff --git a/library/datasource/build.gradle b/library/datasource/build.gradle index a790f669713..ef39c3d70b4 100644 --- a/library/datasource/build.gradle +++ b/library/datasource/build.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' diff --git a/library/decoder/build.gradle b/library/decoder/build.gradle index 48d8054c227..6b49189b97d 100644 --- a/library/decoder/build.gradle +++ b/library/decoder/build.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' diff --git a/library/effect/build.gradle b/library/effect/build.gradle index 2feff94ae4a..f7c1d24c19c 100644 --- a/library/effect/build.gradle +++ b/library/effect/build.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' diff --git a/library/extractor/build.gradle b/library/extractor/build.gradle index 4b8a0b3796f..9459d05f385 100644 --- a/library/extractor/build.gradle +++ b/library/extractor/build.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' diff --git a/library/hls/build.gradle b/library/hls/build.gradle index 4ad09f254b4..5f9aa0e0156 100644 --- a/library/hls/build.gradle +++ b/library/hls/build.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' diff --git a/library/rtsp/build.gradle b/library/rtsp/build.gradle index 1500b0a7db3..4fc4df22760 100644 --- a/library/rtsp/build.gradle +++ b/library/rtsp/build.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' diff --git a/library/smoothstreaming/build.gradle b/library/smoothstreaming/build.gradle index 50b04374b40..e972b0c1a05 100644 --- a/library/smoothstreaming/build.gradle +++ b/library/smoothstreaming/build.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' diff --git a/library/transformer/build.gradle b/library/transformer/build.gradle index 560fda5feef..e1665b29ed6 100644 --- a/library/transformer/build.gradle +++ b/library/transformer/build.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' diff --git a/library/ui/build.gradle b/library/ui/build.gradle index 7b21db436ef..bc808876144 100644 --- a/library/ui/build.gradle +++ b/library/ui/build.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' diff --git a/missing_aar_type_workaround.gradle b/missing_aar_type_workaround.gradle index bf8e7a93ff8..6ec99a172b9 100644 --- a/missing_aar_type_workaround.gradle +++ b/missing_aar_type_workaround.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 = diff --git a/playbacktests/build.gradle b/playbacktests/build.gradle index 396ea1cbd6e..58df51ddad5 100644 --- a/playbacktests/build.gradle +++ b/playbacktests/build.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 { diff --git a/robolectricutils/build.gradle b/robolectricutils/build.gradle index 9b4e6ad93b7..5c99f1482d4 100644 --- a/robolectricutils/build.gradle +++ b/robolectricutils/build.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 { 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' diff --git a/settings.gradle b/settings.gradle index 46fc0bbd599..8fcfb57d29b 100644 --- a/settings.gradle +++ b/settings.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') diff --git a/testdata/build.gradle b/testdata/build.gradle index 2510c37e654..cd4d10205a9 100644 --- a/testdata/build.gradle +++ b/testdata/build.gradle @@ -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" diff --git a/testutils/build.gradle b/testutils/build.gradle index 7f46a7cc1a3..c507a57e5b3 100644 --- a/testutils/build.gradle +++ b/testutils/build.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'