Skip to content

Commit ad48bec

Browse files
committed
fix(example-app): 🚑 fix android build issues
1 parent 9cc8ad6 commit ad48bec

File tree

4 files changed

+999
-620
lines changed

4 files changed

+999
-620
lines changed

example/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,14 @@
2222
"react-native-reanimated": "2.12.0",
2323
"react-native-safe-area-context": "4.4.1",
2424
"react-native-screens": "~3.18.0",
25+
"react-native-svg": "13.4.0",
2526
"react-native-web": "~0.18.10",
2627
"twrnc": "3.4.1"
2728
},
2829
"devDependencies": {
2930
"@babel/core": "^7.19.3",
30-
"@babel/runtime": "7.18.9",
3131
"@babel/plugin-proposal-export-namespace-from": "^7.18.9",
32+
"@babel/runtime": "7.18.9",
3233
"@types/react": "~18.0.24",
3334
"@types/react-native": "~0.70.6",
3435
"babel-loader": "8.2.5",

example/yarn.lock

Lines changed: 52 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4325,6 +4325,17 @@ css-select@^4.1.3:
43254325
domutils "^2.8.0"
43264326
nth-check "^2.0.1"
43274327

4328+
css-select@^5.1.0:
4329+
version "5.1.0"
4330+
resolved "https://registry.yarnpkg.com/css-select/-/css-select-5.1.0.tgz#b8ebd6554c3637ccc76688804ad3f6a6fdaea8a6"
4331+
integrity sha512-nwoRF1rvRRnnCqqY7updORDsuqKzqYJ28+oSMaJMMgOauh3fvwHqMS7EZpIPqK8GL+g9mKxF1vP/ZjSeNjEVHg==
4332+
dependencies:
4333+
boolbase "^1.0.0"
4334+
css-what "^6.1.0"
4335+
domhandler "^5.0.2"
4336+
domutils "^3.0.1"
4337+
nth-check "^2.0.1"
4338+
43284339
43294340
version "1.0.0-alpha.37"
43304341
resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-1.0.0-alpha.37.tgz#98bebd62c4c1d9f960ec340cf9f7522e30709a22"
@@ -4333,7 +4344,7 @@ [email protected]:
43334344
mdn-data "2.0.4"
43344345
source-map "^0.6.1"
43354346

4336-
css-tree@^1.1.2:
4347+
css-tree@^1.1.2, css-tree@^1.1.3:
43374348
version "1.1.3"
43384349
resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-1.1.3.tgz#eb4870fb6fd7707327ec95c2ff2ab09b5e8db91d"
43394350
integrity sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q==
@@ -4346,7 +4357,7 @@ css-what@^3.2.1:
43464357
resolved "https://registry.yarnpkg.com/css-what/-/css-what-3.4.2.tgz#ea7026fcb01777edbde52124e21f327e7ae950e4"
43474358
integrity sha512-ACUm3L0/jiZTqfzRM3Hi9Q8eZqd6IK37mMWPLz9PJxkLWllYeRf+EHUSHYEtFop2Eqytaq1FizFVh7XfBnXCDQ==
43484359

4349-
css-what@^6.0.1:
4360+
css-what@^6.0.1, css-what@^6.1.0:
43504361
version "6.1.0"
43514362
resolved "https://registry.yarnpkg.com/css-what/-/css-what-6.1.0.tgz#fb5effcf76f1ddea2c81bdfaa4de44e79bac70f4"
43524363
integrity sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==
@@ -4765,6 +4776,15 @@ dom-serializer@^1.0.1:
47654776
domhandler "^4.2.0"
47664777
entities "^2.0.0"
47674778

4779+
dom-serializer@^2.0.0:
4780+
version "2.0.0"
4781+
resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-2.0.0.tgz#e41b802e1eedf9f6cae183ce5e622d789d7d8e53"
4782+
integrity sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==
4783+
dependencies:
4784+
domelementtype "^2.3.0"
4785+
domhandler "^5.0.2"
4786+
entities "^4.2.0"
4787+
47684788
domain-browser@^1.1.1:
47694789
version "1.2.0"
47704790
resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.2.0.tgz#3d31f50191a6749dd1375a7f522e823d42e54eda"
@@ -4775,7 +4795,7 @@ domelementtype@1:
47754795
resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.1.tgz#d048c44b37b0d10a7f2a3d5fee3f4333d790481f"
47764796
integrity sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==
47774797

4778-
domelementtype@^2.0.1, domelementtype@^2.2.0:
4798+
domelementtype@^2.0.1, domelementtype@^2.2.0, domelementtype@^2.3.0:
47794799
version "2.3.0"
47804800
resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.3.0.tgz#5c45e8e869952626331d7aab326d01daf65d589d"
47814801
integrity sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==
@@ -4794,6 +4814,13 @@ domhandler@^4.0.0, domhandler@^4.2.0, domhandler@^4.3.1:
47944814
dependencies:
47954815
domelementtype "^2.2.0"
47964816

4817+
domhandler@^5.0.1, domhandler@^5.0.2:
4818+
version "5.0.3"
4819+
resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-5.0.3.tgz#cc385f7f751f1d1fc650c21374804254538c7d31"
4820+
integrity sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==
4821+
dependencies:
4822+
domelementtype "^2.3.0"
4823+
47974824
domino@^2.1.6:
47984825
version "2.1.6"
47994826
resolved "https://registry.yarnpkg.com/domino/-/domino-2.1.6.tgz#fe4ace4310526e5e7b9d12c7de01b7f485a57ffe"
@@ -4816,6 +4843,15 @@ domutils@^2.0.0, domutils@^2.5.2, domutils@^2.8.0:
48164843
domelementtype "^2.2.0"
48174844
domhandler "^4.2.0"
48184845

4846+
domutils@^3.0.1:
4847+
version "3.0.1"
4848+
resolved "https://registry.yarnpkg.com/domutils/-/domutils-3.0.1.tgz#696b3875238338cb186b6c0612bd4901c89a4f1c"
4849+
integrity sha512-z08c1l761iKhDFtfXO04C7kTdPBLi41zwOZl00WS8b5eiaebNpY00HKbztwBq+e3vyqWNwWF3mP9YLUeqIrF+Q==
4850+
dependencies:
4851+
dom-serializer "^2.0.0"
4852+
domelementtype "^2.3.0"
4853+
domhandler "^5.0.1"
4854+
48194855
dot-case@^3.0.4:
48204856
version "3.0.4"
48214857
resolved "https://registry.yarnpkg.com/dot-case/-/dot-case-3.0.4.tgz#9b2b670d00a431667a8a75ba29cd1b98809ce751"
@@ -4915,6 +4951,11 @@ entities@^2.0.0:
49154951
resolved "https://registry.yarnpkg.com/entities/-/entities-2.2.0.tgz#098dc90ebb83d8dffa089d55256b351d34c4da55"
49164952
integrity sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==
49174953

4954+
entities@^4.2.0:
4955+
version "4.4.0"
4956+
resolved "https://registry.yarnpkg.com/entities/-/entities-4.4.0.tgz#97bdaba170339446495e653cfd2db78962900174"
4957+
integrity sha512-oYp7156SP8LkeGD0GF85ad1X9Ai79WtRsZ2gxJqtBuzH+98YUV6jkHEKlZkMbcrjJjIVJNIDP/3WL9wQkoPbWA==
4958+
49184959
env-editor@^0.4.1:
49194960
version "0.4.2"
49204961
resolved "https://registry.yarnpkg.com/env-editor/-/env-editor-0.4.2.tgz#4e76568d0bd8f5c2b6d314a9412c8fe9aa3ae861"
@@ -9739,6 +9780,14 @@ react-native-screens@~3.18.0:
97399780
react-freeze "^1.0.0"
97409781
warn-once "^0.1.0"
97419782

9783+
9784+
version "13.4.0"
9785+
resolved "https://registry.yarnpkg.com/react-native-svg/-/react-native-svg-13.4.0.tgz#82399ba0956c454144618aa581e2d748dd3f010a"
9786+
integrity sha512-B3TwK+H0+JuRhYPzF21AgqMt4fjhCwDZ9QUtwNstT5XcslJBXC0FoTkdZo8IEb1Sv4suSqhZwlAY6lwOv3tHag==
9787+
dependencies:
9788+
css-select "^5.1.0"
9789+
css-tree "^1.1.3"
9790+
97429791
react-native-web@~0.18.10:
97439792
version "0.18.10"
97449793
resolved "https://registry.yarnpkg.com/react-native-web/-/react-native-web-0.18.10.tgz#fb4db047f4be7f9cf35f37ec8d52f7d1c450600f"

package.json

Lines changed: 37 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -82,10 +82,7 @@
8282
"@react-native-aria/checkbox": "^0.2.3",
8383
"@react-stately/toggle": "^3.3.0",
8484
"lodash": "^4.17.21",
85-
"react-native-gesture-handler": "2.8.0",
8685
"react-native-popper": "^0.3.2",
87-
"react-native-reanimated": "2.13.0",
88-
"react-native-svg": "^13.6.0",
8986
"tailwind-merge": "^1.8.0",
9087
"tailwindcss": "^3.2.4",
9188
"twrnc": "^3.4.1"
@@ -98,6 +95,7 @@
9895
"@commitlint/config-conventional": "17.3.0",
9996
"@react-native-community/eslint-config": "3.0.3",
10097
"@release-it/conventional-changelog": "5.0.0",
98+
"@rnx-kit/align-deps": "^2.0.1",
10199
"@types/jest": "29.1.2",
102100
"@types/react": "18.0.0",
103101
"@types/react-native": "0.70.0",
@@ -108,21 +106,28 @@
108106
"eslint-plugin-simple-import-sort": "8.0.0",
109107
"gacp": "3.0.2",
110108
"husky": "8.0.1",
111-
"jest": "29.1.2",
109+
"jest": "^26.6.3",
112110
"lint-staged": "13.0.3",
113111
"pinst": "3.0.0",
114112
"prettier": "2.7.1",
115113
"react": "18.1.0",
116-
"react-dom": "18.1.0",
117-
"react-native": "0.70.0",
114+
"react-dom": "^18.1.0",
115+
"react-native": "^0.70.0",
118116
"react-native-builder-bob": "0.18.3",
117+
"react-native-gesture-handler": "^2.6.0",
118+
"react-native-reanimated": "^2.10.0",
119+
"react-native-svg": "^12.3.0",
119120
"release-it": "15.1.4",
120121
"sort-package-json": "2.0.0",
121122
"typescript": "4.8.3"
122123
},
123124
"peerDependencies": {
124-
"react": "*",
125-
"react-native": "*"
125+
"react": "16.9.0 || 16.11.0 || 16.13.1 || 17.0.1 || 17.0.2 || 18.0.0 || 18.1.0",
126+
"react-dom": "16.9.0 || 16.11.0 || 16.13.1 || 17.0.1 || 17.0.2 || ^18.0.0 || ^18.1.0",
127+
"react-native": "^0.61.5 || ^0.62.3 || ^0.63.2 || ^0.64.2 || ^0.65.0 || ^0.66.0 || ^0.67.0 || ^0.68.0 || ^0.69.0 || ^0.70.0",
128+
"react-native-gesture-handler": "^1.9.0 || ^1.10.3 || ^2.3.2 || ^2.5.0 || ^2.6.0",
129+
"react-native-reanimated": "^1.13.3 || ^2.1.0 || ^2.2.1 || ^2.2.3 || ^2.2.4 || ^2.5.0 || ^2.9.0 || ^2.10.0",
130+
"react-native-svg": "^12.1.1 || ^12.3.0"
126131
},
127132
"publishConfig": {
128133
"access": "public",
@@ -147,5 +152,29 @@
147152
}
148153
]
149154
]
155+
},
156+
"rnx-kit": {
157+
"kitType": "library",
158+
"alignDeps": {
159+
"requirements": {
160+
"development": [
161+
162+
],
163+
"production": [
164+
"react-native@*"
165+
]
166+
},
167+
"capabilities": [
168+
"animation",
169+
"core",
170+
"core-android",
171+
"core-ios",
172+
"gestures",
173+
"jest",
174+
"react",
175+
"react-dom",
176+
"svg"
177+
]
178+
}
150179
}
151180
}

0 commit comments

Comments
 (0)