chore: Fix codegen

software-mansion · Sep 24, 2024 · ee1d2f9 · ee1d2f9
1 parent da6e2ce
commit ee1d2f9
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/packages/react-native-reanimated/android/src/main/cpp/worklets/WorkletsModule.cpp b/packages/react-native-reanimated/android/src/main/cpp/worklets/WorkletsModule.cpp
@@ -9,6 +9,7 @@
 #include <react/fabric/Binding.h>
 #endif
 
+#include "RNRuntimeWorkletDecorator.h"
 #include "WorkletRuntimeCollector.h"
 #include "WorkletsModule.h"
 
@@ -24,7 +25,9 @@ WorkletsModule::WorkletsModule(
     : javaPart_(jni::make_global(jThis)),
       rnRuntime_(rnRuntime),
       nativeWorkletsModule_(std::make_shared<reanimated::NativeWorkletsModule>(
-          valueUnpackerCode)) {}
+          valueUnpackerCode)) {
+  RNRuntimeWorkletDecorator::decorate(*rnRuntime_, nativeWorkletsModule_);
+}
 
 jni::local_ref<WorkletsModule::jhybriddata> WorkletsModule::initHybrid(
     jni::alias_ref<jhybridobject> jThis,

diff --git a/...ve-reanimated/android/src/paper/java/com/swmansion/worklets/NativeWorkletsModuleSpec.java b/...ve-reanimated/android/src/paper/java/com/swmansion/worklets/NativeWorkletsModuleSpec.java
@@ -1,4 +1,6 @@
-package com.swmansion.worklets;
+// This file should be a part of `worklets` package but codegen
+// mangles namespaces for its Fabric counterpart.
+package com.swmansion.reanimated;
 
 import com.facebook.proguard.annotations.DoNotStrip;
 import com.facebook.react.bridge.ReactApplicationContext;

diff --git a/...iveVersionPatch/ReanimatedUIManager/latest/com/swmansion/reanimated/ReanimatedModule.java b/...iveVersionPatch/ReanimatedUIManager/latest/com/swmansion/reanimated/ReanimatedModule.java
@@ -1,13 +1,13 @@
 package com.swmansion.reanimated;
 
+import android.annotation.SuppressLint;
 import android.util.Log;
 import androidx.annotation.NonNull;
 import com.facebook.react.bridge.LifecycleEventListener;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactMethod;
 import com.facebook.react.bridge.UIManager;
 import com.facebook.react.bridge.UIManagerListener;
-import com.facebook.react.common.annotations.UnstableReactNativeAPI;
 import com.facebook.react.fabric.FabricUIManager;
 import com.facebook.react.module.annotations.ReactModule;
 import com.facebook.react.uimanager.UIManagerModule;
@@ -17,7 +17,7 @@
 import java.util.Objects;
 import javax.annotation.Nullable;
 
-@UnstableReactNativeAPI
+@SuppressLint("UnsafeOptInUsageError") // TODO: Fix this
 @ReactModule(name = ReanimatedModule.NAME)
 public class ReanimatedModule extends NativeReanimatedModuleSpec
     implements LifecycleEventListener, UIManagerModuleListener, UIManagerListener {

diff --git a/packages/react-native-reanimated/src/worklets/native/NativeWorklets.ts b/packages/react-native-reanimated/src/worklets/native/NativeWorklets.ts
@@ -1,5 +1,4 @@
 'use strict';
-import { checkCppVersion } from '../../platform-specific/checkCppVersion';
 import { getValueUnpackerCode } from '../../valueUnpacker';
 import { WorkletsTurboModule } from '../../specs';
 import { ReanimatedError } from '../../errors';
@@ -21,9 +20,6 @@ export class NativeWorklets {
 See https://docs.swmansion.com/react-native-reanimated/docs/guides/troubleshooting#native-part-of-reanimated-doesnt-seem-to-be-initialized for more details.`
       );
     }
-    if (__DEV__) {
-      checkCppVersion();
-    }
     this.#workletsModuleProxy = global.__workletsModuleProxy;
   }
 }