From e6dbd32ae55c9b3bfc466d33bae3ab2c124a2c64 Mon Sep 17 00:00:00 2001 From: karahanharunn Date: Wed, 28 Aug 2024 23:41:35 +0200 Subject: [PATCH] fix: react native update version --- .../com/mendix/developerapp/MainActivity.kt | 2 +- .../sampelapps/SampleAppsListFragment.kt | 5 +- android/build.gradle | 2 +- android/gradle.properties | 2 +- ios/Podfile | 6 +- ios/Podfile.lock | 142 ++++++++++-------- ios/developerapp.xcodeproj/project.pbxproj | 22 ++- package.json | 2 +- react-native.config.js | 7 - 9 files changed, 109 insertions(+), 81 deletions(-) diff --git a/android/app/src/production/java/com/mendix/developerapp/MainActivity.kt b/android/app/src/production/java/com/mendix/developerapp/MainActivity.kt index f266a18..ccab8a9 100644 --- a/android/app/src/production/java/com/mendix/developerapp/MainActivity.kt +++ b/android/app/src/production/java/com/mendix/developerapp/MainActivity.kt @@ -146,7 +146,7 @@ class MainActivity : AppCompatActivity(), DefaultHardwareBackBtnHandler, LaunchS setIntent(intent) (currentFragment as? MendixReactFragment)?.onNewIntent(intent) ?: if (homeViewModel.appUrlInvalid.value == false) handleLaunchedWithExtras(intent) - handlePossibleSpecialLaunch() + else handlePossibleSpecialLaunch() } private fun handleMendixAdvertisingPushNotifications(intent: Intent) { diff --git a/android/app/src/production/java/com/mendix/developerapp/sampelapps/SampleAppsListFragment.kt b/android/app/src/production/java/com/mendix/developerapp/sampelapps/SampleAppsListFragment.kt index bf89c8b..b828cdc 100644 --- a/android/app/src/production/java/com/mendix/developerapp/sampelapps/SampleAppsListFragment.kt +++ b/android/app/src/production/java/com/mendix/developerapp/sampelapps/SampleAppsListFragment.kt @@ -24,9 +24,10 @@ import com.mendix.mendixnative.react.MxConfiguration class SampleAppsFragment : BaseFragment() { private lateinit var binding: ContentSampleAppsBinding + private val sampleAppsViewModel: SampleAppsViewModel by viewModels { - return@viewModels object : ViewModelProvider.Factory { - override fun create(modelClass: Class): T { + object : ViewModelProvider.Factory { + override fun create(modelClass: Class): T { @Suppress("UNCHECKED_CAST") return SampleAppsViewModel(SampleAppsManager(requireContext(), requireActivity().filesDir.absolutePath)) as T } diff --git a/android/build.gradle b/android/build.gradle index 8c00174..9da7b29 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -9,7 +9,7 @@ buildscript { googlePlayServicesVersion = "17+" supportLibVersion = "28.0.0" lifecycleVersion = "2.0.0" - kotlin_version = "1.7.21" + kotlin_version = "1.8.21" androidx_core_version = "1.6.0" androidXBrowser = "1.2.0" excludeAppGlideModule = true diff --git a/android/gradle.properties b/android/gradle.properties index 7913270..d69bd13 100644 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -10,7 +10,7 @@ # Specifies the JVM arguments used for the daemon process. # The setting is particularly useful for tweaking memory settings. # Default value: -Xmx1024m -XX:MaxPermSize=256m -org.gradle.jvmargs=-Xmx4096m -XX:MaxMetaspaceSize=512m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 +org.gradle.jvmargs=-Xmx4g -XX:MaxMetaspaceSize=1g -XX:MaxMetaspaceSize=2048m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 # When configured, Gradle will run in incubating parallel mode. # This option should only be used with decoupled projects. More details, visit diff --git a/ios/Podfile b/ios/Podfile index d6cc854..3f6e5a2 100644 --- a/ios/Podfile +++ b/ios/Podfile @@ -1,7 +1,7 @@ require_relative '../node_modules/react-native/scripts/react_native_pods' require_relative '../node_modules/@react-native-community/cli-platform-ios/native_modules' -deployment_target = '12.4' +deployment_target = '13.4' platform :ios, deployment_target install! 'cocoapods', :deterministic_uuids => false @@ -101,6 +101,10 @@ post_install do |installer| if target.name.start_with?("React") || target.name == "RCTTypeSafety" config.build_settings['GCC_PREPROCESSOR_DEFINITIONS'] ||= ['$(inherited)', "COCOAPODS=1", "RCT_DEV=1"] end + # Specify 'Swift Version: 5.0' for resolving archieve errors. + if target.name == 'react-native-video' + config.build_settings['SWIFT_VERSION'] = '5.0' + end end end diff --git a/ios/Podfile.lock b/ios/Podfile.lock index e0c901e..05172e5 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -51,7 +51,7 @@ PODS: - GoogleUtilities/Logger (~> 7.8) - FirebaseCoreExtension (10.5.0): - FirebaseCore (~> 10.0) - - FirebaseCoreInternal (10.5.0): + - FirebaseCoreInternal (10.29.0): - "GoogleUtilities/NSData+zlib (~> 7.8)" - FirebaseCrashlytics (10.5.0): - FirebaseCore (~> 10.0) @@ -60,7 +60,7 @@ PODS: - GoogleUtilities/Environment (~> 7.8) - nanopb (< 2.30910.0, >= 2.30908.0) - PromisesObjC (~> 2.1) - - FirebaseInstallations (10.5.0): + - FirebaseInstallations (10.29.0): - FirebaseCore (~> 10.0) - GoogleUtilities/Environment (~> 7.8) - GoogleUtilities/UserDefaults (~> 7.8) @@ -176,65 +176,79 @@ PODS: - GoogleUtilities/Network (~> 7.8) - "GoogleUtilities/NSData+zlib (~> 7.8)" - nanopb (< 2.30910.0, >= 2.30908.0) - - GoogleDataTransport (9.2.1): + - GoogleDataTransport (9.4.1): - GoogleUtilities/Environment (~> 7.7) - - nanopb (< 2.30910.0, >= 2.30908.0) + - nanopb (< 2.30911.0, >= 2.30908.0) - PromisesObjC (< 3.0, >= 1.2) - GoogleMaps (6.1.1): - GoogleMaps/Maps (= 6.1.1) - GoogleMaps/Base (6.1.1) - GoogleMaps/Maps (6.1.1): - GoogleMaps/Base - - GoogleUtilities (7.11.0): - - GoogleUtilities/AppDelegateSwizzler (= 7.11.0) - - GoogleUtilities/Environment (= 7.11.0) - - GoogleUtilities/ISASwizzler (= 7.11.0) - - GoogleUtilities/Logger (= 7.11.0) - - GoogleUtilities/MethodSwizzler (= 7.11.0) - - GoogleUtilities/Network (= 7.11.0) - - "GoogleUtilities/NSData+zlib (= 7.11.0)" - - GoogleUtilities/Reachability (= 7.11.0) - - GoogleUtilities/SwizzlerTestHelpers (= 7.11.0) - - GoogleUtilities/UserDefaults (= 7.11.0) - - GoogleUtilities/AppDelegateSwizzler (7.11.0): + - GoogleUtilities (7.13.3): + - GoogleUtilities/AppDelegateSwizzler (= 7.13.3) + - GoogleUtilities/Environment (= 7.13.3) + - GoogleUtilities/ISASwizzler (= 7.13.3) + - GoogleUtilities/Logger (= 7.13.3) + - GoogleUtilities/MethodSwizzler (= 7.13.3) + - GoogleUtilities/Network (= 7.13.3) + - "GoogleUtilities/NSData+zlib (= 7.13.3)" + - GoogleUtilities/Privacy (= 7.13.3) + - GoogleUtilities/Reachability (= 7.13.3) + - GoogleUtilities/SwizzlerTestHelpers (= 7.13.3) + - GoogleUtilities/UserDefaults (= 7.13.3) + - GoogleUtilities/AppDelegateSwizzler (7.13.3): - GoogleUtilities/Environment - GoogleUtilities/Logger - GoogleUtilities/Network - - GoogleUtilities/Environment (7.11.0): + - GoogleUtilities/Privacy + - GoogleUtilities/Environment (7.13.3): + - GoogleUtilities/Privacy - PromisesObjC (< 3.0, >= 1.2) - - GoogleUtilities/ISASwizzler (7.11.0) - - GoogleUtilities/Logger (7.11.0): + - GoogleUtilities/ISASwizzler (7.13.3): + - GoogleUtilities/Privacy + - GoogleUtilities/Logger (7.13.3): - GoogleUtilities/Environment - - GoogleUtilities/MethodSwizzler (7.11.0): + - GoogleUtilities/Privacy + - GoogleUtilities/MethodSwizzler (7.13.3): - GoogleUtilities/Logger - - GoogleUtilities/Network (7.11.0): + - GoogleUtilities/Privacy + - GoogleUtilities/Network (7.13.3): - GoogleUtilities/Logger - "GoogleUtilities/NSData+zlib" + - GoogleUtilities/Privacy - GoogleUtilities/Reachability - - "GoogleUtilities/NSData+zlib (7.11.0)" - - GoogleUtilities/Reachability (7.11.0): + - "GoogleUtilities/NSData+zlib (7.13.3)": + - GoogleUtilities/Privacy + - GoogleUtilities/Privacy (7.13.3) + - GoogleUtilities/Reachability (7.13.3): - GoogleUtilities/Logger - - GoogleUtilities/SwizzlerTestHelpers (7.11.0): + - GoogleUtilities/Privacy + - GoogleUtilities/SwizzlerTestHelpers (7.13.3): - GoogleUtilities/MethodSwizzler - - GoogleUtilities/UserDefaults (7.11.0): + - GoogleUtilities/UserDefaults (7.13.3): - GoogleUtilities/Logger - - IQKeyboardManager (6.5.10) + - GoogleUtilities/Privacy + - IQKeyboardManager (6.5.19) - libevent (2.1.12) - - libwebp (1.2.1): - - libwebp/demux (= 1.2.1) - - libwebp/mux (= 1.2.1) - - libwebp/webp (= 1.2.1) - - libwebp/demux (1.2.1): + - libwebp (1.3.2): + - libwebp/demux (= 1.3.2) + - libwebp/mux (= 1.3.2) + - libwebp/sharpyuv (= 1.3.2) + - libwebp/webp (= 1.3.2) + - libwebp/demux (1.3.2): - libwebp/webp - - libwebp/mux (1.2.1): + - libwebp/mux (1.3.2): - libwebp/demux - - libwebp/webp (1.2.1) + - libwebp/sharpyuv (1.3.2) + - libwebp/webp (1.3.2): + - libwebp/sharpyuv - MultiplatformBleAdapter (0.1.9) - - nanopb (2.30909.0): - - nanopb/decode (= 2.30909.0) - - nanopb/encode (= 2.30909.0) - - nanopb/decode (2.30909.0) - - nanopb/encode (2.30909.0) + - nanopb (2.30909.1): + - nanopb/decode (= 2.30909.1) + - nanopb/encode (= 2.30909.1) + - nanopb/decode (2.30909.1) + - nanopb/encode (2.30909.1) - OpenSSL-Universal (1.1.1100) - Permission-Camera (3.3.1): - RNPermissions @@ -246,7 +260,7 @@ PODS: - RNPermissions - Permission-PhotoLibrary (3.3.1): - RNPermissions - - PromisesObjC (2.2.0) + - PromisesObjC (2.4.0) - QRCodeReader.swift (10.1.0) - RCT-Folly (2021.07.22.00): - boost @@ -497,10 +511,10 @@ PODS: - react-native-sqlite-storage (5.1.3): - React - SQLCipher - - react-native-video (5.2.1): + - react-native-video (6.3.0): - React-Core - - react-native-video/Video (= 5.2.1) - - react-native-video/Video (5.2.1): + - react-native-video/Video (= 6.3.0) + - react-native-video/Video (6.3.0): - React-Core - react-native-view-shot (3.1.2): - React @@ -633,17 +647,17 @@ PODS: - React - RNVectorIcons (9.2.0): - React-Core - - SDWebImage (5.13.0): - - SDWebImage/Core (= 5.13.0) - - SDWebImage/Core (5.13.0) + - SDWebImage (5.19.6): + - SDWebImage/Core (= 5.19.6) + - SDWebImage/Core (5.19.6) - SDWebImageWebPCoder (0.6.1): - libwebp (~> 1.0) - SDWebImage/Core (~> 5.7) - - SocketRocket (0.6.0) - - SQLCipher (4.5.2): - - SQLCipher/standard (= 4.5.2) - - SQLCipher/common (4.5.2) - - SQLCipher/standard (4.5.2): + - SocketRocket (0.6.1) + - SQLCipher (4.6.1): + - SQLCipher/standard (= 4.6.1) + - SQLCipher/common (4.6.1) + - SQLCipher/standard (4.6.1): - SQLCipher/common - SSZipArchive (2.4.3) - TouchID (4.4.1): @@ -980,9 +994,9 @@ SPEC CHECKSUMS: FirebaseAnalytics: 6f7430030cb6b22fe1db2e3bed782e999b76dc00 FirebaseCore: 324b8d182d9ff7e3f6d1fa2f04b082d1c7a3e366 FirebaseCoreExtension: d9fa427f1ae1edccf2368ce5e8d567e4c1f0ebc8 - FirebaseCoreInternal: e463f41bb935cd049505bf7e9a5bdd7dcea90df6 + FirebaseCoreInternal: df84dd300b561c27d5571684f389bf60b0a5c934 FirebaseCrashlytics: ea94bc81f67d5d4702d0c782da13e1483217bac8 - FirebaseInstallations: 935bc4abb6f7a035cab7a0c31cb777b2be3dd254 + FirebaseInstallations: 913cf60d0400ebd5d6b63a28b290372ab44590dd FirebaseMessaging: 35ecbbc68ff547fca80f9326c9622e79288c7149 Flipper: 26fc4b7382499f1281eb8cb921e5c3ad6de91fe0 Flipper-Boost-iOSX: fd1e2b8cbef7e662a122412d7ac5f5bea715403c @@ -997,21 +1011,21 @@ SPEC CHECKSUMS: glog: 04b94705f318337d7ead9e6d17c019bd9b1f6b1b Google-Maps-iOS-Utils: 3343332b18dfd5be8f1f44edd7d481ace3da4d9a GoogleAppMeasurement: 40c70a7d89013f0eca72006c4b9732163ea4cdae - GoogleDataTransport: ea169759df570f4e37bdee1623ec32a7e64e67c4 + GoogleDataTransport: 6c09b596d841063d76d4288cc2d2f42cc36e1e2a GoogleMaps: 94e6e0851beece6678af9f508f4918b7a7c61722 - GoogleUtilities: c2bdc4cf2ce786c4d2e6b3bcfd599a25ca78f06f - IQKeyboardManager: 45a1fa55c1a5b02c61ac0fd7fd5b62bb4ad20d97 + GoogleUtilities: ea963c370a38a8069cc5f7ba4ca849a60b6d7d15 + IQKeyboardManager: c8665b3396bd0b79402b4c573eac345a31c7d485 libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913 - libwebp: 98a37e597e40bfdb4c911fc98f2c53d0b12d05fc + libwebp: 1786c9f4ff8a279e4dac1e8f385004d5fc253009 MultiplatformBleAdapter: 5a6a897b006764392f9cef785e4360f54fb9477d - nanopb: b552cce312b6c8484180ef47159bc0f65a1f0431 + nanopb: d4d75c12cd1316f4a64e3c6963f879ecd4b5e0d5 OpenSSL-Universal: ebc357f1e6bc71fa463ccb2fe676756aff50e88c Permission-Camera: bae27a8503530770c35aadfecbb97ec71823382a Permission-FaceID: 278547824ae3a5cae07050505e8a505932c3c5c4 Permission-LocationWhenInUse: 006c85c8de0c05b5d8be8e8029e4f6b813270293 Permission-Microphone: 13922195a81b9d46d2df8050c225006eae126d49 Permission-PhotoLibrary: ddb5a158725b29cb12e9e477e8a5f5151c66cc3c - PromisesObjC: 09985d6d70fbe7878040aa746d78236e6946d2ef + PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47 QRCodeReader.swift: 373a389fe9a22d513c879a32a6f647c58f4ef572 RCT-Folly: 0080d0a6ebf2577475bda044aa59e2ca1f909cda RCTRequired: 837880d26ec119e105317dc28a456f3016bf16d1 @@ -1042,7 +1056,7 @@ SPEC CHECKSUMS: react-native-safe-area-context: 79fea126c6830c85f65947c223a5e3058a666937 react-native-splash-screen: 200d11d188e2e78cea3ad319964f6142b6384865 react-native-sqlite-storage: c1f73763d877b444d05dd0114843b33b2f998523 - react-native-video: c26780b224543c62d5e1b2a7244a5cd1b50e8253 + react-native-video: 546de1418f4ad7aa1eed04a4a6260ac8cead1c1e react-native-view-shot: 4475fde003fe8a210053d1f98fb9e06c1d834e1c react-native-webview: 9f111dfbcfc826084d6c507f569e5e03342ee1c1 React-perflogger: 52a94f38c19a518d05726624b49bfc192639374d @@ -1080,15 +1094,15 @@ SPEC CHECKSUMS: RNSound: da030221e6ac7e8290c6b43f2b5f2133a8e225b0 RNSVG: ce9d996113475209013317e48b05c21ee988d42e RNVectorIcons: fcc2f6cb32f5735b586e66d14103a74ce6ad61f8 - SDWebImage: 0327043dbb9533e75f2eff8445b3df0f2ceca6ac + SDWebImage: a79252b60f4678812d94316c91da69ec83089c9f SDWebImageWebPCoder: d0dac55073088d24b2ac1b191a71a8f8d0adac21 - SocketRocket: fccef3f9c5cedea1353a9ef6ada904fde10d6608 - SQLCipher: f5b4857434158b571a3ed3b10b3b43cd18ef5f67 + SocketRocket: f32cd54efbe0f095c4d7594881e52619cfe80b17 + SQLCipher: 77fbe633cd84db04b07876dd50766b4924b57d61 SSZipArchive: fe6a26b2a54d5a0890f2567b5cc6de5caa600aef TouchID: ba4c656d849cceabc2e4eef722dea5e55959ecf4 Yoga: 92d086bb705a41cc588599b51db726ba7b1d341c YogaKit: f782866e155069a2cca2517aafea43200b01fd5a -PODFILE CHECKSUM: 48c643c1967e7f5580b7ed2c8a884133db9647af +PODFILE CHECKSUM: a626dab6ce39498de5deba68da05cd1eaae93e3e -COCOAPODS: 1.14.3 +COCOAPODS: 1.15.2 diff --git a/ios/developerapp.xcodeproj/project.pbxproj b/ios/developerapp.xcodeproj/project.pbxproj index c659a56..f6a539e 100644 --- a/ios/developerapp.xcodeproj/project.pbxproj +++ b/ios/developerapp.xcodeproj/project.pbxproj @@ -539,7 +539,13 @@ ); inputPaths = ( "${PODS_ROOT}/Target Support Files/Pods-Mendix-DeveloperApp/Pods-Mendix-DeveloperApp-resources.sh", + "${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCoreInternal/FirebaseCoreInternal_Privacy.bundle", + "${PODS_CONFIGURATION_BUILD_DIR}/FirebaseInstallations/FirebaseInstallations_Privacy.bundle", + "${PODS_CONFIGURATION_BUILD_DIR}/GoogleDataTransport/GoogleDataTransport_Privacy.bundle", "${PODS_ROOT}/GoogleMaps/Maps/Frameworks/GoogleMaps.framework/Resources/GoogleMaps.bundle", + "${PODS_CONFIGURATION_BUILD_DIR}/GoogleUtilities/GoogleUtilities_Privacy.bundle", + "${PODS_CONFIGURATION_BUILD_DIR}/IQKeyboardManager/IQKeyboardManager.bundle", + "${PODS_CONFIGURATION_BUILD_DIR}/PromisesObjC/FBLPromises_Privacy.bundle", "${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/AntDesign.ttf", "${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Entypo.ttf", "${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/EvilIcons.ttf", @@ -557,10 +563,18 @@ "${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/SimpleLineIcons.ttf", "${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Zocial.ttf", "${PODS_CONFIGURATION_BUILD_DIR}/React-Core/AccessibilityResources.bundle", + "${PODS_CONFIGURATION_BUILD_DIR}/SDWebImage/SDWebImage.bundle", + "${PODS_CONFIGURATION_BUILD_DIR}/SQLCipher/SQLCipher.bundle", ); name = "[CP] Copy Pods Resources"; outputPaths = ( + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FirebaseCoreInternal_Privacy.bundle", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FirebaseInstallations_Privacy.bundle", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/GoogleDataTransport_Privacy.bundle", "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/GoogleMaps.bundle", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/GoogleUtilities_Privacy.bundle", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/IQKeyboardManager.bundle", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FBLPromises_Privacy.bundle", "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AntDesign.ttf", "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Entypo.ttf", "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/EvilIcons.ttf", @@ -578,6 +592,8 @@ "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/SimpleLineIcons.ttf", "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Zocial.ttf", "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AccessibilityResources.bundle", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/SDWebImage.bundle", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/SQLCipher.bundle", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; @@ -684,7 +700,7 @@ "${SRCROOT}/../node_modules/@mendix/native/ios/**", ); INFOPLIST_FILE = DeveloperApp/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 12.4; + IPHONEOS_DEPLOYMENT_TARGET = 13.4; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -746,7 +762,7 @@ "${SRCROOT}/../node_modules/@mendix/native/ios/**", ); INFOPLIST_FILE = DeveloperApp/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 12.4; + IPHONEOS_DEPLOYMENT_TARGET = 13.4; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -971,7 +987,7 @@ "${SRCROOT}/../node_modules/@mendix/native/ios/**", ); INFOPLIST_FILE = DeveloperApp/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 12.4; + IPHONEOS_DEPLOYMENT_TARGET = 13.4; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", diff --git a/package.json b/package.json index 4044c52..6c941ba 100644 --- a/package.json +++ b/package.json @@ -65,7 +65,7 @@ "react-native-system-navigation-bar": "1.0.2", "react-native-touch-id": "4.4.1", "react-native-vector-icons": "9.2.0", - "react-native-video": "5.2.1", + "react-native-video": "6.3.0", "react-native-view-shot": "3.1.2", "react-native-webview": "11.26.1" }, diff --git a/react-native.config.js b/react-native.config.js index 7577ef0..eabfe75 100644 --- a/react-native.config.js +++ b/react-native.config.js @@ -6,12 +6,5 @@ module.exports = { ios: null, // disable ios platform, CodePush is not necessary for the MendixNative library }, }, - 'react-native-video': { - platforms: { - android: { - sourceDir: '../node_modules/react-native-video/android-exoplayer', - }, - }, - }, }, };