Skip to content

Commit

Permalink
feat(apple): bump iOS/macOS deployment target to 15.1/12.0
Browse files Browse the repository at this point in the history
BREAKING CHANGE: Minimum iOS and macOS versions have been bumped to
15.1 and 12.0 respectively
  • Loading branch information
tido64 committed Nov 12, 2024
1 parent 96dc28d commit 51df7f1
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 27 deletions.
4 changes: 2 additions & 2 deletions example/Example-Tests.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ Pod::Spec.new do |s|
s.source = { :git => package['repository']['url'] }
s.summary = 'Example tests'

s.ios.deployment_target = '13.0'
s.osx.deployment_target = '10.15'
s.ios.deployment_target = '15.1'
s.osx.deployment_target = '12.0'
s.visionos.deployment_target = '1.0'

s.dependency 'React'
Expand Down
4 changes: 2 additions & 2 deletions ios/ReactTestApp.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -447,7 +447,7 @@
BUNDLE_LOADER = "$(TEST_HOST)";
CODE_SIGN_STYLE = Automatic;
INFOPLIST_FILE = ReactTestAppTests/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
IPHONEOS_DEPLOYMENT_TARGET = 15.1;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand All @@ -468,7 +468,7 @@
BUNDLE_LOADER = "$(TEST_HOST)";
CODE_SIGN_STYLE = Automatic;
INFOPLIST_FILE = ReactTestAppTests/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
IPHONEOS_DEPLOYMENT_TARGET = 15.1;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand Down
2 changes: 1 addition & 1 deletion ios/ReactTestApp/ReactTestApp.common.xcconfig
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ ENABLE_USER_SCRIPT_SANDBOXING = NO
GCC_C_LANGUAGE_STANDARD = gnu11
GCC_NO_COMMON_BLOCKS = YES
GCC_TREAT_WARNINGS_AS_ERRORS = YES
IPHONEOS_DEPLOYMENT_TARGET = 14.0
IPHONEOS_DEPLOYMENT_TARGET = 15.1
MTL_FAST_MATH = YES
OTHER_CFLAGS = $(inherited) -fstack-protector-strong
OTHER_LDFLAGS = $(inherited) -fstack-protector-strong
Expand Down
19 changes: 2 additions & 17 deletions ios/test_app.rb
Original file line number Diff line number Diff line change
Expand Up @@ -313,26 +313,11 @@ def make_project!(xcodeproj, project_root, target_platform, options)
app_project.save

config = app_project.build_configurations[0]

# 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 => macos_deployment_target,
:ios => config.resolve_build_setting(IPHONEOS_DEPLOYMENT_TARGET),
:macos => config.resolve_build_setting(MACOSX_DEPLOYMENT_TARGET),
:visionos => config.resolve_build_setting(XROS_DEPLOYMENT_TARGET),
},
:react_native_version => rn_version,
Expand Down
4 changes: 2 additions & 2 deletions macos/ReactTestApp.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -441,7 +441,7 @@
"@executable_path/../Frameworks",
"@loader_path/../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 10.15;
MACOSX_DEPLOYMENT_TARGET = 12.0;
PRODUCT_BUNDLE_IDENTIFIER = com.microsoft.ReactTestAppTests;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 5.0;
Expand All @@ -462,7 +462,7 @@
"@executable_path/../Frameworks",
"@loader_path/../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 10.15;
MACOSX_DEPLOYMENT_TARGET = 12.0;
PRODUCT_BUNDLE_IDENTIFIER = com.microsoft.ReactTestAppTests;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 5.0;
Expand Down
2 changes: 1 addition & 1 deletion macos/ReactTestApp/ReactTestApp.common.xcconfig
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ ENABLE_USER_SCRIPT_SANDBOXING = NO
GCC_C_LANGUAGE_STANDARD = gnu11
GCC_NO_COMMON_BLOCKS = YES
GCC_TREAT_WARNINGS_AS_ERRORS = YES
MACOSX_DEPLOYMENT_TARGET = 10.15
MACOSX_DEPLOYMENT_TARGET = 12.0
MTL_FAST_MATH = YES
OTHER_CFLAGS = $(inherited) -fstack-protector-strong
OTHER_LDFLAGS = $(inherited) -fstack-protector-strong
Expand Down
4 changes: 2 additions & 2 deletions visionos/ReactTestApp.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -431,7 +431,7 @@
BUNDLE_LOADER = "$(TEST_HOST)";
CODE_SIGN_STYLE = Automatic;
INFOPLIST_FILE = ReactTestAppTests/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
IPHONEOS_DEPLOYMENT_TARGET = 15.1;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand All @@ -456,7 +456,7 @@
BUNDLE_LOADER = "$(TEST_HOST)";
CODE_SIGN_STYLE = Automatic;
INFOPLIST_FILE = ReactTestAppTests/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
IPHONEOS_DEPLOYMENT_TARGET = 15.1;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand Down

0 comments on commit 51df7f1

Please sign in to comment.