Merge pull request #265 from joltup/gradle-upgrade

Traviskn · web-flow · commit b94e9ff6ec43 · 2018-12-11T19:58:02.000-07:00
update android build config for newer react-native versions
diff --git a/android/build.gradle b/android/build.gradle
@@ -11,9 +11,10 @@ repositories {
 buildscript {
     repositories {
         jcenter()
+        google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.3'
+        classpath 'com.android.tools.build:gradle:3.1.4'
     }
 }
 
@@ -37,7 +38,7 @@ android {
 }
 
 dependencies {
-    compile "com.facebook.react:react-native:${safeExtGet('reactNativeVersion', '+')}"
+    implementation "com.facebook.react:react-native:${safeExtGet('reactNativeVersion', '+')}"
     //compile 'com.squareup.okhttp3:okhttp:+'
     //{RNFetchBlob_PRE_0.28_DEPDENDENCY}
 }
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ 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-4.10.2-bin.zip

Original file line number	Diff line number	Diff line change
`@@ -11,9 +11,10 @@ repositories {`
`11`	`11`	`buildscript {`
`12`	`12`	`repositories {`
`13`	`13`	`jcenter()`
	`14`	`+ google()`
`14`	`15`	`}`
`15`	`16`	`dependencies {`
`16`		`- classpath 'com.android.tools.build:gradle:2.2.3'`
	`17`	`+ classpath 'com.android.tools.build:gradle:3.1.4'`
`17`	`18`	`}`
`18`	`19`	`}`
`19`	`20`
`@@ -37,7 +38,7 @@ android {`
`37`	`38`	`}`
`38`	`39`
`39`	`40`	`dependencies {`
`40`		`- compile "com.facebook.react:react-native:${safeExtGet('reactNativeVersion', '+')}"`
	`41`	`+ implementation "com.facebook.react:react-native:${safeExtGet('reactNativeVersion', '+')}"`
`41`	`42`	`//compile 'com.squareup.okhttp3:okhttp:+'`
`42`	`43`	`//{RNFetchBlob_PRE_0.28_DEPDENDENCY}`
`43`	`44`	`}`