Modify gradle dependencies; Upgrade gradle wrapper to fix build issues

UCSD · Jun 4, 2018 · 3597ae3 · 3597ae3
1 parent 3132c79
commit 3597ae3
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -154,7 +154,7 @@ android {
 dependencies {
     compile project(':react-native-restart')
     compile project(':react-native-fcm')
-    compile 'com.google.firebase:firebase-core:11.0.+'
+    compile 'com.google.firebase:firebase-core:11.0.4'
     compile project(':react-native-google-analytics-bridge')
     compile project(':react-native-keychain')
     compile project(':react-native-exit-app')
@@ -167,10 +167,10 @@ dependencies {
         exclude group: 'com.google.android.gms', module: 'play-services-base'
         exclude group: 'com.google.android.gms', module: 'play-services-maps'
     }
-    compile ("com.google.android.gms:play-services-base:11.0.+") {
+    compile ("com.google.android.gms:play-services-base:11.0.4") {
         force = true;
     }
-    compile ("com.google.android.gms:play-services-maps:11.0.+") {
+    compile ("com.google.android.gms:play-services-maps:11.0.4") {
         force = true;
     }
 }

diff --git a/android/gradle.properties b/android/gradle.properties
@@ -18,3 +18,5 @@
 # org.gradle.parallel=true
 
 android.useDeprecatedNdk=true
+googlePlayServicesVersion=11.0.4
+
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
+#Tue May 29 16:26:32 PDT 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-all.zip
Original file line number	Diff line number	Diff line change
Expand Up		@@ -18,3 +18,5 @@
		# org.gradle.parallel=true

		android.useDeprecatedNdk=true
		googlePlayServicesVersion=11.0.4