Skip to content

Commit 348ba1c

Browse files
authored
Cleanup swift-testing migration (#1403)
* Cleanup swift-testing migration * Remove FoundationEssentialsTests suite as it is incompatible with SwiftPM's build system
1 parent 1d5d709 commit 348ba1c

22 files changed

+548
-1366
lines changed

Package.swift

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -99,10 +99,7 @@ let package = Package(
9999
// TestSupport (Internal)
100100
.target(
101101
name: "TestSupport",
102-
dependencies: [
103-
"FoundationEssentials",
104-
"FoundationInternationalization",
105-
],
102+
path: "Tests/TestSupport",
106103
cSettings: wasiLibcCSettings,
107104
swiftSettings: availabilityMacros + featureSettings
108105
),

Sources/FoundationEssentials/JSON/JSONDecoder.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -413,7 +413,7 @@ open class JSONDecoder {
413413

414414
// Check for explicit BOM first, then check the first two bytes. Note that if there is a BOM, we have to create our string without it.
415415
// This isn't strictly part of the JSON spec but it's useful to do anyway.
416-
let sourceEncoding : String._Encoding
416+
let sourceEncoding : String.Encoding
417417
let bomLength : Int
418418
switch (byte0, byte1, byte2, byte3) {
419419
case (0, 0, 0xFE, 0xFF):

Sources/FoundationEssentials/String/String+Encoding.swift

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -50,13 +50,6 @@ extension String {
5050
public static let utf32LittleEndian = Encoding(rawValue: 0x9c000100)
5151
}
5252

53-
// This is a workaround for Clang importer's ambiguous lookup issue since
54-
// - Swift doesn't allow typealias to nested type
55-
// - Swift doesn't allow typealias to builtin types like String
56-
// We therefore rename String.Encoding to String._Encoding for package
57-
// internal use so we can use `String._Encoding` to disambiguate.
58-
internal typealias _Encoding = Encoding
59-
6053
#if FOUNDATION_FRAMEWORK
6154
public typealias EncodingConversionOptions = NSString.EncodingConversionOptions
6255
public typealias EnumerationOptions = NSString.EnumerationOptions

Sources/FoundationInternationalization/Formatting/Duration+TimeFormatStyle.swift

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -147,9 +147,6 @@ extension Duration {
147147
}
148148

149149
}
150-
151-
// For testing purpose. See notes about String._Encoding
152-
internal typealias _TimeFormatStyle = TimeFormatStyle
153150
}
154151

155152
@available(macOS 13.0, iOS 16.0, tvOS 16.0, watchOS 9.0, *)

Sources/FoundationInternationalization/Formatting/Duration+UnitsFormatStyle.swift

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -495,9 +495,6 @@ extension Duration {
495495
Attributed(innerStyle: self)
496496
}
497497
}
498-
499-
// For testing purpose. See notes about String._Encoding
500-
internal typealias _UnitsFormatStyle = UnitsFormatStyle
501498
}
502499

503500
// `FormatStyle` static membership lookup

Sources/TestSupport/TestSupport.swift

Lines changed: 0 additions & 237 deletions
This file was deleted.

0 commit comments

Comments
 (0)