Skip to content

fix: correct Android native registration guidance #1566

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
OskarEichler wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: correct Android native registration guidance #1566

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions example/src/getTests.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2585,6 +2585,24 @@ export function getTests(
.didNotThrow()
.equals(true)
),
createTest(
'NitroModules.createHybridObject(...) error names registerAllNatives()',
() =>
it(() => {
try {
NitroModules.createHybridObject('__MissingHybridObjectForTest__')
return false
} catch (error) {
return (
error instanceof Error &&
error.message.includes('registerAllNatives()') &&
!error.message.includes('::registerNatives()')
)
}
})
.didNotThrow()
.equals(true)
),
createTest('NitroModules.isHybridObject(testObject) to be true', () =>
it(() => {
return NitroModules.isHybridObject(testObject)
Expand Down
4 changes: 2 additions & 2 deletions packages/nitrogen/src/autolinking/android/createHybridObjectInitializer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ ${createFileMetadataString(`${autolinkingClassName}.hpp`)}

namespace ${cxxNamespace} {

[[deprecated("Use registerNatives() instead.")]]
[[deprecated("Use registerAllNatives() instead.")]]
int initialize(JavaVM* vm);

/**
Expand All @@ -94,7 +94,7 @@ namespace ${cxxNamespace} {
* JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM* vm, void*) {
* return facebook::jni::initialize(vm, []() {
* // register all ${cppLibName} HybridObjects
* ${cxxNamespace}::registerNatives();
* ${cxxNamespace}::registerAllNatives();
* // any other custom registrations go here.
* });
* }
Expand Down
2 changes: 1 addition & 1 deletion packages/react-native-nitro-modules/cpp/registry/HybridObjectRegistry.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ std::shared_ptr<HybridObject> HybridObjectRegistry::createHybridObject(const std
"- If you use Nitrogen, make sure your library (*Package.kt)/app (MainApplication.kt) calls "
"`$$androidCxxLibName$$OnLoad.initializeNative()` somewhere on app-startup.\n"
"- If you use Nitrogen, make sure your `cpp-adapter.cpp`/`OnLoad.cpp` calls "
"`margelo::nitro::$$cxxNamespace$$::registerNatives()` inside `facebook::jni::initialize(...)`.\n"
"`margelo::nitro::$$cxxNamespace$$::registerAllNatives()` inside `facebook::jni::initialize(...)`.\n"
"- If you use Nitrogen, inspect the generated `$$androidCxxLibName$$OnLoad.cpp` file.\n"
"- If you don't use Nitrogen, make sure you called `HybridObjectRegistry.registerHybridObject(...)`."
"- All registered HybridObjects: [" +
Expand Down
4 changes: 2 additions & 2 deletions ...s/react-native-nitro-test-external/nitrogen/generated/android/NitroTestExternalOnLoad.hpp
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions packages/react-native-nitro-test/nitrogen/generated/android/NitroTestOnLoad.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

namespace margelo::nitro::test {

[[deprecated("Use registerNatives() instead.")]]
[[deprecated("Use registerAllNatives() instead.")]]
int initialize(JavaVM* vm);

/**
Expand All @@ -23,7 +23,7 @@ namespace margelo::nitro::test {
* JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM* vm, void*) {
* return facebook::jni::initialize(vm, []() {
* // register all NitroTest HybridObjects
* margelo::nitro::test::registerNatives();
* margelo::nitro::test::registerAllNatives();
* // any other custom registrations go here.
* });
* }
Expand Down
Loading