Skip to content

Commit f829572

Browse files
chore: update mendix-native dependency to use branch moo/MOO-2265-update-deprecated-apis
1 parent 66ececb commit f829572

8 files changed

Lines changed: 196 additions & 185 deletions

File tree

android/app/src/production/java/com/mendix/developerapp/MainActivity.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ class MainActivity : AppCompatActivity(), DefaultHardwareBackBtnHandler, LaunchS
242242
}
243243

244244
override fun onKeyUp(keyCode: Int, event: KeyEvent?): Boolean {
245-
return if ((currentFragment as? MendixReactFragment)?.onKeyUp(
245+
return if (event != null && (currentFragment as? MendixReactFragment)?.onKeyUp(
246246
keyCode,
247247
event
248248
) == true

android/app/src/production/java/com/mendix/developerapp/loading/ProjectLoaderViewModel.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import com.mendix.mendixnative.api.ResponseStatus
1111
import com.mendix.mendixnative.api.RuntimeInfoResponse
1212
import com.mendix.mendixnative.api.getRuntimeInfo
1313
import com.mendix.mendixnative.react.MxConfiguration
14-
import com.mendix.mendixnative.util.MendixBackwardsCompatUtility
1514
import kotlinx.coroutines.flow.MutableStateFlow
1615
import kotlinx.coroutines.flow.StateFlow
1716
import kotlinx.coroutines.flow.asStateFlow
@@ -141,7 +140,6 @@ class ProjectLoaderViewModel : ViewModel() {
141140
ResponseStatus.FAILED -> setStatus(STATUS_ERROR_CONNECTION)
142141
else -> {
143142
val nativeBinaryVersion = runtimeInfoResponse.data!!.nativeBinaryVersion
144-
MendixBackwardsCompatUtility.update(runtimeInfoResponse.data!!.version)
145143
val supportedBinaryVersion = MxConfiguration.NATIVE_BINARY_VERSION
146144
when {
147145
nativeBinaryVersion == supportedBinaryVersion -> {

android/gradle.properties

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,4 +29,7 @@ hermesEnabled=true
2929
mendixnative.cookieEncryption=true
3030
VisionCamera_enableCodeScanner=true
3131

32-
edgeToEdgeEnabled=true
32+
edgeToEdgeEnabled=true
33+
34+
# enabled by default in RN 0.84, disabling it since appdev/clent still use hermes v0.16.0
35+
hermesV1Enabled=false

ios/Podfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@ ENV['RCT_NEW_ARCH_ENABLED'] = '1'
1515
ENV['RCT_USE_PREBUILT_RNCORE'] = '0'
1616
ENV['RCT_USE_RN_DEP'] = '0'
1717

18+
# Enabled by default in RN 0.84, disabling it since appdev/clent still use hermes v0.16.0
19+
ENV['RCT_HERMES_V1_ENABLED'] = '0'
20+
1821
# Use it to require both react-native's and this package's scripts:
1922
node_require('react-native/scripts/react_native_pods.rb')
2023
node_require('react-native-permissions/scripts/setup.rb')

ios/Podfile.lock

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -156,9 +156,9 @@ PODS:
156156
- GoogleUtilities/UserDefaults (7.13.3):
157157
- GoogleUtilities/Logger
158158
- GoogleUtilities/Privacy
159-
- hermes-engine (250829098.0.9):
160-
- hermes-engine/Pre-built (= 250829098.0.9)
161-
- hermes-engine/Pre-built (250829098.0.9)
159+
- hermes-engine (0.15.1):
160+
- hermes-engine/Pre-built (= 0.15.1)
161+
- hermes-engine/Pre-built (0.15.1)
162162
- IQKeyboardManager (6.5.19)
163163
- libwebp (1.5.0):
164164
- libwebp/demux (= 1.5.0)
@@ -172,7 +172,7 @@ PODS:
172172
- libwebp/sharpyuv (1.5.0)
173173
- libwebp/webp (1.5.0):
174174
- libwebp/sharpyuv
175-
- MendixNative (0.5.0):
175+
- MendixNative (0.5.1):
176176
- boost
177177
- DoubleConversion
178178
- fast_float
@@ -2451,6 +2451,9 @@ PODS:
24512451
- ReactCommon/turbomodule/core
24522452
- SocketRocket
24532453
- Yoga
2454+
- react-native-track-player (4.1.2):
2455+
- React-Core
2456+
- SwiftAudioEx (= 1.1.0)
24542457
- react-native-vector-icons (12.3.0):
24552458
- boost
24562459
- DoubleConversion
@@ -3800,6 +3803,7 @@ PODS:
38003803
- SDWebImage/Core (~> 5.10)
38013804
- SocketRocket (0.7.1)
38023805
- SSZipArchive (2.6.0)
3806+
- SwiftAudioEx (1.1.0)
38033807
- VisionCamera (4.7.3):
38043808
- VisionCamera/Core (= 4.7.3)
38053809
- VisionCamera/React (= 4.7.3)
@@ -3879,6 +3883,7 @@ DEPENDENCIES:
38793883
- "react-native-netinfo (from `../node_modules/@react-native-community/netinfo`)"
38803884
- react-native-pager-view (from `../node_modules/react-native-pager-view`)
38813885
- react-native-safe-area-context (from `../node_modules/react-native-safe-area-context`)
3886+
- react-native-track-player (from `../node_modules/react-native-track-player`)
38823887
- "react-native-vector-icons (from `../node_modules/@react-native-vector-icons/get-image`)"
38833888
- "react-native-vector-icons-material-icons (from `../node_modules/@react-native-vector-icons/material-icons`)"
38843889
- react-native-video (from `../node_modules/react-native-video`)
@@ -3975,6 +3980,7 @@ SPEC REPOS:
39753980
- SDWebImageWebPCoder
39763981
- SocketRocket
39773982
- SSZipArchive
3983+
- SwiftAudioEx
39783984

39793985
EXTERNAL SOURCES:
39803986
boost:
@@ -3993,7 +3999,7 @@ EXTERNAL SOURCES:
39933999
:podspec: "../node_modules/react-native/third-party-podspecs/glog.podspec"
39944000
hermes-engine:
39954001
:podspec: "../node_modules/react-native/sdks/hermes-engine/hermes-engine.podspec"
3996-
:tag: hermes-v250829098.0.9
4002+
:tag: hermes-v0.15.1
39974003
MendixNative:
39984004
:path: "../node_modules/mendix-native"
39994005
op-sqlite:
@@ -4094,6 +4100,8 @@ EXTERNAL SOURCES:
40944100
:path: "../node_modules/react-native-pager-view"
40954101
react-native-safe-area-context:
40964102
:path: "../node_modules/react-native-safe-area-context"
4103+
react-native-track-player:
4104+
:path: "../node_modules/react-native-track-player"
40974105
react-native-vector-icons:
40984106
:path: "../node_modules/@react-native-vector-icons/get-image"
40994107
react-native-vector-icons-material-icons:
@@ -4246,10 +4254,10 @@ SPEC CHECKSUMS:
42464254
GoogleDataTransport: 6c09b596d841063d76d4288cc2d2f42cc36e1e2a
42474255
GoogleMaps: 8939898920281c649150e0af74aa291c60f2e77d
42484256
GoogleUtilities: ea963c370a38a8069cc5f7ba4ca849a60b6d7d15
4249-
hermes-engine: 166613ab57f3dde1bf3f24c60212b66a1d585f8b
4257+
hermes-engine: 2ece5229b4460076597f50050f4fb14074f8f714
42504258
IQKeyboardManager: c8665b3396bd0b79402b4c573eac345a31c7d485
42514259
libwebp: 02b23773aedb6ff1fd38cec7a77b81414c6842a8
4252-
MendixNative: 2499d1796c68bc9bfc3ebecc5bf91b0a28c13ef1
4260+
MendixNative: ccdf5357fa15ee34fcf7a680ea9f6b5d2595c0ff
42534261
MultiplatformBleAdapter: b1fddd0d499b96b607e00f0faa8e60648343dc1d
42544262
nanopb: 438bc412db1928dac798aa6fd75726007be04262
42554263
op-sqlite: 64000c0da2357c4d73faf4d23ff34dd1ddb332d4
@@ -4305,6 +4313,7 @@ SPEC CHECKSUMS:
43054313
react-native-netinfo: 57447b5a45c98808f8eae292cf641f3d91d13830
43064314
react-native-pager-view: a0516effb17ca5120ac2113bfd21b91130ad5748
43074315
react-native-safe-area-context: befb5404eb8a16fdc07fa2bebab3568ecabcbb8a
4316+
react-native-track-player: dd56f9948e03756a217c75e0a61aa04aab65b5a1
43084317
react-native-vector-icons: 6ba2060e1b82ce0663f14375579fe1d48e9b668a
43094318
react-native-vector-icons-material-icons: 2fe75632937d07937bfe8ca953e1b5d06eef3a1d
43104319
react-native-video: f8e9788554c53a1852166cd119d6e7c324b16dfe
@@ -4366,14 +4375,15 @@ SPEC CHECKSUMS:
43664375
RNSound: d5dd3ca86d9978e1c2736dfa943ba619fc9fc504
43674376
RNSVG: db85b4eb848b5978a77cdbf797738f4e3ed1bdbb
43684377
RNSwanBrowser: d7ecaca6870461dd83eba13c037aa5acd4db2cdd
4369-
RNWorklets: 4d1b91f0b9da6c677f1b4311f9b587a5ac52d803
4378+
RNWorklets: c797347c9218739ffba1b65bbfa75412877615bf
43704379
SDWebImage: a7f831e1a65eb5e285e3fb046a23fcfbf08e696d
43714380
SDWebImageWebPCoder: 908b83b6adda48effe7667cd2b7f78c897e5111d
43724381
SocketRocket: d4aabe649be1e368d1318fdf28a022d714d65748
43734382
SSZipArchive: 8a6ee5677c8e304bebc109e39cf0da91ccef22ea
4383+
SwiftAudioEx: f6aa653770f3a0d3851edaf8d834a30aee4a7646
43744384
VisionCamera: 7187b3dac1ff3071234ead959ce311875748e14f
43754385
Yoga: 447c8baf495b8d96457a46e6691a2c9952cbd07f
43764386

4377-
PODFILE CHECKSUM: dfd6edcdfb21607087b6c181b325f90fb96b198d
4387+
PODFILE CHECKSUM: 31fb8a51908deeb2463a1e8201eeaac75afdcfbd
43784388

43794389
COCOAPODS: 1.16.2

0 commit comments

Comments
 (0)