diff --git a/build.gradle b/build.gradle index 981bab596c..dbc8a41eb0 100644 --- a/build.gradle +++ b/build.gradle @@ -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 diff --git a/constants.gradle b/constants.gradle index df5cf900a1..a877f8bd59 100644 --- a/constants.gradle +++ b/constants.gradle @@ -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 } diff --git a/extensions/ima/build.gradle b/extensions/ima/build.gradle index b2dd2ab97b..7732751296 100644 --- a/extensions/ima/build.gradle +++ b/extensions/ima/build.gradle @@ -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 diff --git a/extensions/okhttp/build.gradle b/extensions/okhttp/build.gradle index 0aba07d118..bc9e0eba3e 100644 --- a/extensions/okhttp/build.gradle +++ b/extensions/okhttp/build.gradle @@ -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' } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 8c0a9b91f6..fc42154505 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -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