Skip to content

SDK / exoplayer

Go to a project
Commit dea52048 by olly Committed by Oliver Woodman
Options

Bump dependency versions 

PiperOrigin-RevId: 382277352
parent 9013facd
Inline Side-by-side
Showing with 27 additions and 25 deletions
constants.gradle
...@@ -24,27 +24,29 @@ project.ext { ...@@ -24,27 +24,29 @@ project.ext {
guavaVersion = '27.1-android' guavaVersion = '27.1-android'
mockitoVersion = '3.4.0' mockitoVersion = '3.4.0'
mockWebServerVersion = '3.12.0' mockWebServerVersion = '3.12.0'
robolectricVersion = '4.5' robolectricVersion = '4.5.1'
checkerframeworkVersion = '3.3.0' checkerframeworkVersion = '3.3.0'
checkerframeworkCompatVersion = '2.5.0' checkerframeworkCompatVersion = '2.5.0'
jsr305Version = '3.0.2' jsr305Version = '3.0.2'
kotlinAnnotationsVersion = '1.3.70' kotlinAnnotationsVersion = '1.5.20'
androidxAnnotationVersion = '1.2.0' androidxAnnotationVersion = '1.2.0'
androidxAppCompatVersion = '1.1.0' androidxAppCompatVersion = '1.3.0'
androidxCollectionVersion = '1.1.0' androidxCollectionVersion = '1.1.0'
androidxCoreVersion = '1.3.2' androidxCoreVersion = '1.3.2'
androidxFuturesVersion = '1.1.0' androidxFuturesVersion = '1.1.0'
androidxMediaVersion = '1.2.1' androidxMediaVersion = '1.3.1'
androidxMedia2Version = '1.1.2' androidxMedia2Version = '1.1.3'
androidxMultidexVersion = '2.0.0' androidxMultidexVersion = '2.0.1'
androidxRecyclerViewVersion = '1.1.0' androidxRecyclerViewVersion = '1.2.1'
androidxMaterialVersion = '1.3.0'
androidxTestCoreVersion = '1.3.0' androidxTestCoreVersion = '1.3.0'
androidxTestJUnitVersion = '1.1.1' androidxTestJUnitVersion = '1.1.2'
androidxTestRunnerVersion = '1.3.0' androidxTestRunnerVersion = '1.3.0'
androidxTestRulesVersion = '1.3.0' androidxTestRulesVersion = '1.3.0'
androidxTestServicesStorageVersion = '1.3.0' androidxTestServicesStorageVersion = '1.3.0'
androidxTestTruthVersion = '1.3.0' androidxTestTruthVersion = '1.3.0'
truthVersion = '1.0' truthVersion = '1.1.3'
okhttpVersion = '4.9.1'
modulePrefix = ':' modulePrefix = ':'
if (gradle.ext.has('exoplayerModulePrefix')) { if (gradle.ext.has('exoplayerModulePrefix')) {
modulePrefix += gradle.ext.exoplayerModulePrefix modulePrefix += gradle.ext.exoplayerModulePrefix
......
demos/cast/build.gradle
...@@ -61,8 +61,8 @@ dependencies { ...@@ -61,8 +61,8 @@ dependencies {
implementation project(modulePrefix + 'extension-cast') implementation project(modulePrefix + 'extension-cast')
implementation 'androidx.appcompat:appcompat:' + androidxAppCompatVersion implementation 'androidx.appcompat:appcompat:' + androidxAppCompatVersion
implementation 'androidx.multidex:multidex:' + androidxMultidexVersion implementation 'androidx.multidex:multidex:' + androidxMultidexVersion
implementation 'androidx.recyclerview:recyclerview:1.1.0' implementation 'androidx.recyclerview:recyclerview:' + androidxRecyclerViewVersion
implementation 'com.google.android.material:material:1.2.1' implementation 'com.google.android.material:material:' + androidxMaterialVersion
} }
apply plugin: 'com.google.android.gms.strict-version-matcher-plugin' apply plugin: 'com.google.android.gms.strict-version-matcher-plugin'
demos/main/build.gradle
...@@ -70,7 +70,7 @@ dependencies { ...@@ -70,7 +70,7 @@ dependencies {
implementation 'androidx.annotation:annotation:' + androidxAnnotationVersion implementation 'androidx.annotation:annotation:' + androidxAnnotationVersion
implementation 'androidx.appcompat:appcompat:' + androidxAppCompatVersion implementation 'androidx.appcompat:appcompat:' + androidxAppCompatVersion
implementation 'androidx.multidex:multidex:' + androidxMultidexVersion 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-core')
implementation project(modulePrefix + 'library-dash') implementation project(modulePrefix + 'library-dash')
implementation project(modulePrefix + 'library-hls') implementation project(modulePrefix + 'library-hls')
......
extensions/cast/build.gradle
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
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:19.0.0' api 'com.google.android.gms:play-services-cast-framework:20.0.0'
implementation 'androidx.annotation:annotation:' + androidxAnnotationVersion implementation 'androidx.annotation:annotation:' + androidxAnnotationVersion
implementation project(modulePrefix + 'library-common') implementation project(modulePrefix + 'library-common')
compileOnly 'org.checkerframework:checker-qual:' + checkerframeworkVersion compileOnly 'org.checkerframework:checker-qual:' + checkerframeworkVersion
......
extensions/cronet/build.gradle
...@@ -20,7 +20,7 @@ android { ...@@ -20,7 +20,7 @@ android {
} }
dependencies { 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 project(modulePrefix + 'library-common')
implementation 'androidx.annotation:annotation:' + androidxAnnotationVersion implementation 'androidx.annotation:annotation:' + androidxAnnotationVersion
compileOnly 'org.checkerframework:checker-qual:' + checkerframeworkVersion compileOnly 'org.checkerframework:checker-qual:' + checkerframeworkVersion
...@@ -31,10 +31,10 @@ dependencies { ...@@ -31,10 +31,10 @@ dependencies {
androidTestImplementation 'com.linkedin.dexmaker:dexmaker-mockito:' + dexmakerVersion androidTestImplementation 'com.linkedin.dexmaker:dexmaker-mockito:' + dexmakerVersion
// Instrumentation tests assume that an app-packaged version of cronet is // Instrumentation tests assume that an app-packaged version of cronet is
// available. // available.
androidTestImplementation 'org.chromium.net:cronet-embedded:72.3626.96' androidTestImplementation 'org.chromium.net:cronet-embedded:76.3809.111'
androidTestImplementation project(modulePrefix + 'testutils') androidTestImplementation project(modulePrefix + 'testutils')
testImplementation project(modulePrefix + 'testutils') testImplementation project(modulePrefix + 'testutils')
testImplementation 'com.squareup.okhttp3:mockwebserver:' + mockWebServerVersion testImplementation 'com.squareup.okhttp3:mockwebserver:' + okhttpVersion
testImplementation 'org.robolectric:robolectric:' + robolectricVersion testImplementation 'org.robolectric:robolectric:' + robolectricVersion
} }
......
extensions/ima/build.gradle
...@@ -25,10 +25,10 @@ android { ...@@ -25,10 +25,10 @@ android {
} }
dependencies { 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 project(modulePrefix + 'library-core')
implementation 'androidx.annotation:annotation:' + androidxAnnotationVersion 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.checkerframework:checker-qual:' + checkerframeworkVersion
compileOnly 'org.jetbrains.kotlin:kotlin-annotations-jvm:' + kotlinAnnotationsVersion compileOnly 'org.jetbrains.kotlin:kotlin-annotations-jvm:' + kotlinAnnotationsVersion
androidTestImplementation project(modulePrefix + 'testutils') androidTestImplementation project(modulePrefix + 'testutils')
......
extensions/okhttp/build.gradle
...@@ -21,9 +21,9 @@ dependencies { ...@@ -21,9 +21,9 @@ dependencies {
compileOnly 'org.checkerframework:checker-qual:' + checkerframeworkVersion compileOnly 'org.checkerframework:checker-qual:' + checkerframeworkVersion
compileOnly 'org.jetbrains.kotlin:kotlin-annotations-jvm:' + kotlinAnnotationsVersion compileOnly 'org.jetbrains.kotlin:kotlin-annotations-jvm:' + kotlinAnnotationsVersion
testImplementation project(modulePrefix + 'testutils') testImplementation project(modulePrefix + 'testutils')
testImplementation 'com.squareup.okhttp3:mockwebserver:' + mockWebServerVersion testImplementation 'com.squareup.okhttp3:mockwebserver:' + okhttpVersion
testImplementation 'org.robolectric:robolectric:' + robolectricVersion testImplementation 'org.robolectric:robolectric:' + robolectricVersion
api 'com.squareup.okhttp3:okhttp:4.9.1' api 'com.squareup.okhttp3:okhttp:' + okhttpVersion
} }
ext { ext {
......
gradle/wrapper/gradle-wrapper.properties
...@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME ...@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists 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
library/common/build.gradle
...@@ -35,7 +35,7 @@ dependencies { ...@@ -35,7 +35,7 @@ dependencies {
testImplementation 'androidx.test.ext:junit:' + androidxTestJUnitVersion testImplementation 'androidx.test.ext:junit:' + androidxTestJUnitVersion
testImplementation 'junit:junit:' + junitVersion testImplementation 'junit:junit:' + junitVersion
testImplementation 'com.google.truth:truth:' + truthVersion testImplementation 'com.google.truth:truth:' + truthVersion
testImplementation 'com.squareup.okhttp3:mockwebserver:' + mockWebServerVersion testImplementation 'com.squareup.okhttp3:mockwebserver:' + okhttpVersion
testImplementation 'org.robolectric:robolectric:' + robolectricVersion testImplementation 'org.robolectric:robolectric:' + robolectricVersion
testImplementation project(modulePrefix + 'library-core') testImplementation project(modulePrefix + 'library-core')
testImplementation project(modulePrefix + 'testutils') testImplementation project(modulePrefix + 'testutils')
......
library/core/build.gradle
...@@ -48,7 +48,7 @@ dependencies { ...@@ -48,7 +48,7 @@ dependencies {
androidTestImplementation(project(modulePrefix + 'testutils')) { androidTestImplementation(project(modulePrefix + 'testutils')) {
exclude module: modulePrefix.substring(1) + 'library-core' 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 'org.robolectric:robolectric:' + robolectricVersion
testImplementation project(modulePrefix + 'testutils') testImplementation project(modulePrefix + 'testutils')
testImplementation project(modulePrefix + 'robolectricutils') testImplementation project(modulePrefix + 'robolectricutils')
......
library/hls/build.gradle
...@@ -32,7 +32,7 @@ dependencies { ...@@ -32,7 +32,7 @@ dependencies {
testImplementation project(modulePrefix + 'robolectricutils') testImplementation project(modulePrefix + 'robolectricutils')
testImplementation project(modulePrefix + 'testutils') testImplementation project(modulePrefix + 'testutils')
testImplementation project(modulePrefix + 'testdata') testImplementation project(modulePrefix + 'testdata')
testImplementation 'com.squareup.okhttp3:mockwebserver:' + mockWebServerVersion testImplementation 'com.squareup.okhttp3:mockwebserver:' + okhttpVersion
testImplementation 'org.robolectric:robolectric:' + robolectricVersion testImplementation 'org.robolectric:robolectric:' + robolectricVersion
} }
......
testutils/build.gradle
...@@ -24,7 +24,7 @@ dependencies { ...@@ -24,7 +24,7 @@ dependencies {
compileOnly 'org.checkerframework:checker-compat-qual:' + checkerframeworkCompatVersion compileOnly 'org.checkerframework:checker-compat-qual:' + checkerframeworkCompatVersion
compileOnly 'org.jetbrains.kotlin:kotlin-annotations-jvm:' + kotlinAnnotationsVersion compileOnly 'org.jetbrains.kotlin:kotlin-annotations-jvm:' + kotlinAnnotationsVersion
implementation 'androidx.annotation:annotation:' + androidxAnnotationVersion implementation 'androidx.annotation:annotation:' + androidxAnnotationVersion
implementation 'com.squareup.okhttp3:mockwebserver:' + mockWebServerVersion implementation 'com.squareup.okhttp3:mockwebserver:' + okhttpVersion
implementation project(modulePrefix + 'library-core') implementation project(modulePrefix + 'library-core')
testImplementation 'org.robolectric:robolectric:' + robolectricVersion testImplementation 'org.robolectric:robolectric:' + robolectricVersion
} }
......
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