Merge branch 'fix/flipper_xcode_15.3' into chore/e2e-enable-ios

flexn-io · Mar 19, 2024 · 5127b2d · 5127b2d
2 parents 7058387 + 9dde487
commit 5127b2d
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 3 deletions.
diff --git a/packages/app-harness/src/app/index.tsx b/packages/app-harness/src/app/index.tsx
@@ -52,7 +52,7 @@ const AppContent = () => {
                 <Image
                     style={styles.logo}
                     source={ICON_LOGO}
-                    {...testProps('template-starter-home-screen-renative-image')}
+                    {...testProps('app-harness-home-screen-renative-image')}
                 />
                 <Text style={styles.introText} {...testProps('app-harness-home-screen-intro-text')}>
                     ReNative Harness

diff --git a/packages/app-harness/test/specs/e2e.cjs b/packages/app-harness/test/specs/e2e.cjs
@@ -5,7 +5,7 @@ describe('Test App Harness', () => {
         FlexnRunner.launchApp();
     });
 
-    it('--> check if element has correct text in Home Page', async () => {
-        await FlexnRunner.expectToHaveTextById('app-harness-home-screen-intro-text', 'ReNative Harness');
+    it('--> check if ReNative logo is displayed in Home Page', async () => {
+        await FlexnRunner.expectToBeDisplayedById('app-harness-home-screen-renative-image');
     });
 });
diff --git a/packages/engine-rn-tvos/templates/platforms/tvos/Podfile b/packages/engine-rn-tvos/templates/platforms/tvos/Podfile
@@ -82,6 +82,19 @@ post_install do |installer|
     :mac_catalyst_enabled => false
   )
   {{INJECT_POST_INSTALL}}
+  
+  installer.pods_project.targets.each do |target|
+    if target.name == 'Flipper'
+      file_path = 'Pods/Flipper/xplat/Flipper/FlipperTransportTypes.h'
+      contents = File.read(file_path)
+      unless contents.include?('#include <functional>')
+        File.open(file_path, 'w') do |file|
+          file.puts('#include <functional>')
+          file.puts(contents)
+        end
+      end
+    end
+  end
 end
 
 {{INJECT_PLUGIN_PODFILE_INJECT}}
diff --git a/packages/engine-rn/templates/platforms/ios/Podfile b/packages/engine-rn/templates/platforms/ios/Podfile
@@ -65,6 +65,19 @@ target 'RNVApp' do
       :mac_catalyst_enabled => false
     )
     {{INJECT_POST_INSTALL}}
+
+    installer.pods_project.targets.each do |target|
+      if target.name == 'Flipper'
+        file_path = 'Pods/Flipper/xplat/Flipper/FlipperTransportTypes.h'
+        contents = File.read(file_path)
+        unless contents.include?('#include <functional>')
+          File.open(file_path, 'w') do |file|
+            file.puts('#include <functional>')
+            file.puts(contents)
+          end
+        end
+      end
+    end
   end
 end