From b386b2e5216e87e621544a7594772c46b7c26883 Mon Sep 17 00:00:00 2001 From: Salakar Date: Fri, 23 Mar 2018 22:17:51 +0000 Subject: [PATCH] [android] gradle version updates --- android/build.gradle | 15 +++++++++++---- .../io/invertase/firebase/RNFirebasePackage.java | 1 - .../storage/RNFirebaseStoragePackage.java | 1 - 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index ab92cb57..26685402 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -2,6 +2,10 @@ buildscript { ext.firebaseVersion = '11.8.0' repositories { jcenter() + mavenLocal() + maven { + url "https://maven.google.com" + } maven { url 'https://maven.fabric.io/public' } @@ -19,10 +23,10 @@ android { buildToolsVersion "27.0.2" defaultConfig { minSdkVersion 16 - targetSdkVersion 26 + targetSdkVersion 27 versionCode 1 versionName "1.0" - // multiDexEnabled true + multiDexEnabled true } buildTypes { release { @@ -44,6 +48,7 @@ allprojects { } } + rootProject.gradle.buildFinished { buildResult -> if (buildResult.getFailure() != null) { try { @@ -74,15 +79,17 @@ rootProject.gradle.buildFinished { buildResult -> logger.log(LogLevel.ERROR, "| |") logger.log(LogLevel.ERROR, " ----------------------------------------------------------- ") } - } catch (Exception exception) {} + } catch (Exception exception) { + } } } dependencies { compile fileTree(include: ['*.jar'], dir: 'libs') + //noinspection GradleDynamicVersion compile "com.facebook.react:react-native:+" // From node_modules - compile "com.android.support:support-v4:27.0.2" + compile "com.android.support:support-v4:27.1.0" compile 'me.leolin:ShortcutBadger:1.1.21@aar' compile "com.google.android.gms:play-services-base:$firebaseVersion" compile "com.google.firebase:firebase-core:$firebaseVersion" diff --git a/android/src/main/java/io/invertase/firebase/RNFirebasePackage.java b/android/src/main/java/io/invertase/firebase/RNFirebasePackage.java index 8bf7fcbd..4c4ea50c 100644 --- a/android/src/main/java/io/invertase/firebase/RNFirebasePackage.java +++ b/android/src/main/java/io/invertase/firebase/RNFirebasePackage.java @@ -3,7 +3,6 @@ package io.invertase.firebase; import android.content.Context; import com.facebook.react.ReactPackage; -import com.facebook.react.bridge.JavaScriptModule; import com.facebook.react.bridge.NativeModule; import com.facebook.react.bridge.ReactApplicationContext; import com.facebook.react.uimanager.UIManagerModule; diff --git a/android/src/main/java/io/invertase/firebase/storage/RNFirebaseStoragePackage.java b/android/src/main/java/io/invertase/firebase/storage/RNFirebaseStoragePackage.java index a14cc738..56241059 100644 --- a/android/src/main/java/io/invertase/firebase/storage/RNFirebaseStoragePackage.java +++ b/android/src/main/java/io/invertase/firebase/storage/RNFirebaseStoragePackage.java @@ -3,7 +3,6 @@ package io.invertase.firebase.storage; import android.support.annotation.RequiresPermission; import com.facebook.react.ReactPackage; -import com.facebook.react.bridge.JavaScriptModule; import com.facebook.react.bridge.NativeModule; import com.facebook.react.bridge.ReactApplicationContext; import com.facebook.react.uimanager.UIManagerModule;