From 131e71652bbd4f25882f42f10c40353c06e5d7eb Mon Sep 17 00:00:00 2001 From: Jean Regisser Date: Fri, 11 Oct 2024 13:14:38 +0200 Subject: [PATCH 1/2] fix: build error with c++17 (#6590) ## Summary There was a small typo in #6553 which caused building with c++17 to still fail. ## Test plan Build works again with RN 0.72 which uses c++17. ## Notes - Fixes https://github.com/software-mansion/react-native-reanimated/issues/6512#issuecomment-2407118212 - Fixes #6584 --- .../cpp/reanimated/NativeModules/NativeReanimatedModule.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/react-native-reanimated/Common/cpp/reanimated/NativeModules/NativeReanimatedModule.cpp b/packages/react-native-reanimated/Common/cpp/reanimated/NativeModules/NativeReanimatedModule.cpp index e81700a027fe..8b203a6930d9 100644 --- a/packages/react-native-reanimated/Common/cpp/reanimated/NativeModules/NativeReanimatedModule.cpp +++ b/packages/react-native-reanimated/Common/cpp/reanimated/NativeModules/NativeReanimatedModule.cpp @@ -34,7 +34,7 @@ // Standard `__cplusplus` macro reference: // https://en.cppreference.com/w/cpp/preprocessor/replace#Predefined_macros -#if REACT_NATIVE_MINOR_VERSION >= 75 || __cplusplus >= 20202L +#if REACT_NATIVE_MINOR_VERSION >= 75 || __cplusplus >= 202002L // Implicit copy capture of `this` is deprecated in NDK27, which uses C++20. #define COPY_CAPTURE_WITH_THIS [ =, this ] // NOLINT (whitespace/braces) #else @@ -42,7 +42,7 @@ // explicitly disallows C++20 features, including the syntax above. Therefore we // fallback to the deprecated syntax here. #define COPY_CAPTURE_WITH_THIS [=] // NOLINT (whitespace/braces) -#endif // REACT_NATIVE_MINOR_VERSION >= 75 || __cplusplus >= 20202L +#endif // REACT_NATIVE_MINOR_VERSION >= 75 || __cplusplus >= 202002L using namespace facebook; From 3c5377610991d8860267876b63f8e86c12adc71f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20=C5=BBelawski?= Date: Fri, 11 Oct 2024 14:00:50 +0200 Subject: [PATCH 2/2] chore: Bump version to 3.15.5 --- packages/react-native-reanimated/package.json | 2 +- .../react-native-reanimated/src/platform-specific/jsVersion.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/react-native-reanimated/package.json b/packages/react-native-reanimated/package.json index 2c5f6a4482ba..f4f3a777171e 100644 --- a/packages/react-native-reanimated/package.json +++ b/packages/react-native-reanimated/package.json @@ -1,6 +1,6 @@ { "name": "react-native-reanimated", - "version": "3.15.4", + "version": "3.15.5", "description": "More powerful alternative to Animated library for React Native.", "scripts": { "test": "jest", diff --git a/packages/react-native-reanimated/src/platform-specific/jsVersion.ts b/packages/react-native-reanimated/src/platform-specific/jsVersion.ts index e818761f2073..e49a07357a04 100644 --- a/packages/react-native-reanimated/src/platform-specific/jsVersion.ts +++ b/packages/react-native-reanimated/src/platform-specific/jsVersion.ts @@ -4,4 +4,4 @@ * with the version used to build the native part of the library in runtime. * Remember to keep this in sync with the version declared in `package.json` */ -export const jsVersion = '3.15.4'; +export const jsVersion = '3.15.5';