From 7bd8f017dbbe2cd65c4c289df2ebd8a08e7a89f3 Mon Sep 17 00:00:00 2001 From: Jakub Piasecki Date: Thu, 11 Apr 2024 13:00:25 +0200 Subject: [PATCH 1/2] Add patch for `react-native-quick-sqlite` --- patches/react-native-quick-sqlite+8.0.0-beta.2.patch | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 patches/react-native-quick-sqlite+8.0.0-beta.2.patch diff --git a/patches/react-native-quick-sqlite+8.0.0-beta.2.patch b/patches/react-native-quick-sqlite+8.0.0-beta.2.patch new file mode 100644 index 0000000000000..b5810c9038736 --- /dev/null +++ b/patches/react-native-quick-sqlite+8.0.0-beta.2.patch @@ -0,0 +1,12 @@ +diff --git a/node_modules/react-native-quick-sqlite/android/build.gradle b/node_modules/react-native-quick-sqlite/android/build.gradle +index 323d34e..c2d0c44 100644 +--- a/node_modules/react-native-quick-sqlite/android/build.gradle ++++ b/node_modules/react-native-quick-sqlite/android/build.gradle +@@ -90,7 +90,6 @@ android { + externalNativeBuild { + cmake { + cppFlags "-O2", "-fexceptions", "-frtti", "-std=c++1y", "-DONANDROID" +- abiFilters 'x86', 'x86_64', 'armeabi-v7a', 'arm64-v8a' + arguments '-DANDROID_STL=c++_shared', + "-DREACT_NATIVE_DIR=${REACT_NATIVE_DIR}", + "-DSQLITE_FLAGS='${SQLITE_FLAGS ? SQLITE_FLAGS : ''}'" From 112907d5c1a1c9125b9f181160b55bb54693e60a Mon Sep 17 00:00:00 2001 From: Jakub Piasecki Date: Thu, 11 Apr 2024 13:13:43 +0200 Subject: [PATCH 2/2] Bump live markdown --- ios/Podfile.lock | 10 +++++----- package-lock.json | 12 ++++-------- package.json | 2 +- 3 files changed, 10 insertions(+), 14 deletions(-) diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 2f53f00918bfe..231ce0248d5e3 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -1836,7 +1836,7 @@ PODS: - RNGoogleSignin (10.0.1): - GoogleSignIn (~> 7.0) - React-Core - - RNLiveMarkdown (0.1.38): + - RNLiveMarkdown (0.1.47): - glog - hermes-engine - RCT-Folly (= 2022.05.16.00) @@ -1854,9 +1854,9 @@ PODS: - React-utils - ReactCommon/turbomodule/bridging - ReactCommon/turbomodule/core - - RNLiveMarkdown/common (= 0.1.38) + - RNLiveMarkdown/common (= 0.1.47) - Yoga - - RNLiveMarkdown/common (0.1.38): + - RNLiveMarkdown/common (0.1.47): - glog - hermes-engine - RCT-Folly (= 2022.05.16.00) @@ -2565,7 +2565,7 @@ SPEC CHECKSUMS: RNFS: 4ac0f0ea233904cb798630b3c077808c06931688 RNGestureHandler: 1190c218cdaaf029ee1437076a3fbbc3297d89fb RNGoogleSignin: ccaa4a81582cf713eea562c5dd9dc1961a715fd0 - RNLiveMarkdown: 9d974f060d0bd857f7d96fac0e9a1539363baa5e + RNLiveMarkdown: f172c7199283dc9d21bccf7e21ea10741fd19e1d RNLocalize: d4b8af4e442d4bcca54e68fc687a2129b4d71a81 rnmapbox-maps: 3e273e0e867a079ec33df9ee33bb0482434b897d RNPermissions: 8990fc2c10da3640938e6db1647cb6416095b729 @@ -2582,7 +2582,7 @@ SPEC CHECKSUMS: SocketRocket: f32cd54efbe0f095c4d7594881e52619cfe80b17 Turf: 13d1a92d969ca0311bbc26e8356cca178ce95da2 VisionCamera: 3033e0dd5272d46e97bcb406adea4ae0e6907abf - Yoga: 1b901a6d6eeba4e8a2e8f308f708691cdb5db312 + Yoga: 64cd2a583ead952b0315d5135bf39e053ae9be70 PODFILE CHECKSUM: a25a81f2b50270f0c0bd0aff2e2ebe4d0b4ec06d diff --git a/package-lock.json b/package-lock.json index 5315c22d9161f..5074c229a628b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13,7 +13,7 @@ "@babel/plugin-proposal-private-methods": "^7.18.6", "@babel/plugin-proposal-private-property-in-object": "^7.21.11", "@dotlottie/react-player": "^1.6.3", - "@expensify/react-native-live-markdown": "github:Expensify/react-native-live-markdown#f762be6fa832419dbbecb8a0cf64bf7dce18545b", + "@expensify/react-native-live-markdown": "0.1.47", "@expo/metro-runtime": "~3.1.1", "@formatjs/intl-datetimeformat": "^6.10.0", "@formatjs/intl-listformat": "^7.2.2", @@ -3570,13 +3570,9 @@ } }, "node_modules/@expensify/react-native-live-markdown": { - "version": "0.1.38", - "resolved": "git+ssh://git@github.com/Expensify/react-native-live-markdown.git#f762be6fa832419dbbecb8a0cf64bf7dce18545b", - "integrity": "sha512-m8+t3y1AtpvFAt3GAwRCiGwcOhUagOTCvwJ87kMGO5q/SKB2GCBHYMQ0QZaHw2QvAzRE6v2kCdqItX5DY+4MPQ==", - "license": "MIT", - "workspaces": [ - "example" - ], + "version": "0.1.47", + "resolved": "https://registry.npmjs.org/@expensify/react-native-live-markdown/-/react-native-live-markdown-0.1.47.tgz", + "integrity": "sha512-zUfwgg6qq47MnGuynamDpdHSlBYwVKFV4Zc/2wlVzFcBndQOjOyFu04Ns8YDB4Gl80LyGvfAuBT/sU+kvmMU6g==", "engines": { "node": ">= 18.0.0" }, diff --git a/package.json b/package.json index cca384eeb3861..40dd20be42e42 100644 --- a/package.json +++ b/package.json @@ -64,7 +64,7 @@ "@babel/plugin-proposal-private-methods": "^7.18.6", "@babel/plugin-proposal-private-property-in-object": "^7.21.11", "@dotlottie/react-player": "^1.6.3", - "@expensify/react-native-live-markdown": "github:Expensify/react-native-live-markdown#f762be6fa832419dbbecb8a0cf64bf7dce18545b", + "@expensify/react-native-live-markdown": "0.1.47", "@expo/metro-runtime": "~3.1.1", "@formatjs/intl-datetimeformat": "^6.10.0", "@formatjs/intl-listformat": "^7.2.2",