Merge pull request #1 from a7urag/dev

Android build fix

Author: AmitM30

android/app/build.gradle

@@ -139,13 +139,14 @@ android {
 }
 
 dependencies {
-//    implementation fileTree(dir: "libs", include: ["*.jar"])
-//    implementation "com.android.support:appcompat-v7:${rootProject.ext.supportLibVersion}"
-//    implementation "com.facebook.react:react-native:+"  // From node_modules
     implementation fileTree(dir: "libs", include: ["*.jar"])
     implementation "com.android.support:appcompat-v7:${rootProject.ext.supportLibVersion}"
-    implementation "com.facebook.react:react-native:+"  // From node_modules
+    implementation "com.facebook.react:react-native:0.57.8"  // From node_modules
     implementation project(':react-native-navigation')
+
+    implementation "com.android.support:design:${rootProject.ext.supportLibVersion}"
+    implementation "com.android.support:appcompat-v7:${rootProject.ext.supportLibVersion}"
+    implementation "com.android.support:support-v4:${rootProject.ext.supportLibVersion}"
 }
 
 // Run this once to be able to run the application with BUCK
@@ -161,7 +162,7 @@ subprojects { subproject ->
             android {
                 variantFilter { variant ->
                     def names = variant.flavors*.name
-                    if (names.contains("reactNative51") || names.contains("reactNative57")) {
+                    if (names.contains("reactNative51") || names.contains("reactNative55")) {
                         setIgnore(true)
                     }
                 }

android/build.gradle

@@ -4,9 +4,9 @@ buildscript {
     ext {
         buildToolsVersion = "27.0.3"
         minSdkVersion = 19
-        compileSdkVersion = 26
+        compileSdkVersion = 28
         targetSdkVersion = 26
-        supportLibVersion = "26.1.0"
+        supportLibVersion = "28.0.0"
     }
     repositories {
         google()
@@ -36,6 +36,21 @@ allprojects {
     }
 }
 
+subprojects { subproject ->
+        afterEvaluate {
+                if ((subproject.plugins.hasPlugin('android') || subproject.plugins.hasPlugin('android-library'))) {
+                        android {
+                                variantFilter { variant ->
+                                        def names = variant.flavors*.name
+                                        if (names.contains("reactNative51") || names.contains("reactNative55")) {
+                                                setIgnore(true)
+                                            }
+                                    }
+                            }
+                    }
+            }
+    }
+
 
 task wrapper(type: Wrapper) {
     gradleVersion = '4.7'

android/settings.gradle

@@ -1,6 +1,4 @@
 rootProject.name = 'FridayApp'
-
-include ':app'
-
 include ':react-native-navigation'
 project(':react-native-navigation').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-navigation/lib/android/app/')
+include ':app'

package.json

@@ -31,7 +31,7 @@
   },
   "dependencies": {
     "react": "16.6.3",
-    "react-native": "0.58.1",
+    "react-native": "0.57.8",
     "react-native-navigation": "^2.8.0",
     "react-redux": "^6.0.0",
     "redux": "^4.0.1",