Commit be9bc328 by ibaker Committed by Tofunmi Adigun-Hameed

Remove a copybara stripping tag

#minor-release

PiperOrigin-RevId: 530935437
parent 2b79dee7
...@@ -33,7 +33,7 @@ allprojects { ...@@ -33,7 +33,7 @@ allprojects {
} }
buildDir = "${externalBuildDir}/${project.name}" buildDir = "${externalBuildDir}/${project.name}"
} }
group = 'com.google.android.exoplayer' group = 'com.google.android.exoplayer'
} }
apply from: 'javadoc_combined.gradle' apply from: 'javadoc_combined.gradle'
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and // See the License for the specific language governing permissions and
// limitations under the License. // limitations under the License.
apply from: "$gradle.ext.exoplayerSettingsDir/constants.gradle" apply from: "$gradle.ext.exoplayerSettingsDir/constants.gradle"
apply plugin: 'com.android.library' apply plugin: 'com.android.library'
android { android {
......
...@@ -12,9 +12,9 @@ ...@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and // See the License for the specific language governing permissions and
// limitations under the License. // limitations under the License.
project.ext { project.ext {
// ExoPlayer version and version code. // ExoPlayer version and version code.
releaseVersion = '2.18.6' releaseVersion = '2.18.6'
releaseVersionCode = 2_018_006 releaseVersionCode = 2_018_006
minSdkVersion = 16 minSdkVersion = 16
appTargetSdkVersion = 33 appTargetSdkVersion = 33
// API version before restricting local file access. // API version before restricting local file access.
...@@ -60,7 +60,7 @@ project.ext { ...@@ -60,7 +60,7 @@ project.ext {
truthVersion = '1.1.3' truthVersion = '1.1.3'
okhttpVersion = '4.11.0' okhttpVersion = '4.11.0'
modulePrefix = ':' modulePrefix = ':'
if (gradle.ext.has('exoplayerModulePrefix')) { if (gradle.ext.has('exoplayerModulePrefix')) {
modulePrefix += gradle.ext.exoplayerModulePrefix modulePrefix += gradle.ext.exoplayerModulePrefix
} }
} }
...@@ -12,14 +12,14 @@ ...@@ -12,14 +12,14 @@
// See the License for the specific language governing permissions and // See the License for the specific language governing permissions and
// limitations under the License. // limitations under the License.
def rootDir = file(".") def rootDir = file(".")
if (!gradle.ext.has('exoplayerSettingsDir')) { if (!gradle.ext.has('exoplayerSettingsDir')) {
gradle.ext.exoplayerSettingsDir = rootDir.getCanonicalPath() gradle.ext.exoplayerSettingsDir = rootDir.getCanonicalPath()
} }
def modulePrefix = ':' def modulePrefix = ':'
if (gradle.ext.has('exoplayerModulePrefix')) { if (gradle.ext.has('exoplayerModulePrefix')) {
modulePrefix += gradle.ext.exoplayerModulePrefix modulePrefix += gradle.ext.exoplayerModulePrefix
} }
include modulePrefix + 'library-common' include modulePrefix + 'library-common'
project(modulePrefix + 'library-common').projectDir = new File(rootDir, 'library/common') project(modulePrefix + 'library-common').projectDir = new File(rootDir, 'library/common')
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and // See the License for the specific language governing permissions and
// limitations under the License. // limitations under the License.
apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle" apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle"
android { android {
defaultConfig { defaultConfig {
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and // See the License for the specific language governing permissions and
// limitations under the License. // limitations under the License.
apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle" apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle"
dependencies { dependencies {
api 'com.google.android.gms:play-services-cast-framework:21.3.0' api 'com.google.android.gms:play-services-cast-framework:21.3.0'
...@@ -30,7 +30,7 @@ ext { ...@@ -30,7 +30,7 @@ ext {
apply from: '../../javadoc_library.gradle' apply from: '../../javadoc_library.gradle'
ext { ext {
releaseArtifactId = 'extension-cast' releaseArtifactId = 'extension-cast'
releaseDescription = 'Cast extension for ExoPlayer.' releaseDescription = 'Cast extension for ExoPlayer.'
} }
apply from: '../../publish.gradle' apply from: '../../publish.gradle'
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and // See the License for the specific language governing permissions and
// limitations under the License. // limitations under the License.
apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle" apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle"
dependencies { dependencies {
api "com.google.android.gms:play-services-cronet:18.0.1" api "com.google.android.gms:play-services-cronet:18.0.1"
...@@ -39,7 +39,7 @@ ext { ...@@ -39,7 +39,7 @@ ext {
apply from: '../../javadoc_library.gradle' apply from: '../../javadoc_library.gradle'
ext { ext {
releaseArtifactId = 'extension-cronet' releaseArtifactId = 'extension-cronet'
releaseDescription = 'Cronet extension for ExoPlayer.' releaseDescription = 'Cronet extension for ExoPlayer.'
} }
apply from: '../../publish.gradle' apply from: '../../publish.gradle'
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and // See the License for the specific language governing permissions and
// limitations under the License. // 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 // 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. // failures if ffmpeg hasn't been built according to the README instructions.
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and // See the License for the specific language governing permissions and
// limitations under the License. // limitations under the License.
apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle" apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle"
android { android {
sourceSets { sourceSets {
...@@ -19,7 +19,7 @@ android { ...@@ -19,7 +19,7 @@ android {
jniLibs.srcDir 'src/main/libs' jniLibs.srcDir 'src/main/libs'
jni.srcDirs = [] // Disable the automatic ndk-build call by Android Studio. 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,11 +11,11 @@ ...@@ -11,11 +11,11 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and // See the License for the specific language governing permissions and
// limitations under the License. // limitations under the License.
apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle" apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle"
android { android {
sourceSets { sourceSets {
androidTest.assets.srcDir '../../testdata/src/test/assets/' androidTest.assets.srcDir '../../testdata/src/test/assets/'
} }
} }
...@@ -40,7 +40,7 @@ ext { ...@@ -40,7 +40,7 @@ ext {
apply from: '../../javadoc_library.gradle' apply from: '../../javadoc_library.gradle'
ext { ext {
releaseArtifactId = 'extension-ima' releaseArtifactId = 'extension-ima'
releaseDescription = 'Interactive Media Ads extension for ExoPlayer.' releaseDescription = 'Interactive Media Ads extension for ExoPlayer.'
} }
apply from: '../../publish.gradle' apply from: '../../publish.gradle'
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and // See the License for the specific language governing permissions and
// limitations under the License. // 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 android.defaultConfig.minSdkVersion 17
...@@ -28,7 +28,7 @@ ext { ...@@ -28,7 +28,7 @@ ext {
apply from: '../../javadoc_library.gradle' apply from: '../../javadoc_library.gradle'
ext { ext {
releaseArtifactId = 'extension-leanback' releaseArtifactId = 'extension-leanback'
releaseDescription = 'Leanback extension for ExoPlayer.' releaseDescription = 'Leanback extension for ExoPlayer.'
} }
apply from: '../../publish.gradle' apply from: '../../publish.gradle'
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and // See the License for the specific language governing permissions and
// limitations under the License. // limitations under the License.
apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle" apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle"
dependencies { dependencies {
implementation project(modulePrefix + 'library-common') implementation project(modulePrefix + 'library-common')
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and // See the License for the specific language governing permissions and
// limitations under the License. // limitations under the License.
apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle" apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle"
dependencies { dependencies {
implementation project(modulePrefix + 'library-common') implementation project(modulePrefix + 'library-common')
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and // See the License for the specific language governing permissions and
// limitations under the License. // 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 android.defaultConfig.minSdkVersion 21
...@@ -34,7 +34,7 @@ ext { ...@@ -34,7 +34,7 @@ ext {
apply from: '../../javadoc_library.gradle' apply from: '../../javadoc_library.gradle'
ext { ext {
releaseArtifactId = 'extension-okhttp' releaseArtifactId = 'extension-okhttp'
releaseDescription = 'OkHttp extension for ExoPlayer.' releaseDescription = 'OkHttp extension for ExoPlayer.'
} }
apply from: '../../publish.gradle' apply from: '../../publish.gradle'
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and // See the License for the specific language governing permissions and
// limitations under the License. // limitations under the License.
apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle" apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle"
android { android {
sourceSets { sourceSets {
...@@ -19,7 +19,7 @@ android { ...@@ -19,7 +19,7 @@ android {
jniLibs.srcDir 'src/main/libs' jniLibs.srcDir 'src/main/libs'
jni.srcDirs = [] // Disable the automatic ndk-build call by Android Studio. 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 @@ ...@@ -11,7 +11,7 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and // See the License for the specific language governing permissions and
// limitations under the License. // limitations under the License.
apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle" apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle"
dependencies { dependencies {
implementation project(modulePrefix + 'library-common') implementation project(modulePrefix + 'library-common')
...@@ -31,7 +31,7 @@ ext { ...@@ -31,7 +31,7 @@ ext {
apply from: '../../javadoc_library.gradle' apply from: '../../javadoc_library.gradle'
ext { ext {
releaseArtifactId = 'extension-rtmp' releaseArtifactId = 'extension-rtmp'
releaseDescription = 'RTMP extension for ExoPlayer.' releaseDescription = 'RTMP extension for ExoPlayer.'
} }
apply from: '../../publish.gradle' apply from: '../../publish.gradle'
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and // See the License for the specific language governing permissions and
// limitations under the License. // limitations under the License.
apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle" apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle"
android { android {
sourceSets { sourceSets {
...@@ -19,7 +19,7 @@ android { ...@@ -19,7 +19,7 @@ android {
jniLibs.srcDir 'src/main/libs' jniLibs.srcDir 'src/main/libs'
jni.srcDirs = [] // Disable the automatic ndk-build call by Android Studio. 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 @@ ...@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle" apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle"
dependencies { dependencies {
implementation project(modulePrefix + 'library-core') implementation project(modulePrefix + 'library-core')
...@@ -27,7 +27,7 @@ ext { ...@@ -27,7 +27,7 @@ ext {
apply from: '../../javadoc_library.gradle' apply from: '../../javadoc_library.gradle'
ext { ext {
releaseArtifactId = 'extension-workmanager' releaseArtifactId = 'extension-workmanager'
releaseDescription = 'WorkManager extension for ExoPlayer.' releaseDescription = 'WorkManager extension for ExoPlayer.'
} }
apply from: '../../publish.gradle' apply from: '../../publish.gradle'
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and // See the License for the specific language governing permissions and
// limitations under the License. // limitations under the License.
apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle" apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle"
dependencies { dependencies {
api project(modulePrefix + 'library-common') api project(modulePrefix + 'library-common')
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and // See the License for the specific language governing permissions and
// limitations under the License. // limitations under the License.
apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle" apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle"
android { android {
buildTypes { buildTypes {
...@@ -63,7 +63,7 @@ ext { ...@@ -63,7 +63,7 @@ ext {
apply from: '../../javadoc_library.gradle' apply from: '../../javadoc_library.gradle'
ext { ext {
releaseArtifactId = 'exoplayer-common' releaseArtifactId = 'exoplayer-common'
releaseDescription = 'The ExoPlayer library common module.' releaseDescription = 'The ExoPlayer library common module.'
} }
apply from: '../../publish.gradle' apply from: '../../publish.gradle'
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and // See the License for the specific language governing permissions and
// limitations under the License. // limitations under the License.
apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle" apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle"
android { android {
defaultConfig { defaultConfig {
...@@ -28,8 +28,8 @@ android { ...@@ -28,8 +28,8 @@ android {
} }
sourceSets { sourceSets {
androidTest.assets.srcDir '../../testdata/src/test/assets/' androidTest.assets.srcDir '../../testdata/src/test/assets/'
test.assets.srcDir '../../testdata/src/test/assets/' test.assets.srcDir '../../testdata/src/test/assets/'
} }
} }
...@@ -67,7 +67,7 @@ ext { ...@@ -67,7 +67,7 @@ ext {
apply from: '../../javadoc_library.gradle' apply from: '../../javadoc_library.gradle'
ext { ext {
releaseArtifactId = 'exoplayer-core' releaseArtifactId = 'exoplayer-core'
releaseDescription = 'The ExoPlayer library core module.' releaseDescription = 'The ExoPlayer library core module.'
} }
apply from: '../../publish.gradle' apply from: '../../publish.gradle'
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and // See the License for the specific language governing permissions and
// limitations under the License. // limitations under the License.
apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle" apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle"
android { android {
buildTypes { buildTypes {
...@@ -20,7 +20,7 @@ android { ...@@ -20,7 +20,7 @@ android {
} }
} }
sourceSets.test.assets.srcDir '../../testdata/src/test/assets/' sourceSets.test.assets.srcDir '../../testdata/src/test/assets/'
} }
dependencies { dependencies {
...@@ -41,7 +41,7 @@ ext { ...@@ -41,7 +41,7 @@ ext {
apply from: '../../javadoc_library.gradle' apply from: '../../javadoc_library.gradle'
ext { ext {
releaseArtifactId = 'exoplayer-dash' releaseArtifactId = 'exoplayer-dash'
releaseDescription = 'The ExoPlayer library DASH module.' releaseDescription = 'The ExoPlayer library DASH module.'
} }
apply from: '../../publish.gradle' apply from: '../../publish.gradle'
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and // See the License for the specific language governing permissions and
// limitations under the License. // limitations under the License.
apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle" apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle"
android { android {
buildTypes { buildTypes {
...@@ -38,7 +38,7 @@ ext { ...@@ -38,7 +38,7 @@ ext {
apply from: '../../javadoc_library.gradle' apply from: '../../javadoc_library.gradle'
ext { ext {
releaseArtifactId = 'exoplayer-database' releaseArtifactId = 'exoplayer-database'
releaseDescription = 'The ExoPlayer database module.' releaseDescription = 'The ExoPlayer database module.'
} }
apply from: '../../publish.gradle' apply from: '../../publish.gradle'
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and // See the License for the specific language governing permissions and
// limitations under the License. // limitations under the License.
apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle" apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle"
android { android {
buildTypes { buildTypes {
...@@ -21,8 +21,8 @@ android { ...@@ -21,8 +21,8 @@ android {
} }
sourceSets { sourceSets {
androidTest.assets.srcDir '../../testdata/src/test/assets/' androidTest.assets.srcDir '../../testdata/src/test/assets/'
test.assets.srcDir '../../testdata/src/test/assets/' test.assets.srcDir '../../testdata/src/test/assets/'
} }
} }
...@@ -57,7 +57,7 @@ ext { ...@@ -57,7 +57,7 @@ ext {
apply from: '../../javadoc_library.gradle' apply from: '../../javadoc_library.gradle'
ext { ext {
releaseArtifactId = 'exoplayer-datasource' releaseArtifactId = 'exoplayer-datasource'
releaseDescription = 'The ExoPlayer library DataSource module.' releaseDescription = 'The ExoPlayer library DataSource module.'
} }
apply from: '../../publish.gradle' apply from: '../../publish.gradle'
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and // See the License for the specific language governing permissions and
// limitations under the License. // limitations under the License.
apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle" apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle"
android { android {
buildTypes { buildTypes {
...@@ -37,7 +37,7 @@ ext { ...@@ -37,7 +37,7 @@ ext {
apply from: '../../javadoc_library.gradle' apply from: '../../javadoc_library.gradle'
ext { ext {
releaseArtifactId = 'exoplayer-decoder' releaseArtifactId = 'exoplayer-decoder'
releaseDescription = 'The ExoPlayer library decoder module.' releaseDescription = 'The ExoPlayer library decoder module.'
} }
apply from: '../../publish.gradle' apply from: '../../publish.gradle'
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and // See the License for the specific language governing permissions and
// limitations under the License. // limitations under the License.
apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle" apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle"
android { android {
defaultConfig { defaultConfig {
...@@ -29,8 +29,8 @@ android { ...@@ -29,8 +29,8 @@ android {
} }
sourceSets { sourceSets {
androidTest.assets.srcDir '../../testdata/src/test/assets/' androidTest.assets.srcDir '../../testdata/src/test/assets/'
test.assets.srcDir '../../testdata/src/test/assets/' test.assets.srcDir '../../testdata/src/test/assets/'
} }
} }
...@@ -60,7 +60,7 @@ ext { ...@@ -60,7 +60,7 @@ ext {
apply from: '../../javadoc_library.gradle' apply from: '../../javadoc_library.gradle'
ext { ext {
releaseArtifactId = 'exoplayer-effect' releaseArtifactId = 'exoplayer-effect'
releaseDescription = 'The ExoPlayer library effect module.' releaseDescription = 'The ExoPlayer library effect module.'
} }
apply from: '../../publish.gradle' apply from: '../../publish.gradle'
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and // See the License for the specific language governing permissions and
// limitations under the License. // limitations under the License.
apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle" apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle"
android { android {
buildTypes { buildTypes {
...@@ -20,7 +20,7 @@ android { ...@@ -20,7 +20,7 @@ android {
} }
} }
sourceSets.test.assets.srcDir '../../testdata/src/test/assets/' sourceSets.test.assets.srcDir '../../testdata/src/test/assets/'
} }
dependencies { dependencies {
...@@ -44,7 +44,7 @@ ext { ...@@ -44,7 +44,7 @@ ext {
apply from: '../../javadoc_library.gradle' apply from: '../../javadoc_library.gradle'
ext { ext {
releaseArtifactId = 'exoplayer-extractor' releaseArtifactId = 'exoplayer-extractor'
releaseDescription = 'The ExoPlayer library extractor module.' releaseDescription = 'The ExoPlayer library extractor module.'
} }
apply from: '../../publish.gradle' apply from: '../../publish.gradle'
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and // See the License for the specific language governing permissions and
// limitations under the License. // limitations under the License.
apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle" apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle"
android { android {
buildTypes { buildTypes {
...@@ -20,7 +20,7 @@ android { ...@@ -20,7 +20,7 @@ android {
} }
} }
sourceSets.test.assets.srcDir '../../testdata/src/test/assets/' sourceSets.test.assets.srcDir '../../testdata/src/test/assets/'
} }
dependencies { dependencies {
...@@ -43,7 +43,7 @@ ext { ...@@ -43,7 +43,7 @@ ext {
apply from: '../../javadoc_library.gradle' apply from: '../../javadoc_library.gradle'
ext { ext {
releaseArtifactId = 'exoplayer-hls' releaseArtifactId = 'exoplayer-hls'
releaseDescription = 'The ExoPlayer library HLS module.' releaseDescription = 'The ExoPlayer library HLS module.'
} }
apply from: '../../publish.gradle' apply from: '../../publish.gradle'
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and // See the License for the specific language governing permissions and
// limitations under the License. // limitations under the License.
apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle" apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle"
android { android {
defaultConfig { defaultConfig {
...@@ -29,8 +29,8 @@ android { ...@@ -29,8 +29,8 @@ android {
} }
sourceSets { sourceSets {
androidTest.assets.srcDir '../../testdata/src/test/assets/' androidTest.assets.srcDir '../../testdata/src/test/assets/'
test.assets.srcDir '../../testdata/src/test/assets/' test.assets.srcDir '../../testdata/src/test/assets/'
} }
} }
...@@ -58,7 +58,7 @@ dependencies { ...@@ -58,7 +58,7 @@ dependencies {
apply from: '../../javadoc_library.gradle' apply from: '../../javadoc_library.gradle'
ext { ext {
releaseArtifactId = 'exoplayer-muxer' releaseArtifactId = 'exoplayer-muxer'
releaseDescription = 'The ExoPlayer library muxer module.' releaseDescription = 'The ExoPlayer library muxer module.'
} }
apply from: '../../publish.gradle' apply from: '../../publish.gradle'
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and // See the License for the specific language governing permissions and
// limitations under the License. // limitations under the License.
apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle" apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle"
android { android {
buildTypes { buildTypes {
...@@ -20,7 +20,7 @@ android { ...@@ -20,7 +20,7 @@ android {
} }
} }
sourceSets.test.assets.srcDir '../../testdata/src/test/assets/' sourceSets.test.assets.srcDir '../../testdata/src/test/assets/'
} }
dependencies { dependencies {
...@@ -44,7 +44,7 @@ ext { ...@@ -44,7 +44,7 @@ ext {
apply from: '../../javadoc_library.gradle' apply from: '../../javadoc_library.gradle'
ext { ext {
releaseArtifactId = 'exoplayer-rtsp' releaseArtifactId = 'exoplayer-rtsp'
releaseDescription = 'The ExoPlayer library RTSP module.' releaseDescription = 'The ExoPlayer library RTSP module.'
} }
apply from: '../../publish.gradle' apply from: '../../publish.gradle'
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and // See the License for the specific language governing permissions and
// limitations under the License. // limitations under the License.
apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle" apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle"
android { android {
buildTypes { buildTypes {
...@@ -20,7 +20,7 @@ android { ...@@ -20,7 +20,7 @@ android {
} }
} }
sourceSets.test.assets.srcDir '../../testdata/src/test/assets/' sourceSets.test.assets.srcDir '../../testdata/src/test/assets/'
} }
dependencies { dependencies {
...@@ -41,7 +41,7 @@ ext { ...@@ -41,7 +41,7 @@ ext {
apply from: '../../javadoc_library.gradle' apply from: '../../javadoc_library.gradle'
ext { ext {
releaseArtifactId = 'exoplayer-smoothstreaming' releaseArtifactId = 'exoplayer-smoothstreaming'
releaseDescription = 'The ExoPlayer library SmoothStreaming module.' releaseDescription = 'The ExoPlayer library SmoothStreaming module.'
} }
apply from: '../../publish.gradle' apply from: '../../publish.gradle'
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and // See the License for the specific language governing permissions and
// limitations under the License. // limitations under the License.
apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle" apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle"
android { android {
defaultConfig { defaultConfig {
...@@ -29,8 +29,8 @@ android { ...@@ -29,8 +29,8 @@ android {
} }
sourceSets { sourceSets {
androidTest.assets.srcDir '../../testdata/src/test/assets/' androidTest.assets.srcDir '../../testdata/src/test/assets/'
test.assets.srcDir '../../testdata/src/test/assets/' test.assets.srcDir '../../testdata/src/test/assets/'
} }
} }
...@@ -63,7 +63,7 @@ ext { ...@@ -63,7 +63,7 @@ ext {
apply from: '../../javadoc_library.gradle' apply from: '../../javadoc_library.gradle'
ext { ext {
releaseArtifactId = 'exoplayer-transformer' releaseArtifactId = 'exoplayer-transformer'
releaseDescription = 'The ExoPlayer library transformer module.' releaseDescription = 'The ExoPlayer library transformer module.'
} }
apply from: '../../publish.gradle' apply from: '../../publish.gradle'
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and // See the License for the specific language governing permissions and
// limitations under the License. // 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 android.buildTypes.debug.testCoverageEnabled true
...@@ -23,7 +23,7 @@ android { ...@@ -23,7 +23,7 @@ android {
dependencies { dependencies {
implementation project(modulePrefix + 'library-common') implementation project(modulePrefix + 'library-common')
api 'androidx.media:media:' + androidxMediaVersion api 'androidx.media:media:' + androidxMediaVersion
implementation 'androidx.annotation:annotation:' + androidxAnnotationVersion implementation 'androidx.annotation:annotation:' + androidxAnnotationVersion
implementation 'androidx.core:core:' + androidxCoreVersion implementation 'androidx.core:core:' + androidxCoreVersion
implementation 'androidx.recyclerview:recyclerview:' + androidxRecyclerViewVersion implementation 'androidx.recyclerview:recyclerview:' + androidxRecyclerViewVersion
...@@ -41,7 +41,7 @@ ext { ...@@ -41,7 +41,7 @@ ext {
apply from: '../../javadoc_library.gradle' apply from: '../../javadoc_library.gradle'
ext { ext {
releaseArtifactId = 'exoplayer-ui' releaseArtifactId = 'exoplayer-ui'
releaseDescription = 'The ExoPlayer library UI module.' releaseDescription = 'The ExoPlayer library UI module.'
} }
apply from: '../../publish.gradle' apply from: '../../publish.gradle'
...@@ -71,7 +71,7 @@ def addMissingAarTypeToXml(xml) { ...@@ -71,7 +71,7 @@ def addMissingAarTypeToXml(xml) {
.children()[0] .children()[0]
String dependencyName = groupId + ":" + artifactId String dependencyName = groupId + ":" + artifactId
boolean isProjectLibrary = boolean isProjectLibrary =
groupId == 'com.google.android.exoplayer' groupId == 'com.google.android.exoplayer'
boolean hasJar = boolean hasJar =
jar_only_dependencies.contains(dependencyName) jar_only_dependencies.contains(dependencyName)
boolean hasAar = boolean hasAar =
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and // See the License for the specific language governing permissions and
// limitations under the License. // limitations under the License.
apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle" apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle"
dependencies { dependencies {
androidTestImplementation 'androidx.test:rules:' + androidxTestRulesVersion androidTestImplementation 'androidx.test:rules:' + androidxTestRulesVersion
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and // See the License for the specific language governing permissions and
// limitations under the License. // limitations under the License.
apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle" apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle"
dependencies { dependencies {
compileOnly 'org.checkerframework:checker-qual:' + checkerframeworkVersion compileOnly 'org.checkerframework:checker-qual:' + checkerframeworkVersion
...@@ -26,10 +26,10 @@ dependencies { ...@@ -26,10 +26,10 @@ dependencies {
ext { ext {
javadocTitle = 'Robolectric utils' javadocTitle = 'Robolectric utils'
} }
apply from: '../javadoc_library.gradle' apply from: '../javadoc_library.gradle'
ext { ext {
releaseArtifactId = 'exoplayer-robolectricutils' releaseArtifactId = 'exoplayer-robolectricutils'
releaseDescription = 'Robolectric utils for ExoPlayer.' releaseDescription = 'Robolectric utils for ExoPlayer.'
} }
apply from: '../publish.gradle' apply from: '../publish.gradle'
...@@ -11,14 +11,14 @@ ...@@ -11,14 +11,14 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and // See the License for the specific language governing permissions and
// limitations under the License. // limitations under the License.
gradle.ext.exoplayerModulePrefix = '' gradle.ext.exoplayerModulePrefix = ''
def modulePrefix = ':' def modulePrefix = ':'
if (gradle.ext.has('exoplayerModulePrefix')) { if (gradle.ext.has('exoplayerModulePrefix')) {
modulePrefix += gradle.ext.exoplayerModulePrefix modulePrefix += gradle.ext.exoplayerModulePrefix
} }
rootProject.name = 'exoplayer2' rootProject.name = 'exoplayer2'
include modulePrefix + 'demo' include modulePrefix + 'demo'
project(modulePrefix + 'demo').projectDir = new File(rootDir, 'demos/main') project(modulePrefix + 'demo').projectDir = new File(rootDir, 'demos/main')
......
...@@ -11,5 +11,5 @@ ...@@ -11,5 +11,5 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and // See the License for the specific language governing permissions and
// limitations under the License. // 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 @@ ...@@ -11,7 +11,7 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and // See the License for the specific language governing permissions and
// limitations under the License. // limitations under the License.
apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle" apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle"
dependencies { dependencies {
api 'org.mockito:mockito-core:' + mockitoVersion api 'org.mockito:mockito-core:' + mockitoVersion
...@@ -33,10 +33,10 @@ dependencies { ...@@ -33,10 +33,10 @@ dependencies {
ext { ext {
javadocTitle = 'Test utils' javadocTitle = 'Test utils'
} }
apply from: '../javadoc_library.gradle' apply from: '../javadoc_library.gradle'
ext { ext {
releaseArtifactId = 'exoplayer-testutils' releaseArtifactId = 'exoplayer-testutils'
releaseDescription = 'Test utils for ExoPlayer.' 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