From 1836f1df36ba3c51a7be987fe754fbf0d7fb5a98 Mon Sep 17 00:00:00 2001 From: tonihei Date: Mon, 22 Jun 2020 16:26:13 +0100 Subject: [PATCH] Update Checkerframework. The compat dependency is no longer maintained and we need to keep it at its old version. PiperOrigin-RevId: 317658349 --- constants.gradle | 3 ++- demos/gl/build.gradle | 2 +- extensions/cast/build.gradle | 2 +- library/common/build.gradle | 2 +- library/core/build.gradle | 2 +- library/dash/build.gradle | 2 +- library/extractor/build.gradle | 2 +- library/hls/build.gradle | 2 +- library/smoothstreaming/build.gradle | 2 +- testutils/build.gradle | 2 +- 10 files changed, 11 insertions(+), 10 deletions(-) diff --git a/constants.gradle b/constants.gradle index e4f9a7f61d..22766d40a0 100644 --- a/constants.gradle +++ b/constants.gradle @@ -25,7 +25,8 @@ project.ext { mockitoVersion = '2.25.0' mockWebServerVersion = '3.12.0' robolectricVersion = '4.4-SNAPSHOT' - checkerframeworkVersion = '2.5.0' + checkerframeworkVersion = '3.3.0' + checkerframeworkCompatVersion = '2.5.0' jsr305Version = '3.0.2' kotlinAnnotationsVersion = '1.3.70' androidxAnnotationVersion = '1.1.0' diff --git a/demos/gl/build.gradle b/demos/gl/build.gradle index 8fe3e04045..e065f9b8f2 100644 --- a/demos/gl/build.gradle +++ b/demos/gl/build.gradle @@ -49,5 +49,5 @@ dependencies { implementation project(modulePrefix + 'library-dash') implementation 'androidx.annotation:annotation:' + androidxAnnotationVersion compileOnly 'org.checkerframework:checker-qual:' + checkerframeworkVersion - compileOnly 'org.checkerframework:checker-compat-qual:' + checkerframeworkVersion + compileOnly 'org.checkerframework:checker-compat-qual:' + checkerframeworkCompatVersion } diff --git a/extensions/cast/build.gradle b/extensions/cast/build.gradle index 853861e4ad..58bb15dff2 100644 --- a/extensions/cast/build.gradle +++ b/extensions/cast/build.gradle @@ -36,7 +36,7 @@ dependencies { implementation project(modulePrefix + 'library-core') implementation project(modulePrefix + 'library-ui') compileOnly 'org.checkerframework:checker-qual:' + checkerframeworkVersion - compileOnly 'org.checkerframework:checker-compat-qual:' + checkerframeworkVersion + compileOnly 'org.checkerframework:checker-compat-qual:' + checkerframeworkCompatVersion compileOnly 'org.jetbrains.kotlin:kotlin-annotations-jvm:' + kotlinAnnotationsVersion testImplementation project(modulePrefix + 'testutils') testImplementation 'org.robolectric:robolectric:' + robolectricVersion diff --git a/library/common/build.gradle b/library/common/build.gradle index 14bfd6aba5..27ca38d444 100644 --- a/library/common/build.gradle +++ b/library/common/build.gradle @@ -41,7 +41,7 @@ dependencies { implementation 'com.google.guava:guava:' + guavaVersion compileOnly 'com.google.code.findbugs:jsr305:' + jsr305Version compileOnly 'org.checkerframework:checker-qual:' + checkerframeworkVersion - compileOnly 'org.checkerframework:checker-compat-qual:' + checkerframeworkVersion + compileOnly 'org.checkerframework:checker-compat-qual:' + checkerframeworkCompatVersion compileOnly 'org.jetbrains.kotlin:kotlin-annotations-jvm:' + kotlinAnnotationsVersion testImplementation project(modulePrefix + 'testutils') testImplementation 'org.robolectric:robolectric:' + robolectricVersion diff --git a/library/core/build.gradle b/library/core/build.gradle index 6ce6dac707..d95629e0d7 100644 --- a/library/core/build.gradle +++ b/library/core/build.gradle @@ -56,7 +56,7 @@ dependencies { implementation 'com.google.guava:guava:' + guavaVersion compileOnly 'com.google.code.findbugs:jsr305:' + jsr305Version compileOnly 'org.checkerframework:checker-qual:' + checkerframeworkVersion - compileOnly 'org.checkerframework:checker-compat-qual:' + checkerframeworkVersion + compileOnly 'org.checkerframework:checker-compat-qual:' + checkerframeworkCompatVersion compileOnly 'org.jetbrains.kotlin:kotlin-annotations-jvm:' + kotlinAnnotationsVersion androidTestImplementation 'androidx.test:runner:' + androidxTestRunnerVersion androidTestImplementation 'com.google.guava:guava:' + guavaVersion diff --git a/library/dash/build.gradle b/library/dash/build.gradle index 33cbab1b90..26515c8470 100644 --- a/library/dash/build.gradle +++ b/library/dash/build.gradle @@ -42,7 +42,7 @@ dependencies { implementation project(modulePrefix + 'library-core') implementation 'com.google.guava:guava:' + guavaVersion compileOnly 'org.checkerframework:checker-qual:' + checkerframeworkVersion - compileOnly 'org.checkerframework:checker-compat-qual:' + checkerframeworkVersion + compileOnly 'org.checkerframework:checker-compat-qual:' + checkerframeworkCompatVersion compileOnly 'org.jetbrains.kotlin:kotlin-annotations-jvm:' + kotlinAnnotationsVersion implementation 'androidx.annotation:annotation:' + androidxAnnotationVersion testImplementation project(modulePrefix + 'testutils') diff --git a/library/extractor/build.gradle b/library/extractor/build.gradle index d9a5128b13..52cc193550 100644 --- a/library/extractor/build.gradle +++ b/library/extractor/build.gradle @@ -43,7 +43,7 @@ dependencies { implementation project(modulePrefix + 'library-common') implementation 'com.google.guava:guava:' + guavaVersion compileOnly 'org.checkerframework:checker-qual:' + checkerframeworkVersion - compileOnly 'org.checkerframework:checker-compat-qual:' + checkerframeworkVersion + compileOnly 'org.checkerframework:checker-compat-qual:' + checkerframeworkCompatVersion compileOnly 'org.jetbrains.kotlin:kotlin-annotations-jvm:' + kotlinAnnotationsVersion testImplementation project(modulePrefix + 'library-core') testImplementation project(modulePrefix + 'testutils') diff --git a/library/hls/build.gradle b/library/hls/build.gradle index 152fd35dff..e4630f6044 100644 --- a/library/hls/build.gradle +++ b/library/hls/build.gradle @@ -42,7 +42,7 @@ dependencies { implementation 'androidx.annotation:annotation:' + androidxAnnotationVersion implementation 'com.google.guava:guava:' + guavaVersion compileOnly 'org.checkerframework:checker-qual:' + checkerframeworkVersion - compileOnly 'org.checkerframework:checker-compat-qual:' + checkerframeworkVersion + compileOnly 'org.checkerframework:checker-compat-qual:' + checkerframeworkCompatVersion compileOnly 'org.jetbrains.kotlin:kotlin-annotations-jvm:' + kotlinAnnotationsVersion implementation project(modulePrefix + 'library-core') testImplementation project(modulePrefix + 'testutils') diff --git a/library/smoothstreaming/build.gradle b/library/smoothstreaming/build.gradle index 404f1d6541..e9ffcd9b5b 100644 --- a/library/smoothstreaming/build.gradle +++ b/library/smoothstreaming/build.gradle @@ -41,7 +41,7 @@ android { dependencies { implementation project(modulePrefix + 'library-core') compileOnly 'org.checkerframework:checker-qual:' + checkerframeworkVersion - compileOnly 'org.checkerframework:checker-compat-qual:' + checkerframeworkVersion + compileOnly 'org.checkerframework:checker-compat-qual:' + checkerframeworkCompatVersion compileOnly 'org.jetbrains.kotlin:kotlin-annotations-jvm:' + kotlinAnnotationsVersion implementation 'androidx.annotation:annotation:' + androidxAnnotationVersion testImplementation project(modulePrefix + 'testutils') diff --git a/testutils/build.gradle b/testutils/build.gradle index e4cfd7cab0..931203b3bb 100644 --- a/testutils/build.gradle +++ b/testutils/build.gradle @@ -37,7 +37,7 @@ dependencies { api 'junit:junit:' + junitVersion api 'com.google.truth:truth:' + truthVersion compileOnly 'org.checkerframework:checker-qual:' + checkerframeworkVersion - compileOnly 'org.checkerframework:checker-compat-qual:' + checkerframeworkVersion + compileOnly 'org.checkerframework:checker-compat-qual:' + checkerframeworkCompatVersion compileOnly 'org.jetbrains.kotlin:kotlin-annotations-jvm:' + kotlinAnnotationsVersion implementation 'androidx.annotation:annotation:' + androidxAnnotationVersion implementation project(modulePrefix + 'library-core')