Update dependency versions

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=168194589
This commit is contained in:
olly 2017-09-11 00:25:36 -07:00 committed by Oliver Woodman
parent 340d0be40a
commit 75d5adce6f
6 changed files with 12 additions and 18 deletions

View File

@ -28,15 +28,13 @@ repository and depend on the modules locally.
### From JCenter ###
The easiest way to get started using ExoPlayer is to add it as a gradle
dependency. You need to make sure you have the JCenter and Google Maven
repositories included in the `build.gradle` file in the root of your project:
dependency. You need to make sure you have the JCenter and Google repositories
included in the `build.gradle` file in the root of your project:
```gradle
repositories {
jcenter()
maven {
url "https://maven.google.com"
}
google()
}
```

View File

@ -14,9 +14,7 @@
buildscript {
repositories {
jcenter()
maven {
url "https://maven.google.com"
}
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.0.0-beta4'
@ -34,9 +32,7 @@ buildscript {
allprojects {
repositories {
jcenter()
maven {
url "https://maven.google.com"
}
google()
}
project.ext {
exoplayerPublishEnabled = true

View File

@ -21,8 +21,8 @@ project.ext {
targetSdkVersion = 26
buildToolsVersion = '26'
testSupportLibraryVersion = '0.5'
supportLibraryVersion = '26.0.1'
playServicesLibraryVersion = '11.0.2'
supportLibraryVersion = '26.0.2'
playServicesLibraryVersion = '11.2.0'
dexmakerVersion = '1.2'
mockitoVersion = '1.9.5'
junitVersion = '4.12'

View File

@ -26,7 +26,7 @@ android {
dependencies {
compile project(modulePrefix + 'library-core')
compile 'com.google.vr:sdk-audio:1.60.1'
compile 'com.google.vr:sdk-audio:1.80.0'
}
ext {

View File

@ -29,9 +29,9 @@ dependencies {
compile project(modulePrefix + 'library-core')
// This dependency is necessary to force the supportLibraryVersion of
// com.android.support:support-v4 to be used. Else an older version (25.2.0) is included via:
// com.google.android.gms:play-services-ads:11.0.2
// |-- com.google.android.gms:play-services-ads-lite:[11.0.2] -> 11.0.2
// |-- com.google.android.gms:play-services-basement:[11.0.2] -> 11.0.2
// com.google.android.gms:play-services-ads:11.2.0
// |-- com.google.android.gms:play-services-ads-lite:11.2.0
// |-- com.google.android.gms:play-services-basement:11.2.0
// |-- com.android.support:support-v4:25.2.0
compile 'com.android.support:support-v4:' + supportLibraryVersion
compile 'com.google.ads.interactivemedia.v3:interactivemedia:3.7.4'

View File

@ -31,7 +31,7 @@ android {
dependencies {
compile project(modulePrefix + 'library-core')
compile('com.squareup.okhttp3:okhttp:3.8.1') {
compile('com.squareup.okhttp3:okhttp:3.9.0') {
exclude group: 'org.json'
}
}