From 6f165e3774de5aa5db79f4113e830f3736dbb2c5 Mon Sep 17 00:00:00 2001
From: Emily Janzer <janzer@fb.com>
Date: Sun, 7 Jun 2020 16:32:34 -0700
Subject: [PATCH] Fix CircleCI by adding dependency on JSI to cxxreact

Summary:
D21908523 added an implicit dependency on `jsi.h` to use functions like `asObject`, etc. For some reason this doesn't break the build with BUCK (??) but it does with cocoapods. Adding the dep to the cxxreact podspec and regenerating offline mirrors to unbreak CircleCI. Also adding the BUCK dep and include statement for good measure.

Changelog: [Internal]

Differential Revision: D21924592

fbshipit-source-id: 60da149f0bdef5cb07fffae3a5fe930440138c44
---
 RNTester/Podfile.lock                       | 3 ++-
 ReactCommon/cxxreact/BUCK                   | 1 +
 ReactCommon/cxxreact/NativeToJsBridge.cpp   | 1 +
 ReactCommon/cxxreact/React-cxxreact.podspec | 1 +
 4 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/RNTester/Podfile.lock b/RNTester/Podfile.lock
index a26763b7588b..2f8e22d94d56 100644
--- a/RNTester/Podfile.lock
+++ b/RNTester/Podfile.lock
@@ -251,6 +251,7 @@ PODS:
     - Folly (= 2020.01.13.00)
     - glog
     - React-callinvoker (= 1000.0.0)
+    - React-jsi (= 1000.0.0)
     - React-jsinspector (= 1000.0.0)
     - React-perflogger (= 1000.0.0)
     - React-runtimeexecutor (= 1000.0.0)
@@ -521,7 +522,7 @@ SPEC CHECKSUMS:
   React-callinvoker: 0dada022d38b73e6e15b33e2a96476153f79bbf6
   React-Core: d85e4563acbfbb6e6be7414a813ad55d05d675df
   React-CoreModules: d13d148c851af5780f864be74bc2165140923dc7
-  React-cxxreact: bb64d8c5798d75565870ff1a7a8ac57a09bd9ff8
+  React-cxxreact: 4661b3295e62c6eaada084e2f826c70c71ef11ea
   React-jsi: fe94132da767bfc4801968c2a12abae43e9a833e
   React-jsiexecutor: 959bb48c75a3bfc1b1d2b991087a6d8df721cbcf
   React-jsinspector: 7fbf9b42b58b02943a0d89b0ba9fff0070f2de98
diff --git a/ReactCommon/cxxreact/BUCK b/ReactCommon/cxxreact/BUCK
index 36d242b889c7..0db1caf43664 100644
--- a/ReactCommon/cxxreact/BUCK
+++ b/ReactCommon/cxxreact/BUCK
@@ -149,6 +149,7 @@ rn_xplat_cxx_library(
         "//xplat/folly:headers_only",
         "//xplat/folly:memory",
         "//xplat/folly:molly",
+        "//xplat/jsi:jsi",
         react_native_xplat_target("callinvoker:callinvoker"),
         react_native_xplat_target("jsinspector:jsinspector"),
         react_native_xplat_target("microprofiler:microprofiler"),
diff --git a/ReactCommon/cxxreact/NativeToJsBridge.cpp b/ReactCommon/cxxreact/NativeToJsBridge.cpp
index c68318875138..58e99c992215 100644
--- a/ReactCommon/cxxreact/NativeToJsBridge.cpp
+++ b/ReactCommon/cxxreact/NativeToJsBridge.cpp
@@ -11,6 +11,7 @@
 #include <folly/MoveWrapper.h>
 #include <folly/json.h>
 #include <glog/logging.h>
+#include <jsi/jsi.h>
 #include <reactperflogger/BridgeNativeModulePerfLogger.h>
 
 #include "Instance.h"
diff --git a/ReactCommon/cxxreact/React-cxxreact.podspec b/ReactCommon/cxxreact/React-cxxreact.podspec
index e1b85a7310b9..34e8f0dca512 100644
--- a/ReactCommon/cxxreact/React-cxxreact.podspec
+++ b/ReactCommon/cxxreact/React-cxxreact.podspec
@@ -44,4 +44,5 @@ Pod::Spec.new do |s|
   s.dependency "React-callinvoker", version
   s.dependency "React-runtimeexecutor", version
   s.dependency "React-perflogger", version
+  s.dependency "React-jsi", version
 end