From e716e315ff8d74fff468d1b3d555863efb8a3879 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Thu, 29 Mar 2018 01:39:15 -0700
Subject: [PATCH] Update build tools for Android Studio 3.1

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=190896757
---
 build.gradle            | 4 ++--
 constants.gradle        | 2 +-
 javadoc_combined.gradle | 1 -
 publish.gradle          | 4 ++--
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/build.gradle b/build.gradle
index fa950a2e65..3813a241e0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -17,8 +17,8 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.1'
-        classpath 'com.novoda:bintray-release:0.8.0'
+        classpath 'com.android.tools.build:gradle:3.1.0'
+        classpath 'com.novoda:bintray-release:0.8.1'
     }
     // Workaround for the following test coverage issue. Remove when fixed:
     // https://code.google.com/p/android/issues/detail?id=226070
diff --git a/constants.gradle b/constants.gradle
index 3e75567231..4619801390 100644
--- a/constants.gradle
+++ b/constants.gradle
@@ -22,7 +22,7 @@ project.ext {
     minSdkVersion = 14
     targetSdkVersion = 27
     compileSdkVersion = 27
-    buildToolsVersion = '26.0.2'
+    buildToolsVersion = '27.0.3'
     testSupportLibraryVersion = '0.5'
     supportLibraryVersion = '27.0.0'
     playServicesLibraryVersion = '11.4.2'
diff --git a/javadoc_combined.gradle b/javadoc_combined.gradle
index 1fec48ca25..7e27f41c5e 100644
--- a/javadoc_combined.gradle
+++ b/javadoc_combined.gradle
@@ -35,7 +35,6 @@ class CombinedJavadocPlugin implements Plugin<Project> {
           }
           exclude "**/BuildConfig.java"
           exclude "**/R.java"
-          destinationDir project.file("$project.buildDir/docs/javadoc")
           doLast {
             libraryModules.each { libraryModule ->
               project.copy {
diff --git a/publish.gradle b/publish.gradle
index ca1a2cfd8b..85cf87aa85 100644
--- a/publish.gradle
+++ b/publish.gradle
@@ -16,8 +16,8 @@ if (project.ext.has("exoplayerPublishEnabled")
     apply plugin: 'bintray-release'
     publish {
         artifactId = releaseArtifact
-        description = releaseDescription
-        version = releaseVersion
+        desc = releaseDescription
+        publishVersion = releaseVersion
         repoName = getBintrayRepo()
         userOrg = 'google'
         groupId = 'com.google.android.exoplayer'