Skip to content

SDK / exoplayer

Go to a project
Commit 8401097e by olly Committed by Andrew Lewis
Options

Upgrade gradle plugin and friends 

PiperOrigin-RevId: 233390513
parent 90592755
Inline Side-by-side
Showing with 8 additions and 34 deletions
build.gradle
...@@ -17,9 +17,9 @@ buildscript { ...@@ -17,9 +17,9 @@ buildscript {
jcenter() jcenter()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:3.1.4' classpath 'com.android.tools.build:gradle:3.3.1'
classpath 'com.novoda:bintray-release:0.8.1' classpath 'com.novoda:bintray-release:0.9'
classpath 'com.google.android.gms:strict-version-matcher-plugin:1.0.3' classpath 'com.google.android.gms:strict-version-matcher-plugin:1.1.0'
} }
// Workaround for the following test coverage issue. Remove when fixed: // Workaround for the following test coverage issue. Remove when fixed:
// https://code.google.com/p/android/issues/detail?id=226070 // https://code.google.com/p/android/issues/detail?id=226070
......
constants.gradle
...@@ -18,7 +18,6 @@ project.ext { ...@@ -18,7 +18,6 @@ project.ext {
minSdkVersion = 16 minSdkVersion = 16
targetSdkVersion = 28 targetSdkVersion = 28
compileSdkVersion = 28 compileSdkVersion = 28
buildToolsVersion = '28.0.2'
testSupportLibraryVersion = '0.5' testSupportLibraryVersion = '0.5'
supportLibraryVersion = '27.1.1' supportLibraryVersion = '27.1.1'
dexmakerVersion = '1.2' dexmakerVersion = '1.2'
......
demos/cast/build.gradle
...@@ -16,7 +16,6 @@ apply plugin: 'com.android.application' ...@@ -16,7 +16,6 @@ apply plugin: 'com.android.application'
android { android {
compileSdkVersion project.ext.compileSdkVersion compileSdkVersion project.ext.compileSdkVersion
buildToolsVersion project.ext.buildToolsVersion
compileOptions { compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8 sourceCompatibility JavaVersion.VERSION_1_8
......
demos/ima/build.gradle
...@@ -16,7 +16,6 @@ apply plugin: 'com.android.application' ...@@ -16,7 +16,6 @@ apply plugin: 'com.android.application'
android { android {
compileSdkVersion project.ext.compileSdkVersion compileSdkVersion project.ext.compileSdkVersion
buildToolsVersion project.ext.buildToolsVersion
compileOptions { compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8 sourceCompatibility JavaVersion.VERSION_1_8
......
demos/main/build.gradle
...@@ -16,7 +16,6 @@ apply plugin: 'com.android.application' ...@@ -16,7 +16,6 @@ apply plugin: 'com.android.application'
android { android {
compileSdkVersion project.ext.compileSdkVersion compileSdkVersion project.ext.compileSdkVersion
buildToolsVersion project.ext.buildToolsVersion
compileOptions { compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8 sourceCompatibility JavaVersion.VERSION_1_8
......
extensions/cast/build.gradle
...@@ -16,7 +16,6 @@ apply plugin: 'com.android.library' ...@@ -16,7 +16,6 @@ apply plugin: 'com.android.library'
android { android {
compileSdkVersion project.ext.compileSdkVersion compileSdkVersion project.ext.compileSdkVersion
buildToolsVersion project.ext.buildToolsVersion
compileOptions { compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8 sourceCompatibility JavaVersion.VERSION_1_8
......
extensions/cronet/build.gradle
...@@ -16,7 +16,6 @@ apply plugin: 'com.android.library' ...@@ -16,7 +16,6 @@ apply plugin: 'com.android.library'
android { android {
compileSdkVersion project.ext.compileSdkVersion compileSdkVersion project.ext.compileSdkVersion
buildToolsVersion project.ext.buildToolsVersion
defaultConfig { defaultConfig {
minSdkVersion project.ext.minSdkVersion minSdkVersion project.ext.minSdkVersion
......
extensions/ffmpeg/build.gradle
...@@ -16,7 +16,6 @@ apply plugin: 'com.android.library' ...@@ -16,7 +16,6 @@ apply plugin: 'com.android.library'
android { android {
compileSdkVersion project.ext.compileSdkVersion compileSdkVersion project.ext.compileSdkVersion
buildToolsVersion project.ext.buildToolsVersion
compileOptions { compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8 sourceCompatibility JavaVersion.VERSION_1_8
......
extensions/flac/build.gradle
...@@ -16,7 +16,6 @@ apply plugin: 'com.android.library' ...@@ -16,7 +16,6 @@ apply plugin: 'com.android.library'
android { android {
compileSdkVersion project.ext.compileSdkVersion compileSdkVersion project.ext.compileSdkVersion
buildToolsVersion project.ext.buildToolsVersion
compileOptions { compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8 sourceCompatibility JavaVersion.VERSION_1_8
......
extensions/gvr/build.gradle
...@@ -16,7 +16,6 @@ apply plugin: 'com.android.library' ...@@ -16,7 +16,6 @@ apply plugin: 'com.android.library'
android { android {
compileSdkVersion project.ext.compileSdkVersion compileSdkVersion project.ext.compileSdkVersion
buildToolsVersion project.ext.buildToolsVersion
compileOptions { compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8 sourceCompatibility JavaVersion.VERSION_1_8
......
extensions/ima/build.gradle
...@@ -16,7 +16,6 @@ apply plugin: 'com.android.library' ...@@ -16,7 +16,6 @@ apply plugin: 'com.android.library'
android { android {
compileSdkVersion project.ext.compileSdkVersion compileSdkVersion project.ext.compileSdkVersion
buildToolsVersion project.ext.buildToolsVersion
compileOptions { compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8 sourceCompatibility JavaVersion.VERSION_1_8
......
extensions/jobdispatcher/build.gradle
...@@ -18,7 +18,6 @@ apply plugin: 'com.android.library' ...@@ -18,7 +18,6 @@ apply plugin: 'com.android.library'
android { android {
compileSdkVersion project.ext.compileSdkVersion compileSdkVersion project.ext.compileSdkVersion
buildToolsVersion project.ext.buildToolsVersion
compileOptions { compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8 sourceCompatibility JavaVersion.VERSION_1_8
......
extensions/leanback/build.gradle
...@@ -16,7 +16,6 @@ apply plugin: 'com.android.library' ...@@ -16,7 +16,6 @@ apply plugin: 'com.android.library'
android { android {
compileSdkVersion project.ext.compileSdkVersion compileSdkVersion project.ext.compileSdkVersion
buildToolsVersion project.ext.buildToolsVersion
compileOptions { compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8 sourceCompatibility JavaVersion.VERSION_1_8
......
extensions/mediasession/build.gradle
...@@ -16,7 +16,6 @@ apply plugin: 'com.android.library' ...@@ -16,7 +16,6 @@ apply plugin: 'com.android.library'
android { android {
compileSdkVersion project.ext.compileSdkVersion compileSdkVersion project.ext.compileSdkVersion
buildToolsVersion project.ext.buildToolsVersion
compileOptions { compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8 sourceCompatibility JavaVersion.VERSION_1_8
......
extensions/okhttp/build.gradle
...@@ -16,7 +16,6 @@ apply plugin: 'com.android.library' ...@@ -16,7 +16,6 @@ apply plugin: 'com.android.library'
android { android {
compileSdkVersion project.ext.compileSdkVersion compileSdkVersion project.ext.compileSdkVersion
buildToolsVersion project.ext.buildToolsVersion
compileOptions { compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8 sourceCompatibility JavaVersion.VERSION_1_8
......
extensions/opus/build.gradle
...@@ -16,7 +16,6 @@ apply plugin: 'com.android.library' ...@@ -16,7 +16,6 @@ apply plugin: 'com.android.library'
android { android {
compileSdkVersion project.ext.compileSdkVersion compileSdkVersion project.ext.compileSdkVersion
buildToolsVersion project.ext.buildToolsVersion
compileOptions { compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8 sourceCompatibility JavaVersion.VERSION_1_8
......
extensions/rtmp/build.gradle
...@@ -16,7 +16,6 @@ apply plugin: 'com.android.library' ...@@ -16,7 +16,6 @@ apply plugin: 'com.android.library'
android { android {
compileSdkVersion project.ext.compileSdkVersion compileSdkVersion project.ext.compileSdkVersion
buildToolsVersion project.ext.buildToolsVersion
compileOptions { compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8 sourceCompatibility JavaVersion.VERSION_1_8
......
extensions/vp9/build.gradle
...@@ -16,7 +16,6 @@ apply plugin: 'com.android.library' ...@@ -16,7 +16,6 @@ apply plugin: 'com.android.library'
android { android {
compileSdkVersion project.ext.compileSdkVersion compileSdkVersion project.ext.compileSdkVersion
buildToolsVersion project.ext.buildToolsVersion
compileOptions { compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8 sourceCompatibility JavaVersion.VERSION_1_8
......
gradle/wrapper/gradle-wrapper.properties
#Tue Sep 05 13:43:42 BST 2017 #Fri Feb 08 20:49:20 GMT 2019
distributionBase=GRADLE_USER_HOME 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-4.4-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
javadoc_combined.gradle
...@@ -42,7 +42,7 @@ class CombinedJavadocPlugin implements Plugin<Project> { ...@@ -42,7 +42,7 @@ class CombinedJavadocPlugin implements Plugin<Project> {
if (name == "release") { if (name == "release") {
classpath += classpath +=
libraryModule.project.files( libraryModule.project.files(
variant.javaCompile.classpath.files, variant.javaCompileProvider.get().classpath.files,
libraryModule.project.android.getBootClasspath()) libraryModule.project.android.getBootClasspath())
} }
} }
......
javadoc_library.gradle
...@@ -21,7 +21,7 @@ android.libraryVariants.all { variant -> ...@@ -21,7 +21,7 @@ android.libraryVariants.all { variant ->
task("generateJavadoc", type: Javadoc) { task("generateJavadoc", type: Javadoc) {
description = "Generates Javadoc for the ${javadocTitle}." description = "Generates Javadoc for the ${javadocTitle}."
title = "ExoPlayer ${javadocTitle}" title = "ExoPlayer ${javadocTitle}"
source = variant.javaCompile.source source = variant.javaCompileProvider.get().source
options { options {
links "http://docs.oracle.com/javase/7/docs/api/" links "http://docs.oracle.com/javase/7/docs/api/"
linksOffline "https://developer.android.com/reference", linksOffline "https://developer.android.com/reference",
...@@ -33,7 +33,7 @@ android.libraryVariants.all { variant -> ...@@ -33,7 +33,7 @@ android.libraryVariants.all { variant ->
doFirst { doFirst {
classpath = classpath =
files( files(
variant.javaCompile.classpath.files, variant.javaCompileProvider.get().classpath.files,
project.android.getBootClasspath()) project.android.getBootClasspath())
} }
doLast { doLast {
......
library/all/build.gradle
...@@ -16,7 +16,6 @@ apply plugin: 'com.android.library' ...@@ -16,7 +16,6 @@ apply plugin: 'com.android.library'
android { android {
compileSdkVersion project.ext.compileSdkVersion compileSdkVersion project.ext.compileSdkVersion
buildToolsVersion project.ext.buildToolsVersion
defaultConfig { defaultConfig {
minSdkVersion project.ext.minSdkVersion minSdkVersion project.ext.minSdkVersion
......
library/core/build.gradle
...@@ -16,7 +16,6 @@ apply from: '../../constants.gradle' ...@@ -16,7 +16,6 @@ apply from: '../../constants.gradle'
android { android {
compileSdkVersion project.ext.compileSdkVersion compileSdkVersion project.ext.compileSdkVersion
buildToolsVersion project.ext.buildToolsVersion
compileOptions { compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8 sourceCompatibility JavaVersion.VERSION_1_8
......
library/dash/build.gradle
...@@ -16,7 +16,6 @@ apply plugin: 'com.android.library' ...@@ -16,7 +16,6 @@ apply plugin: 'com.android.library'
android { android {
compileSdkVersion project.ext.compileSdkVersion compileSdkVersion project.ext.compileSdkVersion
buildToolsVersion project.ext.buildToolsVersion
compileOptions { compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8 sourceCompatibility JavaVersion.VERSION_1_8
......
library/hls/build.gradle
...@@ -16,7 +16,6 @@ apply plugin: 'com.android.library' ...@@ -16,7 +16,6 @@ apply plugin: 'com.android.library'
android { android {
compileSdkVersion project.ext.compileSdkVersion compileSdkVersion project.ext.compileSdkVersion
buildToolsVersion project.ext.buildToolsVersion
compileOptions { compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8 sourceCompatibility JavaVersion.VERSION_1_8
......
library/smoothstreaming/build.gradle
...@@ -16,7 +16,6 @@ apply plugin: 'com.android.library' ...@@ -16,7 +16,6 @@ apply plugin: 'com.android.library'
android { android {
compileSdkVersion project.ext.compileSdkVersion compileSdkVersion project.ext.compileSdkVersion
buildToolsVersion project.ext.buildToolsVersion
compileOptions { compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8 sourceCompatibility JavaVersion.VERSION_1_8
......
library/ui/build.gradle
...@@ -16,7 +16,6 @@ apply plugin: 'com.android.library' ...@@ -16,7 +16,6 @@ apply plugin: 'com.android.library'
android { android {
compileSdkVersion project.ext.compileSdkVersion compileSdkVersion project.ext.compileSdkVersion
buildToolsVersion project.ext.buildToolsVersion
compileOptions { compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8 sourceCompatibility JavaVersion.VERSION_1_8
......
playbacktests/build.gradle
...@@ -16,7 +16,6 @@ apply plugin: 'com.android.library' ...@@ -16,7 +16,6 @@ apply plugin: 'com.android.library'
android { android {
compileSdkVersion project.ext.compileSdkVersion compileSdkVersion project.ext.compileSdkVersion
buildToolsVersion project.ext.buildToolsVersion
compileOptions { compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8 sourceCompatibility JavaVersion.VERSION_1_8
......
testutils/build.gradle
...@@ -16,7 +16,6 @@ apply plugin: 'com.android.library' ...@@ -16,7 +16,6 @@ apply plugin: 'com.android.library'
android { android {
compileSdkVersion project.ext.compileSdkVersion compileSdkVersion project.ext.compileSdkVersion
buildToolsVersion project.ext.buildToolsVersion
compileOptions { compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8 sourceCompatibility JavaVersion.VERSION_1_8
......
testutils_robolectric/build.gradle
...@@ -16,7 +16,6 @@ apply plugin: 'com.android.library' ...@@ -16,7 +16,6 @@ apply plugin: 'com.android.library'
android { android {
compileSdkVersion project.ext.compileSdkVersion compileSdkVersion project.ext.compileSdkVersion
buildToolsVersion project.ext.buildToolsVersion
compileOptions { compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8 sourceCompatibility JavaVersion.VERSION_1_8
......
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