Skip to content

Commit bbf184d

Browse files
committed
Bump examples to React Native 0.81 (#3676)
This PR bumps example apps (except macos) to React Native 0.81. Tested on example apps.
1 parent 017114d commit bbf184d

File tree

9 files changed

+871
-1070
lines changed

9 files changed

+871
-1070
lines changed
Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
diff --git a/android/src/main/jni/CMakeLists.txt b/android/src/main/jni/CMakeLists.txt
2+
index f720c8e8808c01eab3446b0a819f48aa355077de..0484a6409c2c92ab6971a9b8d607e800a54dea9c 100644
3+
--- a/android/src/main/jni/CMakeLists.txt
4+
+++ b/android/src/main/jni/CMakeLists.txt
5+
@@ -9,15 +9,6 @@ set(LIB_COMMON_DIR ${LIB_ANDROID_DIR}/../common/cpp)
6+
set(LIB_ANDROID_GENERATED_JNI_DIR ${LIB_ANDROID_DIR}/build/generated/source/codegen/jni)
7+
set(LIB_ANDROID_GENERATED_COMPONENTS_DIR ${LIB_ANDROID_GENERATED_JNI_DIR}/react/renderer/components/${LIB_LITERAL})
8+
9+
-add_compile_options(
10+
- -fexceptions
11+
- -frtti
12+
- -std=c++20
13+
- -Wall
14+
- -Wpedantic
15+
- -Wno-gnu-zero-variadic-macro-arguments
16+
-)
17+
-
18+
file(GLOB LIB_CUSTOM_SRCS CONFIGURE_DEPENDS *.cpp ${LIB_COMMON_DIR}/react/renderer/components/${LIB_LITERAL}/*.cpp)
19+
file(GLOB LIB_CODEGEN_SRCS CONFIGURE_DEPENDS ${LIB_ANDROID_GENERATED_JNI_DIR}/*.cpp ${LIB_ANDROID_GENERATED_COMPONENTS_DIR}/*.cpp)
20+
21+
@@ -70,6 +61,21 @@ else()
22+
)
23+
endif()
24+
25+
+if(ReactAndroid_VERSION_MINOR GREATER_EQUAL 80)
26+
+ target_compile_reactnative_options(${LIB_TARGET_NAME} PUBLIC)
27+
+else()
28+
+ target_compile_options(
29+
+ ${LIB_TARGET_NAME}
30+
+ PRIVATE
31+
+ -fexceptions
32+
+ -frtti
33+
+ -std=c++20
34+
+ -Wall
35+
+ -Wpedantic
36+
+ -Wno-gnu-zero-variadic-macro-arguments
37+
+ )
38+
+endif()
39+
+
40+
target_compile_options(
41+
${LIB_TARGET_NAME}
42+
PRIVATE

0 commit comments

Comments
 (0)