Skip to content

Commit dbe6f81

Browse files
okwasniewskiokwasniewski
committed
feat: add visionOS as separate target to fix iOS tests
1 parent 0ee6253 commit dbe6f81

File tree

13 files changed

+489
-83
lines changed

13 files changed

+489
-83
lines changed

‎packages/rn-tester/Podfile

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
require_relative '../react-native/scripts/react_native_pods'
22

33
source 'https://cdn.cocoapods.org/'
4-
platform :visionos, min_visionos_version_supported
4+
platform :ios, min_ios_version_supported
55

66
cmake_path = `command -v cmake`
77

@@ -39,7 +39,6 @@ def pods(target_name, options = {})
3939

4040
# Hermes is now enabled by default.
4141
# The following line will only disable Hermes if the USE_HERMES envvar is SET to a value other than 1 (e.g. USE_HERMES=0).
42-
# TODO: Make hermes work
4342
hermes_enabled = !ENV.has_key?('USE_HERMES') || ENV['USE_HERMES'] == '1'
4443
puts "Configuring #{target_name} with Fabric #{fabric_enabled ? "enabled" : "disabled"}.#{hermes_enabled ? " Using Hermes engine." : ""}"
4544

@@ -56,7 +55,6 @@ def pods(target_name, options = {})
5655

5756
# Additional Pods which aren't included in the default Podfile
5857
pod 'React-RCTPushNotification', :path => "#{@prefix_path}/Libraries/PushNotificationIOS"
59-
pod 'Yoga', :path => "#{@prefix_path}/ReactCommon/yoga", :modular_headers => true
6058
# Additional Pods which are classed as unstable
6159

6260
# RNTester native modules and components
@@ -69,6 +67,11 @@ target 'RNTester' do
6967
pods('RNTester')
7068
end
7169

70+
target('RNTester-visionOS') do
71+
platform :visionos, min_visionos_version_supported
72+
pods('RNTester-visionOS')
73+
end
74+
7275
target 'RNTesterUnitTests' do
7376
pods('RNTesterUnitTests')
7477
pod 'React-RCTTest', :path => "./RCTTest"

‎packages/rn-tester/Podfile.lock

Lines changed: 49 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -1397,65 +1397,65 @@ EXTERNAL SOURCES:
13971397
SPEC CHECKSUMS:
13981398
boost: 3f76a4d6d9d0f232d25b7782f83fcf988f47d517
13991399
DoubleConversion: 71bf0761505a44e4dfddc0aa04afa049fdfb63b5
1400-
FBLazyVector: 9352d838784d30d9658499016902f48abeaa8fc0
1400+
FBLazyVector: 546c6a2e35cd173dee6b8e6ad5ec55b6ec191f09
14011401
fmt: 5d9ffa7ccba126c08b730252123601d514652320
14021402
glog: 4f05d17aa39a829fee878689fc9a41af587fabba
14031403
hermes-engine: 9a7115f7051008756d8049e60153cec2f661b8e3
14041404
MyNativeView: 47eae94856869581ac5eff85bcb5df32d39b7a23
14051405
NativeCxxModuleExample: 78b1153a30fe9c0b69a008a5a212c5b42fd00ea7
14061406
RCT-Folly: 35de8f372fc3e617131511a6f16028db5c3db620
14071407
RCTDeprecation: 3808e36294137f9ee5668f4df2e73dc079cd1dcf
1408-
RCTRequired: ed69229196689eac1ea0df00ad5b6cd44c0ce09c
1409-
RCTTypeSafety: a76660a790bc50ce4cf9ebaa90c8312dd78a98d3
1410-
React: 6cfc2ed5428b936fd2287a0ef934a731aceba940
1411-
React-callinvoker: 150a30fbc5fbfd72368ed5b88951364f51c4759d
1408+
RCTRequired: 6639860febc6ba2a3b3e2789fb1caf861e35e23e
1409+
RCTTypeSafety: d99258cba5b77de0936eab4994406a658eb297f6
1410+
React: 29bbd2ee79fddef83156d923d7379244437473ad
1411+
React-callinvoker: db08cc78e19c67afb522ec1a07fcebec78a81ea8
14121412
React-Codegen: af0cf07b09594110169f4db192b120e32abdf280
1413-
React-Core: f1fa91e49b5c742702532bd456135595611ffedc
1414-
React-CoreModules: 9cf8c9d980553dfe864129923f53945f25b7b9f4
1415-
React-cxxreact: 77894053f79ff76de621fecf165e57767a5e7476
1416-
React-debug: e0240b2d3ee84ec60ff357cc99acdac62231c967
1417-
React-Fabric: 3cef5abb158ad95603550220c05605dd5c332b48
1418-
React-FabricImage: d119c0b98a5bf2c5cac5b597efa7a08361111b71
1419-
React-graphics: 5a9db721b21b11d6bada42bc0443a8cfea5d75b0
1420-
React-hermes: c69a3baea33947f8aa866deadb0d064b0aecfa52
1421-
React-ImageManager: ea267a2a7ae672a1fcdaf5931fb3ac4b65a051c5
1422-
React-jserrorhandler: ae35615dba534b3214b16db430f8dcc66184387f
1423-
React-jsi: 10b0077239da97756f2dd24c4b5b8de50cae01a0
1424-
React-jsiexecutor: 88b94f8f9518331cf0ac90a7b59de77ec9ca9ac2
1425-
React-jsinspector: 3b4c9812a32cae1c8f453f71d732a117a11f4bf7
1426-
React-jsitracing: 1f65030a1c5900e3e46da7c19f53c86790ac4dd1
1427-
React-logger: 81a5e25462ffc061722e22b7fe86872d6c2f7310
1428-
React-Mapbuffer: e0065717528fca068df9e396baaa15aa78bba01d
1429-
React-nativeconfig: 41aaa3b8e5a9af392fa1f9f695bf2355915abb40
1430-
React-NativeModulesApple: acfde87ffb3520e396ea9518423b34ba7df31eba
1431-
React-perflogger: 60abb340c1e28bbcd8a963bea56e60f72c0d8f3c
1432-
React-RCTActionSheet: ad32fd034a2bb96c4c17540b080d93eabf69d11a
1433-
React-RCTAnimation: e3338042f1d2f378f26b8d32c86d80d160426523
1434-
React-RCTAppDelegate: 2da759607b1b74189dfa22ce6812aefdcc1ca434
1435-
React-RCTBlob: de051eb74ad911f5c55cdb4fe3c788a6ccfc8ba4
1436-
React-RCTFabric: b4ff13049b3b1eaf8735bfca82677de9950f2a20
1437-
React-RCTImage: fa8f8f45c06e0fa9db49ef3d28724ce71852ac3f
1438-
React-RCTLinking: f54189bae9672c624953af5ef122bcfb3862de4a
1439-
React-RCTNetwork: 37b9ab3124b632a80406494065c32a6ee727d03e
1440-
React-RCTPushNotification: 6a5a3763906ae1597ffa000badf1120bd813468a
1441-
React-RCTSettings: 5821e67bacbfec2da45320486825a2f8c7040d61
1442-
React-RCTTest: d2302187af2960968c19a81f52b06a61011fc9ea
1443-
React-RCTText: a31c1b4ef51934cdc17d3a30de7640efc635d2be
1444-
React-RCTVibration: d44a3e51061d81b54d97a6e28ce94edf64c2ba18
1445-
React-rendererdebug: a34a3aa097584cd460175fbc68c3d7bbf690925a
1446-
React-rncore: a4decd0110eaba21c0a3113a906f862f5df424b1
1447-
React-RuntimeApple: 273a5a37636ede4a8274fd6caf8709accab91ee0
1448-
React-RuntimeCore: 4844b17e71481ef4fd188796f1a3322eb8de0462
1449-
React-runtimeexecutor: 072f93bdd040d36010e6fcb2ad71e9d94edc65d4
1450-
React-RuntimeHermes: f382de11f7691c2ed371f5d23b851a35fce4f3d6
1451-
React-runtimescheduler: 8741cceeecb81969788c814c85c5a1cd8566eb43
1452-
React-utils: 0b6272af3990664a7d257d1ea7253af6d3ea9fd6
1453-
ReactCommon: 9c41843d264a63abf0b0b99596b0b2dcf39af260
1454-
ReactCommon-Samples: cdeaf546a80094863adcee22ea96bc69589578f8
1413+
React-Core: b183ce05aa7a36fa33e84110e309a1d510cd1216
1414+
React-CoreModules: 9f8aaf2b06a48d5d8ccaff3bc10112eb5f2ed89c
1415+
React-cxxreact: e82a0cfdee74386b0f801e13df687f415347b91e
1416+
React-debug: 40ba3dea9ff840019e030307239cfb0393ac37ce
1417+
React-Fabric: d392f3e468ef4f5e8d4c67fd0772b454119d3e54
1418+
React-FabricImage: f5331bc663c70bff19eccbb21dc3da08546319bc
1419+
React-graphics: f54b297a600ae01aaf746fd968154111e326d0b4
1420+
React-hermes: debd0f3b42d076d5d384f23d9b28f9852563b4ef
1421+
React-ImageManager: 3214be72fceb42ec56855095f527719aa46aa864
1422+
React-jserrorhandler: a460a9300df719ba80d5dc940cec64d0e3a1b8d6
1423+
React-jsi: 9129be21b8389743f174bfc8170a3199b2ac8fe0
1424+
React-jsiexecutor: 2d3e06bed53aaca8dee128ad26d8662dbe02065e
1425+
React-jsinspector: 9df4f887b688b3840ce5f5cc468a375003278648
1426+
React-jsitracing: 0f25aa2b6623bb9f7b8bc4c8afd346bb01f4d41d
1427+
React-logger: cccc6f10431520d764e0317cba2eeb67396629f6
1428+
React-Mapbuffer: babefe01fece19abc14c82e8551926a83e54f601
1429+
React-nativeconfig: 5602e4bfa037ec527deae1ffe320e078e09e963b
1430+
React-NativeModulesApple: 33e906578a685c7ce1851557d34619593c511969
1431+
React-perflogger: 1d4bc2e36ff4d3bb2980f4168328acab7f1e9ee0
1432+
React-RCTActionSheet: 6a1f57f044bc38155fce50681f30a02fdb59ff39
1433+
React-RCTAnimation: f0d8daedb69e42b29476720852a6374d094af41d
1434+
React-RCTAppDelegate: 1c72c1be7f6ebfe57d9c8b62be3ce6f550351ee3
1435+
React-RCTBlob: 059cd8ea2b509757a01d0e4dea568abefa67a09a
1436+
React-RCTFabric: 0d2bd7c0c8e1004f47daf38eebf723c1837c5481
1437+
React-RCTImage: cd418371af520b1a683d32cbe936c99b6e7e184d
1438+
React-RCTLinking: b96e02f9793fc2926bc1efe81b68604f54e71444
1439+
React-RCTNetwork: 12192c813e80083ac8f00b911dc91ffa7cd8fd03
1440+
React-RCTPushNotification: 2af61af1e304a52af65fe2fe4d1710784c14a2e7
1441+
React-RCTSettings: f1f00d2261819dbe61e2c45c044646caa8a167f9
1442+
React-RCTTest: 97ca40df80a7716ba7f2d741095ce285336cdc1c
1443+
React-RCTText: d29cbc5db36ae2c4f398affbc551d03e753102d1
1444+
React-RCTVibration: 044a3e51fa62731189dbad9c5de62db2c7ecfcbe
1445+
React-rendererdebug: 5b23f8cf5b7cc31f2014e3ac1ac154596811511a
1446+
React-rncore: eec04123aaeffc6270096b90b4b6dd08f959979d
1447+
React-RuntimeApple: b63ce61fa51e0b63a4f73f9977ee22af5528a272
1448+
React-RuntimeCore: 13e7dbdc3794ad852c165572b0d58899880c2217
1449+
React-runtimeexecutor: b25dc450d66c3a7cf82c52a260120e86ac6871fb
1450+
React-RuntimeHermes: edceff5aea2a2e7220bc144f98962e8259167788
1451+
React-runtimescheduler: 86e30781869117031dc4189cc6c68e061862bd23
1452+
React-utils: bf7c90400bda31135a5f478e310f363d5b653d8a
1453+
ReactCommon: 0860df6e9595ef445b4f999e9056b58a6ddd3e25
1454+
ReactCommon-Samples: d3755b8c37a1eca79b7c277036ef3e127929d8bd
14551455
ScreenshotManager: 42901f5e612f43fd3f4a6f3f242618e0e6cf0b5f
14561456
SocketRocket: 0ba3e799f983d2dfa878777017659ef6c866e5c6
1457-
Yoga: 233eb920c8cabc2215a0e59a634fad0cbe5787c2
1457+
Yoga: 6c14069748f0a629f11ec4a28c63d04b4e4788e3
14581458

1459-
PODFILE CHECKSUM: 1e1bf87351d19893d7766aa6f0c24e943294dce9
1459+
PODFILE CHECKSUM: 8b622f56d74a8283ca03068e2f975f6a04f0e2cd
14601460

14611461
COCOAPODS: 1.13.0

‎packages/rn-tester/RNTester-visionOS/Assets.xcassets/AppIcon.solidimagestack/Back.solidimagestacklayer/Content.imageset/Contents.json

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"images" : [
3+
{
4+
"idiom" : "vision",
5+
"scale" : "2x"
6+
}
7+
],
8+
"info" : {
9+
"author" : "xcode",
10+
"version" : 1
11+
}
12+
}

‎packages/rn-tester/RNTester-visionOS/Assets.xcassets/AppIcon.solidimagestack/Back.solidimagestacklayer/Contents.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"info" : {
3+
"author" : "xcode",
4+
"version" : 1
5+
}
6+
}

‎packages/rn-tester/RNTester-visionOS/Assets.xcassets/AppIcon.solidimagestack/Contents.json

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
{
2+
"info" : {
3+
"author" : "xcode",
4+
"version" : 1
5+
},
6+
"layers" : [
7+
{
8+
"filename" : "Front.solidimagestacklayer"
9+
},
10+
{
11+
"filename" : "Middle.solidimagestacklayer"
12+
},
13+
{
14+
"filename" : "Back.solidimagestacklayer"
15+
}
16+
]
17+
}

‎packages/rn-tester/RNTester-visionOS/Assets.xcassets/AppIcon.solidimagestack/Front.solidimagestacklayer/Content.imageset/Contents.json

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"images" : [
3+
{
4+
"idiom" : "vision",
5+
"scale" : "2x"
6+
}
7+
],
8+
"info" : {
9+
"author" : "xcode",
10+
"version" : 1
11+
}
12+
}

‎packages/rn-tester/RNTester-visionOS/Assets.xcassets/AppIcon.solidimagestack/Front.solidimagestacklayer/Contents.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"info" : {
3+
"author" : "xcode",
4+
"version" : 1
5+
}
6+
}

‎packages/rn-tester/RNTester-visionOS/Assets.xcassets/AppIcon.solidimagestack/Middle.solidimagestacklayer/Content.imageset/Contents.json

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"images" : [
3+
{
4+
"idiom" : "vision",
5+
"scale" : "2x"
6+
}
7+
],
8+
"info" : {
9+
"author" : "xcode",
10+
"version" : 1
11+
}
12+
}

‎packages/rn-tester/RNTester-visionOS/Assets.xcassets/AppIcon.solidimagestack/Middle.solidimagestacklayer/Contents.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"info" : {
3+
"author" : "xcode",
4+
"version" : 1
5+
}
6+
}

‎packages/rn-tester/RNTester-visionOS/Assets.xcassets/Contents.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"info" : {
3+
"version" : 1,
4+
"author" : "xcode"
5+
}
6+
}

‎packages/rn-tester/RNTester-visionOS/Info.plist

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>UIApplicationSceneManifest</key>
6+
<dict>
7+
<key>UIApplicationPreferredDefaultSceneSessionRole</key>
8+
<string>UIWindowSceneSessionRoleApplication</string>
9+
<key>UIApplicationSupportsMultipleScenes</key>
10+
<true/>
11+
<key>UISceneConfigurations</key>
12+
<dict/>
13+
</dict>
14+
</dict>
15+
</plist>

‎packages/rn-tester/RNTester-visionOS/Preview Content/Preview Assets.xcassets/Contents.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"info" : {
3+
"author" : "xcode",
4+
"version" : 1
5+
}
6+
}

0 commit comments

Comments
 (0)