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

fix(macos): declare support for 0.75 #2199

Merged
merged 1 commit into from
Sep 2, 2024
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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ Pods/
android/**/build/
clang-format-diff.py
coverage/
example/*/DerivedData/
example/*/build/
example/Screenshot-*.png
local.properties
Expand Down
10 changes: 8 additions & 2 deletions ios/test_app.rb
Original file line number Diff line number Diff line change
Expand Up @@ -327,19 +327,25 @@ def make_project!(xcodeproj, project_root, target_platform, options)

config = app_project.build_configurations[0]

# TODO: Deployment target is bumped in 4.0. We should remove this block then.
# TODO: Deployment targets are bumped in 4.0. We should remove these blocks then.
ios_deployment_target =
if rn_version >= v(0, 76, 0)
'15.1'
else
config.resolve_build_setting(IPHONEOS_DEPLOYMENT_TARGET)
end
macos_deployment_target =
if rn_version >= v(0, 75, 0)
'11.0'
else
config.resolve_build_setting(MACOSX_DEPLOYMENT_TARGET)
end

{
:xcodeproj_path => xcodeproj_dst,
:platforms => {
:ios => ios_deployment_target,
:macos => config.resolve_build_setting(MACOSX_DEPLOYMENT_TARGET),
:macos => macos_deployment_target,
:visionos => config.resolve_build_setting(XROS_DEPLOYMENT_TARGET),
},
:react_native_version => rn_version,
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@
"@expo/config-plugins": ">=5.0",
"react": "17.0.1 - 19.0",
"react-native": "0.66 - 0.75 || >=0.76.0-0 <0.76.0",
"react-native-macos": "^0.0.0-0 || 0.66 || 0.68 || 0.71 - 0.74",
"react-native-macos": "^0.0.0-0 || 0.66 || 0.68 || 0.71 - 0.75",
"react-native-windows": "^0.0.0-0 || 0.66 - 0.75"
},
"peerDependenciesMeta": {
Expand Down
2 changes: 1 addition & 1 deletion yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -12486,7 +12486,7 @@ __metadata:
"@expo/config-plugins": ">=5.0"
react: 17.0.1 - 19.0
react-native: 0.66 - 0.75 || >=0.76.0-0 <0.76.0
react-native-macos: ^0.0.0-0 || 0.66 || 0.68 || 0.71 - 0.74
react-native-macos: ^0.0.0-0 || 0.66 || 0.68 || 0.71 - 0.75
react-native-windows: ^0.0.0-0 || 0.66 - 0.75
peerDependenciesMeta:
"@callstack/react-native-visionos":
Expand Down
Loading