fix: Add REACT_NATIVE_VERSION macro for backwards compatibility (#108)

Author: tido64

example/ios/Podfile.lock

@@ -1,7 +1,7 @@
 PODS:
   - boost-for-react-native (1.63.0)
   - DoubleConversion (1.1.6)
-  - Example-Tests (0.1.2):
+  - Example-Tests (0.1.4):
     - React
   - FBLazyVector (0.61.5)
   - FBReactNativeSpec (0.61.5):
@@ -220,7 +220,7 @@ PODS:
     - React-cxxreact (= 0.61.5)
     - React-jsi (= 0.61.5)
     - ReactCommon/jscallinvoker (= 0.61.5)
-  - ReactTestApp-DevSupport (0.1.2)
+  - ReactTestApp-DevSupport (0.1.4)
   - ReactTestApp-Resources (1.0.0-dev)
   - SwiftLint (0.39.1)
   - Yoga (1.14.0)
@@ -327,7 +327,7 @@ EXTERNAL SOURCES:
 SPEC CHECKSUMS:
   boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c
   DoubleConversion: 5805e889d232975c086db112ece9ed034df7a0b2
-  Example-Tests: 6affe8047ddb57b68d6356dbc876e194ef9c64b8
+  Example-Tests: a9469b2406804bcc1ac76e8f1c661f86ca653781
   FBLazyVector: aaeaf388755e4f29cd74acbc9e3b8da6d807c37f
   FBReactNativeSpec: 118d0d177724c2d67f08a59136eb29ef5943ec75
   Folly: 30e7936e1c45c08d884aa59369ed951a8e68cf51
@@ -352,7 +352,7 @@ SPEC CHECKSUMS:
   React-RCTText: 9ccc88273e9a3aacff5094d2175a605efa854dbe
   React-RCTVibration: a49a1f42bf8f5acf1c3e297097517c6b3af377ad
   ReactCommon: 198c7c8d3591f975e5431bec1b0b3b581aa1c5dd
-  ReactTestApp-DevSupport: 67fa5247501557ce874d10b301a121e48966f926
+  ReactTestApp-DevSupport: 33f1a78a766f1fe7931c3fbd0111439096dc2113
   ReactTestApp-Resources: c070f72dfcb2806d922eec6656259cbf7a4d2bcf
   SwiftLint: 55e96a4a4d537d4a3156859fc1c54bd24851a046
   Yoga: f2a7cd4280bfe2cca5a7aed98ba0eb3d1310f18b

example/macos/Podfile.lock

@@ -217,7 +217,7 @@ PODS:
     - React-cxxreact (= 0.61.39)
     - React-jsi (= 0.61.39)
     - ReactCommon/jscallinvoker (= 0.61.39)
-  - ReactTestApp-DevSupport (0.1.2)
+  - ReactTestApp-DevSupport (0.1.4)
   - ReactTestApp-Resources (1.0.0-dev)
   - SwiftLint (0.39.2)
   - Yoga (1.14.0)
@@ -344,7 +344,7 @@ SPEC CHECKSUMS:
   React-RCTText: e81f5065516561545ae40f2c5b84d7b14fe6baec
   React-RCTVibration: 2ab29818330374b02167caac117d609159f360ab
   ReactCommon: e24f8c0d974cdb872d73cbd87cdfea9d72cfae26
-  ReactTestApp-DevSupport: 67fa5247501557ce874d10b301a121e48966f926
+  ReactTestApp-DevSupport: 33f1a78a766f1fe7931c3fbd0111439096dc2113
   ReactTestApp-Resources: c070f72dfcb2806d922eec6656259cbf7a4d2bcf
   SwiftLint: 22ccbbe3b8008684be5955693bab135e0ed6a447
   Yoga: 9cc54b8ca13d6fa87f8214c6eac97745e1df8092

ios/ReactTestApp.xcodeproj/project.pbxproj

@@ -9,6 +9,7 @@
 /* Begin PBXBuildFile section */
 		1914199A234B2DD800D856AE /* RCTDevSupport+UIScene.m in Sources */ = {isa = PBXBuildFile; fileRef = 19141999234B2DD800D856AE /* RCTDevSupport+UIScene.m */; };
 		192DD201240FCAF5004E9CEB /* Manifest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 192DD200240FCAF5004E9CEB /* Manifest.swift */; };
+		196C22622490CB7600449D3C /* React+Compatibility.m in Sources */ = {isa = PBXBuildFile; fileRef = 196C22602490CB7600449D3C /* React+Compatibility.m */; };
 		196C7215232F1788006556ED /* ReactInstance.swift in Sources */ = {isa = PBXBuildFile; fileRef = 196C7214232F1788006556ED /* ReactInstance.swift */; };
 		196C724123319A85006556ED /* QRCodeReaderDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 196C724023319A85006556ED /* QRCodeReaderDelegate.swift */; };
 		1988284524105BEC005057FF /* UIViewController+ReactTestApp.m in Sources */ = {isa = PBXBuildFile; fileRef = 1988284424105BEC005057FF /* UIViewController+ReactTestApp.m */; };
@@ -44,6 +45,8 @@
 /* Begin PBXFileReference section */
 		19141999234B2DD800D856AE /* RCTDevSupport+UIScene.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "RCTDevSupport+UIScene.m"; sourceTree = "<group>"; };
 		192DD200240FCAF5004E9CEB /* Manifest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Manifest.swift; sourceTree = "<group>"; };
+		196C22602490CB7600449D3C /* React+Compatibility.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "React+Compatibility.m"; sourceTree = "<group>"; };
+		196C22612490CB7600449D3C /* React+Compatibility.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "React+Compatibility.h"; sourceTree = "<group>"; };
 		196C7207232EF5DC006556ED /* ReactTestApp-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "ReactTestApp-Bridging-Header.h"; sourceTree = "<group>"; };
 		196C7214232F1788006556ED /* ReactInstance.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReactInstance.swift; sourceTree = "<group>"; };
 		196C7216232F6CD9006556ED /* ReactTestApp.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = ReactTestApp.entitlements; sourceTree = "<group>"; };
@@ -133,10 +136,12 @@
 				192DD200240FCAF5004E9CEB /* Manifest.swift */,
 				196C724023319A85006556ED /* QRCodeReaderDelegate.swift */,
 				196C7214232F1788006556ED /* ReactInstance.swift */,
+				196C7207232EF5DC006556ED /* ReactTestApp-Bridging-Header.h */,
 				19141999234B2DD800D856AE /* RCTDevSupport+UIScene.m */,
+				196C22612490CB7600449D3C /* React+Compatibility.h */,
+				196C22602490CB7600449D3C /* React+Compatibility.m */,
 				1988282224105BCC005057FF /* UIViewController+ReactTestApp.h */,
 				1988284424105BEC005057FF /* UIViewController+ReactTestApp.m */,
-				196C7207232EF5DC006556ED /* ReactTestApp-Bridging-Header.h */,
 				19ECD0DB232ED427003D8557 /* Assets.xcassets */,
 				19ECD0E0232ED427003D8557 /* LaunchScreen.storyboard */,
 				19ECD0E3232ED427003D8557 /* Info.plist */,
@@ -432,6 +437,7 @@
 				192DD201240FCAF5004E9CEB /* Manifest.swift in Sources */,
 				196C724123319A85006556ED /* QRCodeReaderDelegate.swift in Sources */,
 				1914199A234B2DD800D856AE /* RCTDevSupport+UIScene.m in Sources */,
+				196C22622490CB7600449D3C /* React+Compatibility.m in Sources */,
 				196C7215232F1788006556ED /* ReactInstance.swift in Sources */,
 				19ECD0D8232ED425003D8557 /* SceneDelegate.swift in Sources */,
 				1988284524105BEC005057FF /* UIViewController+ReactTestApp.m in Sources */,

ios/ReactTestApp/React+Compatibility.h

@@ -0,0 +1,12 @@
+//
+// Copyright (c) Microsoft Corporation
+//
+// This source code is licensed under the MIT license found in the
+// LICENSE file in the root directory of this source tree.
+//
+
+#import <Foundation/Foundation.h>
+
+@class RCTBridge;
+
+void RTATriggerReloadCommand(RCTBridge *, NSString *reason);

ios/ReactTestApp/React+Compatibility.m

@@ -0,0 +1,27 @@
+//
+// Copyright (c) Microsoft Corporation
+//
+// This source code is licensed under the MIT license found in the
+// LICENSE file in the root directory of this source tree.
+//
+
+#import "React+Compatibility.h"
+
+#include <TargetConditionals.h>
+
+#import <React/RCTBridge.h>
+
+// `RCTReloadCommand.h` is excluded from `react-native-macos`
+// See https://github.com/microsoft/react-native-macos/blob/v0.61.39/React-Core.podspec#L66
+#if !TARGET_OS_OSX
+#import <React/RCTReloadCommand.h>
+#endif
+
+void RTATriggerReloadCommand(RCTBridge *bridge, NSString *reason)
+{
+#if REACT_NATIVE_VERSION < 6200
+    [bridge reload];
+#else
+    RCTTriggerReloadCommandListeners(reason);
+#endif
+}

ios/ReactTestApp/ReactInstance.swift

@@ -85,7 +85,7 @@ final class ReactInstance: NSObject, RCTBridgeDelegate, RCTTurboModuleLookupDele
                 // -[RCTWebSocketExecutor executeApplicationScript:sourceURL:onComplete:]
                 RCTDevSettings().isDebuggingRemotely = false
             }
-            bridge.reload()
+            RTATriggerReloadCommand(bridge, "ReactTestApp")
         } else if let bridge = RCTBridge(delegate: self, launchOptions: nil) {
             self.bridge = bridge
 

ios/ReactTestApp/ReactTestApp-Bridging-Header.h

@@ -17,4 +17,5 @@
 #import <React/RCTVersion.h>
 #import <ReactTestApp-DevSupport/ReactTestApp-DevSupport.h>
 
+#import "React+Compatibility.h"
 #import "UIViewController+ReactTestApp.h"

ios/test_app.rb

@@ -110,13 +110,8 @@ def use_react_native!(project_root, target_platform)
                         project_root)
 end
 
-# rubocop:disable Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity
-def use_test_app_internal!(target_platform)
-  assert(%i[ios macos].include?(target_platform), "Unsupported platform: #{target_platform}")
-
-  xcodeproj = 'ReactTestApp.xcodeproj'
+def make_project!(xcodeproj, project_root, target_platform)
   src_xcodeproj = File.join(__dir__, '..', target_platform.to_s, xcodeproj)
-  project_root = find_project_root
   destination = File.join(nearest_node_modules(project_root), '.generated', target_platform.to_s)
   dst_xcodeproj = File.join(destination, xcodeproj)
 
@@ -137,6 +132,32 @@ def use_test_app_internal!(target_platform)
     FileUtils.ln_sf(source, File.join(destination, 'ReactTestAppShared'))
   end
 
+  react_native = Pathname.new(resolve_module('react-native'))
+  version = package_version(react_native.to_s)
+  version = version[:major].to_i * 10_000 + version[:minor].to_i * 100 + version[:patch].to_i
+  version_macro = "REACT_NATIVE_VERSION=#{version}"
+
+  app_project = Xcodeproj::Project.open(dst_xcodeproj)
+  app_project.native_targets.each do |target|
+    next if target.name != 'ReactTestApp'
+
+    target.build_configurations.each do |config|
+      config.build_settings['GCC_PREPROCESSOR_DEFINITIONS'] ||= ['$(inherited)', version_macro]
+    end
+  end
+  app_project.save
+
+  dst_xcodeproj
+end
+
+# rubocop:disable Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity
+def use_test_app_internal!(target_platform)
+  assert(%i[ios macos].include?(target_platform), "Unsupported platform: #{target_platform}")
+
+  xcodeproj = 'ReactTestApp.xcodeproj'
+  project_root = find_project_root
+  dst_xcodeproj = make_project!(xcodeproj, project_root, target_platform)
+
   require_relative(autolink_script_path)
 
   platform :ios, '12.0' if target_platform == :ios

macos/ReactTestApp.xcodeproj/project.pbxproj

@@ -14,6 +14,7 @@
 		193EF08F247A799D00BE8C79 /* Manifest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 193EF08E247A799D00BE8C79 /* Manifest.swift */; };
 		193EF093247A830200BE8C79 /* UIViewController+ReactTestApp.m in Sources */ = {isa = PBXBuildFile; fileRef = 193EF091247A830200BE8C79 /* UIViewController+ReactTestApp.m */; };
 		193EF098247B130700BE8C79 /* ReactInstance.swift in Sources */ = {isa = PBXBuildFile; fileRef = 193EF097247B130700BE8C79 /* ReactInstance.swift */; };
+		196C22652490CBAB00449D3C /* React+Compatibility.m in Sources */ = {isa = PBXBuildFile; fileRef = 196C22632490CBAB00449D3C /* React+Compatibility.m */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -50,6 +51,8 @@
 		193EF092247A830200BE8C79 /* UIViewController+ReactTestApp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "UIViewController+ReactTestApp.h"; path = "../ReactTestAppShared/UIViewController+ReactTestApp.h"; sourceTree = "<group>"; };
 		193EF094247A84DA00BE8C79 /* ReactTestApp-Bridging-Header.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "ReactTestApp-Bridging-Header.h"; path = "../ReactTestAppShared/ReactTestApp-Bridging-Header.h"; sourceTree = "<group>"; };
 		193EF097247B130700BE8C79 /* ReactInstance.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ReactInstance.swift; path = ../ReactTestAppShared/ReactInstance.swift; sourceTree = "<group>"; };
+		196C22632490CBAB00449D3C /* React+Compatibility.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "React+Compatibility.m"; path = "../ReactTestAppShared/React+Compatibility.m"; sourceTree = "<group>"; };
+		196C22642490CBAB00449D3C /* React+Compatibility.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "React+Compatibility.h"; path = "../ReactTestAppShared/React+Compatibility.h"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -105,6 +108,8 @@
 				193EF097247B130700BE8C79 /* ReactInstance.swift */,
 				193EF064247A736200BE8C79 /* ViewController.swift */,
 				193EF094247A84DA00BE8C79 /* ReactTestApp-Bridging-Header.h */,
+				196C22642490CBAB00449D3C /* React+Compatibility.h */,
+				196C22632490CBAB00449D3C /* React+Compatibility.m */,
 				193EF092247A830200BE8C79 /* UIViewController+ReactTestApp.h */,
 				193EF091247A830200BE8C79 /* UIViewController+ReactTestApp.m */,
 				193EF066247A736300BE8C79 /* Assets.xcassets */,
@@ -286,6 +291,7 @@
 			files = (
 				193EF063247A736200BE8C79 /* AppDelegate.swift in Sources */,
 				193EF08F247A799D00BE8C79 /* Manifest.swift in Sources */,
+				196C22652490CBAB00449D3C /* React+Compatibility.m in Sources */,
 				193EF098247B130700BE8C79 /* ReactInstance.swift in Sources */,
 				193EF065247A736200BE8C79 /* ViewController.swift in Sources */,
 				193EF093247A830200BE8C79 /* UIViewController+ReactTestApp.m in Sources */,