Skip to content

Commit a1b7210

Browse files
authored
fix: android build failure for the expo app (#2624)
* fix: patch react-native-quick-sqlite on android * fix: broken patch
1 parent 0a385db commit a1b7210

File tree

3 files changed

+108
-9
lines changed

3 files changed

+108
-9
lines changed

examples/ExpoMessaging/package.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
"android": "expo run:android",
88
"ios": "expo run:ios",
99
"web": "expo start --web",
10-
"eject": "expo eject"
10+
"eject": "expo eject",
11+
"postinstall": "patch-package"
1112
},
1213
"dependencies": {
1314
"@react-native-community/netinfo": "11.3.1",
@@ -26,6 +27,8 @@
2627
"expo-sharing": "~12.0.1",
2728
"expo-splash-screen": "~0.27.5",
2829
"expo-status-bar": "~1.12.1",
30+
"patch-package": "^8.0.0",
31+
"postinstall-postinstall": "^2.1.0",
2932
"react": "18.2.0",
3033
"react-dom": "18.2.0",
3134
"react-native": "0.74.2",
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
diff --git a/node_modules/react-native-quick-sqlite/android/build.gradle b/node_modules/react-native-quick-sqlite/android/build.gradle
2+
index afcda02..e2ca174 100644
3+
--- a/node_modules/react-native-quick-sqlite/android/build.gradle
4+
+++ b/node_modules/react-native-quick-sqlite/android/build.gradle
5+
@@ -63,7 +63,7 @@ android {
6+
}
7+
8+
defaultConfig {
9+
- minSdkVersion 21
10+
+ minSdkVersion safeExtGet('minSdkVersion', 21)
11+
targetSdkVersion safeExtGet('targetSdkVersion', 28)
12+
versionCode 1
13+
versionName "1.0"

examples/ExpoMessaging/yarn.lock

Lines changed: 91 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2654,6 +2654,11 @@
26542654
resolved "https://registry.yarnpkg.com/@xmldom/xmldom/-/xmldom-0.7.11.tgz#adecc134521274711d071d5b0200907cc83b38ee"
26552655
integrity sha512-UDi3g6Jss/W5FnSzO9jCtQwEpfymt0M+sPPlmLhDH6h2TJ8j4ESE/LpmNPBij15J5NKkk4/cg/qoVMdWI3vnlQ==
26562656

2657+
"@yarnpkg/lockfile@^1.1.0":
2658+
version "1.1.0"
2659+
resolved "https://registry.yarnpkg.com/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz#e77a97fbd345b76d83245edcd17d393b1b41fb31"
2660+
integrity sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ==
2661+
26572662
26582663
version "0.9.0"
26592664
resolved "https://registry.yarnpkg.com/@zxing/text-encoding/-/text-encoding-0.9.0.tgz#fb50ffabc6c7c66a0c96b4c03e3d9be74864b70b"
@@ -3109,7 +3114,7 @@ cacache@^18.0.2:
31093114
tar "^6.1.11"
31103115
unique-filename "^3.0.0"
31113116

3112-
call-bind@^1.0.2, call-bind@^1.0.7:
3117+
call-bind@^1.0.2, call-bind@^1.0.5, call-bind@^1.0.7:
31133118
version "1.0.7"
31143119
resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.7.tgz#06016599c40c56498c18769d2730be242b6fa3b9"
31153120
integrity sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==
@@ -3206,6 +3211,11 @@ ci-info@^3.2.0, ci-info@^3.3.0:
32063211
resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.8.0.tgz#81408265a5380c929f0bc665d62256628ce9ef91"
32073212
integrity sha512-eXTggHWSooYhq49F2opQhuHWgzucfF2YgODK4e1566GQs5BIfP30B0oenwBJHfWxAs2fyPB1s7Mg949zLf61Yw==
32083213

3214+
ci-info@^3.7.0:
3215+
version "3.9.0"
3216+
resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.9.0.tgz#4279a62028a7b1f262f3473fc9605f5e218c59b4"
3217+
integrity sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==
3218+
32093219
clean-stack@^2.0.0:
32103220
version "2.2.0"
32113221
resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b"
@@ -4175,7 +4185,7 @@ find-up@^5.0.0, find-up@~5.0.0:
41754185
locate-path "^6.0.0"
41764186
path-exists "^4.0.0"
41774187

4178-
find-yarn-workspace-root@~2.0.0:
4188+
find-yarn-workspace-root@^2.0.0, find-yarn-workspace-root@~2.0.0:
41794189
version "2.0.0"
41804190
resolved "https://registry.yarnpkg.com/find-yarn-workspace-root/-/find-yarn-workspace-root-2.0.0.tgz#f47fb8d239c900eb78179aa81b66673eac88f7bd"
41814191
integrity sha512-1IMnbjt4KzsQfnhnzNd8wUEgXZ44IzZaZmnLYx7D5FZlaHt2gW20Cri8Q+E/t5tIj4+epTBub+2Zxu/vNILzqQ==
@@ -4850,6 +4860,11 @@ is-wsl@^2.1.1, is-wsl@^2.2.0:
48504860
dependencies:
48514861
is-docker "^2.0.0"
48524862

4863+
isarray@^2.0.5:
4864+
version "2.0.5"
4865+
resolved "https://registry.yarnpkg.com/isarray/-/isarray-2.0.5.tgz#8af1e4c1221244cc62459faf38940d4e644a5723"
4866+
integrity sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==
4867+
48534868
isarray@~1.0.0:
48544869
version "1.0.0"
48554870
resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
@@ -5064,6 +5079,16 @@ json-schema-traverse@^1.0.0:
50645079
resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz#ae7bcb3656ab77a73ba5c49bf654f38e6b6860e2"
50655080
integrity sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==
50665081

5082+
json-stable-stringify@^1.0.2:
5083+
version "1.1.1"
5084+
resolved "https://registry.yarnpkg.com/json-stable-stringify/-/json-stable-stringify-1.1.1.tgz#52d4361b47d49168bcc4e564189a42e5a7439454"
5085+
integrity sha512-SU/971Kt5qVQfJpyDveVhQ/vya+5hvrjClFOcr8c0Fq5aODJjMwutrOfCU+eCnVD5gpx1Q3fEqkyom77zH1iIg==
5086+
dependencies:
5087+
call-bind "^1.0.5"
5088+
isarray "^2.0.5"
5089+
jsonify "^0.0.1"
5090+
object-keys "^1.1.1"
5091+
50675092
json5@^2.2.2, json5@^2.2.3:
50685093
version "2.2.3"
50695094
resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283"
@@ -5085,6 +5110,11 @@ jsonfile@^6.0.1:
50855110
optionalDependencies:
50865111
graceful-fs "^4.1.6"
50875112

5113+
jsonify@^0.0.1:
5114+
version "0.0.1"
5115+
resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.1.tgz#2aa3111dae3d34a0f151c63f3a45d995d9420978"
5116+
integrity sha512-2/Ki0GcmuqSrgFyelQq9M05y7PS0mEwuIzrf3f1fPqkVDVRvZrPZtVSMHxdgo8Aq0sxAOb/cr2aqqA3LeWHVPg==
5117+
50885118
jsonwebtoken@~9.0.0:
50895119
version "9.0.0"
50905120
resolved "https://registry.yarnpkg.com/jsonwebtoken/-/jsonwebtoken-9.0.0.tgz#d0faf9ba1cc3a56255fe49c0961a67e520c1926d"
@@ -5117,6 +5147,13 @@ kind-of@^6.0.2:
51175147
resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd"
51185148
integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==
51195149

5150+
klaw-sync@^6.0.0:
5151+
version "6.0.0"
5152+
resolved "https://registry.yarnpkg.com/klaw-sync/-/klaw-sync-6.0.0.tgz#1fd2cfd56ebb6250181114f0a581167099c2b28c"
5153+
integrity sha512-nIeuVSzdCCs6TDPTqI8w1Yre34sSq7AkZ4B3sfOBbI2CgVSB4Du4aLQijFU2+lhAFCwt9+42Hel6lQNIv6AntQ==
5154+
dependencies:
5155+
graceful-fs "^4.1.11"
5156+
51205157
kleur@^3.0.3:
51215158
version "3.0.3"
51225159
resolved "https://registry.yarnpkg.com/kleur/-/kleur-3.0.3.tgz#a79c9ecc86ee1ce3fa6206d1216c501f147fc07e"
@@ -6036,6 +6073,11 @@ object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1:
60366073
resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
60376074
integrity sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==
60386075

6076+
object-keys@^1.1.1:
6077+
version "1.1.1"
6078+
resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
6079+
integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
6080+
60396081
60406082
version "2.4.1"
60416083
resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.4.1.tgz#58c8c44116e54845ad57f14ab10b03533184ac3f"
@@ -6083,7 +6125,7 @@ open@^6.2.0:
60836125
dependencies:
60846126
is-wsl "^1.1.0"
60856127

6086-
open@^7.0.3:
6128+
open@^7.0.3, open@^7.4.2:
60876129
version "7.4.2"
60886130
resolved "https://registry.yarnpkg.com/open/-/open-7.4.2.tgz#b8147e26dcf3e426316c730089fd71edd29c2321"
60896131
integrity sha512-MVHddDVweXZF3awtlAS+6pgKLlm/JgxZ90+/NBurBoQctVOOB/zDdVjcyPzQ+0laDGbsWgrRkflI65sQeOgT9Q==
@@ -6225,6 +6267,27 @@ password-prompt@^1.0.4:
62256267
ansi-escapes "^3.1.0"
62266268
cross-spawn "^6.0.5"
62276269

6270+
patch-package@^8.0.0:
6271+
version "8.0.0"
6272+
resolved "https://registry.yarnpkg.com/patch-package/-/patch-package-8.0.0.tgz#d191e2f1b6e06a4624a0116bcb88edd6714ede61"
6273+
integrity sha512-da8BVIhzjtgScwDJ2TtKsfT5JFWz1hYoBl9rUQ1f38MC2HwnEIkK8VN3dKMKcP7P7bvvgzNDbfNHtx3MsQb5vA==
6274+
dependencies:
6275+
"@yarnpkg/lockfile" "^1.1.0"
6276+
chalk "^4.1.2"
6277+
ci-info "^3.7.0"
6278+
cross-spawn "^7.0.3"
6279+
find-yarn-workspace-root "^2.0.0"
6280+
fs-extra "^9.0.0"
6281+
json-stable-stringify "^1.0.2"
6282+
klaw-sync "^6.0.0"
6283+
minimist "^1.2.6"
6284+
open "^7.4.2"
6285+
rimraf "^2.6.3"
6286+
semver "^7.5.3"
6287+
slash "^2.0.0"
6288+
tmp "^0.0.33"
6289+
yaml "^2.2.2"
6290+
62286291
path-exists@^3.0.0:
62296292
version "3.0.0"
62306293
resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"
@@ -6340,6 +6403,11 @@ postcss@~8.4.32:
63406403
picocolors "^1.0.0"
63416404
source-map-js "^1.2.0"
63426405

6406+
postinstall-postinstall@^2.1.0:
6407+
version "2.1.0"
6408+
resolved "https://registry.yarnpkg.com/postinstall-postinstall/-/postinstall-postinstall-2.1.0.tgz#4f7f77441ef539d1512c40bd04c71b06a4704ca3"
6409+
integrity sha512-7hQX6ZlZXIoRiWNrbMQaLzUUfH+sSx39u8EJ9HYuDc1kLo9IXKWjM5RSquZN1ad5GnH8CGFM78fsAAQi3OKEEQ==
6410+
63436411
63446412
version "5.6.0"
63456413
resolved "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-5.6.0.tgz#356256f643804773c82f64723fe78c92c62beaeb"
@@ -6857,7 +6925,7 @@ reusify@^1.0.4:
68576925
resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76"
68586926
integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==
68596927

6860-
rimraf@^2.6.2:
6928+
rimraf@^2.6.2, rimraf@^2.6.3:
68616929
version "2.7.1"
68626930
resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec"
68636931
integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==
@@ -6973,6 +7041,11 @@ semver@^7.5.2:
69737041
dependencies:
69747042
lru-cache "^6.0.0"
69757043

7044+
semver@^7.5.3:
7045+
version "7.6.3"
7046+
resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.3.tgz#980f7b5550bc175fb4dc09403085627f9eb33143"
7047+
integrity sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==
7048+
69767049
semver@^7.5.4, semver@^7.6.0:
69777050
version "7.6.2"
69787051
resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.2.tgz#1e3b34759f896e8f14d6134732ce798aeb0c6e13"
@@ -7123,6 +7196,11 @@ sisteransi@^1.0.5:
71237196
resolved "https://registry.yarnpkg.com/sisteransi/-/sisteransi-1.0.5.tgz#134d681297756437cc05ca01370d3a7a571075ed"
71247197
integrity sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==
71257198

7199+
slash@^2.0.0:
7200+
version "2.0.0"
7201+
resolved "https://registry.yarnpkg.com/slash/-/slash-2.0.0.tgz#de552851a1759df3a8f206535442f5ec4ddeab44"
7202+
integrity sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==
7203+
71267204
slash@^3.0.0:
71277205
version "3.0.0"
71287206
resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
@@ -7232,10 +7310,10 @@ [email protected], stream-buffers@~2.2.0:
72327310
version "0.0.0"
72337311
uid ""
72347312

7235-
stream-chat-react-native-core@5.33.1:
7236-
version "5.33.1"
7237-
resolved "https://registry.yarnpkg.com/stream-chat-react-native-core/-/stream-chat-react-native-core-5.33.1.tgz#d9e7847469d3ffb6e7fd35fbb7b720f2e25d172e"
7238-
integrity sha512-TCDmChJe07cYyL3sErc6qycRFMA+HbflCKRGrFvVvpU0RdWJljaqiOo3avFSauciSnQxx9WxzTkMism8YsFHcQ==
7313+
stream-chat-react-native-core@5.35.0:
7314+
version "5.35.0"
7315+
resolved "https://registry.yarnpkg.com/stream-chat-react-native-core/-/stream-chat-react-native-core-5.35.0.tgz#fe12428400edf715e2ff9ef567b1233d35b9d357"
7316+
integrity sha512-botPziAoRY7SE/XdLECCKdYAcYiRuQFj0IeUWj2HNkEwCU0bpjQT9y+wpHKC0gKX57VUksPJsoV9ZBQT0KclTQ==
72397317
dependencies:
72407318
"@gorhom/bottom-sheet" "4.4.8"
72417319
dayjs "1.10.5"
@@ -8067,6 +8145,11 @@ yaml@^2.2.1:
80678145
resolved "https://registry.yarnpkg.com/yaml/-/yaml-2.4.1.tgz#2e57e0b5e995292c25c75d2658f0664765210eed"
80688146
integrity sha512-pIXzoImaqmfOrL7teGUBt/T7ZDnyeGBWyXQBvOVhLkWLN37GXv8NMLK406UY6dS51JfcQHsmcW5cJ441bHg6Lg==
80698147

8148+
yaml@^2.2.2:
8149+
version "2.5.0"
8150+
resolved "https://registry.yarnpkg.com/yaml/-/yaml-2.5.0.tgz#c6165a721cf8000e91c36490a41d7be25176cf5d"
8151+
integrity sha512-2wWLbGbYDiSqqIKoPjar3MPgB94ErzCtrNE1FdqGuaO0pi2JGjmE8aW8TDZwzU7vuxcGRdL/4gPQwQ7hD5AMSw==
8152+
80708153
yargs-parser@^18.1.2:
80718154
version "18.1.3"
80728155
resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-18.1.3.tgz#be68c4975c6b2abf469236b0c870362fab09a7b0"

0 commit comments

Comments
 (0)