From 5d4faaecf3c7f837c5aca28028a5e3420a5b7a67 Mon Sep 17 00:00:00 2001 From: Patrick Kabwe Date: Sat, 22 Nov 2025 06:43:31 +0200 Subject: [PATCH 1/2] chore: upgrade nitro to latest version (0.31.9) --- bun.lock | 10 ++++++---- package.json | 4 ++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/bun.lock b/bun.lock index 8c39459..5f8d0d1 100644 --- a/bun.lock +++ b/bun.lock @@ -14,11 +14,11 @@ "@types/jest": "^29.5.12", "@types/react": "^19.1.0", "conventional-changelog-conventionalcommits": "^9.1.0", - "nitrogen": "^0.31.5", + "nitrogen": "^0.31.9", "react": "19.1.0", "react-native": "0.81.0", "react-native-builder-bob": "^0.37.0", - "react-native-nitro-modules": "^0.31.5", + "react-native-nitro-modules": "^0.31.9", "semantic-release": "^24.2.7", "typescript": "^5.8.3", }, @@ -1410,7 +1410,7 @@ "nerf-dart": ["nerf-dart@1.0.0", "", {}, "sha512-EZSPZB70jiVsivaBLYDCyntd5eH8NTSMOn3rB+HxwdmKThGELLdYv8qVIMWvZEFy9w8ZZpW9h9OB32l1rGtj7g=="], - "nitrogen": ["nitrogen@0.31.5", "", { "dependencies": { "chalk": "^5.3.0", "react-native-nitro-modules": "^0.31.5", "ts-morph": "^27.0.0", "yargs": "^18.0.0", "zod": "^4.0.5" }, "bin": { "nitrogen": "lib/index.js" } }, "sha512-aCPwXkkcGbmXZxfiC9Q29RybGje9LQDZQ3ehqKCsgM2VGB0VKWgaC7f3jHaa4/RFGUki0GlWTmD7Ov3hqg2TBg=="], + "nitrogen": ["nitrogen@0.31.9", "", { "dependencies": { "chalk": "^5.3.0", "react-native-nitro-modules": "^0.31.9", "ts-morph": "^27.0.0", "yargs": "^18.0.0", "zod": "^4.0.5" }, "bin": { "nitrogen": "lib/index.js" } }, "sha512-6CinyRMMR8W4h6to6tLGx9BGddlOiUZi4W4iQaUrRJnYif09/w3HBNXwj43ItehICzlTA8E+vV7YbLCls4n6XQ=="], "nocache": ["nocache@3.0.4", "", {}, "sha512-WDD0bdg9mbq6F4mRxEYcPWwfA1vxd0mrvKOyxI7Xj/atfRHVeutzuWByG//jfm4uPzp0y4Kj051EORCBSQMycw=="], @@ -1576,7 +1576,7 @@ "react-native-nitro-fs-example": ["react-native-nitro-fs-example@workspace:example"], - "react-native-nitro-modules": ["react-native-nitro-modules@0.31.5", "", { "peerDependencies": { "react": "*", "react-native": "*" } }, "sha512-h/IbVsK5IH7JkvseihAoz/o5dy6CafvGo7j4jTvAa+gnxZWFtXQZg8EDvu0en88LFAumKd/pcF20dzxMiNOmug=="], + "react-native-nitro-modules": ["react-native-nitro-modules@0.31.9", "", { "peerDependencies": { "react": "*", "react-native": "*" } }, "sha512-w7NtHq4wP6LZgvDs7zbFU3B2uHpRx/bJlSTckw0By8NyEX39fURPGgHyi4a67q1O7I3iFJvbRNWUiiOBbNvHDg=="], "react-native-safe-area-context": ["react-native-safe-area-context@5.6.2", "", { "peerDependencies": { "react": "*", "react-native": "*" } }, "sha512-4XGqMNj5qjUTYywJqpdWZ9IG8jgkS3h06sfVjfw5yZQZfWnRFXczi0GnYyFyCc2EBps/qFmoCH8fez//WumdVg=="], @@ -2544,6 +2544,8 @@ "react-native-builder-bob/yargs": ["yargs@17.7.2", "", { "dependencies": { "cliui": "^8.0.1", "escalade": "^3.1.1", "get-caller-file": "^2.0.5", "require-directory": "^2.1.1", "string-width": "^4.2.3", "y18n": "^5.0.5", "yargs-parser": "^21.1.1" } }, "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w=="], + "react-native-nitro-fs-example/react-native-nitro-modules": ["react-native-nitro-modules@0.31.5", "", { "peerDependencies": { "react": "*", "react-native": "*" } }, "sha512-h/IbVsK5IH7JkvseihAoz/o5dy6CafvGo7j4jTvAa+gnxZWFtXQZg8EDvu0en88LFAumKd/pcF20dzxMiNOmug=="], + "read-package-up/type-fest": ["type-fest@4.41.0", "", {}, "sha512-TeTSQ6H5YHvpqVwBRcnLDCBnDOHWYu7IvGbHT6N8AOymcr9PJGjc1GTtiWZTYg0NCgYwvnYWEkVChQAr9bjfwA=="], "read-pkg/parse-json": ["parse-json@8.3.0", "", { "dependencies": { "@babel/code-frame": "^7.26.2", "index-to-position": "^1.1.0", "type-fest": "^4.39.1" } }, "sha512-ybiGyvspI+fAoRQbIPRddCcSTV9/LsJbf0e/S85VLowVGzRmokfneg2kwVW/KU5rOXrPSbF1qAKPMgNTqqROQQ=="], diff --git a/package.json b/package.json index 70671ae..dd7e181 100644 --- a/package.json +++ b/package.json @@ -58,11 +58,11 @@ "@types/jest": "^29.5.12", "@types/react": "^19.1.0", "conventional-changelog-conventionalcommits": "^9.1.0", - "nitrogen": "^0.31.5", + "nitrogen": "^0.31.9", "react": "19.1.0", "react-native": "0.81.0", "react-native-builder-bob": "^0.37.0", - "react-native-nitro-modules": "^0.31.5", + "react-native-nitro-modules": "^0.31.9", "semantic-release": "^24.2.7", "typescript": "^5.8.3" }, From 6d8d49cdd50d6efc9b101cf87dd5ff5ee9939329 Mon Sep 17 00:00:00 2001 From: Patrick Kabwe Date: Sat, 22 Nov 2025 06:46:21 +0200 Subject: [PATCH 2/2] chore: update generated files and dependencies after nitro upgrade --- bun.lock | 4 +--- example/ios/Podfile.lock | 4 ++-- example/package.json | 2 +- nitrogen/generated/android/c++/JFunc_void_double_double.hpp | 3 ++- nitrogen/generated/android/c++/JHybridNitroFSSpec.cpp | 1 + nitrogen/generated/ios/NitroFS-Swift-Cxx-Bridge.cpp | 1 + nitrogen/generated/ios/swift/Func_void.swift | 2 +- nitrogen/generated/ios/swift/Func_void_NitroFile.swift | 2 +- nitrogen/generated/ios/swift/Func_void_NitroFileStat.swift | 2 +- nitrogen/generated/ios/swift/Func_void_bool.swift | 2 +- nitrogen/generated/ios/swift/Func_void_double_double.swift | 2 +- .../generated/ios/swift/Func_void_std__exception_ptr.swift | 2 +- nitrogen/generated/ios/swift/Func_void_std__string.swift | 2 +- .../ios/swift/Func_void_std__vector_NitroFile_.swift | 2 +- nitrogen/generated/ios/swift/HybridNitroFSSpec.swift | 1 - nitrogen/generated/ios/swift/HybridNitroFSSpec_cxx.swift | 1 - nitrogen/generated/ios/swift/NitroFile.swift | 1 + nitrogen/generated/ios/swift/NitroFileStat.swift | 1 + nitrogen/generated/ios/swift/NitroUploadOptions.swift | 1 + 19 files changed, 19 insertions(+), 17 deletions(-) diff --git a/bun.lock b/bun.lock index 5f8d0d1..3bb5277 100644 --- a/bun.lock +++ b/bun.lock @@ -35,7 +35,7 @@ "react": "19.1.0", "react-native": "0.81.0", "react-native-nitro-document-picker": "^1.2.0", - "react-native-nitro-modules": "^0.31.5", + "react-native-nitro-modules": "^0.31.9", "react-native-safe-area-context": "^5.6.2", }, "devDependencies": { @@ -2544,8 +2544,6 @@ "react-native-builder-bob/yargs": ["yargs@17.7.2", "", { "dependencies": { "cliui": "^8.0.1", "escalade": "^3.1.1", "get-caller-file": "^2.0.5", "require-directory": "^2.1.1", "string-width": "^4.2.3", "y18n": "^5.0.5", "yargs-parser": "^21.1.1" } }, "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w=="], - "react-native-nitro-fs-example/react-native-nitro-modules": ["react-native-nitro-modules@0.31.5", "", { "peerDependencies": { "react": "*", "react-native": "*" } }, "sha512-h/IbVsK5IH7JkvseihAoz/o5dy6CafvGo7j4jTvAa+gnxZWFtXQZg8EDvu0en88LFAumKd/pcF20dzxMiNOmug=="], - "read-package-up/type-fest": ["type-fest@4.41.0", "", {}, "sha512-TeTSQ6H5YHvpqVwBRcnLDCBnDOHWYu7IvGbHT6N8AOymcr9PJGjc1GTtiWZTYg0NCgYwvnYWEkVChQAr9bjfwA=="], "read-pkg/parse-json": ["parse-json@8.3.0", "", { "dependencies": { "@babel/code-frame": "^7.26.2", "index-to-position": "^1.1.0", "type-fest": "^4.39.1" } }, "sha512-ybiGyvspI+fAoRQbIPRddCcSTV9/LsJbf0e/S85VLowVGzRmokfneg2kwVW/KU5rOXrPSbF1qAKPMgNTqqROQQ=="], diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock index 99052f7..f0fafc2 100644 --- a/example/ios/Podfile.lock +++ b/example/ios/Podfile.lock @@ -68,7 +68,7 @@ PODS: - ReactCommon/turbomodule/core - SocketRocket - Yoga - - NitroModules (0.31.5): + - NitroModules (0.31.9): - boost - DoubleConversion - fast_float @@ -2648,7 +2648,7 @@ SPEC CHECKSUMS: hermes-engine: e7491a2038f2618c8cd444ed411a6deb350a3742 NitroDocumentPicker: 3f7adcb535ed9ac19a92a65c7228da559227ffdb NitroFS: 61a09bcd2314341d3ad3db444ba75a57e6facef6 - NitroModules: edd5870885e786b0f2119836cf47e8b28d5b9c1f + NitroModules: 224bf833d249b0c7ce32831368f2887008579b13 RCT-Folly: 846fda9475e61ec7bcbf8a3fe81edfcaeb090669 RCTDeprecation: 0735ab4f6b3ec93a7f98187b5da74d7916e2cf4c RCTRequired: 8fcc7801bfc433072287b0f24a662e2816e89d0c diff --git a/example/package.json b/example/package.json index a1695af..5dcfc0d 100644 --- a/example/package.json +++ b/example/package.json @@ -14,7 +14,7 @@ "react": "19.1.0", "react-native": "0.81.0", "react-native-nitro-document-picker": "^1.2.0", - "react-native-nitro-modules": "^0.31.5", + "react-native-nitro-modules": "^0.31.9", "react-native-safe-area-context": "^5.6.2" }, "devDependencies": { diff --git a/nitrogen/generated/android/c++/JFunc_void_double_double.hpp b/nitrogen/generated/android/c++/JFunc_void_double_double.hpp index d8a8a05..810a31b 100644 --- a/nitrogen/generated/android/c++/JFunc_void_double_double.hpp +++ b/nitrogen/generated/android/c++/JFunc_void_double_double.hpp @@ -11,6 +11,7 @@ #include #include +#include namespace margelo::nitro::nitrofs { @@ -37,7 +38,7 @@ namespace margelo::nitro::nitrofs { /** * An implementation of Func_void_double_double that is backed by a C++ implementation (using `std::function<...>`) */ - struct JFunc_void_double_double_cxx final: public jni::HybridClass { + class JFunc_void_double_double_cxx final: public jni::HybridClass { public: static jni::local_ref fromCpp(const std::function& func) { return JFunc_void_double_double_cxx::newObjectCxxArgs(func); diff --git a/nitrogen/generated/android/c++/JHybridNitroFSSpec.cpp b/nitrogen/generated/android/c++/JHybridNitroFSSpec.cpp index b85cb2d..4c9a44b 100644 --- a/nitrogen/generated/android/c++/JHybridNitroFSSpec.cpp +++ b/nitrogen/generated/android/c++/JHybridNitroFSSpec.cpp @@ -35,6 +35,7 @@ namespace margelo::nitro::nitrofs { enum class NitroUploadMethod; } #include "JNitroUploadMethod.hpp" #include #include "JFunc_void_double_double.hpp" +#include namespace margelo::nitro::nitrofs { diff --git a/nitrogen/generated/ios/NitroFS-Swift-Cxx-Bridge.cpp b/nitrogen/generated/ios/NitroFS-Swift-Cxx-Bridge.cpp index 961ca67..dc2f354 100644 --- a/nitrogen/generated/ios/NitroFS-Swift-Cxx-Bridge.cpp +++ b/nitrogen/generated/ios/NitroFS-Swift-Cxx-Bridge.cpp @@ -10,6 +10,7 @@ // Include C++ implementation defined types #include "HybridNitroFSSpecSwift.hpp" #include "NitroFS-Swift-Cxx-Umbrella.hpp" +#include namespace margelo::nitro::nitrofs::bridge::swift { diff --git a/nitrogen/generated/ios/swift/Func_void.swift b/nitrogen/generated/ios/swift/Func_void.swift index 108efe7..c417782 100644 --- a/nitrogen/generated/ios/swift/Func_void.swift +++ b/nitrogen/generated/ios/swift/Func_void.swift @@ -5,9 +5,9 @@ /// Copyright © 2025 Marc Rousavy @ Margelo /// +import Foundation import NitroModules - /** * Wraps a Swift `() -> Void` as a class. * This class can be used from C++, e.g. to wrap the Swift closure as a `std::function`. diff --git a/nitrogen/generated/ios/swift/Func_void_NitroFile.swift b/nitrogen/generated/ios/swift/Func_void_NitroFile.swift index 61c0bfd..6e51d2d 100644 --- a/nitrogen/generated/ios/swift/Func_void_NitroFile.swift +++ b/nitrogen/generated/ios/swift/Func_void_NitroFile.swift @@ -5,9 +5,9 @@ /// Copyright © 2025 Marc Rousavy @ Margelo /// +import Foundation import NitroModules - /** * Wraps a Swift `(_ value: NitroFile) -> Void` as a class. * This class can be used from C++, e.g. to wrap the Swift closure as a `std::function`. diff --git a/nitrogen/generated/ios/swift/Func_void_NitroFileStat.swift b/nitrogen/generated/ios/swift/Func_void_NitroFileStat.swift index 83cab2e..42ff3fd 100644 --- a/nitrogen/generated/ios/swift/Func_void_NitroFileStat.swift +++ b/nitrogen/generated/ios/swift/Func_void_NitroFileStat.swift @@ -5,9 +5,9 @@ /// Copyright © 2025 Marc Rousavy @ Margelo /// +import Foundation import NitroModules - /** * Wraps a Swift `(_ value: NitroFileStat) -> Void` as a class. * This class can be used from C++, e.g. to wrap the Swift closure as a `std::function`. diff --git a/nitrogen/generated/ios/swift/Func_void_bool.swift b/nitrogen/generated/ios/swift/Func_void_bool.swift index bb9ab99..3731ecf 100644 --- a/nitrogen/generated/ios/swift/Func_void_bool.swift +++ b/nitrogen/generated/ios/swift/Func_void_bool.swift @@ -5,9 +5,9 @@ /// Copyright © 2025 Marc Rousavy @ Margelo /// +import Foundation import NitroModules - /** * Wraps a Swift `(_ value: Bool) -> Void` as a class. * This class can be used from C++, e.g. to wrap the Swift closure as a `std::function`. diff --git a/nitrogen/generated/ios/swift/Func_void_double_double.swift b/nitrogen/generated/ios/swift/Func_void_double_double.swift index c4d3529..4c4ca87 100644 --- a/nitrogen/generated/ios/swift/Func_void_double_double.swift +++ b/nitrogen/generated/ios/swift/Func_void_double_double.swift @@ -5,9 +5,9 @@ /// Copyright © 2025 Marc Rousavy @ Margelo /// +import Foundation import NitroModules - /** * Wraps a Swift `(_ uploadedBytes: Double, _ totalBytes: Double) -> Void` as a class. * This class can be used from C++, e.g. to wrap the Swift closure as a `std::function`. diff --git a/nitrogen/generated/ios/swift/Func_void_std__exception_ptr.swift b/nitrogen/generated/ios/swift/Func_void_std__exception_ptr.swift index f4cad28..e7df9ac 100644 --- a/nitrogen/generated/ios/swift/Func_void_std__exception_ptr.swift +++ b/nitrogen/generated/ios/swift/Func_void_std__exception_ptr.swift @@ -5,9 +5,9 @@ /// Copyright © 2025 Marc Rousavy @ Margelo /// +import Foundation import NitroModules - /** * Wraps a Swift `(_ error: Error) -> Void` as a class. * This class can be used from C++, e.g. to wrap the Swift closure as a `std::function`. diff --git a/nitrogen/generated/ios/swift/Func_void_std__string.swift b/nitrogen/generated/ios/swift/Func_void_std__string.swift index 3cdee4f..c4726d8 100644 --- a/nitrogen/generated/ios/swift/Func_void_std__string.swift +++ b/nitrogen/generated/ios/swift/Func_void_std__string.swift @@ -5,9 +5,9 @@ /// Copyright © 2025 Marc Rousavy @ Margelo /// +import Foundation import NitroModules - /** * Wraps a Swift `(_ value: String) -> Void` as a class. * This class can be used from C++, e.g. to wrap the Swift closure as a `std::function`. diff --git a/nitrogen/generated/ios/swift/Func_void_std__vector_NitroFile_.swift b/nitrogen/generated/ios/swift/Func_void_std__vector_NitroFile_.swift index 2ea1bcf..18eb94f 100644 --- a/nitrogen/generated/ios/swift/Func_void_std__vector_NitroFile_.swift +++ b/nitrogen/generated/ios/swift/Func_void_std__vector_NitroFile_.swift @@ -5,9 +5,9 @@ /// Copyright © 2025 Marc Rousavy @ Margelo /// +import Foundation import NitroModules - /** * Wraps a Swift `(_ value: [NitroFile]) -> Void` as a class. * This class can be used from C++, e.g. to wrap the Swift closure as a `std::function`. diff --git a/nitrogen/generated/ios/swift/HybridNitroFSSpec.swift b/nitrogen/generated/ios/swift/HybridNitroFSSpec.swift index 23f4d97..a9d411d 100644 --- a/nitrogen/generated/ios/swift/HybridNitroFSSpec.swift +++ b/nitrogen/generated/ios/swift/HybridNitroFSSpec.swift @@ -7,7 +7,6 @@ import Foundation import NitroModules -import NitroModules /// See ``HybridNitroFSSpec`` public protocol HybridNitroFSSpec_protocol: HybridObject { diff --git a/nitrogen/generated/ios/swift/HybridNitroFSSpec_cxx.swift b/nitrogen/generated/ios/swift/HybridNitroFSSpec_cxx.swift index ed378ee..8015f1e 100644 --- a/nitrogen/generated/ios/swift/HybridNitroFSSpec_cxx.swift +++ b/nitrogen/generated/ios/swift/HybridNitroFSSpec_cxx.swift @@ -7,7 +7,6 @@ import Foundation import NitroModules -import NitroModules /** * A class implementation that bridges HybridNitroFSSpec over to C++. diff --git a/nitrogen/generated/ios/swift/NitroFile.swift b/nitrogen/generated/ios/swift/NitroFile.swift index 13b3909..63db534 100644 --- a/nitrogen/generated/ios/swift/NitroFile.swift +++ b/nitrogen/generated/ios/swift/NitroFile.swift @@ -5,6 +5,7 @@ /// Copyright © 2025 Marc Rousavy @ Margelo /// +import Foundation import NitroModules /** diff --git a/nitrogen/generated/ios/swift/NitroFileStat.swift b/nitrogen/generated/ios/swift/NitroFileStat.swift index 2702ae6..3068516 100644 --- a/nitrogen/generated/ios/swift/NitroFileStat.swift +++ b/nitrogen/generated/ios/swift/NitroFileStat.swift @@ -5,6 +5,7 @@ /// Copyright © 2025 Marc Rousavy @ Margelo /// +import Foundation import NitroModules /** diff --git a/nitrogen/generated/ios/swift/NitroUploadOptions.swift b/nitrogen/generated/ios/swift/NitroUploadOptions.swift index 936b429..2141117 100644 --- a/nitrogen/generated/ios/swift/NitroUploadOptions.swift +++ b/nitrogen/generated/ios/swift/NitroUploadOptions.swift @@ -5,6 +5,7 @@ /// Copyright © 2025 Marc Rousavy @ Margelo /// +import Foundation import NitroModules /**