Update build.gradle

This commit is contained in:
Erwan Croze 2017-10-19 11:36:06 +02:00
parent 09b6be1cde
commit e28abd853f

View file

@ -21,7 +21,7 @@ buildscript {
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:2.3.3' classpath 'com.android.tools.build:gradle:2.3.3'
if (googleFile.exists()) { if (googleFile.exists()) {
classpath 'com.google.gms:google-services:3.1.0' classpath 'com.google.gms:google-services:3.+'
} }
} }
} }
@ -45,7 +45,7 @@ dependencies {
androidTestCompile 'junit:junit:+' androidTestCompile 'junit:junit:+'
compile 'org.apache.commons:commons-compress:+' compile 'org.apache.commons:commons-compress:+'
if (firebaseEnable()) { if (firebaseEnable()) {
compile 'com.google.firebase:firebase-messaging:11.4.0' compile 'com.google.firebase:firebase-messaging:11.+'
} else { } else {
compile fileTree(include: 'gcm.jar', dir: 'libs') compile fileTree(include: 'gcm.jar', dir: 'libs')
compile 'com.android.support:support-v4:+' compile 'com.android.support:support-v4:+'
@ -87,7 +87,7 @@ excludePackage.add('**/LICENSE.txt')
android { android {
defaultConfig { defaultConfig {
compileSdkVersion 26 compileSdkVersion 26
buildToolsVersion "26.0.2" buildToolsVersion "26.0.1"
applicationId getPackageName() applicationId getPackageName()
multiDexEnabled true multiDexEnabled true
@ -161,8 +161,10 @@ android {
debug.setRoot('build-types/debug') debug.setRoot('build-types/debug')
release.setRoot('build-types/release') release.setRoot('build-types/release')
} }
compileSdkVersion 26 packagingOptions {
buildToolsVersion '26.0.1' pickFirst 'META-INF/NOTICE'
pickFirst 'META-INF/LICENSE'
}
} }
// Grant permissions // Grant permissions