Up gradle to use android:gradle:3.1.0, target sdk 27, use support lib…

…rary 27.1.1 # Conflicts: # lib/build.gradle
Tubitv · Jul 14, 2018 · 005c34e · 005c34e
1 parent 8329082
commit 005c34e
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 20 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -2,6 +2,7 @@ buildscript {
     repositories {
         jcenter()
         maven { url 'https://maven.fabric.io/public' }
+        google()
     }
 
     dependencies {
@@ -47,7 +48,7 @@ android {
     defaultConfig {
         applicationId "com.tubitv.demo"
         minSdkVersion 16
-        targetSdkVersion 25
+        targetSdkVersion 27
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -60,10 +61,8 @@ android {
     }
 
     applicationVariants.all { variant ->
-        variant.outputs.each { output ->
-            output.outputFile = new File(
-                    output.outputFile.parent,
-                    output.outputFile.name.replace(".apk", "-${variant.versionName}.apk"))
+        variant.outputs.all { output ->
+            outputFileName = "${variant.versionName}.apk"
         }
     }
 }

diff --git a/build.gradle b/build.gradle
@@ -3,9 +3,10 @@
 buildscript {
     repositories {
         jcenter()
+        google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.3'
+        classpath 'com.android.tools.build:gradle:3.1.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -18,7 +19,7 @@ allprojects {
         mavenCentral()
         maven { url 'https://maven.fabric.io/public' }
         maven { url "http://dl.bintray.com/tubitv/UI" } //TODO remove once jcenter hosts VaudTextView
-        maven { url 'https://maven.google.com' }
+        google()
     }
 }
 

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Mar 20 08:48:50 PDT 2017
+#Fri Jul 13 11:23:44 PDT 2018
 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.4-all.zip
diff --git a/lib/build.gradle b/lib/build.gradle
@@ -4,9 +4,10 @@ apply plugin: 'com.novoda.bintray-release' // must be applied after your artifac
 buildscript {
     repositories {
         jcenter()
+        google()
     }
     dependencies {
-        classpath 'com.novoda:bintray-release:0.4.0'
+        classpath 'com.novoda:bintray-release:0.8.0'
     }
 }
 
@@ -32,7 +33,7 @@ android {
 
     defaultConfig {
         minSdkVersion 16
-        targetSdkVersion 23
+        targetSdkVersion 27
         versionCode 1
         versionName libVersion
 
@@ -52,18 +53,19 @@ android {
     }
 
     libraryVariants.all { variant ->
-        variant.outputs.each { output ->
-            def outputFile = output.outputFile
-            if (outputFile != null && outputFile.name.endsWith('.aar')) {
-//                def fileName = "${archivesBaseName}-${version}.aar"
-                def fileName = "exoplayer.aar"
-                output.outputFile = new File(outputFile.parent, fileName)
-            }
+        variant.outputs.all { output ->
+            outputFileName = "tubiplayer-${libVersion}.aar"
         }
     }
 }
 
 dependencies {
+    def supportLibraryVersion = '27.1.1'
+
+    configurations {
+        all*.exclude group: 'com.android.support', module: 'support-v13'
+    }
+
     compile fileTree(dir: 'libs', include: ['*.jar'])
 
     compile(name: 'vaud-text-view-release', ext: 'aar')
@@ -73,9 +75,13 @@ dependencies {
     compile 'com.squareup.picasso:picasso:2.5.2'
 
     compile 'com.google.android.exoplayer:exoplayer:r2.4.2'
-    compile 'com.android.support:appcompat-v7:25.3.1'
+    compile "com.android.support:appcompat-v7:${supportLibraryVersion}"
     compile 'com.android.support.constraint:constraint-layout:1.0.2'
-    compile 'com.android.support:design:25.3.1'
+    compile "com.android.support:design:${supportLibraryVersion}"
+
+    //chromecast
+    compile "com.android.support:mediarouter-v7:${supportLibraryVersion}"
+    compile 'com.google.android.gms:play-services-cast-framework:10.0.1'
 
     //dagger 2
     compile "com.google.dagger:dagger:2.9"