react-native 0.68.0-rc.4 → 0.68.2

package/Libraries/Core/ReactNativeVersion.js

@@ -12,6 +12,6 @@
 exports.version = {
   major: 0,
   minor: 68,
-  patch: 0,
-  prerelease: 'rc.4',
+  patch: 2,
+  prerelease: null,
 };

package/React/Base/RCTVersion.m

@@ -23,8 +23,8 @@ NSDictionary* RCTGetReactNativeVersion(void)
     __rnVersion = @{
                   RCTVersionMajor: @(0),
                   RCTVersionMinor: @(68),
-                  RCTVersionPatch: @(0),
-                  RCTVersionPrerelease: @"rc.4",
+                  RCTVersionPatch: @(2),
+                  RCTVersionPrerelease: [NSNull null],
                   };
   });
   return __rnVersion;

package/ReactAndroid/build.gradle

@@ -281,10 +281,13 @@ task androidSourcesJar(type: Jar) {
 android {
     compileSdkVersion 31
 
-    // Used to override the NDK path & version on internal CI
-    if (System.getenv("ANDROID_NDK") != null && System.getenv("LOCAL_ANDROID_NDK_VERSION") != null) {
-        ndkPath System.getenv("ANDROID_NDK")
-        ndkVersion System.getenv("LOCAL_ANDROID_NDK_VERSION")
+    // Used to override the NDK path/version on internal CI or by allowing
+    // users to customize the NDK path/version from their root project (e.g. for M1 support)
+    if (rootProject.hasProperty("ndkPath")) {
+        ndkPath rootProject.ext.ndkPath
+    }
+    if (rootProject.hasProperty("ndkVersion")) {
+        ndkVersion rootProject.ext.ndkVersion
     }
 
     defaultConfig {
@@ -318,6 +321,11 @@ android {
                     // This flag will suppress "fcntl(): Bad file descriptor" warnings on local builds.
                     arguments "--output-sync=none"
                 }
+
+                // Fix for windows limit on number of character in file paths and in command lines
+                if (Os.isFamily(Os.FAMILY_WINDOWS)) {
+                    arguments "NDK_APP_SHORT_COMMANDS=true"
+                }
             }
         }
         ndk {

package/ReactAndroid/gradle.properties

@@ -1,4 +1,4 @@
-VERSION_NAME=0.68.0-rc.4
+VERSION_NAME=0.68.2
 GROUP=com.facebook.react
 
 POM_NAME=ReactNative

package/ReactAndroid/src/main/java/com/facebook/hermes/instrumentation/Android.mk

@@ -13,6 +13,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := jsijniprofiler
 
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH) $(REACT_NATIVE)/ReactCommon/jsi $(call find-node-module,$(LOCAL_PATH),hermes-engine)/android/include
 

package/ReactAndroid/src/main/java/com/facebook/hermes/reactexecutor/Android.mk

@@ -12,6 +12,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := hermes-executor-release
 
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH) $(REACT_NATIVE)/ReactCommon/jsi $(call find-node-module,$(LOCAL_PATH),hermes-engine)/android/include
 
@@ -35,6 +36,7 @@ LOCAL_MODULE := hermes-executor-debug
 LOCAL_CFLAGS := -DHERMES_ENABLE_DEBUGGER=1
 
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH) $(REACT_NATIVE)/ReactCommon/jsi $(call find-node-module,$(LOCAL_PATH),hermes-engine)/android/include
 

package/ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/jni/Android.mk

@@ -10,6 +10,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := mapbufferjni
 
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/react/common/mapbuffer/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_SHARED_LIBRARIES := \
   libfb \

package/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/Android.mk

@@ -10,6 +10,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := fabricjni
 
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_SHARED_LIBRARIES := \
   libbutter \

package/ReactAndroid/src/main/java/com/facebook/react/jscexecutor/Android.mk

@@ -10,6 +10,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := jscexecutor
 
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)
 

package/ReactAndroid/src/main/java/com/facebook/react/modules/blob/jni/Android.mk

@@ -10,6 +10,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := reactnativeblob
 
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)
 

package/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/ReactNativeVersion.java

@@ -17,6 +17,6 @@ public class ReactNativeVersion {
   public static final Map<String, Object> VERSION = MapBuilder.<String, Object>of(
       "major", 0,
       "minor", 68,
-      "patch", 0,
-      "prerelease", "rc.4");
+      "patch", 2,
+      "prerelease", null);
 }

package/ReactAndroid/src/main/java/com/facebook/react/reactperflogger/jni/Android.mk

@@ -26,6 +26,7 @@ LOCAL_MODULE := reactperfloggerjni
 
 # Compile all local c++ files
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/reactperflogger/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 # Build the files in this directory as a shared library
 include $(BUILD_SHARED_LIBRARY)

package/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/Android.mk

@@ -28,6 +28,7 @@ LOCAL_MODULE := callinvokerholder
 
 # Compile all local c++ files
 LOCAL_SRC_FILES := $(LOCAL_PATH)/ReactCommon/CallInvokerHolder.cpp
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 # Build the files in this directory as a shared library
 include $(BUILD_STATIC_LIBRARY)
@@ -56,6 +57,7 @@ LOCAL_STATIC_LIBRARIES = libcallinvokerholder libreactperfloggerjni
 
 # Compile all local c++ files
 LOCAL_SRC_FILES := $(LOCAL_PATH)/ReactCommon/TurboModuleManager.cpp $(LOCAL_PATH)/ReactCommon/OnLoad.cpp
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 # Build the files in this directory as a shared library
 include $(BUILD_SHARED_LIBRARY)

package/ReactAndroid/src/main/java/com/facebook/react/uimanager/jni/Android.mk

@@ -10,6 +10,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := uimanagerjni
 
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_SHARED_LIBRARIES := \
   libfb \

package/ReactAndroid/src/main/jni/first-party/yogajni/Android.mk

@@ -10,6 +10,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := yoga
 
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/jni/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/jni
 

package/ReactAndroid/src/main/jni/react/jni/Android.mk

@@ -47,6 +47,7 @@ LOCAL_MODULE := reactnativeutilsjni
 
 # Compile all local c++ files.
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 ifeq ($(APP_OPTIM),debug)
   # Keep symbols by overriding the strip command invoked by ndk-build.
@@ -106,6 +107,7 @@ LOCAL_MODULE := reactnativejni
 
 # Compile all local c++ files.
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 ifeq ($(APP_OPTIM),debug)
   # Keep symbols by overriding the strip command invoked by ndk-build.

package/ReactAndroid/src/main/jni/third-party/boost/Android.mk

@@ -5,6 +5,7 @@ include $(CLEAR_VARS)
 # because the react native version does not include anything outside of headers.
 # They are required for Folly futures to compile successfully.
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/asm/$(TARGET_ARCH)/*.S)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/boost_1_63_0
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/boost_1_63_0

package/ReactCommon/butter/Android.mk

@@ -10,6 +10,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := butter
 
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/

package/ReactCommon/cxxreact/Android.mk

@@ -10,6 +10,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := reactnative
 
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/..
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_C_INCLUDES)

package/ReactCommon/cxxreact/ReactNativeVersion.h

@@ -17,8 +17,8 @@ namespace facebook::react {
 constexpr struct {
   int32_t Major = 0;
   int32_t Minor = 68;
-  int32_t Patch = 0;
-  std::string_view Prerelease = "rc.4";
+  int32_t Patch = 2;
+  std::string_view Prerelease = "";
 } ReactNativeVersion;
 
 } // namespace facebook::react

package/ReactCommon/hermes/executor/Android.mk

@@ -12,6 +12,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := hermes-executor-common-release
 
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH) $(REACT_NATIVE)/ReactCommon/jsi $(call find-node-module,$(LOCAL_PATH),hermes-engine)/android/include
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)
@@ -27,6 +28,7 @@ LOCAL_MODULE := hermes-executor-common-debug
 LOCAL_CFLAGS := -DHERMES_ENABLE_DEBUGGER=1
 
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH) $(REACT_NATIVE)/ReactCommon/jsi $(call find-node-module,$(LOCAL_PATH),hermes-engine)/android/include
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)

package/ReactCommon/hermes/inspector/Android.mk

@@ -12,6 +12,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := hermes-inspector
 
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp $(LOCAL_PATH)/detail/*.cpp $(LOCAL_PATH)/chrome/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_C_ROOT := $(LOCAL_PATH)/../..
 

package/ReactCommon/jsi/Android.mk

@@ -10,6 +10,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := jsi
 
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/jsi/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)
@@ -25,6 +26,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := jscruntime
 
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)

package/ReactCommon/jsiexecutor/Android.mk

@@ -10,6 +10,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := jsireact
 
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/jsireact/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_C_INCLUDES)

package/ReactCommon/jsinspector/Android.mk

@@ -10,6 +10,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := jsinspector
 
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/..
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_C_INCLUDES)

package/ReactCommon/logger/Android.mk

@@ -10,6 +10,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := logger
 
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/..
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_C_INCLUDES)

package/ReactCommon/react/config/Android.mk

@@ -10,6 +10,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := react_config
 
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../

package/ReactCommon/react/debug/Android.mk

@@ -12,6 +12,7 @@ LOCAL_MODULE := react_debug
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../../
 
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../../
 

package/ReactCommon/react/nativemodule/core/Android.mk

@@ -12,6 +12,7 @@ LOCAL_MODULE := react_nativemodule_core
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../../ $(LOCAL_PATH)/ReactCommon $(LOCAL_PATH)/platform/android/ReactCommon
 
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/ReactCommon/*.cpp) $(wildcard $(LOCAL_PATH)/platform/android/ReactCommon/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) $(LOCAL_PATH)/platform/android/
 

package/ReactCommon/react/nativemodule/samples/platform/android/Android.mk

@@ -9,6 +9,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := sampleturbomodule
 LOCAL_C_INCLUDES := $(LOCAL_PATH)
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/ReactCommon/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)
 LOCAL_SHARED_LIBRARIES := \
   libfbjni \

package/ReactCommon/react/renderer/animations/Android.mk

@@ -10,6 +10,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := react_render_animations
 
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../../

package/ReactCommon/react/renderer/attributedstring/Android.mk

@@ -10,6 +10,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := react_render_attributedstring
 
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../../

package/ReactCommon/react/renderer/componentregistry/Android.mk

@@ -12,6 +12,7 @@ LOCAL_MODULE := react_render_componentregistry
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../../
 
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../../
 

package/ReactCommon/react/renderer/componentregistry/native/Android.mk

@@ -12,6 +12,7 @@ LOCAL_MODULE := rrc_native
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../../../
 
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../../../
 

package/ReactCommon/react/renderer/components/image/Android.mk

@@ -10,6 +10,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := rrc_image
 
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../../../

package/ReactCommon/react/renderer/components/modal/Android.mk

@@ -10,6 +10,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := rrc_modal
 
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../../../

package/ReactCommon/react/renderer/components/progressbar/Android.mk

@@ -10,6 +10,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := rrc_progressbar
 
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/android/react/renderer/components/progressbar/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/android/
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/android/

package/ReactCommon/react/renderer/components/root/Android.mk

@@ -10,6 +10,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := rrc_root
 
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../../../

package/ReactCommon/react/renderer/components/scrollview/Android.mk

@@ -10,6 +10,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := rrc_scrollview
 
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../../../

package/ReactCommon/react/renderer/components/slider/Android.mk

@@ -10,6 +10,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := rrc_slider
 
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp) $(wildcard $(LOCAL_PATH)/platform/android/react/renderer/components/slider/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/ $(LOCAL_PATH)/platform/android/
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../../../ $(LOCAL_PATH)/platform/android/

package/ReactCommon/react/renderer/components/switch/Android.mk

@@ -10,6 +10,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := rrc_switch
 
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/androidswitch/react/renderer/components/androidswitch/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/androidswitch/
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/androidswitch/

package/ReactCommon/react/renderer/components/text/Android.mk

@@ -10,6 +10,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := rrc_text
 
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../../../

package/ReactCommon/react/renderer/components/textinput/Android.mk

@@ -10,6 +10,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := rrc_textinput
 
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/androidtextinput/react/renderer/components/androidtextinput/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/androidtextinput/react/renderer/components/androidtextinput/
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/androidtextinput/

package/ReactCommon/react/renderer/components/unimplementedview/Android.mk

@@ -10,6 +10,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := rrc_unimplementedview
 
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../../../

package/ReactCommon/react/renderer/components/view/Android.mk

@@ -10,6 +10,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := rrc_view
 
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../../../
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../../../

package/ReactCommon/react/renderer/core/Android.mk

@@ -12,6 +12,7 @@ LOCAL_MODULE := react_render_core
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../../
 
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../../
 

package/ReactCommon/react/renderer/debug/Android.mk

@@ -12,6 +12,7 @@ LOCAL_MODULE := react_render_debug
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../../
 
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../../
 

package/ReactCommon/react/renderer/graphics/Android.mk

@@ -10,6 +10,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := react_render_graphics
 
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp $(LOCAL_PATH)/platform/cxx/react/renderer/graphics/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_SHARED_LIBRARIES := \
   glog \

package/ReactCommon/react/renderer/imagemanager/Android.mk

@@ -10,6 +10,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := react_render_imagemanager
 
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp $(LOCAL_PATH)/platform/cxx/react/renderer/imagemanager/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_SHARED_LIBRARIES := \
   libfolly_json \

package/ReactCommon/react/renderer/leakchecker/Android.mk

@@ -12,6 +12,7 @@ LOCAL_MODULE := react_render_leakchecker
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../../
 
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../../
 

package/ReactCommon/react/renderer/mapbuffer/Android.mk

@@ -10,6 +10,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := react_render_mapbuffer
 
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../../
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../../

package/ReactCommon/react/renderer/mounting/Android.mk

@@ -10,6 +10,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := react_render_mounting
 
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../../

package/ReactCommon/react/renderer/runtimescheduler/Android.mk

@@ -12,6 +12,7 @@ LOCAL_MODULE := react_render_runtimescheduler
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../../
 
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../../
 

package/ReactCommon/react/renderer/scheduler/Android.mk

@@ -10,6 +10,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := react_render_scheduler
 
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../../

package/ReactCommon/react/renderer/telemetry/Android.mk

@@ -10,6 +10,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := react_render_telemetry
 
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../../

package/ReactCommon/react/renderer/templateprocessor/Android.mk

@@ -10,6 +10,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := react_render_templateprocessor
 
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../../

package/ReactCommon/react/renderer/textlayoutmanager/Android.mk

@@ -10,6 +10,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := react_render_textlayoutmanager
 
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp $(LOCAL_PATH)/platform/android/react/renderer/textlayoutmanager/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_SHARED_LIBRARIES := \
   glog \

package/ReactCommon/react/renderer/uimanager/Android.mk

@@ -10,6 +10,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := react_render_uimanager
 
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../../

package/ReactCommon/react/renderer/uimanager/UIManager.cpp

@@ -22,6 +22,13 @@
 
 namespace facebook::react {
 
+// Explicitly define destructors here, as they to exist in order to act as a
+// "key function" for the ShadowNodeWrapper class -- this allow for RTTI to work
+// properly across dynamic library boundaries (i.e. dynamic_cast that is used by
+// isHostObject method)
+ShadowNodeWrapper::~ShadowNodeWrapper() = default;
+ShadowNodeListWrapper::~ShadowNodeListWrapper() = default;
+
 static std::unique_ptr<LeakChecker> constructLeakCheckerIfNeeded(
     RuntimeExecutor const &runtimeExecutor) {
 #ifdef REACT_NATIVE_DEBUG

package/ReactCommon/react/renderer/uimanager/primitives.h

@@ -30,6 +30,11 @@ struct ShadowNodeWrapper : public jsi::HostObject {
   ShadowNodeWrapper(SharedShadowNode shadowNode)
       : shadowNode(std::move(shadowNode)) {}
 
+  // The below method needs to be implemented out-of-line in order for the class
+  // to have at least one "key function" (see
+  // https://itanium-cxx-abi.github.io/cxx-abi/abi.html#vague-vtable)
+  ~ShadowNodeWrapper() override;
+
   ShadowNode::Shared shadowNode;
 };
 
@@ -37,6 +42,11 @@ struct ShadowNodeListWrapper : public jsi::HostObject {
   ShadowNodeListWrapper(SharedShadowNodeUnsharedList shadowNodeList)
       : shadowNodeList(shadowNodeList) {}
 
+  // The below method needs to be implemented out-of-line in order for the class
+  // to have at least one "key function" (see
+  // https://itanium-cxx-abi.github.io/cxx-abi/abi.html#vague-vtable)
+  ~ShadowNodeListWrapper() override;
+
   SharedShadowNodeUnsharedList shadowNodeList;
 };
 

package/ReactCommon/react/utils/Android.mk

@@ -10,6 +10,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := react_utils
 
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH) $(LOCAL_PATH)/../../
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../

package/ReactCommon/reactperflogger/Android.mk

@@ -20,6 +20,7 @@ LOCAL_MODULE := reactperflogger
 
 # Compile all local c++ files under ./ReactCommon
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/reactperflogger/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 # Build the files in this directory as a shared library
 include $(BUILD_STATIC_LIBRARY)

package/ReactCommon/yoga/Android.mk

@@ -11,6 +11,7 @@ LOCAL_MODULE := yogacore
 
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/yoga/*.cpp)
 LOCAL_SRC_FILES += $(wildcard $(LOCAL_PATH)/yoga/*/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_C_INCLUDES)

package/android/com/facebook/react/react-native/0.68.2/react-native-0.68.2-sources.jar.md5

@@ -0,0 +1 @@
+00c463ff871e0304a451c9dacff46ce1

package/android/com/facebook/react/react-native/0.68.2/react-native-0.68.2-sources.jar.sha1

@@ -0,0 +1 @@
+adf0d286c68566df24959324849d01de574b45e3

package/android/com/facebook/react/react-native/0.68.2/react-native-0.68.2-sources.jar.sha256

@@ -0,0 +1 @@
+346f21bdb20c96ee71bcf6d79b6366ce43d5d5f09e30d8452c7fa5402f74c397

package/android/com/facebook/react/react-native/0.68.2/react-native-0.68.2-sources.jar.sha512

@@ -0,0 +1 @@
+a9a21e5dab561ed6157cea21b331cf26a4c02f56f474c0cfcb73488b472ed3539ccb8956241a3c47ce788e604828b44736c24b196a0469d718086ed171be80e4

package/android/com/facebook/react/react-native/0.68.2/react-native-0.68.2.aar.md5

@@ -0,0 +1 @@
+d666afe8cd0cc343ccb5a563ba6ec0de

package/android/com/facebook/react/react-native/0.68.2/react-native-0.68.2.aar.sha1

@@ -0,0 +1 @@
+4280fad14bfe5be0c48e726b9a3198c3cf14b656

package/android/com/facebook/react/react-native/0.68.2/react-native-0.68.2.aar.sha256

@@ -0,0 +1 @@
+9b66dd0a4da6f0f2f91b9d80a2b0f3f9cb0b9dce61d82b18a53b8291978d58fc

package/android/com/facebook/react/react-native/0.68.2/react-native-0.68.2.aar.sha512

@@ -0,0 +1 @@
+3a382af29982d6cbbee62463d499f8d29be1ebc64a1633b07a470c3cb3686d5c1aa101902c43dc1512f4fa5957c5e35b910f847cf0fd0aff223417eea78c782a

package/android/com/facebook/react/react-native/{0.68.0-rc.4/react-native-0.68.0-rc.4.module → 0.68.2/react-native-0.68.2.module}

@@ -3,7 +3,7 @@
   "component": {
     "group": "com.facebook.react",
     "module": "react-native",
-    "version": "0.68.0-rc.4",
+    "version": "0.68.2",
     "attributes": {
       "org.gradle.status": "release"
     }
@@ -131,13 +131,13 @@
       ],
       "files": [
         {
-          "name": "react-native-0.68.0-rc.4.aar",
-          "url": "react-native-0.68.0-rc.4.aar",
-          "size": 16395231,
-          "sha512": "7684c75039e3b9ec07cdfd39214e04f28730285bbe5773a55b18fd278db8cef339a39285f0baaecdabf01a205cbdfc704539288ae03b020725ca07f79b704414",
-          "sha256": "5828625bb3c9ac9d98b6de0b2559dfd63af35ea19811af169eecad1e509ac12e",
-          "sha1": "88f701d2a7428778ad561ba69f7b4aad80a4a74b",
-          "md5": "21bbd956d29f733e5079798166b5b221"
+          "name": "react-native-0.68.2.aar",
+          "url": "react-native-0.68.2.aar",
+          "size": 16395325,
+          "sha512": "3a382af29982d6cbbee62463d499f8d29be1ebc64a1633b07a470c3cb3686d5c1aa101902c43dc1512f4fa5957c5e35b910f847cf0fd0aff223417eea78c782a",
+          "sha256": "9b66dd0a4da6f0f2f91b9d80a2b0f3f9cb0b9dce61d82b18a53b8291978d58fc",
+          "sha1": "4280fad14bfe5be0c48e726b9a3198c3cf14b656",
+          "md5": "d666afe8cd0cc343ccb5a563ba6ec0de"
         }
       ]
     },
@@ -258,13 +258,13 @@
       ],
       "files": [
         {
-          "name": "react-native-0.68.0-rc.4.aar",
-          "url": "react-native-0.68.0-rc.4.aar",
-          "size": 16395231,
-          "sha512": "7684c75039e3b9ec07cdfd39214e04f28730285bbe5773a55b18fd278db8cef339a39285f0baaecdabf01a205cbdfc704539288ae03b020725ca07f79b704414",
-          "sha256": "5828625bb3c9ac9d98b6de0b2559dfd63af35ea19811af169eecad1e509ac12e",
-          "sha1": "88f701d2a7428778ad561ba69f7b4aad80a4a74b",
-          "md5": "21bbd956d29f733e5079798166b5b221"
+          "name": "react-native-0.68.2.aar",
+          "url": "react-native-0.68.2.aar",
+          "size": 16395325,
+          "sha512": "3a382af29982d6cbbee62463d499f8d29be1ebc64a1633b07a470c3cb3686d5c1aa101902c43dc1512f4fa5957c5e35b910f847cf0fd0aff223417eea78c782a",
+          "sha256": "9b66dd0a4da6f0f2f91b9d80a2b0f3f9cb0b9dce61d82b18a53b8291978d58fc",
+          "sha1": "4280fad14bfe5be0c48e726b9a3198c3cf14b656",
+          "md5": "d666afe8cd0cc343ccb5a563ba6ec0de"
         }
       ]
     }

package/android/com/facebook/react/react-native/0.68.2/react-native-0.68.2.module.md5

@@ -0,0 +1 @@
+a9cf9e60e16064fef22766a1ab4b2962

package/android/com/facebook/react/react-native/0.68.2/react-native-0.68.2.module.sha1

@@ -0,0 +1 @@
+4c6983eba482e2e4cb39a10b0a0ffce014e4b30e

package/android/com/facebook/react/react-native/0.68.2/react-native-0.68.2.module.sha256

@@ -0,0 +1 @@
+9542c7bab4d20071b9915c6bb624067cf9160271ebf02dd63ed81bf70444cd90

package/android/com/facebook/react/react-native/0.68.2/react-native-0.68.2.module.sha512

@@ -0,0 +1 @@
+2f07244d0bdfc10ab83deb415f686f3a0e2e845400456df8aa9a646c6ebb5f08b7a1d5bd03ac4160b5183d6c0ea9ab33a6631cb64992d1b1980f5a73d87f0db3

package/android/com/facebook/react/react-native/{0.68.0-rc.4/react-native-0.68.0-rc.4.pom → 0.68.2/react-native-0.68.2.pom}

@@ -9,7 +9,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.facebook.react</groupId>
   <artifactId>react-native</artifactId>
-  <version>0.68.0-rc.4</version>
+  <version>0.68.2</version>
   <packaging>aar</packaging>
   <name>ReactNative</name>
   <description>A framework for building native apps with React</description>

package/android/com/facebook/react/react-native/0.68.2/react-native-0.68.2.pom.md5

@@ -0,0 +1 @@
+fd65034eccc6c3ae104fd76ef9aa451d

package/android/com/facebook/react/react-native/0.68.2/react-native-0.68.2.pom.sha1

@@ -0,0 +1 @@
+ee236855ea6fd44906b6bb7f0d87cf69ec44d09d

package/android/com/facebook/react/react-native/0.68.2/react-native-0.68.2.pom.sha256

@@ -0,0 +1 @@
+210584bb40ca9aa7865f8fd095ba4f10b8a2fcf9940a9d906df6b122fc1e466a

package/android/com/facebook/react/react-native/0.68.2/react-native-0.68.2.pom.sha512

@@ -0,0 +1 @@
+e8b67488f4a6aa0894b378af89f6c0567c479ac920297eb9c0626a6d7892fed6857606f7e46aca5a7ed00a4bb30ca638e0a82b5956d99e7683976fb339aca1cf

package/android/com/facebook/react/react-native/maven-metadata.xml

@@ -3,11 +3,11 @@
   <groupId>com.facebook.react</groupId>
   <artifactId>react-native</artifactId>
   <versioning>
-    <latest>0.68.0-rc.4</latest>
-    <release>0.68.0-rc.4</release>
+    <latest>0.68.2</latest>
+    <release>0.68.2</release>
     <versions>
-      <version>0.68.0-rc.4</version>
+      <version>0.68.2</version>
     </versions>
-    <lastUpdated>20220325145553</lastUpdated>
+    <lastUpdated>20220509105732</lastUpdated>
   </versioning>
 </metadata>

package/android/com/facebook/react/react-native/maven-metadata.xml.md5

@@ -1 +1 @@
-61f8e5a1bfd4bd678d2d2dc4e4bd10e4
+ef5062e498ae4be27a17bacf2e096fc8

package/android/com/facebook/react/react-native/maven-metadata.xml.sha1

@@ -1 +1 @@
-98d9276424850b7afa9efbbfa932fe0c28eb3feb
+f3c786068cbdc323a3805bda66cffd764ae65bdb

package/android/com/facebook/react/react-native/maven-metadata.xml.sha256

@@ -1 +1 @@
-9333d75067ea241417ed137094080f0062ba3a1ebed316d838d920b8205665ac
+b7162463007967e5fc1da7682340a8b2fa7a523f699bc0b5f35bd089f58b2491

package/android/com/facebook/react/react-native/maven-metadata.xml.sha512

@@ -1 +1 @@
-16afea73a6fe60bd742ba7d2cf8144e8df3abcf1a9aa3d9651beb23346e567ba590ce9bad8523f5964c0a855b09fe77820d7c962de1466c678894dc87cb343a0
+b28446aa21a39f5f5b9d605d80cfad7cf47a308b1656dc5120c844552fea54345cd7306f854982c5ae6c88cd96e40d839f71bcce13e8743f6b2aab94a06b8608

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native",
-  "version": "0.68.0-rc.4",
+  "version": "0.68.2",
   "bin": "./cli.js",
   "description": "A framework for building native apps using React",
   "license": "MIT",
@@ -108,16 +108,16 @@
     "pretty-format": "^26.5.2",
     "promise": "^8.0.3",
     "react-devtools-core": "^4.23.0",
-    "react-native-gradle-plugin": "^0.0.5",
+    "react-native-gradle-plugin": "^0.0.6",
     "react-refresh": "^0.4.0",
     "react-shallow-renderer": "16.14.1",
     "regenerator-runtime": "^0.13.2",
     "scheduler": "^0.20.2",
     "stacktrace-parser": "^0.1.3",
-    "use-subscription": "^1.0.0",
+    "use-subscription": ">=1.0.0 <1.6.0",
     "whatwg-fetch": "^3.0.0",
     "ws": "^6.1.4",
-    "react-native-codegen": "^0.0.13"
+    "react-native-codegen": "^0.0.17"
   },
   "devDependencies": {
     "flow-bin": "^0.170.0",

package/template/Gemfile.lock

@@ -3,7 +3,7 @@ GEM
   specs:
     CFPropertyList (3.0.5)
       rexml
-    activesupport (6.1.5)
+    activesupport (6.1.5.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -45,7 +45,7 @@ GEM
       public_suffix (~> 4.0)
       typhoeus (~> 1.0)
     cocoapods-deintegrate (1.0.5)
-    cocoapods-downloader (1.6.1)
+    cocoapods-downloader (1.6.3)
     cocoapods-plugins (1.0.0)
       nap
     cocoapods-search (1.0.1)
@@ -71,7 +71,7 @@ GEM
     nanaimo (0.3.0)
     nap (1.1.0)
     netrc (0.11.0)
-    public_suffix (4.0.6)
+    public_suffix (4.0.7)
     rexml (3.2.5)
     ruby-macho (2.5.1)
     typhoeus (1.4.0)

package/template/android/app/build.gradle

@@ -1,6 +1,7 @@
 apply plugin: "com.android.application"
 
 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
@@ -157,6 +158,15 @@ 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 "helloworld_appmodules"
+                    // Fix for windows limit on number of character in file paths and in command lines
+                    if (Os.isFamily(Os.FAMILY_WINDOWS)) {
+                        arguments "NDK_APP_SHORT_COMMANDS=true"
+                    }
+                }
+            }
+            if (!enableSeparateBuildPerCPUArchitecture) {
+                ndk {
+                    abiFilters (*reactNativeArchitectures())
                 }
             }
         }

package/template/android/build.gradle

@@ -1,3 +1,5 @@
+import org.apache.tools.ant.taskdefs.condition.Os
+
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
@@ -6,7 +8,14 @@ buildscript {
         minSdkVersion = 21
         compileSdkVersion = 31
         targetSdkVersion = 31
-        ndkVersion = "21.4.7075529"
+
+        if (System.properties['os.arch'] == "aarch64") {
+            // For M1 Users we need to use the NDK 24 which added support for aarch64
+            ndkVersion = "24.0.8215888"
+        } else {
+            // Otherwise we default to the side-by-side NDK version from AGP.
+            ndkVersion = "21.4.7075529"
+        }
     }
     repositories {
         google()

package/template/package.json

@@ -11,7 +11,7 @@
   },
   "dependencies": {
     "react": "17.0.2",
-    "react-native": "0.68.0-rc.4"
+    "react-native": "0.68.2"
   },
   "devDependencies": {
     "@babel/core": "^7.12.9",

package/android/com/facebook/react/react-native/0.68.0-rc.4/react-native-0.68.0-rc.4-sources.jar.md5

@@ -1 +0,0 @@
-061d9969695be61bee0e5e1da9fdea79

package/android/com/facebook/react/react-native/0.68.0-rc.4/react-native-0.68.0-rc.4-sources.jar.sha1

@@ -1 +0,0 @@
-150b7a188a54d40798935d447e3047e995334422

package/android/com/facebook/react/react-native/0.68.0-rc.4/react-native-0.68.0-rc.4-sources.jar.sha256

@@ -1 +0,0 @@
-618f6eb909a92a352bbb839c00cd0f4b776a6123642352baf2bee0ed874de0f6

package/android/com/facebook/react/react-native/0.68.0-rc.4/react-native-0.68.0-rc.4-sources.jar.sha512

@@ -1 +0,0 @@
-5b224b392a51e5fab6ad43f5c9d1ffb0df9786336785e85b1abcc7cf4a572c2193766068c24ad00649940369bbd3d042e9011de2c0408009de74d4cc0d82ad28

package/android/com/facebook/react/react-native/0.68.0-rc.4/react-native-0.68.0-rc.4.aar.md5

@@ -1 +0,0 @@
-21bbd956d29f733e5079798166b5b221

package/android/com/facebook/react/react-native/0.68.0-rc.4/react-native-0.68.0-rc.4.aar.sha1

@@ -1 +0,0 @@
-88f701d2a7428778ad561ba69f7b4aad80a4a74b

package/android/com/facebook/react/react-native/0.68.0-rc.4/react-native-0.68.0-rc.4.aar.sha256

@@ -1 +0,0 @@
-5828625bb3c9ac9d98b6de0b2559dfd63af35ea19811af169eecad1e509ac12e

package/android/com/facebook/react/react-native/0.68.0-rc.4/react-native-0.68.0-rc.4.aar.sha512

@@ -1 +0,0 @@
-7684c75039e3b9ec07cdfd39214e04f28730285bbe5773a55b18fd278db8cef339a39285f0baaecdabf01a205cbdfc704539288ae03b020725ca07f79b704414

package/android/com/facebook/react/react-native/0.68.0-rc.4/react-native-0.68.0-rc.4.module.md5

@@ -1 +0,0 @@
-ea227da923feb56c842bca62a5edbdf8

package/android/com/facebook/react/react-native/0.68.0-rc.4/react-native-0.68.0-rc.4.module.sha1

@@ -1 +0,0 @@
-166f02b50fc554b52c51d4415462181f08e37ada

package/android/com/facebook/react/react-native/0.68.0-rc.4/react-native-0.68.0-rc.4.module.sha256

@@ -1 +0,0 @@
-28869b35c16971c8a71a5065cdc54711c72239daf8a6bf8e3b6b454225a6625d

package/android/com/facebook/react/react-native/0.68.0-rc.4/react-native-0.68.0-rc.4.module.sha512

@@ -1 +0,0 @@
-9bfeb1156cdf69f64b8efe53dfee2b65922bd845a067c76faa78412b71e854144ccf970669ce2d90ecad5eba7bf448b1fa8fe8c6b1676156c24003e473618ab8

package/android/com/facebook/react/react-native/0.68.0-rc.4/react-native-0.68.0-rc.4.pom.md5

@@ -1 +0,0 @@
-ef0589b2d1fe974acc20fb19ae30797f

package/android/com/facebook/react/react-native/0.68.0-rc.4/react-native-0.68.0-rc.4.pom.sha1

@@ -1 +0,0 @@
-b2bfa3ece500979326dedf024d52780f20289959

package/android/com/facebook/react/react-native/0.68.0-rc.4/react-native-0.68.0-rc.4.pom.sha256

@@ -1 +0,0 @@
-21461eb4d8808531bb3d540bb6108519ce2006b76569e732193448fa57d23492

package/android/com/facebook/react/react-native/0.68.0-rc.4/react-native-0.68.0-rc.4.pom.sha512

@@ -1 +0,0 @@
-a337720a2e0f8aada7e7cbd965b69bb51af5299d962e1062f573acf179a010b8e7474b1a0dfea0fa1d15c82998e75e2f241276ccc10bbee0044f79c0987025ae