From a44c6f05d377af31eca915cf331d980e12456885 Mon Sep 17 00:00:00 2001 From: Michael Sotnikov Date: Mon, 31 Jul 2017 23:49:01 +0300 Subject: [PATCH] WIP: #199 Update ExoPlayer to 2.x --- build.gradle | 2 +- demo/build.gradle | 11 +++++++++-- gradle/wrapper/gradle-wrapper.properties | 4 ++-- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index dbc8a41eb07..6903a932e4b 100644 --- a/build.gradle +++ b/build.gradle @@ -16,7 +16,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.3.3' + classpath 'com.android.tools.build:gradle:3.0.0-alpha8' classpath 'com.novoda:bintray-release:0.5.0' } // Workaround for the following test coverage issue. Remove when fixed: diff --git a/demo/build.gradle b/demo/build.gradle index 7eea25478ff..e3c0bb33b9a 100644 --- a/demo/build.gradle +++ b/demo/build.gradle @@ -39,10 +39,17 @@ android { disable 'MissingTranslation' } + // TVirl: Studio 3.0 +// productFlavors { +// noExtensions +// withExtensions +// } productFlavors { - noExtensions - withExtensions + flavorDimensions "extensions" + noExtensions {dimension "extensions"} + withExtensions {dimension "extensions"} } + // !TVirl } dependencies { diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index fc42154505b..9b648e3f357 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Wed Jul 12 10:31:13 BST 2017 +#Mon Jul 31 23:34:40 MSK 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.0.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-milestone-1-all.zip