Skip to content

Commit 98b9d3d

Browse files
committed
Standardize "future" OS versions on 99.99.
We had multiple different "future" versions for different OSes. Make them all the same for consistency. rdar://101929999
1 parent 44e6cb1 commit 98b9d3d

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

lib/AST/Availability.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -579,10 +579,10 @@ AvailabilityContext ASTContext::getSwiftFutureAvailability() {
579579
VersionRange::allGTE(llvm::VersionTuple(99, 99, 0)));
580580
} else if (target.isiOS()) {
581581
return AvailabilityContext(
582-
VersionRange::allGTE(llvm::VersionTuple(99, 0, 0)));
582+
VersionRange::allGTE(llvm::VersionTuple(99, 99, 0)));
583583
} else if (target.isWatchOS()) {
584584
return AvailabilityContext(
585-
VersionRange::allGTE(llvm::VersionTuple(9, 99, 0)));
585+
VersionRange::allGTE(llvm::VersionTuple(99, 99, 0)));
586586
} else {
587587
return AvailabilityContext::alwaysAvailable();
588588
}

test/lit.cfg

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -823,10 +823,10 @@ if run_vendor == 'apple':
823823
next_stable_version, run_environment)
824824
FUTURE_VERSION = {
825825
'macosx': '99.99',
826-
'ios': '99.0',
826+
'ios': '99.99',
827827
'maccatalyst': '99.99',
828-
'tvos': '99.0',
829-
'watchos': '9.99.0'
828+
'tvos': '99.99',
829+
'watchos': '99.99'
830830
}
831831
future_version = FUTURE_VERSION.get(run_os, '')
832832
config.future_triple = '%s-%s-%s%s%s' % (run_cpu, run_vendor, run_os,
@@ -1120,15 +1120,15 @@ if run_vendor == 'apple':
11201120
if run_os == 'ios':
11211121
lit_config.note('Testing iOS ' + config.variant_triple)
11221122
xcrun_sdk_name = "iphoneos"
1123-
target_future_version = "99.0"
1123+
target_future_version = "99.99.0"
11241124
elif run_os == 'tvos':
11251125
lit_config.note('Testing AppleTV ' + config.variant_triple)
11261126
xcrun_sdk_name = "appletvos"
1127-
target_future_version = "99.0"
1127+
target_future_version = "99.99.0"
11281128
elif run_os == 'watchos':
11291129
lit_config.note('Testing watchOS ' + config.variant_triple)
11301130
xcrun_sdk_name = "watchos"
1131-
target_future_version = "9.99.0"
1131+
target_future_version = "99.99.0"
11321132

11331133
config.target_env_prefix = 'IOS_CHILD_'
11341134

@@ -1160,17 +1160,17 @@ if run_vendor == 'apple':
11601160
config.available_features.add('DARWIN_SIMULATOR=ios')
11611161
lit_config.note("Testing iOS simulator " + config.variant_triple)
11621162
xcrun_sdk_name = "iphonesimulator"
1163-
target_future_version = "99.0"
1163+
target_future_version = "99.99.0"
11641164
elif run_os == 'watchos':
11651165
config.available_features.add('DARWIN_SIMULATOR=watchos')
11661166
lit_config.note("Testing watchOS simulator " + config.variant_triple)
11671167
xcrun_sdk_name = "watchsimulator"
1168-
target_future_version = "9.99.0"
1168+
target_future_version = "99.99.0"
11691169
else:
11701170
config.available_features.add('DARWIN_SIMULATOR=tvos')
11711171
lit_config.note("Testing AppleTV simulator " + config.variant_triple)
11721172
xcrun_sdk_name = "appletvsimulator"
1173-
target_future_version = "99.0"
1173+
target_future_version = "99.99.0"
11741174

11751175
target_specific_module_triple += "-simulator"
11761176

0 commit comments

Comments
 (0)