File tree Expand file tree Collapse file tree 2 files changed +19
-10
lines changed Expand file tree Collapse file tree 2 files changed +19
-10
lines changed Original file line number Diff line number Diff line change @@ -22,9 +22,14 @@ class RNTModalViewManager : RNTModalViewManagerSpec<RNTModalView>() {
2222 override fun getExportedCustomDirectEventTypeConstants (): MutableMap <String , Any > {
2323 val buildOf = " registrationName"
2424
25- return MapBuilder .builder<String , Any >()
25+ val map = MapBuilder .builder<String , Any >()
2626 .put(PressBackEvent .NAME , MapBuilder .of(buildOf, PressBackEvent .REGISTRATION_NAME ))
2727 .build()
28+
29+ return when (map) {
30+ is MutableMap <String , Any > -> map
31+ else -> map.toMutableMap()
32+ }
2833 }
2934
3035 override fun onDropViewInstance (view : RNTModalView ) {
Original file line number Diff line number Diff line change @@ -74,15 +74,19 @@ else()
7474 )
7575endif ()
7676
77- target_compile_options (
78- ${LIB_TARGET_NAME}
79- PRIVATE
80- -DLOG_TAG=\"ReactNative\"
81- -fexceptions
82- -frtti
83- -std=c++20
84- -Wall
85- )
77+ if (ReactAndroid_VERSION_MINOR GREATER_EQUAL 81)
78+ target_compile_reactnative_options(${LIB_TARGET_NAME} PRIVATE )
79+ else ()
80+ target_compile_options (
81+ ${LIB_TARGET_NAME}
82+ PRIVATE
83+ -DLOG_TAG=\"ReactNative\"
84+ -fexceptions
85+ -frtti
86+ -std=c++20
87+ -Wall
88+ )
89+ endif ()
8690
8791target_include_directories (
8892 ${CMAKE_PROJECT_NAME}
You can’t perform that action at this time.
0 commit comments