From b30c495930e4073f5c2c2bd08c20449db0f89c92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20=C5=BBelawski?= Date: Thu, 12 Dec 2024 14:56:26 +0100 Subject: [PATCH] chore: remove excessive changes --- packages/react-native-reanimated/android/build.gradle | 10 ++++++++++ .../java/com/swmansion/worklets/WorkletsModule.java | 0 .../swmansion/worklets/WorkletsMessageQueueThread.java | 0 .../worklets/WorkletsMessageQueueThreadBase.java | 0 .../swmansion/worklets/NativeWorkletsModuleSpec.java | 0 5 files changed, 10 insertions(+) rename packages/react-native-reanimated/android/src/{main => worklets/WorkletsModule}/java/com/swmansion/worklets/WorkletsModule.java (100%) rename packages/react-native-reanimated/android/src/{ => worklets}/main/java/com/swmansion/worklets/WorkletsMessageQueueThread.java (100%) rename packages/react-native-reanimated/android/src/{ => worklets}/main/java/com/swmansion/worklets/WorkletsMessageQueueThreadBase.java (100%) rename packages/react-native-reanimated/android/src/{ => worklets}/paper/java/com/swmansion/worklets/NativeWorkletsModuleSpec.java (100%) diff --git a/packages/react-native-reanimated/android/build.gradle b/packages/react-native-reanimated/android/build.gradle index fd5701a7312..989e2c08acc 100644 --- a/packages/react-native-reanimated/android/build.gradle +++ b/packages/react-native-reanimated/android/build.gradle @@ -347,9 +347,19 @@ android { } sourceSets.main { java { + // Always present + srcDirs += "src/worklets/WorkletsModule/java" + + if(!hasExternalWorklets){ + srcDirs += "src/worklets/main/java" + } + if (IS_NEW_ARCHITECTURE_ENABLED) { srcDirs += "src/fabric/java" } else { + if(!hasExternalWorklets){ + srcDirs +="src/worklets/paper/java" + } srcDirs += "src/paper/java" } diff --git a/packages/react-native-reanimated/android/src/main/java/com/swmansion/worklets/WorkletsModule.java b/packages/react-native-reanimated/android/src/worklets/WorkletsModule/java/com/swmansion/worklets/WorkletsModule.java similarity index 100% rename from packages/react-native-reanimated/android/src/main/java/com/swmansion/worklets/WorkletsModule.java rename to packages/react-native-reanimated/android/src/worklets/WorkletsModule/java/com/swmansion/worklets/WorkletsModule.java diff --git a/packages/react-native-reanimated/android/src/main/java/com/swmansion/worklets/WorkletsMessageQueueThread.java b/packages/react-native-reanimated/android/src/worklets/main/java/com/swmansion/worklets/WorkletsMessageQueueThread.java similarity index 100% rename from packages/react-native-reanimated/android/src/main/java/com/swmansion/worklets/WorkletsMessageQueueThread.java rename to packages/react-native-reanimated/android/src/worklets/main/java/com/swmansion/worklets/WorkletsMessageQueueThread.java diff --git a/packages/react-native-reanimated/android/src/main/java/com/swmansion/worklets/WorkletsMessageQueueThreadBase.java b/packages/react-native-reanimated/android/src/worklets/main/java/com/swmansion/worklets/WorkletsMessageQueueThreadBase.java similarity index 100% rename from packages/react-native-reanimated/android/src/main/java/com/swmansion/worklets/WorkletsMessageQueueThreadBase.java rename to packages/react-native-reanimated/android/src/worklets/main/java/com/swmansion/worklets/WorkletsMessageQueueThreadBase.java diff --git a/packages/react-native-reanimated/android/src/paper/java/com/swmansion/worklets/NativeWorkletsModuleSpec.java b/packages/react-native-reanimated/android/src/worklets/paper/java/com/swmansion/worklets/NativeWorkletsModuleSpec.java similarity index 100% rename from packages/react-native-reanimated/android/src/paper/java/com/swmansion/worklets/NativeWorkletsModuleSpec.java rename to packages/react-native-reanimated/android/src/worklets/paper/java/com/swmansion/worklets/NativeWorkletsModuleSpec.java