Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: add visionOS as separate target to fix iOS tests #31

Merged
merged 4 commits into from
Nov 24, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions packages/rn-tester/Podfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
require_relative '../react-native/scripts/react_native_pods'

source 'https://cdn.cocoapods.org/'
platform :visionos, min_visionos_version_supported
platform :ios, min_ios_version_supported

cmake_path = `command -v cmake`

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

# Hermes is now enabled by default.
# 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).
# TODO: Make hermes work
hermes_enabled = !ENV.has_key?('USE_HERMES') || ENV['USE_HERMES'] == '1'
puts "Configuring #{target_name} with Fabric #{fabric_enabled ? "enabled" : "disabled"}.#{hermes_enabled ? " Using Hermes engine." : ""}"

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

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

# RNTester native modules and components
Expand All @@ -69,6 +67,11 @@ target 'RNTester' do
pods('RNTester')
end

target('RNTester-visionOS') do
platform :visionos, min_visionos_version_supported
pods('RNTester-visionOS')
end

target 'RNTesterUnitTests' do
pods('RNTesterUnitTests')
pod 'React-RCTTest', :path => "./RCTTest"
Expand Down
98 changes: 49 additions & 49 deletions packages/rn-tester/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1397,65 +1397,65 @@ EXTERNAL SOURCES:
SPEC CHECKSUMS:
boost: 3f76a4d6d9d0f232d25b7782f83fcf988f47d517
DoubleConversion: 71bf0761505a44e4dfddc0aa04afa049fdfb63b5
FBLazyVector: 9352d838784d30d9658499016902f48abeaa8fc0
FBLazyVector: ad35ece60a21979d12ca8291cb53f76c12346118
fmt: 5d9ffa7ccba126c08b730252123601d514652320
glog: 4f05d17aa39a829fee878689fc9a41af587fabba
hermes-engine: 9a7115f7051008756d8049e60153cec2f661b8e3
MyNativeView: 47eae94856869581ac5eff85bcb5df32d39b7a23
NativeCxxModuleExample: 78b1153a30fe9c0b69a008a5a212c5b42fd00ea7
RCT-Folly: 35de8f372fc3e617131511a6f16028db5c3db620
RCTDeprecation: 3808e36294137f9ee5668f4df2e73dc079cd1dcf
RCTRequired: ed69229196689eac1ea0df00ad5b6cd44c0ce09c
RCTTypeSafety: a76660a790bc50ce4cf9ebaa90c8312dd78a98d3
React: 6cfc2ed5428b936fd2287a0ef934a731aceba940
React-callinvoker: 150a30fbc5fbfd72368ed5b88951364f51c4759d
RCTRequired: 4ac7f10fba4cfed285a15239ad334447b0269bf9
RCTTypeSafety: 419e28b1a00fc31ab1bf10f0cadeeaf7b1f76cbb
React: b67e6190b5178663e3c444c38bd945f018665ce8
React-callinvoker: 8132237bd58d9e51c3b92e78cfde8aa563943696
React-Codegen: af0cf07b09594110169f4db192b120e32abdf280
React-Core: f1fa91e49b5c742702532bd456135595611ffedc
React-CoreModules: 9cf8c9d980553dfe864129923f53945f25b7b9f4
React-cxxreact: 77894053f79ff76de621fecf165e57767a5e7476
React-debug: e0240b2d3ee84ec60ff357cc99acdac62231c967
React-Fabric: 3cef5abb158ad95603550220c05605dd5c332b48
React-FabricImage: d119c0b98a5bf2c5cac5b597efa7a08361111b71
React-graphics: 5a9db721b21b11d6bada42bc0443a8cfea5d75b0
React-hermes: c69a3baea33947f8aa866deadb0d064b0aecfa52
React-ImageManager: ea267a2a7ae672a1fcdaf5931fb3ac4b65a051c5
React-jserrorhandler: ae35615dba534b3214b16db430f8dcc66184387f
React-jsi: 10b0077239da97756f2dd24c4b5b8de50cae01a0
React-jsiexecutor: 88b94f8f9518331cf0ac90a7b59de77ec9ca9ac2
React-jsinspector: 3b4c9812a32cae1c8f453f71d732a117a11f4bf7
React-jsitracing: 1f65030a1c5900e3e46da7c19f53c86790ac4dd1
React-logger: 81a5e25462ffc061722e22b7fe86872d6c2f7310
React-Mapbuffer: e0065717528fca068df9e396baaa15aa78bba01d
React-nativeconfig: 41aaa3b8e5a9af392fa1f9f695bf2355915abb40
React-NativeModulesApple: acfde87ffb3520e396ea9518423b34ba7df31eba
React-perflogger: 60abb340c1e28bbcd8a963bea56e60f72c0d8f3c
React-RCTActionSheet: ad32fd034a2bb96c4c17540b080d93eabf69d11a
React-RCTAnimation: e3338042f1d2f378f26b8d32c86d80d160426523
React-RCTAppDelegate: 2da759607b1b74189dfa22ce6812aefdcc1ca434
React-RCTBlob: de051eb74ad911f5c55cdb4fe3c788a6ccfc8ba4
React-RCTFabric: b4ff13049b3b1eaf8735bfca82677de9950f2a20
React-RCTImage: fa8f8f45c06e0fa9db49ef3d28724ce71852ac3f
React-RCTLinking: f54189bae9672c624953af5ef122bcfb3862de4a
React-RCTNetwork: 37b9ab3124b632a80406494065c32a6ee727d03e
React-RCTPushNotification: 6a5a3763906ae1597ffa000badf1120bd813468a
React-RCTSettings: 5821e67bacbfec2da45320486825a2f8c7040d61
React-RCTTest: d2302187af2960968c19a81f52b06a61011fc9ea
React-RCTText: a31c1b4ef51934cdc17d3a30de7640efc635d2be
React-RCTVibration: d44a3e51061d81b54d97a6e28ce94edf64c2ba18
React-rendererdebug: a34a3aa097584cd460175fbc68c3d7bbf690925a
React-rncore: a4decd0110eaba21c0a3113a906f862f5df424b1
React-RuntimeApple: 273a5a37636ede4a8274fd6caf8709accab91ee0
React-RuntimeCore: 4844b17e71481ef4fd188796f1a3322eb8de0462
React-runtimeexecutor: 072f93bdd040d36010e6fcb2ad71e9d94edc65d4
React-RuntimeHermes: f382de11f7691c2ed371f5d23b851a35fce4f3d6
React-runtimescheduler: 8741cceeecb81969788c814c85c5a1cd8566eb43
React-utils: 0b6272af3990664a7d257d1ea7253af6d3ea9fd6
ReactCommon: 9c41843d264a63abf0b0b99596b0b2dcf39af260
ReactCommon-Samples: cdeaf546a80094863adcee22ea96bc69589578f8
React-Core: 8f4b4856243b14a2f345601f470ba12e78b02217
React-CoreModules: 2398b213b520ff85d64340f0ebb1f4d4ec5481d1
React-cxxreact: 05c174226c0f6ac1c17c5769ff9d0b59135f1146
React-debug: 98dc5ccac41dadfbfcac8d85f059a3220d66b19f
React-Fabric: 6f4afda6a00ffd6bbdc15df519d34b6b90f4d3a9
React-FabricImage: 8dfdc812f5841a82a84b27cf2225e31aeefc1085
React-graphics: 7d86ebd7e2128a6ea040ab0f2e2d7d6cb29175f1
React-hermes: ccfceb2c8d04188427f3501e0370d78ab75c5805
React-ImageManager: 223c008e4199417428197e7e76d75a1519fb4570
React-jserrorhandler: 9c9614e8baa25149ada068b14a085eea033524a2
React-jsi: d176f6454909cfcf3a207696be11ab6b6c92f5cf
React-jsiexecutor: 6910c3129c6631ddd22cfb05319a7b7ae4f1ad41
React-jsinspector: e899dba19b6b30165138f87659b6592f626c8063
React-jsitracing: bbcdf047eb980ce8a643d57c9780088d0b07d8ba
React-logger: d3b3cc2076e1c8ca226eb85f615495185e05dd49
React-Mapbuffer: 12468b5412654c25d4229347b40e1b86fa10ff63
React-nativeconfig: e9ebca704e97b8beff654814d39aaca65473c8ac
React-NativeModulesApple: 25d7ade2f575e01577b28f9580ddb291dbe0ecf2
React-perflogger: bd7e1b9672a727302f2e067d8e747dc70f2e87ba
React-RCTActionSheet: 75487462c4ec45e53005fc7318251b6a34b9d3ff
React-RCTAnimation: 74d5ef5f6b452e965894d3921f1dd7f96a5b322c
React-RCTAppDelegate: a24aaacd0814db79d4ee9fc871ce8ace6c26b2fa
React-RCTBlob: fcff404e1df17c810837ed3e7361f0e791705d19
React-RCTFabric: 479a24986610496846e32de111bfe6c0266fa965
React-RCTImage: 543f13c75d718570fbe42454fd7410e01e265b42
React-RCTLinking: 97fb7a2674bd849b80b2874a80331ccb15e30674
React-RCTNetwork: ad361a2060fdf4a21e59b3fa34ed87ca5b5d4a7f
React-RCTPushNotification: 4954d1e963e3f131b52c2f50d5a47cf063afeda7
React-RCTSettings: 458ce1cea8f87f23bba0f084ffd3fdb1a7ca2f66
React-RCTTest: b9df27f59bcb795896a67301b1c1846b091e3f20
React-RCTText: 1eff3c2968f8900ab79908c38c8ae0755d957db2
React-RCTVibration: e7ab4d9ccfd6a4c68632bb5fbcf741b132682fc9
React-rendererdebug: 645c26670c1da62201cd8732181f1da09e76f35f
React-rncore: b04dd3ea952191dff2dc78891227cd9139c2754a
React-RuntimeApple: 2ce2ced7a7b2ea6d83eb0bae00061d9b1decdea7
React-RuntimeCore: 376ddf58bf30c1fcab8f18c4200a6622bff50875
React-runtimeexecutor: 325c45ae36723476736f401b50bdaf540bfb5df5
React-RuntimeHermes: 67e6f40df1fa95c0d8591a23a2509eb82dc2bd68
React-runtimescheduler: 095a83fba217e28ed8f971da6a6166b16e8c2073
React-utils: 5373f51d2a196006b28296c769a25063e42ab8cd
ReactCommon: 3cc1431102403d0de8cfa9d18245fdd3ff41eb3a
ReactCommon-Samples: ab2633435825b3c718aed0464f62277d46f1f15f
ScreenshotManager: 42901f5e612f43fd3f4a6f3f242618e0e6cf0b5f
SocketRocket: 0ba3e799f983d2dfa878777017659ef6c866e5c6
Yoga: 233eb920c8cabc2215a0e59a634fad0cbe5787c2
Yoga: 64ed216e743acb329bf15a65be17342662ea62a6

PODFILE CHECKSUM: 1e1bf87351d19893d7766aa6f0c24e943294dce9
PODFILE CHECKSUM: 4c2885e9a2aeb8ef3931d92190763fcc01533d8c

COCOAPODS: 1.13.0
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"images" : [
{
"filename" : "back.jpg",
"idiom" : "vision",
"scale" : "2x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"info" : {
"author" : "xcode",
"version" : 1
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"info" : {
"author" : "xcode",
"version" : 1
},
"layers" : [
{
"filename" : "Front.solidimagestacklayer"
},
{
"filename" : "Middle.solidimagestacklayer"
},
{
"filename" : "Back.solidimagestacklayer"
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"images" : [
{
"filename" : "front.png",
"idiom" : "vision",
"scale" : "2x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"info" : {
"author" : "xcode",
"version" : 1
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"images" : [
{
"idiom" : "vision",
"scale" : "2x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"info" : {
"author" : "xcode",
"version" : 1
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"info" : {
"version" : 1,
"author" : "xcode"
}
}
15 changes: 15 additions & 0 deletions packages/rn-tester/RNTester-visionOS/Info.plist
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>UIApplicationSceneManifest</key>
<dict>
<key>UIApplicationPreferredDefaultSceneSessionRole</key>
<string>UIWindowSceneSessionRoleApplication</string>
<key>UIApplicationSupportsMultipleScenes</key>
<false/>
<key>UISceneConfigurations</key>
<dict/>
</dict>
</dict>
</plist>
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading