Merge pull request talknagish#28 from rvasseur31/update-rn-68.1

build: upgrade to react-native 0.68.1
galaxycard · Apr 25, 2022 · 7e65cf7 · 7e65cf7
2 parents ff7adfd + da15917
commit 7e65cf7
Show file tree

Hide file tree

Showing 6 changed files with 604 additions and 618 deletions.
diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle
@@ -2,6 +2,7 @@ apply plugin: "com.android.application"
 apply plugin: "com.facebook.react"
 
 import com.android.build.OutputFile
+import org.apache.tools.ant.taskdefs.condition.Os
 
 /**
  * The react.gradle file registers a task for each build variant (e.g. bundleDebugJsAndAssets
@@ -156,12 +157,17 @@ android {
                     // Make sure this target name is the same you specify inside the
                     // src/main/jni/Android.mk file for the `LOCAL_MODULE` variable.
                     targets "reactnativeturbostarter_appmodules"
+                                        // Fix for windows limit on number of character in file paths and in command lines
+                    if (Os.isFamily(Os.FAMILY_WINDOWS)) {
+                        arguments "NDK_OUT=${rootProject.projectDir.getParent()}\\.cxx",
+                            "NDK_APP_SHORT_COMMANDS=true"
+                    }
                 }
             }
             if (!enableSeparateBuildPerCPUArchitecture) {
-              ndk {
-                abiFilters (*reactNativeArchitectures())
-              }
+                ndk {
+                    abiFilters (*reactNativeArchitectures())
+                }
             }
         }
     }