Skip to content

Commit ac5a200

Browse files
authored
fix(android): resolve include path for UniffiCallInvoker.h in windows (#1)
* fix(android): resolve include path for UniffiCallInvoker.h in windows build: add patch-package for dependency patching * simplified uniffi-bindgen-react-native+0.28.3-5.patch
1 parent c43ca12 commit ac5a200

File tree

3 files changed

+134
-8
lines changed

3 files changed

+134
-8
lines changed

package.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,8 @@
4545
"lint": "eslint \"**/*.{js,ts,tsx}\"",
4646
"clean": "del-cli android/build example/android/build example/android/app/build example/ios/build lib",
4747
"prepare": "bob build",
48-
"release": "release-it --only-version"
48+
"release": "release-it --only-version",
49+
"postinstall": "patch-package"
4950
},
5051
"keywords": [
5152
"react-native",
@@ -76,6 +77,7 @@
7677
"commitlint": "^19.6.1",
7778
"del-cli": "^5.1.0",
7879
"jest": "^29.7.0",
80+
"patch-package": "^8.0.0",
7981
"prettier": "^3.0.3",
8082
"react": "19.0.0",
8183
"react-native": "0.79.2",
@@ -173,4 +175,4 @@
173175
"dependencies": {
174176
"uniffi-bindgen-react-native": "0.28.3-5"
175177
}
176-
}
178+
}
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
diff --git a/node_modules/uniffi-bindgen-react-native/crates/ubrn_cli/src/codegen/templates/CMakeLists.txt b/node_modules/uniffi-bindgen-react-native/crates/ubrn_cli/src/codegen/templates/CMakeLists.txt
2+
index 3a8d733..b2e0a1d 100644
3+
--- a/node_modules/uniffi-bindgen-react-native/crates/ubrn_cli/src/codegen/templates/CMakeLists.txt
4+
+++ b/node_modules/uniffi-bindgen-react-native/crates/ubrn_cli/src/codegen/templates/CMakeLists.txt
5+
@@ -17,10 +17,7 @@ execute_process(
6+
OUTPUT_VARIABLE UNIFFI_BINDGEN_PATH
7+
OUTPUT_STRIP_TRAILING_WHITESPACE
8+
)
9+
-string(REGEX
10+
- REPLACE "/package\\.json$" ""
11+
- UNIFFI_BINDGEN_PATH ${UNIFFI_BINDGEN_PATH}
12+
-)
13+
+get_filename_component(UNIFFI_BINDGEN_PATH "${UNIFFI_BINDGEN_PATH}" DIRECTORY)
14+
15+
# Specifies a path to native header files.
16+
include_directories(

yarn.lock

Lines changed: 114 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3362,6 +3362,13 @@ __metadata:
33623362
languageName: node
33633363
linkType: hard
33643364

3365+
"@yarnpkg/lockfile@npm:^1.1.0":
3366+
version: 1.1.0
3367+
resolution: "@yarnpkg/lockfile@npm:1.1.0"
3368+
checksum: 05b881b4866a3546861fee756e6d3812776ea47fa6eb7098f983d6d0eefa02e12b66c3fff931574120f196286a7ad4879ce02743c8bb2be36c6a576c7852083a
3369+
languageName: node
3370+
linkType: hard
3371+
33653372
"JSONStream@npm:^1.3.5":
33663373
version: 1.3.5
33673374
resolution: "JSONStream@npm:1.3.5"
@@ -3744,6 +3751,13 @@ __metadata:
37443751
languageName: node
37453752
linkType: hard
37463753

3754+
"at-least-node@npm:^1.0.0":
3755+
version: 1.0.0
3756+
resolution: "at-least-node@npm:1.0.0"
3757+
checksum: 463e2f8e43384f1afb54bc68485c436d7622acec08b6fad269b421cb1d29cebb5af751426793d0961ed243146fe4dc983402f6d5a51b720b277818dbf6f2e49e
3758+
languageName: node
3759+
linkType: hard
3760+
37473761
"atomically@npm:^2.0.3":
37483762
version: 2.0.3
37493763
resolution: "atomically@npm:2.0.3"
@@ -4261,7 +4275,7 @@ __metadata:
42614275
languageName: node
42624276
linkType: hard
42634277

4264-
"ci-info@npm:^3.2.0":
4278+
"ci-info@npm:^3.2.0, ci-info@npm:^3.7.0":
42654279
version: 3.9.0
42664280
resolution: "ci-info@npm:3.9.0"
42674281
checksum: 6b19dc9b2966d1f8c2041a838217299718f15d6c4b63ae36e4674edd2bee48f780e94761286a56aa59eb305a85fbea4ddffb7630ec063e7ec7e7e5ad42549a87
@@ -5930,6 +5944,15 @@ __metadata:
59305944
languageName: node
59315945
linkType: hard
59325946

5947+
"find-yarn-workspace-root@npm:^2.0.0":
5948+
version: 2.0.0
5949+
resolution: "find-yarn-workspace-root@npm:2.0.0"
5950+
dependencies:
5951+
micromatch: ^4.0.2
5952+
checksum: fa5ca8f9d08fe7a54ce7c0a5931ff9b7e36f9ee7b9475fb13752bcea80ec6b5f180fa5102d60b376d5526ce924ea3fc6b19301262efa0a5d248dd710f3644242
5953+
languageName: node
5954+
linkType: hard
5955+
59335956
"flow-enums-runtime@npm:^0.0.6":
59345957
version: 0.0.6
59355958
resolution: "flow-enums-runtime@npm:0.0.6"
@@ -5985,6 +6008,18 @@ __metadata:
59856008
languageName: node
59866009
linkType: hard
59876010

6011+
"fs-extra@npm:^9.0.0":
6012+
version: 9.1.0
6013+
resolution: "fs-extra@npm:9.1.0"
6014+
dependencies:
6015+
at-least-node: ^1.0.0
6016+
graceful-fs: ^4.2.0
6017+
jsonfile: ^6.0.1
6018+
universalify: ^2.0.0
6019+
checksum: ba71ba32e0faa74ab931b7a0031d1523c66a73e225de7426e275e238e312d07313d2da2d33e34a52aa406c8763ade5712eb3ec9ba4d9edce652bcacdc29e6b20
6020+
languageName: node
6021+
linkType: hard
6022+
59886023
"fs-minipass@npm:^3.0.0":
59896024
version: 3.0.3
59906025
resolution: "fs-minipass@npm:3.0.3"
@@ -6338,7 +6373,7 @@ __metadata:
63386373
languageName: node
63396374
linkType: hard
63406375

6341-
"graceful-fs@npm:^4.1.3, graceful-fs@npm:^4.1.6, graceful-fs@npm:^4.2.0, graceful-fs@npm:^4.2.10, graceful-fs@npm:^4.2.11, graceful-fs@npm:^4.2.4, graceful-fs@npm:^4.2.6, graceful-fs@npm:^4.2.9":
6376+
"graceful-fs@npm:^4.1.11, graceful-fs@npm:^4.1.3, graceful-fs@npm:^4.1.6, graceful-fs@npm:^4.2.0, graceful-fs@npm:^4.2.10, graceful-fs@npm:^4.2.11, graceful-fs@npm:^4.2.4, graceful-fs@npm:^4.2.6, graceful-fs@npm:^4.2.9":
63426377
version: 4.2.11
63436378
resolution: "graceful-fs@npm:4.2.11"
63446379
checksum: ac85f94da92d8eb6b7f5a8b20ce65e43d66761c55ce85ac96df6865308390da45a8d3f0296dd3a663de65d30ba497bd46c696cc1e248c72b13d6d567138a4fc7
@@ -7954,6 +7989,19 @@ __metadata:
79547989
languageName: node
79557990
linkType: hard
79567991

7992+
"json-stable-stringify@npm:^1.0.2":
7993+
version: 1.3.0
7994+
resolution: "json-stable-stringify@npm:1.3.0"
7995+
dependencies:
7996+
call-bind: ^1.0.8
7997+
call-bound: ^1.0.4
7998+
isarray: ^2.0.5
7999+
jsonify: ^0.0.1
8000+
object-keys: ^1.1.1
8001+
checksum: aaa8b56b7dbee2234adc5e318cf71e38ecd7b8a3811a420a77add8c870d281f7f5050008e2964a7ced4857f501f4667f3ac88b44bf70197bd0682e068a4d93ea
8002+
languageName: node
8003+
linkType: hard
8004+
79578005
"json5@npm:^2.2.1, json5@npm:^2.2.3":
79588006
version: 2.2.3
79598007
resolution: "json5@npm:2.2.3"
@@ -7988,6 +8036,13 @@ __metadata:
79888036
languageName: node
79898037
linkType: hard
79908038

8039+
"jsonify@npm:^0.0.1":
8040+
version: 0.0.1
8041+
resolution: "jsonify@npm:0.0.1"
8042+
checksum: 027287e1c0294fce15f18c0ff990cfc2318e7f01fb76515f784d5cd0784abfec6fc5c2355c3a2f2cb0ad7f4aa2f5b74ebbfe4e80476c35b2d13cabdb572e1134
8043+
languageName: node
8044+
linkType: hard
8045+
79918046
"jsonparse@npm:^1.2.0":
79928047
version: 1.3.1
79938048
resolution: "jsonparse@npm:1.3.1"
@@ -8014,6 +8069,15 @@ __metadata:
80148069
languageName: node
80158070
linkType: hard
80168071

8072+
"klaw-sync@npm:^6.0.0":
8073+
version: 6.0.0
8074+
resolution: "klaw-sync@npm:6.0.0"
8075+
dependencies:
8076+
graceful-fs: ^4.1.11
8077+
checksum: 0da397f8961313c3ef8f79fb63af9002cde5a8fb2aeb1a37351feff0dd6006129c790400c3f5c3b4e757bedcabb13d21ec0a5eaef5a593d59515d4f2c291e475
8078+
languageName: node
8079+
linkType: hard
8080+
80178081
"kleur@npm:^3.0.3":
80188082
version: 3.0.3
80198083
resolution: "kleur@npm:3.0.3"
@@ -8296,6 +8360,7 @@ __metadata:
82968360
commitlint: ^19.6.1
82978361
del-cli: ^5.1.0
82988362
jest: ^29.7.0
8363+
patch-package: ^8.0.0
82998364
prettier: ^3.0.3
83008365
react: 19.0.0
83018366
react-native: 0.79.2
@@ -8933,7 +8998,7 @@ __metadata:
89338998
languageName: node
89348999
linkType: hard
89359000

8936-
"micromatch@npm:^4.0.4, micromatch@npm:^4.0.8":
9001+
"micromatch@npm:^4.0.2, micromatch@npm:^4.0.4, micromatch@npm:^4.0.8":
89379002
version: 4.0.8
89389003
resolution: "micromatch@npm:4.0.8"
89399004
dependencies:
@@ -9050,7 +9115,7 @@ __metadata:
90509115
languageName: node
90519116
linkType: hard
90529117

9053-
"minimist@npm:^1.2.0, minimist@npm:^1.2.5, minimist@npm:^1.2.8":
9118+
"minimist@npm:^1.2.0, minimist@npm:^1.2.5, minimist@npm:^1.2.6, minimist@npm:^1.2.8":
90549119
version: 1.2.8
90559120
resolution: "minimist@npm:1.2.8"
90569121
checksum: 75a6d645fb122dad29c06a7597bddea977258957ed88d7a6df59b5cd3fe4a527e253e9bbf2e783e4b73657f9098b96a5fe96ab8a113655d4109108577ecf85b0
@@ -9515,7 +9580,7 @@ __metadata:
95159580
languageName: node
95169581
linkType: hard
95179582

9518-
"open@npm:^7.0.3":
9583+
"open@npm:^7.0.3, open@npm:^7.4.2":
95199584
version: 7.4.2
95209585
resolution: "open@npm:7.4.2"
95219586
dependencies:
@@ -9785,6 +9850,31 @@ __metadata:
97859850
languageName: node
97869851
linkType: hard
97879852

9853+
"patch-package@npm:^8.0.0":
9854+
version: 8.0.0
9855+
resolution: "patch-package@npm:8.0.0"
9856+
dependencies:
9857+
"@yarnpkg/lockfile": ^1.1.0
9858+
chalk: ^4.1.2
9859+
ci-info: ^3.7.0
9860+
cross-spawn: ^7.0.3
9861+
find-yarn-workspace-root: ^2.0.0
9862+
fs-extra: ^9.0.0
9863+
json-stable-stringify: ^1.0.2
9864+
klaw-sync: ^6.0.0
9865+
minimist: ^1.2.6
9866+
open: ^7.4.2
9867+
rimraf: ^2.6.3
9868+
semver: ^7.5.3
9869+
slash: ^2.0.0
9870+
tmp: ^0.0.33
9871+
yaml: ^2.2.2
9872+
bin:
9873+
patch-package: index.js
9874+
checksum: d23cddc4d1622e2d8c7ca31b145c6eddb24bd271f69905e766de5e1f199f0b9a5479a6a6939ea857288399d4ed249285639d539a2c00fbddb7daa39934b007a2
9875+
languageName: node
9876+
linkType: hard
9877+
97889878
"path-exists@npm:^4.0.0":
97899879
version: 4.0.0
97909880
resolution: "path-exists@npm:4.0.0"
@@ -10629,6 +10719,17 @@ __metadata:
1062910719
languageName: node
1063010720
linkType: hard
1063110721

10722+
"rimraf@npm:^2.6.3":
10723+
version: 2.7.1
10724+
resolution: "rimraf@npm:2.7.1"
10725+
dependencies:
10726+
glob: ^7.1.3
10727+
bin:
10728+
rimraf: ./bin.js
10729+
checksum: cdc7f6eacb17927f2a075117a823e1c5951792c6498ebcce81ca8203454a811d4cf8900314154d3259bb8f0b42ab17f67396a8694a54cae3283326e57ad250cd
10730+
languageName: node
10731+
linkType: hard
10732+
1063210733
"rimraf@npm:^3.0.2":
1063310734
version: 3.0.2
1063410735
resolution: "rimraf@npm:3.0.2"
@@ -10957,6 +11058,13 @@ __metadata:
1095711058
languageName: node
1095811059
linkType: hard
1095911060

11061+
"slash@npm:^2.0.0":
11062+
version: 2.0.0
11063+
resolution: "slash@npm:2.0.0"
11064+
checksum: 512d4350735375bd11647233cb0e2f93beca6f53441015eea241fe784d8068281c3987fbaa93e7ef1c38df68d9c60013045c92837423c69115297d6169aa85e6
11065+
languageName: node
11066+
linkType: hard
11067+
1096011068
"slash@npm:^3.0.0":
1096111069
version: 3.0.0
1096211070
resolution: "slash@npm:3.0.0"
@@ -12293,7 +12401,7 @@ __metadata:
1229312401
languageName: node
1229412402
linkType: hard
1229512403

12296-
"yaml@npm:^2.2.1":
12404+
"yaml@npm:^2.2.1, yaml@npm:^2.2.2":
1229712405
version: 2.8.0
1229812406
resolution: "yaml@npm:2.8.0"
1229912407
bin:

0 commit comments

Comments
 (0)