Skip to content

Commit b6ca869

Browse files
authored
Upgrade SwiftFoundationICU to version 74 (#802)
1 parent aa68eeb commit b6ca869

File tree

2 files changed

+1
-19
lines changed

2 files changed

+1
-19
lines changed

Package.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ var dependencies: [Package.Dependency] {
6262
from: "1.1.0"),
6363
.package(
6464
url: "https://github.com/apple/swift-foundation-icu",
65-
exact: "0.0.9"),
65+
branch: "main"),
6666
.package(
6767
url: "https://github.com/swiftlang/swift-syntax",
6868
from: "600.0.0-latest")

Tests/FoundationInternationalizationTests/LocaleTests.swift

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -161,15 +161,9 @@ final class LocaleTests : XCTestCase {
161161
return localeComponents
162162
}
163163

164-
#if FIXED_ICU_20187
165164
verify(cldr: "root", bcp47: "und", icu: "") {
166165
return Locale.Components(identifier: "")
167166
}
168-
#else
169-
verify(cldr: "root", bcp47: "und", icu: "en_US_POSIX") {
170-
return Locale.Components(identifier: "")
171-
}
172-
#endif
173167

174168
verify(cldr: "und_US", bcp47: "und-US", icu: "_US") {
175169
return Locale.Components(languageRegion: .unitedStates)
@@ -757,11 +751,7 @@ extension LocaleTests {
757751

758752
// TODO: Reenable once (Locale.canonicalIdentifier) is implemented
759753
func test_identifierTypesFromSpecialIdentifier() throws {
760-
#if FIXED_ICU_20187
761754
verify("", cldr: "root", bcp47: "und", icu: "")
762-
#else
763-
verify("", cldr: "root", bcp47: "und", icu: "en_US_POSIX")
764-
#endif
765755
verify("root", cldr: "root", bcp47: "root", icu: "root")
766756
verify("und", cldr: "root", bcp47: "und", icu: "und")
767757

@@ -780,20 +770,12 @@ extension LocaleTests {
780770

781771
// If there's only one component, it is treated as the language code
782772
verify("123", cldr: "root", bcp47: "und", icu: "123")
783-
#if FIXED_ICU_20187
784773
verify("😀123", cldr: "root", bcp47: "und", icu: "")
785-
#else
786-
verify("😀123", cldr: "root", bcp47: "und", icu: "en_US_POSIX")
787-
#endif
788774

789775
// The "_" prefix marks the start of the region
790776
verify("_ZZ", cldr: "und_ZZ", bcp47: "und-ZZ", icu: "_ZZ")
791777
verify("_123", cldr: "und_123", bcp47: "und-123", icu: "_123")
792-
#if FIXED_ICU_20187
793778
verify("_😀123", cldr: "root", bcp47: "und", icu: "")
794-
#else
795-
verify("_😀123", cldr: "root", bcp47: "und", icu: "en_US_POSIX")
796-
#endif
797779

798780
// Starting an ID with script code is an acceptable special case
799781
verify("Hant", cldr: "hant", bcp47: "hant", icu: "hant")

0 commit comments

Comments
 (0)