diff --git a/constants.gradle b/constants.gradle index ede41a54d5..377765343b 100644 --- a/constants.gradle +++ b/constants.gradle @@ -26,7 +26,7 @@ project.ext { robolectricVersion = '4.3.1' checkerframeworkVersion = '2.5.0' jsr305Version = '3.0.2' - kotlinAnnotationsVersion = '1.3.31' + kotlinAnnotationsVersion = '1.3.70' androidxAnnotationVersion = '1.1.0' androidxAppCompatVersion = '1.1.0' androidxCollectionVersion = '1.1.0' diff --git a/extensions/av1/build.gradle b/extensions/av1/build.gradle index 0b539d551b..d61a3a97f8 100644 --- a/extensions/av1/build.gradle +++ b/extensions/av1/build.gradle @@ -65,6 +65,7 @@ if (project.file('src/main/jni/libgav1').exists()) { dependencies { implementation project(modulePrefix + 'library-core') implementation 'androidx.annotation:annotation:' + androidxAnnotationVersion + compileOnly 'org.jetbrains.kotlin:kotlin-annotations-jvm:' + kotlinAnnotationsVersion } ext { diff --git a/extensions/cast/build.gradle b/extensions/cast/build.gradle index 0d7d96db4c..1dfb2480b4 100644 --- a/extensions/cast/build.gradle +++ b/extensions/cast/build.gradle @@ -37,6 +37,7 @@ dependencies { implementation project(modulePrefix + 'library-ui') compileOnly 'org.checkerframework:checker-qual:' + checkerframeworkVersion compileOnly 'org.checkerframework:checker-compat-qual:' + checkerframeworkVersion + compileOnly 'org.jetbrains.kotlin:kotlin-annotations-jvm:' + kotlinAnnotationsVersion testImplementation project(modulePrefix + 'testutils') testImplementation 'org.robolectric:robolectric:' + robolectricVersion } diff --git a/extensions/cronet/build.gradle b/extensions/cronet/build.gradle index d5b7a99f96..742b163ebf 100644 --- a/extensions/cronet/build.gradle +++ b/extensions/cronet/build.gradle @@ -35,6 +35,7 @@ dependencies { implementation project(modulePrefix + 'library-core') implementation 'androidx.annotation:annotation:' + androidxAnnotationVersion compileOnly 'org.checkerframework:checker-qual:' + checkerframeworkVersion + compileOnly 'org.jetbrains.kotlin:kotlin-annotations-jvm:' + kotlinAnnotationsVersion testImplementation project(modulePrefix + 'library') testImplementation project(modulePrefix + 'testutils') testImplementation 'org.robolectric:robolectric:' + robolectricVersion diff --git a/extensions/ffmpeg/build.gradle b/extensions/ffmpeg/build.gradle index 657fa75c24..26a72ae335 100644 --- a/extensions/ffmpeg/build.gradle +++ b/extensions/ffmpeg/build.gradle @@ -40,6 +40,7 @@ dependencies { implementation project(modulePrefix + 'library-core') implementation 'androidx.annotation:annotation:' + androidxAnnotationVersion compileOnly 'org.checkerframework:checker-qual:' + checkerframeworkVersion + compileOnly 'org.jetbrains.kotlin:kotlin-annotations-jvm:' + kotlinAnnotationsVersion testImplementation project(modulePrefix + 'testutils') testImplementation 'org.robolectric:robolectric:' + robolectricVersion } diff --git a/extensions/flac/build.gradle b/extensions/flac/build.gradle index 4c4fd7fe6d..f220d21106 100644 --- a/extensions/flac/build.gradle +++ b/extensions/flac/build.gradle @@ -44,6 +44,7 @@ dependencies { implementation project(modulePrefix + 'library-core') implementation 'androidx.annotation:annotation:' + androidxAnnotationVersion compileOnly 'org.checkerframework:checker-qual:' + checkerframeworkVersion + compileOnly 'org.jetbrains.kotlin:kotlin-annotations-jvm:' + kotlinAnnotationsVersion androidTestImplementation project(modulePrefix + 'testutils') androidTestImplementation 'androidx.test:runner:' + androidxTestRunnerVersion testImplementation 'androidx.test:core:' + androidxTestCoreVersion diff --git a/extensions/gvr/build.gradle b/extensions/gvr/build.gradle index f8992616a2..4e6bd76cb4 100644 --- a/extensions/gvr/build.gradle +++ b/extensions/gvr/build.gradle @@ -36,6 +36,7 @@ dependencies { implementation 'androidx.annotation:annotation:' + androidxAnnotationVersion api 'com.google.vr:sdk-base:1.190.0' compileOnly 'org.checkerframework:checker-qual:' + checkerframeworkVersion + compileOnly 'org.jetbrains.kotlin:kotlin-annotations-jvm:' + kotlinAnnotationsVersion } ext { diff --git a/extensions/ima/build.gradle b/extensions/ima/build.gradle index e2292aed8f..f516cc5001 100644 --- a/extensions/ima/build.gradle +++ b/extensions/ima/build.gradle @@ -36,6 +36,7 @@ dependencies { implementation project(modulePrefix + 'library-core') implementation 'androidx.annotation:annotation:' + androidxAnnotationVersion implementation 'com.google.android.gms:play-services-ads-identifier:17.0.0' + compileOnly 'org.jetbrains.kotlin:kotlin-annotations-jvm:' + kotlinAnnotationsVersion testImplementation project(modulePrefix + 'testutils') testImplementation 'org.robolectric:robolectric:' + robolectricVersion } diff --git a/extensions/jobdispatcher/build.gradle b/extensions/jobdispatcher/build.gradle index d7f19d2545..05ac82ba08 100644 --- a/extensions/jobdispatcher/build.gradle +++ b/extensions/jobdispatcher/build.gradle @@ -35,6 +35,7 @@ android { dependencies { implementation project(modulePrefix + 'library-core') implementation 'com.firebase:firebase-jobdispatcher:0.8.5' + compileOnly 'org.jetbrains.kotlin:kotlin-annotations-jvm:' + kotlinAnnotationsVersion } ext { diff --git a/extensions/leanback/build.gradle b/extensions/leanback/build.gradle index f0be172c90..19b4cde3bf 100644 --- a/extensions/leanback/build.gradle +++ b/extensions/leanback/build.gradle @@ -34,6 +34,7 @@ dependencies { implementation project(modulePrefix + 'library-core') implementation 'androidx.annotation:annotation:' + androidxAnnotationVersion implementation 'androidx.leanback:leanback:1.0.0' + compileOnly 'org.jetbrains.kotlin:kotlin-annotations-jvm:' + kotlinAnnotationsVersion } ext { diff --git a/extensions/mediasession/build.gradle b/extensions/mediasession/build.gradle index 537c5ba534..f32ef263e0 100644 --- a/extensions/mediasession/build.gradle +++ b/extensions/mediasession/build.gradle @@ -34,6 +34,7 @@ dependencies { implementation project(modulePrefix + 'library-core') api 'androidx.media:media:' + androidxMediaVersion compileOnly 'org.checkerframework:checker-qual:' + checkerframeworkVersion + compileOnly 'org.jetbrains.kotlin:kotlin-annotations-jvm:' + kotlinAnnotationsVersion } ext { diff --git a/extensions/okhttp/build.gradle b/extensions/okhttp/build.gradle index 41eac7c661..b03abac670 100644 --- a/extensions/okhttp/build.gradle +++ b/extensions/okhttp/build.gradle @@ -35,6 +35,7 @@ dependencies { implementation project(modulePrefix + 'library-core') implementation 'androidx.annotation:annotation:' + androidxAnnotationVersion compileOnly 'org.checkerframework:checker-qual:' + checkerframeworkVersion + compileOnly 'org.jetbrains.kotlin:kotlin-annotations-jvm:' + kotlinAnnotationsVersion testImplementation project(modulePrefix + 'testutils') testImplementation 'org.robolectric:robolectric:' + robolectricVersion // Do not update to 3.13.X or later until minSdkVersion is increased to 21: diff --git a/extensions/opus/build.gradle b/extensions/opus/build.gradle index 0ab13a6203..545b5a7af8 100644 --- a/extensions/opus/build.gradle +++ b/extensions/opus/build.gradle @@ -43,6 +43,7 @@ android { dependencies { implementation project(modulePrefix + 'library-core') implementation 'androidx.annotation:annotation:' + androidxAnnotationVersion + compileOnly 'org.jetbrains.kotlin:kotlin-annotations-jvm:' + kotlinAnnotationsVersion testImplementation project(modulePrefix + 'testutils') testImplementation 'org.robolectric:robolectric:' + robolectricVersion androidTestImplementation 'androidx.test:runner:' + androidxTestRunnerVersion diff --git a/extensions/rtmp/build.gradle b/extensions/rtmp/build.gradle index 88d3524d72..621f8b2998 100644 --- a/extensions/rtmp/build.gradle +++ b/extensions/rtmp/build.gradle @@ -34,6 +34,7 @@ dependencies { implementation project(modulePrefix + 'library-core') implementation 'net.butterflytv.utils:rtmp-client:3.1.0' implementation 'androidx.annotation:annotation:' + androidxAnnotationVersion + compileOnly 'org.jetbrains.kotlin:kotlin-annotations-jvm:' + kotlinAnnotationsVersion testImplementation project(modulePrefix + 'testutils') testImplementation 'org.robolectric:robolectric:' + robolectricVersion } diff --git a/extensions/vp9/build.gradle b/extensions/vp9/build.gradle index 5e603c24a5..ffd76d6e2f 100644 --- a/extensions/vp9/build.gradle +++ b/extensions/vp9/build.gradle @@ -43,6 +43,7 @@ android { dependencies { implementation project(modulePrefix + 'library-core') implementation 'androidx.annotation:annotation:' + androidxAnnotationVersion + compileOnly 'org.jetbrains.kotlin:kotlin-annotations-jvm:' + kotlinAnnotationsVersion testImplementation project(modulePrefix + 'testutils') testImplementation 'org.robolectric:robolectric:' + robolectricVersion androidTestImplementation 'androidx.test:runner:' + androidxTestRunnerVersion diff --git a/extensions/workmanager/build.gradle b/extensions/workmanager/build.gradle index 6a7aa10722..361f0f4480 100644 --- a/extensions/workmanager/build.gradle +++ b/extensions/workmanager/build.gradle @@ -35,6 +35,7 @@ android { dependencies { implementation project(modulePrefix + 'library-core') implementation 'androidx.work:work-runtime:2.2.0' + compileOnly 'org.jetbrains.kotlin:kotlin-annotations-jvm:' + kotlinAnnotationsVersion } ext { diff --git a/library/core/build.gradle b/library/core/build.gradle index 33f926b5ea..7e58d7e76e 100644 --- a/library/core/build.gradle +++ b/library/core/build.gradle @@ -53,8 +53,10 @@ dependencies { api project(modulePrefix + 'library-common') api project(modulePrefix + 'library-extractor') 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:' + androidxTestRunnerVersion androidTestImplementation 'com.google.guava:guava:' + guavaVersion androidTestImplementation 'com.linkedin.dexmaker:dexmaker:' + dexmakerVersion diff --git a/library/dash/build.gradle b/library/dash/build.gradle index ef87969037..0ffbc718f0 100644 --- a/library/dash/build.gradle +++ b/library/dash/build.gradle @@ -42,6 +42,7 @@ dependencies { implementation project(modulePrefix + 'library-core') compileOnly 'org.checkerframework:checker-qual:' + checkerframeworkVersion compileOnly 'org.checkerframework:checker-compat-qual:' + checkerframeworkVersion + compileOnly 'org.jetbrains.kotlin:kotlin-annotations-jvm:' + kotlinAnnotationsVersion implementation 'androidx.annotation:annotation:' + androidxAnnotationVersion testImplementation project(modulePrefix + 'testutils') testImplementation 'org.robolectric:robolectric:' + robolectricVersion diff --git a/library/extractor/build.gradle b/library/extractor/build.gradle index da80c87d16..26b38705ee 100644 --- a/library/extractor/build.gradle +++ b/library/extractor/build.gradle @@ -42,6 +42,7 @@ dependencies { implementation 'androidx.annotation:annotation:' + androidxAnnotationVersion compileOnly 'org.checkerframework:checker-qual:' + checkerframeworkVersion compileOnly 'org.checkerframework:checker-compat-qual:' + checkerframeworkVersion + compileOnly 'org.jetbrains.kotlin:kotlin-annotations-jvm:' + kotlinAnnotationsVersion implementation project(modulePrefix + 'library-common') testImplementation project(modulePrefix + 'library-core') testImplementation project(modulePrefix + 'testutils') diff --git a/library/hls/build.gradle b/library/hls/build.gradle index df880f7f41..4764cf9882 100644 --- a/library/hls/build.gradle +++ b/library/hls/build.gradle @@ -40,6 +40,7 @@ dependencies { implementation 'androidx.annotation:annotation:' + androidxAnnotationVersion compileOnly 'org.checkerframework:checker-qual:' + checkerframeworkVersion compileOnly 'org.checkerframework:checker-compat-qual:' + checkerframeworkVersion + compileOnly 'org.jetbrains.kotlin:kotlin-annotations-jvm:' + kotlinAnnotationsVersion implementation project(modulePrefix + 'library-core') testImplementation project(modulePrefix + 'testutils') testImplementation 'org.robolectric:robolectric:' + robolectricVersion diff --git a/library/smoothstreaming/build.gradle b/library/smoothstreaming/build.gradle index d039e22dcf..404f1d6541 100644 --- a/library/smoothstreaming/build.gradle +++ b/library/smoothstreaming/build.gradle @@ -42,6 +42,7 @@ dependencies { implementation project(modulePrefix + 'library-core') compileOnly 'org.checkerframework:checker-qual:' + checkerframeworkVersion compileOnly 'org.checkerframework:checker-compat-qual:' + checkerframeworkVersion + compileOnly 'org.jetbrains.kotlin:kotlin-annotations-jvm:' + kotlinAnnotationsVersion 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 b6bf139963..f404ee38a5 100644 --- a/library/ui/build.gradle +++ b/library/ui/build.gradle @@ -41,6 +41,7 @@ dependencies { api 'androidx.media:media:' + androidxMediaVersion implementation 'androidx.annotation:annotation:' + androidxAnnotationVersion compileOnly 'org.checkerframework:checker-qual:' + checkerframeworkVersion + compileOnly 'org.jetbrains.kotlin:kotlin-annotations-jvm:' + kotlinAnnotationsVersion testImplementation project(modulePrefix + 'testutils') testImplementation 'org.robolectric:robolectric:' + robolectricVersion } diff --git a/testutils/build.gradle b/testutils/build.gradle index 9309c23bcd..3cdf3a1685 100644 --- a/testutils/build.gradle +++ b/testutils/build.gradle @@ -38,6 +38,7 @@ dependencies { api 'com.google.truth:truth:' + truthVersion compileOnly 'org.checkerframework:checker-qual:' + checkerframeworkVersion compileOnly 'org.checkerframework:checker-compat-qual:' + checkerframeworkVersion + compileOnly 'org.jetbrains.kotlin:kotlin-annotations-jvm:' + kotlinAnnotationsVersion implementation 'androidx.annotation:annotation:' + androidxAnnotationVersion implementation project(modulePrefix + 'library-core') testImplementation project(modulePrefix + 'testutils')