From dea52048cb4678711726ea512964224eb9b10206 Mon Sep 17 00:00:00 2001 From: olly Date: Wed, 30 Jun 2021 12:40:30 +0100 Subject: [PATCH] Bump dependency versions PiperOrigin-RevId: 382277352 --- constants.gradle | 20 +++++++++++--------- demos/cast/build.gradle | 4 ++-- demos/main/build.gradle | 2 +- extensions/cast/build.gradle | 2 +- extensions/cronet/build.gradle | 6 +++--- extensions/ima/build.gradle | 4 ++-- extensions/okhttp/build.gradle | 4 ++-- gradle/wrapper/gradle-wrapper.properties | 2 +- library/common/build.gradle | 2 +- library/core/build.gradle | 2 +- library/hls/build.gradle | 2 +- testutils/build.gradle | 2 +- 12 files changed, 27 insertions(+), 25 deletions(-) diff --git a/constants.gradle b/constants.gradle index 3bbfc02959..b6c93bf785 100644 --- a/constants.gradle +++ b/constants.gradle @@ -24,27 +24,29 @@ project.ext { guavaVersion = '27.1-android' mockitoVersion = '3.4.0' mockWebServerVersion = '3.12.0' - robolectricVersion = '4.5' + robolectricVersion = '4.5.1' checkerframeworkVersion = '3.3.0' checkerframeworkCompatVersion = '2.5.0' jsr305Version = '3.0.2' - kotlinAnnotationsVersion = '1.3.70' + kotlinAnnotationsVersion = '1.5.20' androidxAnnotationVersion = '1.2.0' - androidxAppCompatVersion = '1.1.0' + androidxAppCompatVersion = '1.3.0' androidxCollectionVersion = '1.1.0' androidxCoreVersion = '1.3.2' androidxFuturesVersion = '1.1.0' - androidxMediaVersion = '1.2.1' - androidxMedia2Version = '1.1.2' - androidxMultidexVersion = '2.0.0' - androidxRecyclerViewVersion = '1.1.0' + androidxMediaVersion = '1.3.1' + androidxMedia2Version = '1.1.3' + androidxMultidexVersion = '2.0.1' + androidxRecyclerViewVersion = '1.2.1' + androidxMaterialVersion = '1.3.0' androidxTestCoreVersion = '1.3.0' - androidxTestJUnitVersion = '1.1.1' + androidxTestJUnitVersion = '1.1.2' androidxTestRunnerVersion = '1.3.0' androidxTestRulesVersion = '1.3.0' androidxTestServicesStorageVersion = '1.3.0' androidxTestTruthVersion = '1.3.0' - truthVersion = '1.0' + truthVersion = '1.1.3' + okhttpVersion = '4.9.1' modulePrefix = ':' if (gradle.ext.has('exoplayerModulePrefix')) { modulePrefix += gradle.ext.exoplayerModulePrefix diff --git a/demos/cast/build.gradle b/demos/cast/build.gradle index 8636c71ab0..2539e777c1 100644 --- a/demos/cast/build.gradle +++ b/demos/cast/build.gradle @@ -61,8 +61,8 @@ dependencies { implementation project(modulePrefix + 'extension-cast') implementation 'androidx.appcompat:appcompat:' + androidxAppCompatVersion implementation 'androidx.multidex:multidex:' + androidxMultidexVersion - implementation 'androidx.recyclerview:recyclerview:1.1.0' - implementation 'com.google.android.material:material:1.2.1' + implementation 'androidx.recyclerview:recyclerview:' + androidxRecyclerViewVersion + implementation 'com.google.android.material:material:' + androidxMaterialVersion } apply plugin: 'com.google.android.gms.strict-version-matcher-plugin' diff --git a/demos/main/build.gradle b/demos/main/build.gradle index e63fb70673..1e29a9ea6f 100644 --- a/demos/main/build.gradle +++ b/demos/main/build.gradle @@ -70,7 +70,7 @@ dependencies { implementation 'androidx.annotation:annotation:' + androidxAnnotationVersion implementation 'androidx.appcompat:appcompat:' + androidxAppCompatVersion implementation 'androidx.multidex:multidex:' + androidxMultidexVersion - implementation 'com.google.android.material:material:1.2.1' + implementation 'com.google.android.material:material:' + androidxMaterialVersion implementation project(modulePrefix + 'library-core') implementation project(modulePrefix + 'library-dash') implementation project(modulePrefix + 'library-hls') diff --git a/extensions/cast/build.gradle b/extensions/cast/build.gradle index 0efda30b93..49077b8580 100644 --- a/extensions/cast/build.gradle +++ b/extensions/cast/build.gradle @@ -14,7 +14,7 @@ apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle" dependencies { - api 'com.google.android.gms:play-services-cast-framework:19.0.0' + api 'com.google.android.gms:play-services-cast-framework:20.0.0' implementation 'androidx.annotation:annotation:' + androidxAnnotationVersion implementation project(modulePrefix + 'library-common') compileOnly 'org.checkerframework:checker-qual:' + checkerframeworkVersion diff --git a/extensions/cronet/build.gradle b/extensions/cronet/build.gradle index d9b2c78507..9a11adbd15 100644 --- a/extensions/cronet/build.gradle +++ b/extensions/cronet/build.gradle @@ -20,7 +20,7 @@ android { } dependencies { - api "com.google.android.gms:play-services-cronet:17.0.0" + api "com.google.android.gms:play-services-cronet:17.0.1" implementation project(modulePrefix + 'library-common') implementation 'androidx.annotation:annotation:' + androidxAnnotationVersion compileOnly 'org.checkerframework:checker-qual:' + checkerframeworkVersion @@ -31,10 +31,10 @@ dependencies { androidTestImplementation 'com.linkedin.dexmaker:dexmaker-mockito:' + dexmakerVersion // Instrumentation tests assume that an app-packaged version of cronet is // available. - androidTestImplementation 'org.chromium.net:cronet-embedded:72.3626.96' + androidTestImplementation 'org.chromium.net:cronet-embedded:76.3809.111' androidTestImplementation project(modulePrefix + 'testutils') testImplementation project(modulePrefix + 'testutils') - testImplementation 'com.squareup.okhttp3:mockwebserver:' + mockWebServerVersion + testImplementation 'com.squareup.okhttp3:mockwebserver:' + okhttpVersion testImplementation 'org.robolectric:robolectric:' + robolectricVersion } diff --git a/extensions/ima/build.gradle b/extensions/ima/build.gradle index 80fcab9587..ad46882f7c 100644 --- a/extensions/ima/build.gradle +++ b/extensions/ima/build.gradle @@ -25,10 +25,10 @@ android { } dependencies { - api 'com.google.ads.interactivemedia.v3:interactivemedia:3.23.0' + api 'com.google.ads.interactivemedia.v3:interactivemedia:3.24.0' implementation project(modulePrefix + 'library-core') implementation 'androidx.annotation:annotation:' + androidxAnnotationVersion - implementation 'com.google.android.gms:play-services-ads-identifier:17.0.0' + implementation 'com.google.android.gms:play-services-ads-identifier:17.0.1' compileOnly 'org.checkerframework:checker-qual:' + checkerframeworkVersion compileOnly 'org.jetbrains.kotlin:kotlin-annotations-jvm:' + kotlinAnnotationsVersion androidTestImplementation project(modulePrefix + 'testutils') diff --git a/extensions/okhttp/build.gradle b/extensions/okhttp/build.gradle index 7589633208..96424b4380 100644 --- a/extensions/okhttp/build.gradle +++ b/extensions/okhttp/build.gradle @@ -21,9 +21,9 @@ dependencies { compileOnly 'org.checkerframework:checker-qual:' + checkerframeworkVersion compileOnly 'org.jetbrains.kotlin:kotlin-annotations-jvm:' + kotlinAnnotationsVersion testImplementation project(modulePrefix + 'testutils') - testImplementation 'com.squareup.okhttp3:mockwebserver:' + mockWebServerVersion + testImplementation 'com.squareup.okhttp3:mockwebserver:' + okhttpVersion testImplementation 'org.robolectric:robolectric:' + robolectricVersion - api 'com.squareup.okhttp3:okhttp:4.9.1' + api 'com.squareup.okhttp3:okhttp:' + okhttpVersion } ext { diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 8efe8c9f90..76c4be41e9 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https://services.gradle.org/distributions/gradle-6.7.1-all.zip +distributionUrl=https://services.gradle.org/distributions/gradle-6.9-all.zip diff --git a/library/common/build.gradle b/library/common/build.gradle index b5aec23700..bdfe7a00f3 100644 --- a/library/common/build.gradle +++ b/library/common/build.gradle @@ -35,7 +35,7 @@ dependencies { testImplementation 'androidx.test.ext:junit:' + androidxTestJUnitVersion testImplementation 'junit:junit:' + junitVersion testImplementation 'com.google.truth:truth:' + truthVersion - testImplementation 'com.squareup.okhttp3:mockwebserver:' + mockWebServerVersion + testImplementation 'com.squareup.okhttp3:mockwebserver:' + okhttpVersion testImplementation 'org.robolectric:robolectric:' + robolectricVersion testImplementation project(modulePrefix + 'library-core') testImplementation project(modulePrefix + 'testutils') diff --git a/library/core/build.gradle b/library/core/build.gradle index a4cd3bd2a3..81e1a3d543 100644 --- a/library/core/build.gradle +++ b/library/core/build.gradle @@ -48,7 +48,7 @@ dependencies { androidTestImplementation(project(modulePrefix + 'testutils')) { exclude module: modulePrefix.substring(1) + 'library-core' } - testImplementation 'com.squareup.okhttp3:mockwebserver:' + mockWebServerVersion + testImplementation 'com.squareup.okhttp3:mockwebserver:' + okhttpVersion testImplementation 'org.robolectric:robolectric:' + robolectricVersion testImplementation project(modulePrefix + 'testutils') testImplementation project(modulePrefix + 'robolectricutils') diff --git a/library/hls/build.gradle b/library/hls/build.gradle index d31f1ce6a2..6c94d1d444 100644 --- a/library/hls/build.gradle +++ b/library/hls/build.gradle @@ -32,7 +32,7 @@ dependencies { testImplementation project(modulePrefix + 'robolectricutils') testImplementation project(modulePrefix + 'testutils') testImplementation project(modulePrefix + 'testdata') - testImplementation 'com.squareup.okhttp3:mockwebserver:' + mockWebServerVersion + testImplementation 'com.squareup.okhttp3:mockwebserver:' + okhttpVersion testImplementation 'org.robolectric:robolectric:' + robolectricVersion } diff --git a/testutils/build.gradle b/testutils/build.gradle index a0dc2b4cb5..67dde583d3 100644 --- a/testutils/build.gradle +++ b/testutils/build.gradle @@ -24,7 +24,7 @@ dependencies { compileOnly 'org.checkerframework:checker-compat-qual:' + checkerframeworkCompatVersion compileOnly 'org.jetbrains.kotlin:kotlin-annotations-jvm:' + kotlinAnnotationsVersion implementation 'androidx.annotation:annotation:' + androidxAnnotationVersion - implementation 'com.squareup.okhttp3:mockwebserver:' + mockWebServerVersion + implementation 'com.squareup.okhttp3:mockwebserver:' + okhttpVersion implementation project(modulePrefix + 'library-core') testImplementation 'org.robolectric:robolectric:' + robolectricVersion }