diff --git a/constants.gradle b/constants.gradle index 9510b8442e..77609df69b 100644 --- a/constants.gradle +++ b/constants.gradle @@ -26,7 +26,8 @@ project.ext { checkerframeworkVersion = '2.5.0' jsr305Version = '3.0.2' kotlinAnnotationsVersion = '1.3.31' - androidXTestVersion = '1.1.0' + androidxAnnotationVersion = '1.1.0' + androidxTestVersion = '1.1.0' truthVersion = '0.44' modulePrefix = ':' if (gradle.ext.has('exoplayerModulePrefix')) { diff --git a/demos/gvr/build.gradle b/demos/gvr/build.gradle index 37d8fbbb99..96c699b2e6 100644 --- a/demos/gvr/build.gradle +++ b/demos/gvr/build.gradle @@ -53,7 +53,7 @@ dependencies { implementation project(modulePrefix + 'library-hls') implementation project(modulePrefix + 'library-smoothstreaming') implementation project(modulePrefix + 'extension-gvr') - implementation 'androidx.annotation:annotation:1.1.0' + implementation 'androidx.annotation:annotation:' + androidxAnnotationVersion } apply plugin: 'com.google.android.gms.strict-version-matcher-plugin' diff --git a/demos/ima/build.gradle b/demos/ima/build.gradle index 124555d9b5..289fa1dc83 100644 --- a/demos/ima/build.gradle +++ b/demos/ima/build.gradle @@ -53,7 +53,7 @@ dependencies { implementation project(modulePrefix + 'library-hls') implementation project(modulePrefix + 'library-smoothstreaming') implementation project(modulePrefix + 'extension-ima') - implementation 'androidx.annotation:annotation:1.1.0' + implementation 'androidx.annotation:annotation:' + androidxAnnotationVersion } apply plugin: 'com.google.android.gms.strict-version-matcher-plugin' diff --git a/demos/main/build.gradle b/demos/main/build.gradle index be08ca9ea2..06c734986c 100644 --- a/demos/main/build.gradle +++ b/demos/main/build.gradle @@ -62,7 +62,7 @@ android { } dependencies { - implementation 'androidx.annotation:annotation:1.1.0' + implementation 'androidx.annotation:annotation:' + androidxAnnotationVersion implementation 'com.google.android.material:material:1.0.0' implementation project(modulePrefix + 'library-core') implementation project(modulePrefix + 'library-dash') diff --git a/extensions/cast/build.gradle b/extensions/cast/build.gradle index 4af8f94c58..0d7d96db4c 100644 --- a/extensions/cast/build.gradle +++ b/extensions/cast/build.gradle @@ -32,7 +32,7 @@ android { dependencies { api 'com.google.android.gms:play-services-cast-framework:17.0.0' - implementation 'androidx.annotation:annotation:1.1.0' + implementation 'androidx.annotation:annotation:' + androidxAnnotationVersion implementation project(modulePrefix + 'library-core') implementation project(modulePrefix + 'library-ui') compileOnly 'org.checkerframework:checker-qual:' + checkerframeworkVersion diff --git a/extensions/cronet/build.gradle b/extensions/cronet/build.gradle index 9c49ba94e1..9b618cd036 100644 --- a/extensions/cronet/build.gradle +++ b/extensions/cronet/build.gradle @@ -33,7 +33,7 @@ android { dependencies { api 'org.chromium.net:cronet-embedded:75.3770.101' implementation project(modulePrefix + 'library-core') - implementation 'androidx.annotation:annotation:1.1.0' + implementation 'androidx.annotation:annotation:' + androidxAnnotationVersion compileOnly 'org.checkerframework:checker-qual:' + checkerframeworkVersion testImplementation project(modulePrefix + 'library') testImplementation project(modulePrefix + 'testutils') diff --git a/extensions/ffmpeg/build.gradle b/extensions/ffmpeg/build.gradle index 2b5a6010a9..657fa75c24 100644 --- a/extensions/ffmpeg/build.gradle +++ b/extensions/ffmpeg/build.gradle @@ -38,7 +38,7 @@ android { dependencies { implementation project(modulePrefix + 'library-core') - implementation 'androidx.annotation:annotation:1.1.0' + implementation 'androidx.annotation:annotation:' + androidxAnnotationVersion compileOnly 'org.checkerframework:checker-qual:' + checkerframeworkVersion testImplementation project(modulePrefix + 'testutils') testImplementation 'org.robolectric:robolectric:' + robolectricVersion diff --git a/extensions/flac/build.gradle b/extensions/flac/build.gradle index dfac2e1c26..5d68711aa7 100644 --- a/extensions/flac/build.gradle +++ b/extensions/flac/build.gradle @@ -39,10 +39,10 @@ android { dependencies { implementation project(modulePrefix + 'library-core') - implementation 'androidx.annotation:annotation:1.1.0' + implementation 'androidx.annotation:annotation:' + androidxAnnotationVersion compileOnly 'org.checkerframework:checker-qual:' + checkerframeworkVersion androidTestImplementation project(modulePrefix + 'testutils') - androidTestImplementation 'androidx.test:runner:' + androidXTestVersion + androidTestImplementation 'androidx.test:runner:' + androidxTestVersion testImplementation project(modulePrefix + 'testutils') testImplementation 'org.robolectric:robolectric:' + robolectricVersion } diff --git a/extensions/gvr/build.gradle b/extensions/gvr/build.gradle index 1031d6f4b7..f8992616a2 100644 --- a/extensions/gvr/build.gradle +++ b/extensions/gvr/build.gradle @@ -33,7 +33,7 @@ android { dependencies { implementation project(modulePrefix + 'library-core') implementation project(modulePrefix + 'library-ui') - implementation 'androidx.annotation:annotation:1.1.0' + implementation 'androidx.annotation:annotation:' + androidxAnnotationVersion api 'com.google.vr:sdk-base:1.190.0' compileOnly 'org.checkerframework:checker-qual:' + checkerframeworkVersion } diff --git a/extensions/ima/build.gradle b/extensions/ima/build.gradle index e330b13e47..e2292aed8f 100644 --- a/extensions/ima/build.gradle +++ b/extensions/ima/build.gradle @@ -34,7 +34,7 @@ android { dependencies { api 'com.google.ads.interactivemedia.v3:interactivemedia:3.11.3' implementation project(modulePrefix + 'library-core') - implementation 'androidx.annotation:annotation:1.1.0' + implementation 'androidx.annotation:annotation:' + androidxAnnotationVersion implementation 'com.google.android.gms:play-services-ads-identifier:17.0.0' testImplementation project(modulePrefix + 'testutils') testImplementation 'org.robolectric:robolectric:' + robolectricVersion diff --git a/extensions/leanback/build.gradle b/extensions/leanback/build.gradle index ecaa78e25b..f0be172c90 100644 --- a/extensions/leanback/build.gradle +++ b/extensions/leanback/build.gradle @@ -32,7 +32,7 @@ android { dependencies { implementation project(modulePrefix + 'library-core') - implementation 'androidx.annotation:annotation:1.1.0' + implementation 'androidx.annotation:annotation:' + androidxAnnotationVersion implementation 'androidx.leanback:leanback:1.0.0' } diff --git a/extensions/okhttp/build.gradle b/extensions/okhttp/build.gradle index 68bd422185..b0d9fb0187 100644 --- a/extensions/okhttp/build.gradle +++ b/extensions/okhttp/build.gradle @@ -33,7 +33,7 @@ android { dependencies { implementation project(modulePrefix + 'library-core') - implementation 'androidx.annotation:annotation:1.1.0' + implementation 'androidx.annotation:annotation:' + androidxAnnotationVersion compileOnly 'org.checkerframework:checker-qual:' + checkerframeworkVersion api 'com.squareup.okhttp3:okhttp:3.12.1' } diff --git a/extensions/opus/build.gradle b/extensions/opus/build.gradle index 7b621a8df9..2759299d63 100644 --- a/extensions/opus/build.gradle +++ b/extensions/opus/build.gradle @@ -39,11 +39,11 @@ android { dependencies { implementation project(modulePrefix + 'library-core') - implementation 'androidx.annotation:annotation:1.1.0' + implementation 'androidx.annotation:annotation:' + androidxAnnotationVersion testImplementation project(modulePrefix + 'testutils') testImplementation 'org.robolectric:robolectric:' + robolectricVersion - androidTestImplementation 'androidx.test:runner:' + androidXTestVersion - androidTestImplementation 'androidx.test.ext:junit:' + androidXTestVersion + androidTestImplementation 'androidx.test:runner:' + androidxTestVersion + androidTestImplementation 'androidx.test.ext:junit:' + androidxTestVersion } ext { diff --git a/extensions/rtmp/build.gradle b/extensions/rtmp/build.gradle index 9c709305bf..88d3524d72 100644 --- a/extensions/rtmp/build.gradle +++ b/extensions/rtmp/build.gradle @@ -33,7 +33,7 @@ android { dependencies { implementation project(modulePrefix + 'library-core') implementation 'net.butterflytv.utils:rtmp-client:3.1.0' - implementation 'androidx.annotation:annotation:1.1.0' + implementation 'androidx.annotation:annotation:' + androidxAnnotationVersion testImplementation project(modulePrefix + 'testutils') testImplementation 'org.robolectric:robolectric:' + robolectricVersion } diff --git a/extensions/vp9/build.gradle b/extensions/vp9/build.gradle index 3b8271869b..e40d6e02d7 100644 --- a/extensions/vp9/build.gradle +++ b/extensions/vp9/build.gradle @@ -39,11 +39,11 @@ android { dependencies { implementation project(modulePrefix + 'library-core') - implementation 'androidx.annotation:annotation:1.1.0' + implementation 'androidx.annotation:annotation:' + androidxAnnotationVersion testImplementation project(modulePrefix + 'testutils') testImplementation 'org.robolectric:robolectric:' + robolectricVersion - androidTestImplementation 'androidx.test:runner:' + androidXTestVersion - androidTestImplementation 'androidx.test.ext:junit:' + androidXTestVersion + androidTestImplementation 'androidx.test:runner:' + androidxTestVersion + androidTestImplementation 'androidx.test.ext:junit:' + androidxTestVersion androidTestImplementation 'com.google.truth:truth:' + truthVersion } diff --git a/library/core/build.gradle b/library/core/build.gradle index d6aee8a35d..afccef3e24 100644 --- a/library/core/build.gradle +++ b/library/core/build.gradle @@ -57,21 +57,21 @@ android { } dependencies { - implementation 'androidx.annotation:annotation:1.1.0' + implementation 'androidx.annotation:annotation:' + androidxAnnotationVersion compileOnly 'com.google.code.findbugs:jsr305:' + jsr305Version compileOnly 'org.checkerframework:checker-qual:' + checkerframeworkVersion compileOnly 'org.checkerframework:checker-compat-qual:' + checkerframeworkVersion compileOnly 'org.jetbrains.kotlin:kotlin-annotations-jvm:' + kotlinAnnotationsVersion - androidTestImplementation 'androidx.test:runner:' + androidXTestVersion - androidTestImplementation 'androidx.test.ext:junit:' + androidXTestVersion + androidTestImplementation 'androidx.test:runner:' + androidxTestVersion + androidTestImplementation 'androidx.test.ext:junit:' + androidxTestVersion androidTestImplementation 'com.google.truth:truth:' + truthVersion androidTestImplementation 'com.google.auto.value:auto-value-annotations:' + autoValueVersion androidTestImplementation 'com.linkedin.dexmaker:dexmaker:' + dexmakerVersion androidTestImplementation 'com.linkedin.dexmaker:dexmaker-mockito:' + dexmakerVersion androidTestImplementation 'org.mockito:mockito-core:' + mockitoVersion androidTestAnnotationProcessor 'com.google.auto.value:auto-value:' + autoValueVersion - testImplementation 'androidx.test:core:' + androidXTestVersion - testImplementation 'androidx.test.ext:junit:' + androidXTestVersion + testImplementation 'androidx.test:core:' + androidxTestVersion + testImplementation 'androidx.test.ext:junit:' + androidxTestVersion testImplementation 'com.google.truth:truth:' + truthVersion testImplementation 'org.mockito:mockito-core:' + mockitoVersion testImplementation 'org.robolectric:robolectric:' + robolectricVersion diff --git a/library/dash/build.gradle b/library/dash/build.gradle index c64da2b86d..ac90d64c1e 100644 --- a/library/dash/build.gradle +++ b/library/dash/build.gradle @@ -42,7 +42,7 @@ dependencies { implementation project(modulePrefix + 'library-core') compileOnly 'org.checkerframework:checker-qual:' + checkerframeworkVersion compileOnly 'org.checkerframework:checker-compat-qual:' + checkerframeworkVersion - implementation 'androidx.annotation:annotation:1.1.0' + implementation 'androidx.annotation:annotation:' + androidxAnnotationVersion testImplementation project(modulePrefix + 'testutils') testImplementation 'org.robolectric:robolectric:' + robolectricVersion } diff --git a/library/hls/build.gradle b/library/hls/build.gradle index 0f685c1130..07696c1c26 100644 --- a/library/hls/build.gradle +++ b/library/hls/build.gradle @@ -39,7 +39,7 @@ android { } dependencies { - implementation 'androidx.annotation:annotation:1.1.0' + implementation 'androidx.annotation:annotation:' + androidxAnnotationVersion compileOnly 'org.checkerframework:checker-qual:' + checkerframeworkVersion compileOnly 'org.checkerframework:checker-compat-qual:' + checkerframeworkVersion implementation project(modulePrefix + 'library-core') diff --git a/library/smoothstreaming/build.gradle b/library/smoothstreaming/build.gradle index b16157f49b..4fe2fae328 100644 --- a/library/smoothstreaming/build.gradle +++ b/library/smoothstreaming/build.gradle @@ -42,7 +42,7 @@ dependencies { implementation project(modulePrefix + 'library-core') compileOnly 'org.checkerframework:checker-qual:' + checkerframeworkVersion compileOnly 'org.checkerframework:checker-compat-qual:' + checkerframeworkVersion - implementation 'androidx.annotation:annotation:1.1.0' + implementation 'androidx.annotation:annotation:' + androidxAnnotationVersion testImplementation project(modulePrefix + 'testutils') testImplementation 'org.robolectric:robolectric:' + robolectricVersion } diff --git a/library/ui/build.gradle b/library/ui/build.gradle index 5b3123e302..3735c94096 100644 --- a/library/ui/build.gradle +++ b/library/ui/build.gradle @@ -41,7 +41,7 @@ android { dependencies { implementation project(modulePrefix + 'library-core') implementation 'androidx.media:media:1.0.1' - implementation 'androidx.annotation:annotation:1.1.0' + implementation 'androidx.annotation:annotation:' + androidxAnnotationVersion compileOnly 'org.checkerframework:checker-qual:' + checkerframeworkVersion testImplementation project(modulePrefix + 'testutils') testImplementation 'org.robolectric:robolectric:' + robolectricVersion diff --git a/playbacktests/build.gradle b/playbacktests/build.gradle index 5865d3c36d..d77944cf23 100644 --- a/playbacktests/build.gradle +++ b/playbacktests/build.gradle @@ -32,9 +32,9 @@ android { } dependencies { - androidTestImplementation 'androidx.test:rules:' + androidXTestVersion - androidTestImplementation 'androidx.test:runner:' + androidXTestVersion - androidTestImplementation 'androidx.annotation:annotation:1.1.0' + androidTestImplementation 'androidx.test:rules:' + androidxTestVersion + androidTestImplementation 'androidx.test:runner:' + androidxTestVersion + androidTestImplementation 'androidx.annotation:annotation:' + androidxAnnotationVersion androidTestImplementation project(modulePrefix + 'library-core') androidTestImplementation project(modulePrefix + 'library-dash') androidTestImplementation project(modulePrefix + 'library-hls') diff --git a/testutils/build.gradle b/testutils/build.gradle index 5c6731c17b..3c7b13a6a8 100644 --- a/testutils/build.gradle +++ b/testutils/build.gradle @@ -39,10 +39,10 @@ android { dependencies { api 'org.mockito:mockito-core:' + mockitoVersion - api 'androidx.test:core:' + androidXTestVersion - api 'androidx.test.ext:junit:' + androidXTestVersion + api 'androidx.test:core:' + androidxTestVersion + api 'androidx.test.ext:junit:' + androidxTestVersion api 'com.google.truth:truth:' + truthVersion - implementation 'androidx.annotation:annotation:1.1.0' + implementation 'androidx.annotation:annotation:' + androidxAnnotationVersion implementation project(modulePrefix + 'library-core') implementation 'com.google.auto.value:auto-value-annotations:' + autoValueVersion annotationProcessor 'com.google.auto.value:auto-value:' + autoValueVersion