Upgrade dependencies

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=161648060
This commit is contained in:
olly 2017-07-12 03:57:18 -07:00 committed by Oliver Woodman
parent f72833476e
commit ecc8f6c4fa
5 changed files with 11 additions and 8 deletions

View File

@ -16,8 +16,8 @@ buildscript {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:2.3.1'
classpath 'com.novoda:bintray-release:0.4.0'
classpath 'com.android.tools.build:gradle:2.3.3'
classpath 'com.novoda:bintray-release:0.5.0'
}
// Workaround for the following test coverage issue. Remove when fixed:
// https://code.google.com/p/android/issues/detail?id=226070
@ -31,6 +31,9 @@ buildscript {
allprojects {
repositories {
jcenter()
maven {
url "https://maven.google.com"
}
}
project.ext {
exoplayerPublishEnabled = true

View File

@ -21,11 +21,11 @@ project.ext {
targetSdkVersion = 25
buildToolsVersion = '25'
testSupportLibraryVersion = '0.5'
supportLibraryVersion = '25.3.1'
supportLibraryVersion = '25.4.0'
dexmakerVersion = '1.2'
mockitoVersion = '1.9.5'
releaseVersion = 'r2.4.3'
modulePrefix = ':';
modulePrefix = ':'
if (gradle.ext.has('exoplayerModulePrefix')) {
modulePrefix += gradle.ext.exoplayerModulePrefix
}

View File

@ -16,7 +16,7 @@ dependencies {
compile project(modulePrefix + 'library-core')
compile 'com.android.support:support-annotations:' + supportLibraryVersion
compile 'com.google.ads.interactivemedia.v3:interactivemedia:3.7.4'
compile 'com.google.android.gms:play-services-ads:11.0.1'
compile 'com.google.android.gms:play-services-ads:11.0.2'
androidTestCompile project(modulePrefix + 'library')
androidTestCompile 'com.google.dexmaker:dexmaker:' + dexmakerVersion
androidTestCompile 'com.google.dexmaker:dexmaker-mockito:' + dexmakerVersion

View File

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

View File

@ -1,6 +1,6 @@
#Mon Mar 13 11:17:14 GMT 2017
#Wed Jul 12 10:31:13 BST 2017
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.0.1-all.zip