software-mansion · tjzel · Nov 20, 2023 · Nov 10, 2023 · Nov 10, 2023 · Nov 10, 2023
diff --git a/Common/cpp/LayoutAnimations/LayoutAnimationsManager.cpp b/Common/cpp/LayoutAnimations/LayoutAnimationsManager.cpp
@@ -1,5 +1,6 @@
 #include "LayoutAnimationsManager.h"
 #include "CollectionUtils.h"
+#include "ReanimatedMacros.h"
 #include "Shareables.h"
 
 #ifndef NDEBUG

diff --git a/Common/cpp/LayoutAnimations/LayoutAnimationsManager.h b/Common/cpp/LayoutAnimations/LayoutAnimationsManager.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include "LayoutAnimationType.h"
+#include "ReanimatedMacros.h"
 #include "Shareables.h"
 
 #ifndef NDEBUG

diff --git a/Common/cpp/NativeModules/NativeReanimatedModule.cpp b/Common/cpp/NativeModules/NativeReanimatedModule.cpp
@@ -1,4 +1,5 @@
 #include "NativeReanimatedModule.h"
+#include "ReanimatedMacros.h"
 
 #ifdef RCT_NEW_ARCH_ENABLED
 #if REACT_NATIVE_MINOR_VERSION >= 72

diff --git a/Common/cpp/NativeModules/NativeReanimatedModule.h b/Common/cpp/NativeModules/NativeReanimatedModule.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include "ReanimatedMacros.h"
+
 #ifdef RCT_NEW_ARCH_ENABLED
 #include <react/renderer/uimanager/UIManager.h>
 #endif

diff --git a/Common/cpp/ReanimatedRuntime/RNRuntimeDecorator.cpp b/Common/cpp/ReanimatedRuntime/RNRuntimeDecorator.cpp
@@ -1,4 +1,5 @@
 #include "RNRuntimeDecorator.h"
+#include "ReanimatedMacros.h"
 #ifndef NDEBUG
 #include "ReanimatedVersion.h"
 #endif // NDEBUG

diff --git a/Common/cpp/ReanimatedRuntime/ReanimatedHermesRuntime.cpp b/Common/cpp/ReanimatedRuntime/ReanimatedHermesRuntime.cpp
@@ -1,4 +1,5 @@
 #include "ReanimatedHermesRuntime.h"
+#include "ReanimatedMacros.h"
 
 // Only include this file in Hermes-enabled builds as some platforms (like tvOS)
 // don't support hermes and it causes the compilation to fail.

diff --git a/Common/cpp/ReanimatedRuntime/ReanimatedHermesRuntime.h b/Common/cpp/ReanimatedRuntime/ReanimatedHermesRuntime.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include "ReanimatedMacros.h"
+
 // JS_RUNTIME_HERMES is only set on Android so we have to check __has_include
 // on iOS.
 #if __APPLE__ &&    \

diff --git a/Common/cpp/ReanimatedRuntime/WorkletRuntimeDecorator.cpp b/Common/cpp/ReanimatedRuntime/WorkletRuntimeDecorator.cpp
@@ -1,6 +1,7 @@
 #include "WorkletRuntimeDecorator.h"
 #include "JSISerializer.h"
 #include "ReanimatedJSIUtils.h"
+#include "ReanimatedMacros.h"
 #include "Shareables.h"
 
 #ifdef ANDROID

diff --git a/Common/cpp/SharedItems/Shareables.cpp b/Common/cpp/SharedItems/Shareables.cpp
@@ -1,4 +1,5 @@
 #include "Shareables.h"
+#include "ReanimatedMacros.h"
 
 using namespace facebook;
 

diff --git a/Common/cpp/SharedItems/Shareables.h b/Common/cpp/SharedItems/Shareables.h
@@ -5,6 +5,7 @@
 #include <string>
 #include <utility>
 #include <vector>
+#include "ReanimatedMacros.h"
 
 #include "WorkletRuntimeRegistry.h"
 

diff --git a/Common/cpp/Tools/JSLogger.cpp b/Common/cpp/Tools/JSLogger.cpp
@@ -1,7 +1,8 @@
+#include "ReanimatedMacros.h"
 #ifndef NDEBUG
 
-#include "JSLogger.h"
 #include <memory>
+#include "JSLogger.h"
 
 namespace reanimated {
 

diff --git a/Common/cpp/Tools/JSLogger.h b/Common/cpp/Tools/JSLogger.h
@@ -1,3 +1,4 @@
+#include "ReanimatedMacros.h"
 #ifndef NDEBUG
 
 #pragma once

diff --git a/Common/cpp/Tools/ReanimatedMacros.h b/Common/cpp/Tools/ReanimatedMacros.h
@@ -0,0 +1,27 @@
+#pragma once
+
+/*
+We need this macro due to migration from DEBUG to NDEBUG macro. XCode does only
+inject DEBUG out-of-the-box for Apps (unless the user removes that) so NDEBUG
+has to be added manually. Unfortunately, as of now we have no way of injecting
+NDEBUG into user's App on iOS without asking him to do: `PRODUCTION=1 pod
+install`. However, since
+https://github.com/facebook/react-native/commit/93fdcbaed0f69b268e1ae708a52df9463aae2d53
+RN user's are no longer asked to do `PRODUCTION=1` and NDEBUG is injected by RN
+automatically (on Fabric only). Therefore, we do the following:
+- on Android we just look-up NDEBUG
+- on iOS we look-up NDEBUG (we still inject it in .podspec when `PRODUCTION=1`)
+  - if NDEBUG is not defined we check if Fabric is disabled
+    - if Fabric is disabled, we check for out-of-the-box DEBUG
+      - if DEBUG isn't defined it's almost safe to assume a release build
+*/
+
+#ifndef NDEBUG
+#ifdef __APPLE__
+#ifndef RCT_NEW_ARCH_ENABLED
+#ifndef DEBUG
+#define NDEBUG 1
+#endif // DEBUG
+#endif // RCT_NEW_ARCH_ENABLED
+#endif // __APPLE__
+#endif // NDEBUG
diff --git a/Common/cpp/Tools/ReanimatedVersion.cpp b/Common/cpp/Tools/ReanimatedVersion.cpp
@@ -1,6 +1,7 @@
 #include "ReanimatedVersion.h"
 #include <regex>
 #include <string>
+#include "ReanimatedMacros.h"
 
 #ifdef REANIMATED_VERSION
 #define STRINGIZE(x) #x

diff --git a/Common/cpp/Tools/ReanimatedVersion.h b/Common/cpp/Tools/ReanimatedVersion.h
@@ -2,6 +2,7 @@
 
 #include <jsi/jsi.h>
 #include <string>
+#include "ReanimatedMacros.h"
 
 using namespace facebook;
 

diff --git a/Common/cpp/Tools/SingleInstanceChecker.h b/Common/cpp/Tools/SingleInstanceChecker.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include "ReanimatedMacros.h"
+
 #ifndef NDEBUG
 
 #include <cxxabi.h>

diff --git a/Example/ios/ReanimatedExample.xcodeproj/project.pbxproj b/Example/ios/ReanimatedExample.xcodeproj/project.pbxproj
@@ -487,7 +487,10 @@
 			baseConfigurationReference = 5B7EB9410499542E8C5724F5 /* Pods-ReanimatedExample-ReanimatedExampleTests.debug.xcconfig */;
 			buildSettings = {
 				BUNDLE_LOADER = "$(TEST_HOST)";
-				GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)";
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"DEBUG=1",
+					"$(inherited)",
+				);
 				INFOPLIST_FILE = ReanimatedExampleTests/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 12.4;
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -621,6 +624,7 @@
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PREPROCESSOR_DEFINITIONS = (
+					"DEBUG=1",
 					"$(inherited)",
 					_LIBCPP_ENABLE_CXX17_REMOVED_UNARY_BINARY_FUNCTION,
 				);

diff --git a/Example/ios/ReanimatedExample/AppDelegate.mm b/Example/ios/ReanimatedExample/AppDelegate.mm
@@ -1,4 +1,5 @@
 #import "AppDelegate.h"
+#import "RNReanimated/ReanimatedMacros.h"
 
 #import <React/RCTBundleURLProvider.h>
 
@@ -16,7 +17,7 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
 
 - (NSURL *)sourceURLForBridge:(RCTBridge *)bridge
 {
-#ifndef NDEBUG
+#ifdef DEBUG
   return [[RCTBundleURLProvider sharedSettings] jsBundleURLForBundleRoot:@"index"];
 #else
   return [[NSBundle mainBundle] URLForResource:@"main" withExtension:@"jsbundle"];

diff --git a/Example/ios/ReanimatedExampleTests/ReanimatedExampleTests.m b/Example/ios/ReanimatedExampleTests/ReanimatedExampleTests.m
@@ -4,6 +4,8 @@
 #import <React/RCTLog.h>
 #import <React/RCTRootView.h>
 
+#import <RNReanimated/ReanimatedMacros.h>
+
 #define TIMEOUT_SECONDS 600
 #define TEXT_TO_LOOK_FOR @"Welcome to React"
 

diff --git a/FabricExample/ios/FabricExample.xcodeproj/project.pbxproj b/FabricExample/ios/FabricExample.xcodeproj/project.pbxproj
@@ -482,7 +482,10 @@
 			baseConfigurationReference = 5B7EB9410499542E8C5724F5 /* Pods-FabricExample-FabricExampleTests.debug.xcconfig */;
 			buildSettings = {
 				BUNDLE_LOADER = "$(TEST_HOST)";
-				GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)";
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"DEBUG=1",
+					"$(inherited)",
+				);
 				INFOPLIST_FILE = FabricExampleTests/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 12.4;
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -616,6 +619,7 @@
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PREPROCESSOR_DEFINITIONS = (
+					"DEBUG=1",
 					"$(inherited)",
 					_LIBCPP_ENABLE_CXX17_REMOVED_UNARY_BINARY_FUNCTION,
 				);

diff --git a/FabricExample/ios/FabricExample/AppDelegate.mm b/FabricExample/ios/FabricExample/AppDelegate.mm
@@ -1,5 +1,6 @@
 #import "AppDelegate.h"
 
+#import <RNReanimated/ReanimatedMacros.h>
 #import <React/RCTBundleURLProvider.h>
 
 @implementation AppDelegate
@@ -16,7 +17,7 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
 
 - (NSURL *)sourceURLForBridge:(RCTBridge *)bridge
 {
-#ifndef NDEBUG
+#ifdef DEBUG
   return [[RCTBundleURLProvider sharedSettings] jsBundleURLForBundleRoot:@"index"];
 #else
   return [[NSBundle mainBundle] URLForResource:@"main" withExtension:@"jsbundle"];

diff --git a/FabricExample/ios/FabricExampleTests/FabricExampleTests.m b/FabricExample/ios/FabricExampleTests/FabricExampleTests.m
@@ -4,6 +4,8 @@
 #import <React/RCTLog.h>
 #import <React/RCTRootView.h>
 
+#import <RNReanimated/ReanimatedMacros.h>
+
 #define TIMEOUT_SECONDS 600
 #define TEXT_TO_LOOK_FOR @"Welcome to React"
 

diff --git a/MacOSExample/ios/MacOSExample.xcodeproj/project.pbxproj b/MacOSExample/ios/MacOSExample.xcodeproj/project.pbxproj
@@ -433,7 +433,10 @@
 			baseConfigurationReference = 5B7EB9410499542E8C5724F5 /* Pods-MacOSExample-MacOSExampleTests.debug.xcconfig */;
 			buildSettings = {
 				BUNDLE_LOADER = "$(TEST_HOST)";
-				GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)";
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"DEBUG=1",
+					"$(inherited)",
+				);
 				INFOPLIST_FILE = MacOSExampleTests/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 12.4;
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -567,6 +570,7 @@
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PREPROCESSOR_DEFINITIONS = (
+					"DEBUG=1",
 					"$(inherited)",
 					_LIBCPP_ENABLE_CXX17_REMOVED_UNARY_BINARY_FUNCTION,
 				);

diff --git a/MacOSExample/ios/MacOSExample/AppDelegate.mm b/MacOSExample/ios/MacOSExample/AppDelegate.mm
@@ -1,5 +1,6 @@
 #import "AppDelegate.h"
 
+#import <RNReanimated/ReanimatedMacros.h>
 #import <React/RCTBundleURLProvider.h>
 
 @implementation AppDelegate
@@ -16,7 +17,7 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
 
 - (NSURL *)sourceURLForBridge:(RCTBridge *)bridge
 {
-#ifndef NDEBUG
+#ifdef DEBUG
   return [[RCTBundleURLProvider sharedSettings] jsBundleURLForBundleRoot:@"index"];
 #else
   return [[NSBundle mainBundle] URLForResource:@"main" withExtension:@"jsbundle"];

diff --git a/MacOSExample/ios/MacOSExampleTests/MacOSExampleTests.m b/MacOSExample/ios/MacOSExampleTests/MacOSExampleTests.m
@@ -4,6 +4,8 @@
 #import <React/RCTLog.h>
 #import <React/RCTRootView.h>
 
+#import <RNReanimated/ReanimatedMacros.h>
+
 #define TIMEOUT_SECONDS 600
 #define TEXT_TO_LOOK_FOR @"Welcome to React"
 

diff --git a/MacOSExample/macos/MacOSExample-macOS/AppDelegate.mm b/MacOSExample/macos/MacOSExample-macOS/AppDelegate.mm
@@ -1,5 +1,6 @@
 #import "AppDelegate.h"
 
+#import <RNReanimated/ReanimatedMacros.h>
 #import <React/RCTBundleURLProvider.h>
 
 @implementation AppDelegate

diff --git a/MacOSExample/macos/MacOSExample.xcodeproj/project.pbxproj b/MacOSExample/macos/MacOSExample.xcodeproj/project.pbxproj
@@ -474,6 +474,7 @@
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PREPROCESSOR_DEFINITIONS = (
+					"DEBUG=1",
 					"$(inherited)",
 					_LIBCPP_ENABLE_CXX17_REMOVED_UNARY_BINARY_FUNCTION,
 				);

diff --git a/TVOSExample/ios/TVOSExample.xcodeproj/project.pbxproj b/TVOSExample/ios/TVOSExample.xcodeproj/project.pbxproj
@@ -680,7 +680,10 @@
 			baseConfigurationReference = 36771B2C8C43AC6099096637 /* Pods-TVOSExample-TVOSExampleTests.debug.xcconfig */;
 			buildSettings = {
 				BUNDLE_LOADER = "$(TEST_HOST)";
-				GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)";
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"DEBUG=1",
+					"$(inherited)",
+				);
 				INFOPLIST_FILE = TVOSExampleTests/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
@@ -726,6 +729,7 @@
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"$(inherited)",
 					"COCOAPODS=1",
+					"DEBUG=1",
 				);
 				INFOPLIST_FILE = TVOSExample/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
@@ -912,7 +916,10 @@
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_OPTIMIZATION_LEVEL = 0;
-				GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)";
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"DEBUG=1",
+					"$(inherited)",
+				);
 				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;

diff --git a/TVOSExample/ios/TVOSExample.xcodeproj/xcshareddata/xcschemes/TVOSExample-tvOS.xcscheme b/TVOSExample/ios/TVOSExample.xcodeproj/xcshareddata/xcschemes/TVOSExample-tvOS.xcscheme
@@ -41,7 +41,7 @@
       </Testables>
    </TestAction>
    <LaunchAction
-      buildConfiguration = "Debug"
+      buildConfiguration = "Release"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"
@@ -85,4 +85,4 @@
       buildConfiguration = "Release"
       revealArchiveInOrganizer = "YES">
    </ArchiveAction>
-</Scheme>
+</Scheme>
diff --git a/TVOSExample/ios/TVOSExample/AppDelegate.mm b/TVOSExample/ios/TVOSExample/AppDelegate.mm
@@ -48,11 +48,11 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
 
 #if !TARGET_OS_TV
   if (@available(iOS 13.0, *)) {
-      rootView.backgroundColor = [UIColor systemBackgroundColor];
+    rootView.backgroundColor = [UIColor systemBackgroundColor];
   } else
 #endif
   {
-      rootView.backgroundColor = [UIColor whiteColor];
+    rootView.backgroundColor = [UIColor whiteColor];
   }
 
   self.window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds];
@@ -87,7 +87,7 @@ - (NSDictionary *)prepareInitialProps
 
 - (NSURL *)sourceURLForBridge:(RCTBridge *)bridge
 {
-#ifndef NDEBUG
+#ifdef DEBUG
   return [[RCTBundleURLProvider sharedSettings] jsBundleURLForBundleRoot:@"index"];
 #else
   return [[NSBundle mainBundle] URLForResource:@"main" withExtension:@"jsbundle"];

diff --git a/TVOSExample/ios/TVOSExampleTests/TVOSExampleTests.m b/TVOSExample/ios/TVOSExampleTests/TVOSExampleTests.m
@@ -4,6 +4,8 @@
 #import <React/RCTLog.h>
 #import <React/RCTRootView.h>
 
+#import <RNReanimated/ReanimatedMacros.h>
+
 #define TIMEOUT_SECONDS 600
 #define TEXT_TO_LOOK_FOR @"Welcome to React"
 

diff --git a/android/src/main/cpp/LayoutAnimations.cpp b/android/src/main/cpp/LayoutAnimations.cpp
@@ -1,6 +1,7 @@
 #include "LayoutAnimations.h"
 #include "FeaturesConfig.h"
 #include "Logger.h"
+#include "ReanimatedMacros.h"
 
 namespace reanimated {
 

diff --git a/android/src/main/cpp/LayoutAnimations.h b/android/src/main/cpp/LayoutAnimations.h
@@ -5,6 +5,7 @@
 #include <memory>
 #include <string>
 #include "JNIHelper.h"
+#include "ReanimatedMacros.h"
 
 namespace reanimated {
 

diff --git a/android/src/main/cpp/NativeProxy.cpp b/android/src/main/cpp/NativeProxy.cpp
@@ -22,6 +22,7 @@
 #ifndef NDEBUG
 #include "ReanimatedVersion.h"
 #endif // NDEBUG
+#include "ReanimatedMacros.h"
 #include "WorkletRuntime.h"
 #include "WorkletRuntimeCollector.h"
 

diff --git a/android/src/main/cpp/NativeProxy.h b/android/src/main/cpp/NativeProxy.h
@@ -23,6 +23,7 @@
 #include "JNIHelper.h"
 #include "LayoutAnimations.h"
 #include "NativeReanimatedModule.h"
+#include "ReanimatedMacros.h"
 #include "UIScheduler.h"
 
 namespace reanimated {