Skip to content

Commit f425341

Browse files
committed
fix: android build
1 parent d44c983 commit f425341

File tree

5 files changed

+2
-13
lines changed

5 files changed

+2
-13
lines changed

.github/ISSUE_TEMPLATE/BUILD_ERROR.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ body:
4141
"react-native": "^0.74.3",
4242
"react-native-quick-crypto": "^0.7.1",
4343
"@craftzdog/react-native-buffer": "^6.0.5",
44-
"react-native-fast-encoder": "^0.1.12",
4544
"react-native-quick-base64": "^2.1.2",
4645
...
4746
},

bun.lock

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@
4141
"react": "19.1.0",
4242
"react-native": "0.81.1",
4343
"react-native-bouncy-checkbox": "4.1.2",
44-
"react-native-fast-encoder": "0.2.0",
4544
"react-native-nitro-modules": "0.29.1",
4645
"react-native-quick-base64": "2.2.2",
4746
"react-native-quick-crypto": "workspace:*",
@@ -1396,8 +1395,6 @@
13961395

13971396
"flat-cache": ["[email protected]", "", { "dependencies": { "flatted": "^3.2.9", "keyv": "^4.5.4" } }, "sha512-f7ccFPK3SXFHpx15UIGyRJ/FJQctuKZ0zVuN3frBo4HnK3cay9VEW0R6yPYFHC0AgqhukPzKjq22t5DmAyqGyw=="],
13981397

1399-
"flatbuffers": ["[email protected]", "", {}, "sha512-QTTZTXTbVfuOVQu2X6eLOw4vefUxnFJZxAKeN3rEPhjEzBtIbehimJLfVGHPM8iX0Na+9i76SBEg0skf0c0sCA=="],
1400-
14011398
"flatted": ["[email protected]", "", {}, "sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw=="],
14021399

14031400
"flow-enums-runtime": ["[email protected]", "", {}, "sha512-3PYnM29RFXwvAN6Pc/scUfkI7RwhQ/xqyLUyPNlXUp9S40zI8nup9tUSrTLSVnWGBN38FNiGWbwZOB6uR4OGdw=="],
@@ -2190,8 +2187,6 @@
21902187

21912188
"react-native-builder-bob": ["[email protected]", "", { "dependencies": { "@babel/core": "^7.25.2", "@babel/plugin-transform-strict-mode": "^7.24.7", "@babel/preset-env": "^7.25.2", "@babel/preset-flow": "^7.24.7", "@babel/preset-react": "^7.24.7", "@babel/preset-typescript": "^7.24.7", "babel-plugin-module-resolver": "^5.0.2", "browserslist": "^4.20.4", "cross-spawn": "^7.0.3", "dedent": "^0.7.0", "del": "^6.1.1", "escape-string-regexp": "^4.0.0", "fs-extra": "^10.1.0", "glob": "^8.0.3", "is-git-dirty": "^2.0.1", "json5": "^2.2.1", "kleur": "^4.1.4", "metro-config": "^0.80.9", "prompts": "^2.4.2", "which": "^2.0.2", "yargs": "^17.5.1" }, "bin": { "bob": "bin/bob" } }, "sha512-nEG9FB5a2Rxw0251dnlM9QtqvuM2os8avRhYDWDdvsZOnQJhQI4fGV5wF5FypAqHNWPQUNXmvhPUFrPSwiPnAQ=="],
21922189

2193-
"react-native-fast-encoder": ["[email protected]", "", { "dependencies": { "big-integer": "^1.6.51", "flatbuffers": "2.0.6" }, "peerDependencies": { "react": "*", "react-native": "*" } }, "sha512-E4mx81fRMVs0qq8is3cZTrbuEJdsDo8Nfe7qTxKZwsCianpYpA2QfyH6cEYumSOEht6l+KeRJ4RqcyfxMDyesg=="],
2194-
21952190
"react-native-is-edge-to-edge": ["[email protected]", "", { "peerDependencies": { "react": "*", "react-native": "*" } }, "sha512-FLbPWl/MyYQWz+KwqOZsSyj2JmLKglHatd3xLZWskXOpRaio4LfEDEz8E/A6uD8QoTHW6Aobw1jbEwK7KMgR7Q=="],
21962191

21972192
"react-native-nitro-modules": ["[email protected]", "", { "peerDependencies": { "react": "*", "react-native": "*" } }, "sha512-91A/Lc4Zc1Bvzj1iMSnD6vA5Swqv8aVcwGcv8ddjoPd9mahNvVS2arFh3o7kAqRH4RIh3KcQ0NpYslu7AYn55Q=="],

example/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
"react": "19.1.0",
3737
"react-native": "0.81.1",
3838
"react-native-bouncy-checkbox": "4.1.2",
39-
"react-native-fast-encoder": "0.2.0",
4039
"react-native-nitro-modules": "0.29.1",
4140
"react-native-quick-base64": "2.2.2",
4241
"react-native-quick-crypto": "workspace:*",

example/src/tests/subtle/encrypt_decrypt.ts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,6 @@ import aes_gcm_fixtures from '../../fixtures/aes_gcm';
3030
import { assertThrowsAsync } from '../util';
3131
import { ab2str } from 'react-native-quick-crypto';
3232

33-
import RNFE from 'react-native-fast-encoder';
34-
// @ts-expect-error polyfill types are wonky
35-
globalThis.TextEncoder = () => RNFE;
36-
3733
export type RsaEncryptDecryptTestVector = {
3834
name: string;
3935
publicKey: Buffer | null;

packages/react-native-quick-crypto/android/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ add_library(
1515
../cpp/cipher/XSalsa20Cipher.cpp
1616
../cpp/cipher/ChaCha20Cipher.cpp
1717
../cpp/cipher/ChaCha20Poly1305Cipher.cpp
18+
../cpp/ec/HybridEcKeyPair.cpp
1819
../cpp/ed25519/HybridEdKeyPair.cpp
1920
../cpp/hash/HybridHash.cpp
2021
../cpp/hmac/HybridHmac.cpp
@@ -33,6 +34,7 @@ include(${CMAKE_SOURCE_DIR}/../nitrogen/generated/android/QuickCrypto+autolinkin
3334
include_directories(
3435
"src/main/cpp"
3536
"../cpp/cipher"
37+
"../cpp/ec"
3638
"../cpp/ed25519"
3739
"../cpp/hash"
3840
"../cpp/hmac"
@@ -42,8 +44,6 @@ include_directories(
4244
"../cpp/utils"
4345
"../deps/fastpbkdf2"
4446
"../deps/ncrypto/include"
45-
"../build/includes" # flattened Nitro Modules headers
46-
"../../../node_modules/react-native/ReactCommon/jsi"
4747
)
4848

4949
# Third party libraries (Prefabs)

0 commit comments

Comments
 (0)