From f5f08b716dc809fe714a548268ec87c3f52de270 Mon Sep 17 00:00:00 2001 From: Chris Bianca Date: Tue, 27 Mar 2018 15:32:10 +0100 Subject: [PATCH] [android] Upgrade to build tools 3.0.1 --- android/build.gradle | 1 + .../android/app/src/main/AndroidManifest.xml | 22 +++++++++---------- tests/android/build.gradle | 3 ++- .../gradle/wrapper/gradle-wrapper.properties | 1 - 4 files changed, 14 insertions(+), 13 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index f9c8d72a..1d77e1a3 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -2,6 +2,7 @@ buildscript { ext.firebaseVersion = '12.0.0' repositories { jcenter() + google() maven { url 'https://maven.fabric.io/public' } diff --git a/tests/android/app/src/main/AndroidManifest.xml b/tests/android/app/src/main/AndroidManifest.xml index e739648c..4f090609 100644 --- a/tests/android/app/src/main/AndroidManifest.xml +++ b/tests/android/app/src/main/AndroidManifest.xml @@ -42,15 +42,6 @@ - - - - - - - - - - - + + + + + + + + + + + diff --git a/tests/android/build.gradle b/tests/android/build.gradle index 09ca1514..e90e1ad0 100644 --- a/tests/android/build.gradle +++ b/tests/android/build.gradle @@ -3,12 +3,13 @@ buildscript { repositories { jcenter() + google() maven { url 'https://maven.fabric.io/public' } } dependencies { - classpath 'com.android.tools.build:gradle:2.3.3' + classpath 'com.android.tools.build:gradle:3.0.1' classpath 'com.google.gms:google-services:3.1.2' classpath 'com.google.firebase:firebase-plugins:1.1.1' classpath 'io.fabric.tools:gradle:1.25.1' diff --git a/tests/android/gradle/wrapper/gradle-wrapper.properties b/tests/android/gradle/wrapper/gradle-wrapper.properties index 8ed16571..80c8be32 100644 --- a/tests/android/gradle/wrapper/gradle-wrapper.properties +++ b/tests/android/gradle/wrapper/gradle-wrapper.properties @@ -4,4 +4,3 @@ 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.1-all.zip -