Bring CI back to life (#477)

* Trigger CI

* Bump `cimg/android` image

* Update `Podfile.lock` files

* Bump `android/android-machine`

* Bump `xcode-version`

* Use latest tag for `android/android-machine`

* Downgrade Android images

* Upgrade 0.72 project

* Bump 0.72 project to 0.72.17

* Downgrade yarn

* Disable `test-expo-web`

* Revert "Downgrade yarn"

This reverts commit f024ada.

* Revert "Bump 0.72 project to 0.72.17"

This reverts commit 523815a.

* Update to `0.72.13`

* Fix `hermes-engine` pod

* Remove iOS test on 0.68

* Disable `test-hermes-ios`

* Update `PrivacyInfo.xcprivacy` path

Author: charpeni

.circleci/config.yml

@@ -1,14 +1,14 @@
 version: 2.1
 
 aliases:
-  - &xcode-version 15.1.0
+  - &xcode-version 15.4.0
   - &node-version '20.10.0'
   - &yarn-version '1.22.19'
 
 orbs:
   node: circleci/node@5.1.1
   browser-tools: circleci/browser-tools@1.4.6
-  android: circleci/android@2.3.0
+  android: circleci/android@2.5.0
 
 executors:
   node:
@@ -225,7 +225,7 @@ jobs:
     executor:
       name: android/android-machine
       resource-class: large
-      tag: 2023.11.1
+      tag: 2023.08.1
     working_directory: ~/react-native-url-polyfill/platforms/react-native/<< parameters.react-native-version >>
     steps:
       - attach-workspace
@@ -332,7 +332,7 @@ workflows:
       - test-ios:
           matrix:
             parameters:
-              react-native-version: ['0.68', '0.72']
+              react-native-version: ['0.72']
           requires:
             - lint
             - test-js
@@ -343,22 +343,22 @@ workflows:
           requires:
             - lint
             - test-js
-      - test-hermes-ios:
-          matrix:
-            parameters:
-              react-native-version: ['0.68']
-          requires:
-            - test-ios-<< matrix.react-native-version >>
+      # - test-hermes-ios:
+      #     matrix:
+      #       parameters:
+      #         react-native-version: ['0.68']
+      #     requires:
+      #       - test-ios-<< matrix.react-native-version >>
       - test-hermes-android:
           matrix:
             parameters:
               react-native-version: ['0.68']
           requires:
             - test-android-<< matrix.react-native-version >>
-      - test-expo-web:
-          matrix:
-            parameters:
-              expo-version: ['48']
-          requires:
-            - lint
-            - test-js
+      # - test-expo-web:
+      #     matrix:
+      #       parameters:
+      #         expo-version: ['48']
+      #     requires:
+      #       - lint
+      #       - test-js

platforms/react-native/0.68/ios/Podfile.lock

@@ -516,13 +516,13 @@ SPEC CHECKSUMS:
   React: 176dd882de001854ced260fad41bb68a31aa4bd0
   React-callinvoker: c2864d1818d6e64928d2faf774a3800dfc38fe1f
   React-Codegen: 98b6f97f0a7abf7d67e4ce435c77c05b7a95cf05
-  React-Core: fdaa2916b1c893f39f02cff0476d1fb0cab1e352
+  React-Core: a201852f4b982eb7f12c1ca08f2af5670ce53610
   React-CoreModules: fd8705b80699ec36c2cdd635c2ce9d874b9cfdfc
-  React-cxxreact: 1832d971f7b0cb2c7b943dc0ec962762c90c906e
-  React-jsi: 72af715135abe8c3f0dcf3b2548b71d048b69a7e
-  React-jsiexecutor: b7b553412f2ec768fe6c8f27cd6bafdb9d8719e6
+  React-cxxreact: c15b2a342ba579181e923a59f568ec84f38811d5
+  React-jsi: 2fbfe2d30d73966ce125fe4e11b0eb2f1c2e84a2
+  React-jsiexecutor: fc9cea49a9b3e55071b32e97353c17e8dcef2725
   React-jsinspector: c5989c77cb89ae6a69561095a61cce56a44ae8e8
-  React-logger: a0833912d93b36b791b7a521672d8ee89107aff1
+  React-logger: 4d02c5a38d4ea66888bfa19448201520f1024260
   React-perflogger: a18b4f0bd933b8b24ecf9f3c54f9bf65180f3fe6
   React-RCTActionSheet: 547fe42fdb4b6089598d79f8e1d855d7c23e2162
   React-RCTAnimation: bc9440a1c37b06ae9ebbb532d244f607805c6034
@@ -534,11 +534,11 @@ SPEC CHECKSUMS:
   React-RCTText: f3fb464cc41a50fc7a1aba4deeb76a9ad8282cb9
   React-RCTVibration: 79040b92bfa9c3c2d2cb4f57e981164ec7ab9374
   React-runtimeexecutor: b960b687d2dfef0d3761fbb187e01812ebab8b23
-  ReactCommon: 095366164a276d91ea704ce53cb03825c487a3f2
+  ReactCommon: 6e27065b582af0ef4d4ca9f9b09acafbd429913b
   SocketRocket: fccef3f9c5cedea1353a9ef6ada904fde10d6608
   Yoga: 99652481fcd320aefa4a7ef90095b95acd181952
   YogaKit: f782866e155069a2cca2517aafea43200b01fd5a
 
 PODFILE CHECKSUM: 63addf81c85c09d5bc767c5b5a458bb4293a0823
 
-COCOAPODS: 1.14.3
+COCOAPODS: 1.16.2

platforms/react-native/0.72/Gemfile

@@ -3,4 +3,7 @@ source 'https://rubygems.org'
 # You may use http://rbenv.org/ or https://rvm.io/ to install and use this version
 ruby ">= 2.6.10"
 
-gem 'cocoapods', '~> 1.12'
+# Cocoapods 1.15 introduced a bug which break the build. We will remove the upper
+# bound in the template on Cocoapods with next React Native release.
+gem 'cocoapods', '>= 1.13', '< 1.15'
+gem 'activesupport', '>= 6.1.7.3', '< 7.1.0'

platforms/react-native/0.72/ios/Detox.xcodeproj/project.pbxproj

@@ -12,6 +12,7 @@
 		13B07FBC1A68108700A75B9A /* AppDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB01A68108700A75B9A /* AppDelegate.mm */; };
 		13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; };
 		13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; };
+		6132EF182BDFF13200BBE14D /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = 6132EF172BDFF13200BBE14D /* PrivacyInfo.xcprivacy */; };
 		7699B88040F8A987B510C191 /* libPods-Detox-DetoxTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 19F6CBCC0A4E27FBF8BF4A61 /* libPods-Detox-DetoxTests.a */; };
 		81AB9BB82411601600AC10FF /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */; };
 /* End PBXBuildFile section */
@@ -41,6 +42,7 @@
 		5709B34CF0A7D63546082F79 /* Pods-Detox.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Detox.release.xcconfig"; path = "Target Support Files/Pods-Detox/Pods-Detox.release.xcconfig"; sourceTree = "<group>"; };
 		5B7EB9410499542E8C5724F5 /* Pods-Detox-DetoxTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Detox-DetoxTests.debug.xcconfig"; path = "Target Support Files/Pods-Detox-DetoxTests/Pods-Detox-DetoxTests.debug.xcconfig"; sourceTree = "<group>"; };
 		5DCACB8F33CDC322A6C60F78 /* libPods-Detox.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Detox.a"; sourceTree = BUILT_PRODUCTS_DIR; };
+		6132EF172BDFF13200BBE14D /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = PrivacyInfo.xcprivacy; sourceTree = "<group>"; };
 		81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = LaunchScreen.storyboard; path = Detox/LaunchScreen.storyboard; sourceTree = "<group>"; };
 		89C6BE57DB24E9ADA2F236DE /* Pods-Detox-DetoxTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Detox-DetoxTests.release.xcconfig"; path = "Target Support Files/Pods-Detox-DetoxTests/Pods-Detox-DetoxTests.release.xcconfig"; sourceTree = "<group>"; };
 		ED297162215061F000B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; };
@@ -116,6 +118,7 @@
 		83CBB9F61A601CBA00E9B192 = {
 			isa = PBXGroup;
 			children = (
+				6132EF172BDFF13200BBE14D /* PrivacyInfo.xcprivacy */,
 				13B07FAE1A68108700A75B9A /* Detox */,
 				832341AE1AAA6A7D00B99B32 /* Libraries */,
 				00E356EF1AD99517003FC87E /* DetoxTests */,
@@ -242,6 +245,7 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				6132EF182BDFF13200BBE14D /* PrivacyInfo.xcprivacy in Resources */,
 				81AB9BB82411601600AC10FF /* LaunchScreen.storyboard in Resources */,
 				13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */,
 			);
@@ -572,6 +576,7 @@
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"DEBUG=1",
 					"$(inherited)",
+					_LIBCPP_ENABLE_CXX17_REMOVED_UNARY_BINARY_FUNCTION,
 				);
 				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@@ -599,6 +604,7 @@
 					"-DFOLLY_MOBILE=1",
 					"-DFOLLY_USE_LIBCPP=1",
 				);
+				OTHER_LDFLAGS = "$(inherited)";
 				REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
 				SDKROOT = iphoneos;
 			};
@@ -640,6 +646,10 @@
 				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = i386;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"$(inherited)",
+					_LIBCPP_ENABLE_CXX17_REMOVED_UNARY_BINARY_FUNCTION,
+				);
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
 				GCC_WARN_UNDECLARED_SELECTOR = YES;
@@ -664,6 +674,7 @@
 					"-DFOLLY_MOBILE=1",
 					"-DFOLLY_USE_LIBCPP=1",
 				);
+				OTHER_LDFLAGS = "$(inherited)";
 				REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
 				SDKROOT = iphoneos;
 				VALIDATE_PRODUCT = YES;