From 1838cf01c2473306e008afb7a48a46fac4b6a345 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mikl=C3=B3s=20Fazekas?= Date: Fri, 17 Apr 2026 12:55:57 +0200 Subject: [PATCH] chore: bump nitro-modules to 0.35.4 and nitrogen to 0.35.4 --- example/package.json | 2 +- expo-example/package.json | 2 +- nitrogen/generated/android/c++/JAlignment.hpp | 2 +- .../generated/android/c++/JArtboardBy.hpp | 2 +- .../android/c++/JArtboardByTypes.hpp | 2 +- .../generated/android/c++/JDataBindByName.hpp | 2 +- .../generated/android/c++/JDataBindMode.hpp | 2 +- .../android/c++/JEventPropertiesOutput.hpp | 8 +++--- nitrogen/generated/android/c++/JFit.hpp | 2 +- nitrogen/generated/android/c++/JFunc_void.hpp | 4 +-- .../android/c++/JFunc_void_RiveError.hpp | 4 +-- .../c++/JFunc_void_UnifiedRiveEvent.hpp | 4 +-- .../generated/android/c++/JFunc_void_bool.hpp | 4 +-- .../android/c++/JFunc_void_double.hpp | 4 +-- .../android/c++/JFunc_void_std__string.hpp | 4 +-- .../c++/JHybridBindableArtboardSpec.hpp | 4 +-- .../android/c++/JHybridFallbackFontSpec.hpp | 4 +-- .../c++/JHybridRiveFileFactorySpec.hpp | 4 +-- .../android/c++/JHybridRiveFileSpec.hpp | 4 +-- .../android/c++/JHybridRiveFontConfigSpec.hpp | 4 +-- .../c++/JHybridRiveImageFactorySpec.hpp | 4 +-- .../android/c++/JHybridRiveImageSpec.hpp | 4 +-- .../android/c++/JHybridRiveRuntimeSpec.hpp | 4 +-- .../android/c++/JHybridRiveViewSpec.hpp | 4 +-- .../JHybridViewModelArtboardPropertySpec.hpp | 4 +-- .../JHybridViewModelBooleanPropertySpec.hpp | 4 +-- .../c++/JHybridViewModelColorPropertySpec.hpp | 4 +-- .../c++/JHybridViewModelEnumPropertySpec.hpp | 4 +-- .../c++/JHybridViewModelImagePropertySpec.hpp | 4 +-- .../c++/JHybridViewModelInstanceSpec.hpp | 4 +-- .../c++/JHybridViewModelListPropertySpec.hpp | 4 +-- .../JHybridViewModelNumberPropertySpec.hpp | 4 +-- .../c++/JHybridViewModelPropertySpec.hpp | 4 +-- .../android/c++/JHybridViewModelSpec.hpp | 4 +-- .../JHybridViewModelStringPropertySpec.hpp | 4 +-- .../JHybridViewModelTriggerPropertySpec.hpp | 4 +-- .../android/c++/JReferencedAssetsType.hpp | 2 +- .../android/c++/JResolvedReferencedAsset.hpp | 2 +- nitrogen/generated/android/c++/JRiveError.hpp | 2 +- .../generated/android/c++/JRiveErrorType.hpp | 2 +- .../generated/android/c++/JRiveEventType.hpp | 2 +- .../android/c++/JUnifiedRiveEvent.hpp | 2 +- ...stanceSpec_DataBindMode_DataBindByName.hpp | 8 +++--- .../nitro/rive/EventPropertiesOutput.kt | 26 +++++++++++++------ ...nstanceSpec_DataBindMode_DataBindByName.kt | 26 +++++++++++++------ .../nitro/rive/views/HybridRiveViewManager.kt | 14 ++++++++-- nitrogen/generated/android/riveOnLoad.cpp | 24 ++++++++--------- nitrogen/generated/ios/RNRive+autolinking.rb | 2 ++ .../ios/c++/views/HybridRiveViewComponent.mm | 15 +++++++++++ .../ios/swift/EventPropertiesOutput.swift | 13 ++++++++++ .../ios/swift/HybridRiveViewSpec_cxx.swift | 4 +++ ...nceSpec__DataBindMode_DataBindByName.swift | 13 ++++++++++ package.json | 4 +-- yarn.lock | 26 +++++++++---------- 54 files changed, 198 insertions(+), 121 deletions(-) diff --git a/example/package.json b/example/package.json index 5139471f..f006088b 100644 --- a/example/package.json +++ b/example/package.json @@ -21,7 +21,7 @@ "react": "19.0.0", "react-native": "0.79.2", "react-native-gesture-handler": "2.29.1", - "react-native-nitro-modules": "0.35.0", + "react-native-nitro-modules": "0.35.4", "react-native-reanimated": "4.1.5", "react-native-safe-area-context": "^5.4.0", "react-native-screens": "~4.18.0", diff --git a/expo-example/package.json b/expo-example/package.json index a55c8cb9..661d55e8 100644 --- a/expo-example/package.json +++ b/expo-example/package.json @@ -35,7 +35,7 @@ "react-dom": "19.1.0", "react-native": "0.81.5", "react-native-gesture-handler": "2.29.1", - "react-native-nitro-modules": "0.35.0", + "react-native-nitro-modules": "0.35.4", "react-native-reanimated": "4.1.5", "react-native-safe-area-context": "~5.6.0", "react-native-screens": "~4.16.0", diff --git a/nitrogen/generated/android/c++/JAlignment.hpp b/nitrogen/generated/android/c++/JAlignment.hpp index b2202d90..ff22448b 100644 --- a/nitrogen/generated/android/c++/JAlignment.hpp +++ b/nitrogen/generated/android/c++/JAlignment.hpp @@ -19,7 +19,7 @@ namespace margelo::nitro::rive { */ struct JAlignment final: public jni::JavaClass { public: - static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/rive/Alignment;"; + static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/rive/Alignment;"; public: /** diff --git a/nitrogen/generated/android/c++/JArtboardBy.hpp b/nitrogen/generated/android/c++/JArtboardBy.hpp index 3b8eab87..38034860 100644 --- a/nitrogen/generated/android/c++/JArtboardBy.hpp +++ b/nitrogen/generated/android/c++/JArtboardBy.hpp @@ -24,7 +24,7 @@ namespace margelo::nitro::rive { */ struct JArtboardBy final: public jni::JavaClass { public: - static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/rive/ArtboardBy;"; + static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/rive/ArtboardBy;"; public: /** diff --git a/nitrogen/generated/android/c++/JArtboardByTypes.hpp b/nitrogen/generated/android/c++/JArtboardByTypes.hpp index 1332b18d..1b450eea 100644 --- a/nitrogen/generated/android/c++/JArtboardByTypes.hpp +++ b/nitrogen/generated/android/c++/JArtboardByTypes.hpp @@ -19,7 +19,7 @@ namespace margelo::nitro::rive { */ struct JArtboardByTypes final: public jni::JavaClass { public: - static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/rive/ArtboardByTypes;"; + static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/rive/ArtboardByTypes;"; public: /** diff --git a/nitrogen/generated/android/c++/JDataBindByName.hpp b/nitrogen/generated/android/c++/JDataBindByName.hpp index 11c85e79..3477fc58 100644 --- a/nitrogen/generated/android/c++/JDataBindByName.hpp +++ b/nitrogen/generated/android/c++/JDataBindByName.hpp @@ -21,7 +21,7 @@ namespace margelo::nitro::rive { */ struct JDataBindByName final: public jni::JavaClass { public: - static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/rive/DataBindByName;"; + static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/rive/DataBindByName;"; public: /** diff --git a/nitrogen/generated/android/c++/JDataBindMode.hpp b/nitrogen/generated/android/c++/JDataBindMode.hpp index 3c1480e7..3f2c2f05 100644 --- a/nitrogen/generated/android/c++/JDataBindMode.hpp +++ b/nitrogen/generated/android/c++/JDataBindMode.hpp @@ -19,7 +19,7 @@ namespace margelo::nitro::rive { */ struct JDataBindMode final: public jni::JavaClass { public: - static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/rive/DataBindMode;"; + static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/rive/DataBindMode;"; public: /** diff --git a/nitrogen/generated/android/c++/JEventPropertiesOutput.hpp b/nitrogen/generated/android/c++/JEventPropertiesOutput.hpp index 707ff32d..5a4520c2 100644 --- a/nitrogen/generated/android/c++/JEventPropertiesOutput.hpp +++ b/nitrogen/generated/android/c++/JEventPropertiesOutput.hpp @@ -22,7 +22,7 @@ namespace margelo::nitro::rive { */ class JEventPropertiesOutput: public jni::JavaClass { public: - static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/rive/EventPropertiesOutput;"; + static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/rive/EventPropertiesOutput;"; static jni::local_ref create_0(jboolean value) { static const auto method = javaClassStatic()->getStaticMethod("create"); @@ -52,7 +52,7 @@ namespace margelo::nitro::rive { namespace JEventPropertiesOutput_impl { class First final: public jni::JavaClass { public: - static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/rive/EventPropertiesOutput$First;"; + static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/rive/EventPropertiesOutput$First;"; [[nodiscard]] jboolean getValue() const { static const auto field = javaClassStatic()->getField("value"); @@ -62,7 +62,7 @@ namespace margelo::nitro::rive { class Second final: public jni::JavaClass { public: - static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/rive/EventPropertiesOutput$Second;"; + static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/rive/EventPropertiesOutput$Second;"; [[nodiscard]] jni::local_ref getValue() const { static const auto field = javaClassStatic()->getField("value"); @@ -72,7 +72,7 @@ namespace margelo::nitro::rive { class Third final: public jni::JavaClass { public: - static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/rive/EventPropertiesOutput$Third;"; + static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/rive/EventPropertiesOutput$Third;"; [[nodiscard]] double getValue() const { static const auto field = javaClassStatic()->getField("value"); diff --git a/nitrogen/generated/android/c++/JFit.hpp b/nitrogen/generated/android/c++/JFit.hpp index 4e936801..f8d4cdf5 100644 --- a/nitrogen/generated/android/c++/JFit.hpp +++ b/nitrogen/generated/android/c++/JFit.hpp @@ -19,7 +19,7 @@ namespace margelo::nitro::rive { */ struct JFit final: public jni::JavaClass { public: - static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/rive/Fit;"; + static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/rive/Fit;"; public: /** diff --git a/nitrogen/generated/android/c++/JFunc_void.hpp b/nitrogen/generated/android/c++/JFunc_void.hpp index 083013ff..3ab0d266 100644 --- a/nitrogen/generated/android/c++/JFunc_void.hpp +++ b/nitrogen/generated/android/c++/JFunc_void.hpp @@ -23,7 +23,7 @@ namespace margelo::nitro::rive { */ struct JFunc_void: public jni::JavaClass { public: - static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/rive/Func_void;"; + static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/rive/Func_void;"; public: /** @@ -59,7 +59,7 @@ namespace margelo::nitro::rive { } public: - static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/rive/Func_void_cxx;"; + static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/rive/Func_void_cxx;"; static void registerNatives() { registerHybrid({makeNativeMethod("invoke_cxx", JFunc_void_cxx::invoke_cxx)}); } diff --git a/nitrogen/generated/android/c++/JFunc_void_RiveError.hpp b/nitrogen/generated/android/c++/JFunc_void_RiveError.hpp index 7a850bdf..c4b1c2f9 100644 --- a/nitrogen/generated/android/c++/JFunc_void_RiveError.hpp +++ b/nitrogen/generated/android/c++/JFunc_void_RiveError.hpp @@ -28,7 +28,7 @@ namespace margelo::nitro::rive { */ struct JFunc_void_RiveError: public jni::JavaClass { public: - static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/rive/Func_void_RiveError;"; + static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/rive/Func_void_RiveError;"; public: /** @@ -64,7 +64,7 @@ namespace margelo::nitro::rive { } public: - static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/rive/Func_void_RiveError_cxx;"; + static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/rive/Func_void_RiveError_cxx;"; static void registerNatives() { registerHybrid({makeNativeMethod("invoke_cxx", JFunc_void_RiveError_cxx::invoke_cxx)}); } diff --git a/nitrogen/generated/android/c++/JFunc_void_UnifiedRiveEvent.hpp b/nitrogen/generated/android/c++/JFunc_void_UnifiedRiveEvent.hpp index 5649b9c0..e02c99fc 100644 --- a/nitrogen/generated/android/c++/JFunc_void_UnifiedRiveEvent.hpp +++ b/nitrogen/generated/android/c++/JFunc_void_UnifiedRiveEvent.hpp @@ -32,7 +32,7 @@ namespace margelo::nitro::rive { */ struct JFunc_void_UnifiedRiveEvent: public jni::JavaClass { public: - static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/rive/Func_void_UnifiedRiveEvent;"; + static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/rive/Func_void_UnifiedRiveEvent;"; public: /** @@ -68,7 +68,7 @@ namespace margelo::nitro::rive { } public: - static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/rive/Func_void_UnifiedRiveEvent_cxx;"; + static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/rive/Func_void_UnifiedRiveEvent_cxx;"; static void registerNatives() { registerHybrid({makeNativeMethod("invoke_cxx", JFunc_void_UnifiedRiveEvent_cxx::invoke_cxx)}); } diff --git a/nitrogen/generated/android/c++/JFunc_void_bool.hpp b/nitrogen/generated/android/c++/JFunc_void_bool.hpp index bf659485..0ee32eb5 100644 --- a/nitrogen/generated/android/c++/JFunc_void_bool.hpp +++ b/nitrogen/generated/android/c++/JFunc_void_bool.hpp @@ -23,7 +23,7 @@ namespace margelo::nitro::rive { */ struct JFunc_void_bool: public jni::JavaClass { public: - static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/rive/Func_void_bool;"; + static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/rive/Func_void_bool;"; public: /** @@ -59,7 +59,7 @@ namespace margelo::nitro::rive { } public: - static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/rive/Func_void_bool_cxx;"; + static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/rive/Func_void_bool_cxx;"; static void registerNatives() { registerHybrid({makeNativeMethod("invoke_cxx", JFunc_void_bool_cxx::invoke_cxx)}); } diff --git a/nitrogen/generated/android/c++/JFunc_void_double.hpp b/nitrogen/generated/android/c++/JFunc_void_double.hpp index 28cacc93..4f5de2d2 100644 --- a/nitrogen/generated/android/c++/JFunc_void_double.hpp +++ b/nitrogen/generated/android/c++/JFunc_void_double.hpp @@ -23,7 +23,7 @@ namespace margelo::nitro::rive { */ struct JFunc_void_double: public jni::JavaClass { public: - static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/rive/Func_void_double;"; + static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/rive/Func_void_double;"; public: /** @@ -59,7 +59,7 @@ namespace margelo::nitro::rive { } public: - static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/rive/Func_void_double_cxx;"; + static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/rive/Func_void_double_cxx;"; static void registerNatives() { registerHybrid({makeNativeMethod("invoke_cxx", JFunc_void_double_cxx::invoke_cxx)}); } diff --git a/nitrogen/generated/android/c++/JFunc_void_std__string.hpp b/nitrogen/generated/android/c++/JFunc_void_std__string.hpp index 7374b41a..e81695f7 100644 --- a/nitrogen/generated/android/c++/JFunc_void_std__string.hpp +++ b/nitrogen/generated/android/c++/JFunc_void_std__string.hpp @@ -24,7 +24,7 @@ namespace margelo::nitro::rive { */ struct JFunc_void_std__string: public jni::JavaClass { public: - static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/rive/Func_void_std__string;"; + static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/rive/Func_void_std__string;"; public: /** @@ -60,7 +60,7 @@ namespace margelo::nitro::rive { } public: - static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/rive/Func_void_std__string_cxx;"; + static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/rive/Func_void_std__string_cxx;"; static void registerNatives() { registerHybrid({makeNativeMethod("invoke_cxx", JFunc_void_std__string_cxx::invoke_cxx)}); } diff --git a/nitrogen/generated/android/c++/JHybridBindableArtboardSpec.hpp b/nitrogen/generated/android/c++/JHybridBindableArtboardSpec.hpp index 4364ad82..7773edee 100644 --- a/nitrogen/generated/android/c++/JHybridBindableArtboardSpec.hpp +++ b/nitrogen/generated/android/c++/JHybridBindableArtboardSpec.hpp @@ -21,11 +21,11 @@ namespace margelo::nitro::rive { class JHybridBindableArtboardSpec: public virtual HybridBindableArtboardSpec, public virtual JHybridObject { public: struct JavaPart: public jni::JavaClass { - static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/rive/HybridBindableArtboardSpec;"; + static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/rive/HybridBindableArtboardSpec;"; std::shared_ptr getJHybridBindableArtboardSpec(); }; struct CxxPart: public jni::HybridClass { - static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/rive/HybridBindableArtboardSpec$CxxPart;"; + static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/rive/HybridBindableArtboardSpec$CxxPart;"; static jni::local_ref initHybrid(jni::alias_ref jThis); static void registerNatives(); using HybridBase::HybridBase; diff --git a/nitrogen/generated/android/c++/JHybridFallbackFontSpec.hpp b/nitrogen/generated/android/c++/JHybridFallbackFontSpec.hpp index ecf7219f..96c71c76 100644 --- a/nitrogen/generated/android/c++/JHybridFallbackFontSpec.hpp +++ b/nitrogen/generated/android/c++/JHybridFallbackFontSpec.hpp @@ -21,11 +21,11 @@ namespace margelo::nitro::rive { class JHybridFallbackFontSpec: public virtual HybridFallbackFontSpec, public virtual JHybridObject { public: struct JavaPart: public jni::JavaClass { - static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/rive/HybridFallbackFontSpec;"; + static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/rive/HybridFallbackFontSpec;"; std::shared_ptr getJHybridFallbackFontSpec(); }; struct CxxPart: public jni::HybridClass { - static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/rive/HybridFallbackFontSpec$CxxPart;"; + static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/rive/HybridFallbackFontSpec$CxxPart;"; static jni::local_ref initHybrid(jni::alias_ref jThis); static void registerNatives(); using HybridBase::HybridBase; diff --git a/nitrogen/generated/android/c++/JHybridRiveFileFactorySpec.hpp b/nitrogen/generated/android/c++/JHybridRiveFileFactorySpec.hpp index 8729e034..1e9763cd 100644 --- a/nitrogen/generated/android/c++/JHybridRiveFileFactorySpec.hpp +++ b/nitrogen/generated/android/c++/JHybridRiveFileFactorySpec.hpp @@ -21,11 +21,11 @@ namespace margelo::nitro::rive { class JHybridRiveFileFactorySpec: public virtual HybridRiveFileFactorySpec, public virtual JHybridObject { public: struct JavaPart: public jni::JavaClass { - static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/rive/HybridRiveFileFactorySpec;"; + static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/rive/HybridRiveFileFactorySpec;"; std::shared_ptr getJHybridRiveFileFactorySpec(); }; struct CxxPart: public jni::HybridClass { - static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/rive/HybridRiveFileFactorySpec$CxxPart;"; + static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/rive/HybridRiveFileFactorySpec$CxxPart;"; static jni::local_ref initHybrid(jni::alias_ref jThis); static void registerNatives(); using HybridBase::HybridBase; diff --git a/nitrogen/generated/android/c++/JHybridRiveFileSpec.hpp b/nitrogen/generated/android/c++/JHybridRiveFileSpec.hpp index b184fe7b..313d3a0d 100644 --- a/nitrogen/generated/android/c++/JHybridRiveFileSpec.hpp +++ b/nitrogen/generated/android/c++/JHybridRiveFileSpec.hpp @@ -21,11 +21,11 @@ namespace margelo::nitro::rive { class JHybridRiveFileSpec: public virtual HybridRiveFileSpec, public virtual JHybridObject { public: struct JavaPart: public jni::JavaClass { - static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/rive/HybridRiveFileSpec;"; + static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/rive/HybridRiveFileSpec;"; std::shared_ptr getJHybridRiveFileSpec(); }; struct CxxPart: public jni::HybridClass { - static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/rive/HybridRiveFileSpec$CxxPart;"; + static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/rive/HybridRiveFileSpec$CxxPart;"; static jni::local_ref initHybrid(jni::alias_ref jThis); static void registerNatives(); using HybridBase::HybridBase; diff --git a/nitrogen/generated/android/c++/JHybridRiveFontConfigSpec.hpp b/nitrogen/generated/android/c++/JHybridRiveFontConfigSpec.hpp index d314d5c1..275490d0 100644 --- a/nitrogen/generated/android/c++/JHybridRiveFontConfigSpec.hpp +++ b/nitrogen/generated/android/c++/JHybridRiveFontConfigSpec.hpp @@ -21,11 +21,11 @@ namespace margelo::nitro::rive { class JHybridRiveFontConfigSpec: public virtual HybridRiveFontConfigSpec, public virtual JHybridObject { public: struct JavaPart: public jni::JavaClass { - static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/rive/HybridRiveFontConfigSpec;"; + static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/rive/HybridRiveFontConfigSpec;"; std::shared_ptr getJHybridRiveFontConfigSpec(); }; struct CxxPart: public jni::HybridClass { - static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/rive/HybridRiveFontConfigSpec$CxxPart;"; + static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/rive/HybridRiveFontConfigSpec$CxxPart;"; static jni::local_ref initHybrid(jni::alias_ref jThis); static void registerNatives(); using HybridBase::HybridBase; diff --git a/nitrogen/generated/android/c++/JHybridRiveImageFactorySpec.hpp b/nitrogen/generated/android/c++/JHybridRiveImageFactorySpec.hpp index 80d33403..da88c3dd 100644 --- a/nitrogen/generated/android/c++/JHybridRiveImageFactorySpec.hpp +++ b/nitrogen/generated/android/c++/JHybridRiveImageFactorySpec.hpp @@ -21,11 +21,11 @@ namespace margelo::nitro::rive { class JHybridRiveImageFactorySpec: public virtual HybridRiveImageFactorySpec, public virtual JHybridObject { public: struct JavaPart: public jni::JavaClass { - static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/rive/HybridRiveImageFactorySpec;"; + static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/rive/HybridRiveImageFactorySpec;"; std::shared_ptr getJHybridRiveImageFactorySpec(); }; struct CxxPart: public jni::HybridClass { - static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/rive/HybridRiveImageFactorySpec$CxxPart;"; + static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/rive/HybridRiveImageFactorySpec$CxxPart;"; static jni::local_ref initHybrid(jni::alias_ref jThis); static void registerNatives(); using HybridBase::HybridBase; diff --git a/nitrogen/generated/android/c++/JHybridRiveImageSpec.hpp b/nitrogen/generated/android/c++/JHybridRiveImageSpec.hpp index 4b544088..93c1899a 100644 --- a/nitrogen/generated/android/c++/JHybridRiveImageSpec.hpp +++ b/nitrogen/generated/android/c++/JHybridRiveImageSpec.hpp @@ -21,11 +21,11 @@ namespace margelo::nitro::rive { class JHybridRiveImageSpec: public virtual HybridRiveImageSpec, public virtual JHybridObject { public: struct JavaPart: public jni::JavaClass { - static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/rive/HybridRiveImageSpec;"; + static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/rive/HybridRiveImageSpec;"; std::shared_ptr getJHybridRiveImageSpec(); }; struct CxxPart: public jni::HybridClass { - static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/rive/HybridRiveImageSpec$CxxPart;"; + static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/rive/HybridRiveImageSpec$CxxPart;"; static jni::local_ref initHybrid(jni::alias_ref jThis); static void registerNatives(); using HybridBase::HybridBase; diff --git a/nitrogen/generated/android/c++/JHybridRiveRuntimeSpec.hpp b/nitrogen/generated/android/c++/JHybridRiveRuntimeSpec.hpp index 96cec687..391d1fb1 100644 --- a/nitrogen/generated/android/c++/JHybridRiveRuntimeSpec.hpp +++ b/nitrogen/generated/android/c++/JHybridRiveRuntimeSpec.hpp @@ -21,11 +21,11 @@ namespace margelo::nitro::rive { class JHybridRiveRuntimeSpec: public virtual HybridRiveRuntimeSpec, public virtual JHybridObject { public: struct JavaPart: public jni::JavaClass { - static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/rive/HybridRiveRuntimeSpec;"; + static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/rive/HybridRiveRuntimeSpec;"; std::shared_ptr getJHybridRiveRuntimeSpec(); }; struct CxxPart: public jni::HybridClass { - static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/rive/HybridRiveRuntimeSpec$CxxPart;"; + static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/rive/HybridRiveRuntimeSpec$CxxPart;"; static jni::local_ref initHybrid(jni::alias_ref jThis); static void registerNatives(); using HybridBase::HybridBase; diff --git a/nitrogen/generated/android/c++/JHybridRiveViewSpec.hpp b/nitrogen/generated/android/c++/JHybridRiveViewSpec.hpp index 817d66a8..3dfe10f2 100644 --- a/nitrogen/generated/android/c++/JHybridRiveViewSpec.hpp +++ b/nitrogen/generated/android/c++/JHybridRiveViewSpec.hpp @@ -21,11 +21,11 @@ namespace margelo::nitro::rive { class JHybridRiveViewSpec: public virtual HybridRiveViewSpec, public virtual JHybridObject { public: struct JavaPart: public jni::JavaClass { - static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/rive/HybridRiveViewSpec;"; + static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/rive/HybridRiveViewSpec;"; std::shared_ptr getJHybridRiveViewSpec(); }; struct CxxPart: public jni::HybridClass { - static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/rive/HybridRiveViewSpec$CxxPart;"; + static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/rive/HybridRiveViewSpec$CxxPart;"; static jni::local_ref initHybrid(jni::alias_ref jThis); static void registerNatives(); using HybridBase::HybridBase; diff --git a/nitrogen/generated/android/c++/JHybridViewModelArtboardPropertySpec.hpp b/nitrogen/generated/android/c++/JHybridViewModelArtboardPropertySpec.hpp index 7ce38ff4..127c79a9 100644 --- a/nitrogen/generated/android/c++/JHybridViewModelArtboardPropertySpec.hpp +++ b/nitrogen/generated/android/c++/JHybridViewModelArtboardPropertySpec.hpp @@ -22,11 +22,11 @@ namespace margelo::nitro::rive { class JHybridViewModelArtboardPropertySpec: public virtual HybridViewModelArtboardPropertySpec, public virtual JHybridViewModelPropertySpec { public: struct JavaPart: public jni::JavaClass { - static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/rive/HybridViewModelArtboardPropertySpec;"; + static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/rive/HybridViewModelArtboardPropertySpec;"; std::shared_ptr getJHybridViewModelArtboardPropertySpec(); }; struct CxxPart: public jni::HybridClass { - static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/rive/HybridViewModelArtboardPropertySpec$CxxPart;"; + static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/rive/HybridViewModelArtboardPropertySpec$CxxPart;"; static jni::local_ref initHybrid(jni::alias_ref jThis); static void registerNatives(); using HybridBase::HybridBase; diff --git a/nitrogen/generated/android/c++/JHybridViewModelBooleanPropertySpec.hpp b/nitrogen/generated/android/c++/JHybridViewModelBooleanPropertySpec.hpp index 4662ddf1..0d2dad6d 100644 --- a/nitrogen/generated/android/c++/JHybridViewModelBooleanPropertySpec.hpp +++ b/nitrogen/generated/android/c++/JHybridViewModelBooleanPropertySpec.hpp @@ -22,11 +22,11 @@ namespace margelo::nitro::rive { class JHybridViewModelBooleanPropertySpec: public virtual HybridViewModelBooleanPropertySpec, public virtual JHybridViewModelPropertySpec { public: struct JavaPart: public jni::JavaClass { - static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/rive/HybridViewModelBooleanPropertySpec;"; + static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/rive/HybridViewModelBooleanPropertySpec;"; std::shared_ptr getJHybridViewModelBooleanPropertySpec(); }; struct CxxPart: public jni::HybridClass { - static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/rive/HybridViewModelBooleanPropertySpec$CxxPart;"; + static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/rive/HybridViewModelBooleanPropertySpec$CxxPart;"; static jni::local_ref initHybrid(jni::alias_ref jThis); static void registerNatives(); using HybridBase::HybridBase; diff --git a/nitrogen/generated/android/c++/JHybridViewModelColorPropertySpec.hpp b/nitrogen/generated/android/c++/JHybridViewModelColorPropertySpec.hpp index ffbd11df..45893ee2 100644 --- a/nitrogen/generated/android/c++/JHybridViewModelColorPropertySpec.hpp +++ b/nitrogen/generated/android/c++/JHybridViewModelColorPropertySpec.hpp @@ -22,11 +22,11 @@ namespace margelo::nitro::rive { class JHybridViewModelColorPropertySpec: public virtual HybridViewModelColorPropertySpec, public virtual JHybridViewModelPropertySpec { public: struct JavaPart: public jni::JavaClass { - static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/rive/HybridViewModelColorPropertySpec;"; + static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/rive/HybridViewModelColorPropertySpec;"; std::shared_ptr getJHybridViewModelColorPropertySpec(); }; struct CxxPart: public jni::HybridClass { - static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/rive/HybridViewModelColorPropertySpec$CxxPart;"; + static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/rive/HybridViewModelColorPropertySpec$CxxPart;"; static jni::local_ref initHybrid(jni::alias_ref jThis); static void registerNatives(); using HybridBase::HybridBase; diff --git a/nitrogen/generated/android/c++/JHybridViewModelEnumPropertySpec.hpp b/nitrogen/generated/android/c++/JHybridViewModelEnumPropertySpec.hpp index abc6db3a..5282b177 100644 --- a/nitrogen/generated/android/c++/JHybridViewModelEnumPropertySpec.hpp +++ b/nitrogen/generated/android/c++/JHybridViewModelEnumPropertySpec.hpp @@ -22,11 +22,11 @@ namespace margelo::nitro::rive { class JHybridViewModelEnumPropertySpec: public virtual HybridViewModelEnumPropertySpec, public virtual JHybridViewModelPropertySpec { public: struct JavaPart: public jni::JavaClass { - static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/rive/HybridViewModelEnumPropertySpec;"; + static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/rive/HybridViewModelEnumPropertySpec;"; std::shared_ptr getJHybridViewModelEnumPropertySpec(); }; struct CxxPart: public jni::HybridClass { - static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/rive/HybridViewModelEnumPropertySpec$CxxPart;"; + static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/rive/HybridViewModelEnumPropertySpec$CxxPart;"; static jni::local_ref initHybrid(jni::alias_ref jThis); static void registerNatives(); using HybridBase::HybridBase; diff --git a/nitrogen/generated/android/c++/JHybridViewModelImagePropertySpec.hpp b/nitrogen/generated/android/c++/JHybridViewModelImagePropertySpec.hpp index e5f8df1e..3056fa73 100644 --- a/nitrogen/generated/android/c++/JHybridViewModelImagePropertySpec.hpp +++ b/nitrogen/generated/android/c++/JHybridViewModelImagePropertySpec.hpp @@ -22,11 +22,11 @@ namespace margelo::nitro::rive { class JHybridViewModelImagePropertySpec: public virtual HybridViewModelImagePropertySpec, public virtual JHybridViewModelPropertySpec { public: struct JavaPart: public jni::JavaClass { - static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/rive/HybridViewModelImagePropertySpec;"; + static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/rive/HybridViewModelImagePropertySpec;"; std::shared_ptr getJHybridViewModelImagePropertySpec(); }; struct CxxPart: public jni::HybridClass { - static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/rive/HybridViewModelImagePropertySpec$CxxPart;"; + static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/rive/HybridViewModelImagePropertySpec$CxxPart;"; static jni::local_ref initHybrid(jni::alias_ref jThis); static void registerNatives(); using HybridBase::HybridBase; diff --git a/nitrogen/generated/android/c++/JHybridViewModelInstanceSpec.hpp b/nitrogen/generated/android/c++/JHybridViewModelInstanceSpec.hpp index b5b36233..92d39510 100644 --- a/nitrogen/generated/android/c++/JHybridViewModelInstanceSpec.hpp +++ b/nitrogen/generated/android/c++/JHybridViewModelInstanceSpec.hpp @@ -21,11 +21,11 @@ namespace margelo::nitro::rive { class JHybridViewModelInstanceSpec: public virtual HybridViewModelInstanceSpec, public virtual JHybridObject { public: struct JavaPart: public jni::JavaClass { - static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/rive/HybridViewModelInstanceSpec;"; + static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/rive/HybridViewModelInstanceSpec;"; std::shared_ptr getJHybridViewModelInstanceSpec(); }; struct CxxPart: public jni::HybridClass { - static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/rive/HybridViewModelInstanceSpec$CxxPart;"; + static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/rive/HybridViewModelInstanceSpec$CxxPart;"; static jni::local_ref initHybrid(jni::alias_ref jThis); static void registerNatives(); using HybridBase::HybridBase; diff --git a/nitrogen/generated/android/c++/JHybridViewModelListPropertySpec.hpp b/nitrogen/generated/android/c++/JHybridViewModelListPropertySpec.hpp index d779a623..e55cdd42 100644 --- a/nitrogen/generated/android/c++/JHybridViewModelListPropertySpec.hpp +++ b/nitrogen/generated/android/c++/JHybridViewModelListPropertySpec.hpp @@ -22,11 +22,11 @@ namespace margelo::nitro::rive { class JHybridViewModelListPropertySpec: public virtual HybridViewModelListPropertySpec, public virtual JHybridViewModelPropertySpec { public: struct JavaPart: public jni::JavaClass { - static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/rive/HybridViewModelListPropertySpec;"; + static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/rive/HybridViewModelListPropertySpec;"; std::shared_ptr getJHybridViewModelListPropertySpec(); }; struct CxxPart: public jni::HybridClass { - static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/rive/HybridViewModelListPropertySpec$CxxPart;"; + static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/rive/HybridViewModelListPropertySpec$CxxPart;"; static jni::local_ref initHybrid(jni::alias_ref jThis); static void registerNatives(); using HybridBase::HybridBase; diff --git a/nitrogen/generated/android/c++/JHybridViewModelNumberPropertySpec.hpp b/nitrogen/generated/android/c++/JHybridViewModelNumberPropertySpec.hpp index 2116e132..d7c83145 100644 --- a/nitrogen/generated/android/c++/JHybridViewModelNumberPropertySpec.hpp +++ b/nitrogen/generated/android/c++/JHybridViewModelNumberPropertySpec.hpp @@ -22,11 +22,11 @@ namespace margelo::nitro::rive { class JHybridViewModelNumberPropertySpec: public virtual HybridViewModelNumberPropertySpec, public virtual JHybridViewModelPropertySpec { public: struct JavaPart: public jni::JavaClass { - static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/rive/HybridViewModelNumberPropertySpec;"; + static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/rive/HybridViewModelNumberPropertySpec;"; std::shared_ptr getJHybridViewModelNumberPropertySpec(); }; struct CxxPart: public jni::HybridClass { - static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/rive/HybridViewModelNumberPropertySpec$CxxPart;"; + static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/rive/HybridViewModelNumberPropertySpec$CxxPart;"; static jni::local_ref initHybrid(jni::alias_ref jThis); static void registerNatives(); using HybridBase::HybridBase; diff --git a/nitrogen/generated/android/c++/JHybridViewModelPropertySpec.hpp b/nitrogen/generated/android/c++/JHybridViewModelPropertySpec.hpp index f7d7ffd0..65a5a167 100644 --- a/nitrogen/generated/android/c++/JHybridViewModelPropertySpec.hpp +++ b/nitrogen/generated/android/c++/JHybridViewModelPropertySpec.hpp @@ -21,11 +21,11 @@ namespace margelo::nitro::rive { class JHybridViewModelPropertySpec: public virtual HybridViewModelPropertySpec, public virtual JHybridObject { public: struct JavaPart: public jni::JavaClass { - static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/rive/HybridViewModelPropertySpec;"; + static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/rive/HybridViewModelPropertySpec;"; std::shared_ptr getJHybridViewModelPropertySpec(); }; struct CxxPart: public jni::HybridClass { - static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/rive/HybridViewModelPropertySpec$CxxPart;"; + static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/rive/HybridViewModelPropertySpec$CxxPart;"; static jni::local_ref initHybrid(jni::alias_ref jThis); static void registerNatives(); using HybridBase::HybridBase; diff --git a/nitrogen/generated/android/c++/JHybridViewModelSpec.hpp b/nitrogen/generated/android/c++/JHybridViewModelSpec.hpp index ad4583da..b846a8ec 100644 --- a/nitrogen/generated/android/c++/JHybridViewModelSpec.hpp +++ b/nitrogen/generated/android/c++/JHybridViewModelSpec.hpp @@ -21,11 +21,11 @@ namespace margelo::nitro::rive { class JHybridViewModelSpec: public virtual HybridViewModelSpec, public virtual JHybridObject { public: struct JavaPart: public jni::JavaClass { - static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/rive/HybridViewModelSpec;"; + static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/rive/HybridViewModelSpec;"; std::shared_ptr getJHybridViewModelSpec(); }; struct CxxPart: public jni::HybridClass { - static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/rive/HybridViewModelSpec$CxxPart;"; + static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/rive/HybridViewModelSpec$CxxPart;"; static jni::local_ref initHybrid(jni::alias_ref jThis); static void registerNatives(); using HybridBase::HybridBase; diff --git a/nitrogen/generated/android/c++/JHybridViewModelStringPropertySpec.hpp b/nitrogen/generated/android/c++/JHybridViewModelStringPropertySpec.hpp index 8dfd69d3..66627343 100644 --- a/nitrogen/generated/android/c++/JHybridViewModelStringPropertySpec.hpp +++ b/nitrogen/generated/android/c++/JHybridViewModelStringPropertySpec.hpp @@ -22,11 +22,11 @@ namespace margelo::nitro::rive { class JHybridViewModelStringPropertySpec: public virtual HybridViewModelStringPropertySpec, public virtual JHybridViewModelPropertySpec { public: struct JavaPart: public jni::JavaClass { - static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/rive/HybridViewModelStringPropertySpec;"; + static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/rive/HybridViewModelStringPropertySpec;"; std::shared_ptr getJHybridViewModelStringPropertySpec(); }; struct CxxPart: public jni::HybridClass { - static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/rive/HybridViewModelStringPropertySpec$CxxPart;"; + static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/rive/HybridViewModelStringPropertySpec$CxxPart;"; static jni::local_ref initHybrid(jni::alias_ref jThis); static void registerNatives(); using HybridBase::HybridBase; diff --git a/nitrogen/generated/android/c++/JHybridViewModelTriggerPropertySpec.hpp b/nitrogen/generated/android/c++/JHybridViewModelTriggerPropertySpec.hpp index f5ca2492..3a8fc95c 100644 --- a/nitrogen/generated/android/c++/JHybridViewModelTriggerPropertySpec.hpp +++ b/nitrogen/generated/android/c++/JHybridViewModelTriggerPropertySpec.hpp @@ -22,11 +22,11 @@ namespace margelo::nitro::rive { class JHybridViewModelTriggerPropertySpec: public virtual HybridViewModelTriggerPropertySpec, public virtual JHybridViewModelPropertySpec { public: struct JavaPart: public jni::JavaClass { - static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/rive/HybridViewModelTriggerPropertySpec;"; + static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/rive/HybridViewModelTriggerPropertySpec;"; std::shared_ptr getJHybridViewModelTriggerPropertySpec(); }; struct CxxPart: public jni::HybridClass { - static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/rive/HybridViewModelTriggerPropertySpec$CxxPart;"; + static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/rive/HybridViewModelTriggerPropertySpec$CxxPart;"; static jni::local_ref initHybrid(jni::alias_ref jThis); static void registerNatives(); using HybridBase::HybridBase; diff --git a/nitrogen/generated/android/c++/JReferencedAssetsType.hpp b/nitrogen/generated/android/c++/JReferencedAssetsType.hpp index 94592b1c..3641d4cb 100644 --- a/nitrogen/generated/android/c++/JReferencedAssetsType.hpp +++ b/nitrogen/generated/android/c++/JReferencedAssetsType.hpp @@ -28,7 +28,7 @@ namespace margelo::nitro::rive { */ struct JReferencedAssetsType final: public jni::JavaClass { public: - static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/rive/ReferencedAssetsType;"; + static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/rive/ReferencedAssetsType;"; public: /** diff --git a/nitrogen/generated/android/c++/JResolvedReferencedAsset.hpp b/nitrogen/generated/android/c++/JResolvedReferencedAsset.hpp index acf69cb8..9edba0df 100644 --- a/nitrogen/generated/android/c++/JResolvedReferencedAsset.hpp +++ b/nitrogen/generated/android/c++/JResolvedReferencedAsset.hpp @@ -25,7 +25,7 @@ namespace margelo::nitro::rive { */ struct JResolvedReferencedAsset final: public jni::JavaClass { public: - static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/rive/ResolvedReferencedAsset;"; + static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/rive/ResolvedReferencedAsset;"; public: /** diff --git a/nitrogen/generated/android/c++/JRiveError.hpp b/nitrogen/generated/android/c++/JRiveError.hpp index 6d52d3e8..8a99e1d3 100644 --- a/nitrogen/generated/android/c++/JRiveError.hpp +++ b/nitrogen/generated/android/c++/JRiveError.hpp @@ -23,7 +23,7 @@ namespace margelo::nitro::rive { */ struct JRiveError final: public jni::JavaClass { public: - static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/rive/RiveError;"; + static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/rive/RiveError;"; public: /** diff --git a/nitrogen/generated/android/c++/JRiveErrorType.hpp b/nitrogen/generated/android/c++/JRiveErrorType.hpp index a41e8e7b..1cfa3485 100644 --- a/nitrogen/generated/android/c++/JRiveErrorType.hpp +++ b/nitrogen/generated/android/c++/JRiveErrorType.hpp @@ -19,7 +19,7 @@ namespace margelo::nitro::rive { */ struct JRiveErrorType final: public jni::JavaClass { public: - static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/rive/RiveErrorType;"; + static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/rive/RiveErrorType;"; public: /** diff --git a/nitrogen/generated/android/c++/JRiveEventType.hpp b/nitrogen/generated/android/c++/JRiveEventType.hpp index 98a4ff4d..cd9953d9 100644 --- a/nitrogen/generated/android/c++/JRiveEventType.hpp +++ b/nitrogen/generated/android/c++/JRiveEventType.hpp @@ -19,7 +19,7 @@ namespace margelo::nitro::rive { */ struct JRiveEventType final: public jni::JavaClass { public: - static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/rive/RiveEventType;"; + static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/rive/RiveEventType;"; public: /** diff --git a/nitrogen/generated/android/c++/JUnifiedRiveEvent.hpp b/nitrogen/generated/android/c++/JUnifiedRiveEvent.hpp index 7e77fedf..f0634cdf 100644 --- a/nitrogen/generated/android/c++/JUnifiedRiveEvent.hpp +++ b/nitrogen/generated/android/c++/JUnifiedRiveEvent.hpp @@ -27,7 +27,7 @@ namespace margelo::nitro::rive { */ struct JUnifiedRiveEvent final: public jni::JavaClass { public: - static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/rive/UnifiedRiveEvent;"; + static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/rive/UnifiedRiveEvent;"; public: /** diff --git a/nitrogen/generated/android/c++/JVariant_HybridViewModelInstanceSpec_DataBindMode_DataBindByName.hpp b/nitrogen/generated/android/c++/JVariant_HybridViewModelInstanceSpec_DataBindMode_DataBindByName.hpp index d2370928..ff8eb98d 100644 --- a/nitrogen/generated/android/c++/JVariant_HybridViewModelInstanceSpec_DataBindMode_DataBindByName.hpp +++ b/nitrogen/generated/android/c++/JVariant_HybridViewModelInstanceSpec_DataBindMode_DataBindByName.hpp @@ -29,7 +29,7 @@ namespace margelo::nitro::rive { */ class JVariant_HybridViewModelInstanceSpec_DataBindMode_DataBindByName: public jni::JavaClass { public: - static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/rive/Variant_HybridViewModelInstanceSpec_DataBindMode_DataBindByName;"; + static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/rive/Variant_HybridViewModelInstanceSpec_DataBindMode_DataBindByName;"; static jni::local_ref create_0(jni::alias_ref value) { static const auto method = javaClassStatic()->getStaticMethod)>("create"); @@ -59,7 +59,7 @@ namespace margelo::nitro::rive { namespace JVariant_HybridViewModelInstanceSpec_DataBindMode_DataBindByName_impl { class First final: public jni::JavaClass { public: - static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/rive/Variant_HybridViewModelInstanceSpec_DataBindMode_DataBindByName$First;"; + static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/rive/Variant_HybridViewModelInstanceSpec_DataBindMode_DataBindByName$First;"; [[nodiscard]] jni::local_ref getValue() const { static const auto field = javaClassStatic()->getField("value"); @@ -69,7 +69,7 @@ namespace margelo::nitro::rive { class Second final: public jni::JavaClass { public: - static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/rive/Variant_HybridViewModelInstanceSpec_DataBindMode_DataBindByName$Second;"; + static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/rive/Variant_HybridViewModelInstanceSpec_DataBindMode_DataBindByName$Second;"; [[nodiscard]] jni::local_ref getValue() const { static const auto field = javaClassStatic()->getField("value"); @@ -79,7 +79,7 @@ namespace margelo::nitro::rive { class Third final: public jni::JavaClass { public: - static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/rive/Variant_HybridViewModelInstanceSpec_DataBindMode_DataBindByName$Third;"; + static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/rive/Variant_HybridViewModelInstanceSpec_DataBindMode_DataBindByName$Third;"; [[nodiscard]] jni::local_ref getValue() const { static const auto field = javaClassStatic()->getField("value"); diff --git a/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/EventPropertiesOutput.kt b/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/EventPropertiesOutput.kt index 11b8e926..dc82e9a5 100644 --- a/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/EventPropertiesOutput.kt +++ b/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/EventPropertiesOutput.kt @@ -23,6 +23,24 @@ sealed class EventPropertiesOutput { @DoNotStrip data class Third(@DoNotStrip val value: Double): EventPropertiesOutput() + inline fun asType(): T? { + return when (this) { + is First -> (value) as? T + is Second -> (value) as? T + is Third -> (value) as? T + } + } + inline fun isType(): Boolean { + return asType() != null + } + inline fun match(first: (Boolean) -> R, second: (String) -> R, third: (Double) -> R): R { + return when (this) { + is First -> first(value) + is Second -> second(value) + is Third -> third(value) + } + } + val isFirst: Boolean get() = this is First val isSecond: Boolean @@ -43,14 +61,6 @@ sealed class EventPropertiesOutput { return value } - inline fun match(first: (Boolean) -> R, second: (String) -> R, third: (Double) -> R): R { - return when (this) { - is First -> first(value) - is Second -> second(value) - is Third -> third(value) - } - } - companion object { @JvmStatic @DoNotStrip diff --git a/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/Variant_HybridViewModelInstanceSpec_DataBindMode_DataBindByName.kt b/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/Variant_HybridViewModelInstanceSpec_DataBindMode_DataBindByName.kt index 3aa5fb15..6f0857f0 100644 --- a/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/Variant_HybridViewModelInstanceSpec_DataBindMode_DataBindByName.kt +++ b/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/Variant_HybridViewModelInstanceSpec_DataBindMode_DataBindByName.kt @@ -23,6 +23,24 @@ sealed class Variant_HybridViewModelInstanceSpec_DataBindMode_DataBindByName { @DoNotStrip data class Third(@DoNotStrip val value: DataBindByName): Variant_HybridViewModelInstanceSpec_DataBindMode_DataBindByName() + inline fun asType(): T? { + return when (this) { + is First -> (value) as? T + is Second -> (value) as? T + is Third -> (value) as? T + } + } + inline fun isType(): Boolean { + return asType() != null + } + inline fun match(first: (HybridViewModelInstanceSpec) -> R, second: (DataBindMode) -> R, third: (DataBindByName) -> R): R { + return when (this) { + is First -> first(value) + is Second -> second(value) + is Third -> third(value) + } + } + val isFirst: Boolean get() = this is First val isSecond: Boolean @@ -43,14 +61,6 @@ sealed class Variant_HybridViewModelInstanceSpec_DataBindMode_DataBindByName { return value } - inline fun match(first: (HybridViewModelInstanceSpec) -> R, second: (DataBindMode) -> R, third: (DataBindByName) -> R): R { - return when (this) { - is First -> first(value) - is Second -> second(value) - is Third -> third(value) - } - } - companion object { @JvmStatic @DoNotStrip diff --git a/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/views/HybridRiveViewManager.kt b/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/views/HybridRiveViewManager.kt index 46fc7230..60f16b4a 100644 --- a/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/views/HybridRiveViewManager.kt +++ b/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/views/HybridRiveViewManager.kt @@ -39,7 +39,7 @@ public open class HybridRiveViewManager: SimpleViewManager() { } override fun updateState(view: View, props: ReactStylesDiffMap, stateWrapper: StateWrapper): Any? { - val hybridView = view.getTag(associated_hybrid_view_tag) as? HybridRiveView + val hybridView = getHybridView(view) ?: throw Error("Couldn't find view $view in local views table!") // 1. Update each prop individually @@ -51,9 +51,15 @@ public open class HybridRiveViewManager: SimpleViewManager() { return super.updateState(view, props, stateWrapper) } + override fun onDropViewInstance(view: View) { + val hybridView = getHybridView(view) + hybridView?.onDropView() + return super.onDropViewInstance(view) + } + protected override fun prepareToRecycleView(reactContext: ThemedReactContext, view: View): View? { super.prepareToRecycleView(reactContext, view) - val hybridView = view.getTag(associated_hybrid_view_tag) as? HybridRiveView + val hybridView = getHybridView(view) ?: return null @Suppress("USELESS_IS_CHECK") @@ -67,4 +73,8 @@ public open class HybridRiveViewManager: SimpleViewManager() { return null } } + + private fun getHybridView(view: View): HybridRiveView? { + return view.getTag(associated_hybrid_view_tag) as? HybridRiveView + } } diff --git a/nitrogen/generated/android/riveOnLoad.cpp b/nitrogen/generated/android/riveOnLoad.cpp index b2205fe9..337d8715 100644 --- a/nitrogen/generated/android/riveOnLoad.cpp +++ b/nitrogen/generated/android/riveOnLoad.cpp @@ -54,49 +54,49 @@ int initialize(JavaVM* vm) { } struct JHybridRiveFontConfigSpecImpl: public jni::JavaClass { - static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/rive/HybridRiveFontConfig;"; + static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/rive/HybridRiveFontConfig;"; static std::shared_ptr create() { - static auto constructorFn = javaClassStatic()->getConstructor(); + static const auto constructorFn = javaClassStatic()->getConstructor(); jni::local_ref javaPart = javaClassStatic()->newObject(constructorFn); return javaPart->getJHybridRiveFontConfigSpec(); } }; struct JHybridRiveFileFactorySpecImpl: public jni::JavaClass { - static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/rive/HybridRiveFileFactory;"; + static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/rive/HybridRiveFileFactory;"; static std::shared_ptr create() { - static auto constructorFn = javaClassStatic()->getConstructor(); + static const auto constructorFn = javaClassStatic()->getConstructor(); jni::local_ref javaPart = javaClassStatic()->newObject(constructorFn); return javaPart->getJHybridRiveFileFactorySpec(); } }; struct JHybridRiveFileSpecImpl: public jni::JavaClass { - static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/rive/HybridRiveFile;"; + static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/rive/HybridRiveFile;"; static std::shared_ptr create() { - static auto constructorFn = javaClassStatic()->getConstructor(); + static const auto constructorFn = javaClassStatic()->getConstructor(); jni::local_ref javaPart = javaClassStatic()->newObject(constructorFn); return javaPart->getJHybridRiveFileSpec(); } }; struct JHybridRiveViewSpecImpl: public jni::JavaClass { - static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/rive/HybridRiveView;"; + static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/rive/HybridRiveView;"; static std::shared_ptr create() { - static auto constructorFn = javaClassStatic()->getConstructor(); + static const auto constructorFn = javaClassStatic()->getConstructor(); jni::local_ref javaPart = javaClassStatic()->newObject(constructorFn); return javaPart->getJHybridRiveViewSpec(); } }; struct JHybridRiveImageFactorySpecImpl: public jni::JavaClass { - static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/rive/HybridRiveImageFactory;"; + static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/rive/HybridRiveImageFactory;"; static std::shared_ptr create() { - static auto constructorFn = javaClassStatic()->getConstructor(); + static const auto constructorFn = javaClassStatic()->getConstructor(); jni::local_ref javaPart = javaClassStatic()->newObject(constructorFn); return javaPart->getJHybridRiveImageFactorySpec(); } }; struct JHybridRiveRuntimeSpecImpl: public jni::JavaClass { - static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/rive/HybridRiveRuntime;"; + static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/rive/HybridRiveRuntime;"; static std::shared_ptr create() { - static auto constructorFn = javaClassStatic()->getConstructor(); + static const auto constructorFn = javaClassStatic()->getConstructor(); jni::local_ref javaPart = javaClassStatic()->newObject(constructorFn); return javaPart->getJHybridRiveRuntimeSpec(); } diff --git a/nitrogen/generated/ios/RNRive+autolinking.rb b/nitrogen/generated/ios/RNRive+autolinking.rb index cb5dd7dc..7df76fc6 100644 --- a/nitrogen/generated/ios/RNRive+autolinking.rb +++ b/nitrogen/generated/ios/RNRive+autolinking.rb @@ -56,5 +56,7 @@ def add_nitrogen_files(spec) "SWIFT_OBJC_INTEROP_MODE" => "objcxx", # Enables stricter modular headers "DEFINES_MODULE" => "YES", + # Disable auto-generated ObjC header for Swift (Static linkage on Xcode 26.4 breaks here) + "SWIFT_INSTALL_OBJC_HEADER" => "NO", }) end diff --git a/nitrogen/generated/ios/c++/views/HybridRiveViewComponent.mm b/nitrogen/generated/ios/c++/views/HybridRiveViewComponent.mm index b8b5bba5..d9c0bcb8 100644 --- a/nitrogen/generated/ios/c++/views/HybridRiveViewComponent.mm +++ b/nitrogen/generated/ios/c++/views/HybridRiveViewComponent.mm @@ -17,6 +17,13 @@ #import "HybridRiveViewSpecSwift.hpp" #import "RNRive-Swift-Cxx-Umbrella.hpp" +#if __has_include() +#include +#if REACT_NATIVE_VERSION_MINOR >= 82 +#define ENABLE_RCT_COMPONENT_VIEW_INVALIDATE +#endif +#endif + using namespace facebook; using namespace margelo::nitro::rive; using namespace margelo::nitro::rive::views; @@ -144,4 +151,12 @@ - (void)prepareForRecycle { swiftPart.maybePrepareForRecycle(); } +#ifdef ENABLE_RCT_COMPONENT_VIEW_INVALIDATE +- (void)invalidate { + RNRive::HybridRiveViewSpec_cxx& swiftPart = _hybridView->getSwiftPart(); + swiftPart.onDropView(); + [super invalidate]; +} +#endif + @end diff --git a/nitrogen/generated/ios/swift/EventPropertiesOutput.swift b/nitrogen/generated/ios/swift/EventPropertiesOutput.swift index 7f6a3b8a..47548faa 100644 --- a/nitrogen/generated/ios/swift/EventPropertiesOutput.swift +++ b/nitrogen/generated/ios/swift/EventPropertiesOutput.swift @@ -17,3 +17,16 @@ public enum EventPropertiesOutput { case second(String) case third(Double) } + +public extension EventPropertiesOutput { + func asType(_ type: T.Type = T.self) -> T? { + switch self { + case .first(let value): return value as? T + case .second(let value): return value as? T + case .third(let value): return value as? T + } + } + func isType(_ type: T.Type = T.self) -> Bool { + return self.asType(type) != nil + } +} diff --git a/nitrogen/generated/ios/swift/HybridRiveViewSpec_cxx.swift b/nitrogen/generated/ios/swift/HybridRiveViewSpec_cxx.swift index 3901ed53..5b43eaa5 100644 --- a/nitrogen/generated/ios/swift/HybridRiveViewSpec_cxx.swift +++ b/nitrogen/generated/ios/swift/HybridRiveViewSpec_cxx.swift @@ -639,4 +639,8 @@ open class HybridRiveViewSpec_cxx { guard let recyclable = __implementation as? any RecyclableView else { return } recyclable.prepareForRecycle() } + + public final func onDropView() { + __implementation.onDropView() + } } diff --git a/nitrogen/generated/ios/swift/Variant__any_HybridViewModelInstanceSpec__DataBindMode_DataBindByName.swift b/nitrogen/generated/ios/swift/Variant__any_HybridViewModelInstanceSpec__DataBindMode_DataBindByName.swift index 94fdf1a6..0509e1d0 100644 --- a/nitrogen/generated/ios/swift/Variant__any_HybridViewModelInstanceSpec__DataBindMode_DataBindByName.swift +++ b/nitrogen/generated/ios/swift/Variant__any_HybridViewModelInstanceSpec__DataBindMode_DataBindByName.swift @@ -17,3 +17,16 @@ public indirect enum Variant__any_HybridViewModelInstanceSpec__DataBindMode_Data case second(DataBindMode) case third(DataBindByName) } + +public extension Variant__any_HybridViewModelInstanceSpec__DataBindMode_DataBindByName { + func asType(_ type: T.Type = T.self) -> T? { + switch self { + case .first(let value): return value as? T + case .second(let value): return value as? T + case .third(let value): return value as? T + } + } + func isType(_ type: T.Type = T.self) -> Bool { + return self.asType(type) != nil + } +} diff --git a/package.json b/package.json index c42ac4d2..dd9025f6 100644 --- a/package.json +++ b/package.json @@ -92,12 +92,12 @@ "eslint-plugin-jest": "^29.1.0", "eslint-plugin-prettier": "^5.2.3", "jest": "^29.7.0", - "nitrogen": "0.35.0", + "nitrogen": "0.35.4", "prettier": "^3.0.3", "react": "19.0.0", "react-native": "0.79.2", "react-native-builder-bob": "^0.40.10", - "react-native-nitro-modules": "0.35.0", + "react-native-nitro-modules": "0.35.4", "react-test-renderer": "19.0.0", "release-it": "^17.10.0", "turbo": "^1.10.7", diff --git a/yarn.lock b/yarn.lock index 9274e511..d448b9f9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4476,12 +4476,12 @@ __metadata: eslint-plugin-jest: ^29.1.0 eslint-plugin-prettier: ^5.2.3 jest: ^29.7.0 - nitrogen: 0.35.0 + nitrogen: 0.35.4 prettier: ^3.0.3 react: 19.0.0 react-native: 0.79.2 react-native-builder-bob: ^0.40.10 - react-native-nitro-modules: 0.35.0 + react-native-nitro-modules: 0.35.4 react-test-renderer: 19.0.0 release-it: ^17.10.0 turbo: ^1.10.7 @@ -8628,7 +8628,7 @@ __metadata: react-dom: 19.1.0 react-native: 0.81.5 react-native-gesture-handler: 2.29.1 - react-native-nitro-modules: 0.35.0 + react-native-nitro-modules: 0.35.4 react-native-reanimated: 4.1.5 react-native-safe-area-context: ~5.6.0 react-native-screens: ~4.16.0 @@ -13067,18 +13067,18 @@ __metadata: languageName: node linkType: hard -"nitrogen@npm:0.35.0": - version: 0.35.0 - resolution: "nitrogen@npm:0.35.0" +"nitrogen@npm:0.35.4": + version: 0.35.4 + resolution: "nitrogen@npm:0.35.4" dependencies: chalk: ^5.3.0 - react-native-nitro-modules: ^0.35.0 + react-native-nitro-modules: ^0.35.4 ts-morph: ^27.0.0 yargs: ^18.0.0 zod: ^4.0.5 bin: nitrogen: lib/index.js - checksum: d99d27ff6c5cacf1acaf11aa21ee58b401b1d185086b103a6cc26e92433505e4aef93b8a8281b21f872f219d8ad7a96412ac28c36894542a709eebb86e523fc3 + checksum: f9a0db03d7c574ba629d36e6e723a00d6ae025b3b95f17d9a7835da6b8507c72289f81224369922348ecfeda9775a5cea07b91b6f7f7db6b8f2909aa7d4fd961 languageName: node linkType: hard @@ -14402,13 +14402,13 @@ __metadata: languageName: node linkType: hard -"react-native-nitro-modules@npm:0.35.0, react-native-nitro-modules@npm:^0.35.0": - version: 0.35.0 - resolution: "react-native-nitro-modules@npm:0.35.0" +"react-native-nitro-modules@npm:0.35.4, react-native-nitro-modules@npm:^0.35.4": + version: 0.35.4 + resolution: "react-native-nitro-modules@npm:0.35.4" peerDependencies: react: "*" react-native: "*" - checksum: f006daa1aa58f1a0165a4d6fc087c8d190f2857a7acfd6b47080e5979f05beb20455ed3c66831d489df4eb57d2f430d1610094ed4d6ae3946e17d83362161aa6 + checksum: e243aa9865cd968de4e8a9d410e47b3190cdbb7d4613aef632db04adb9acfe6a4ff458d2d5f8ff6d1fc41252f586783e05d9ff1c1d07f2cd506b98fc6342274d languageName: node linkType: hard @@ -14455,7 +14455,7 @@ __metadata: react-native-builder-bob: ^0.40.10 react-native-gesture-handler: 2.29.1 react-native-harness: 1.0.0 - react-native-nitro-modules: 0.35.0 + react-native-nitro-modules: 0.35.4 react-native-reanimated: 4.1.5 react-native-safe-area-context: ^5.4.0 react-native-screens: ~4.18.0