Skip to content

Commit 3b92cec

Browse files
jbelkinsjbelkins
authored
Merge branch 'main' into jbe/smithy_1_59_0
2 parents 91ca23c + 5e1f108 commit 3b92cec

File tree

1,268 files changed

+15594
-2760
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,268 files changed

+15594
-2760
lines changed

‎AWSSDKSwiftCLI/Sources/AWSSDKSwiftCLI/Models/ReleaseNotesBuilder.swift‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,6 @@ struct ReleaseNotesBuilder {
1818
let features: Features
1919
let featuresIDToServiceName: [String: String]
2020

21-
static let macOSVersionBumpAnnouncement: String = """
22-
**Heads up!**
23-
On June 19th, the minimum supported macOS version for this SDK will increase from 10.15 to 12.
24-
[Read more](https://github.com/awslabs/aws-sdk-swift/discussions/1940)
25-
"""
26-
2721
// MARK: - Build
2822

2923
func build() throws -> String {
@@ -32,10 +26,7 @@ struct ReleaseNotesBuilder {
3226
let fullCommitLogLink = [
3327
"\n**Full Changelog**: https://github.com/\(repoOrg.rawValue)/\(repoType.rawValue)/compare/\(previousVersion)...\(newVersion)"
3428
]
35-
let contents = [
36-
ReleaseNotesBuilder.macOSVersionBumpAnnouncement,
37-
"## What's Changed"
38-
] + serviceClientChanges + sdkChanges + fullCommitLogLink
29+
let contents = ["## What's Changed"] + serviceClientChanges + sdkChanges + fullCommitLogLink
3930
return contents.joined(separator: .newline)
4031
}
4132

‎AWSSDKSwiftCLI/Sources/AWSSDKSwiftCLI/Resources/Package.Base.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ extension Target.Dependency {
3939
let package = Package(
4040
name: "aws-sdk-swift",
4141
platforms: [
42-
.macOS(.v10_15),
42+
.macOS(.v12),
4343
.iOS(.v13),
4444
.tvOS(.v13),
4545
.watchOS(.v6)

‎AWSSDKSwiftCLI/Sources/AWSSDKSwiftCLI/Resources/SmokeTestsPackage.Base.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ extension Target.Dependency {
1010
let package = Package(
1111
name: "SmokeTests",
1212
platforms: [
13-
.macOS(.v10_15)
13+
.macOS(.v12)
1414
],
1515
products: serviceNames.map(productForRunner(_:)),
1616
dependencies: [

‎AWSSDKSwiftCLI/Tests/AWSSDKSwiftCLITests/Models/ReleaseNotesBuilderTests.swift‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ class ReleaseNotesBuilderTests: CLITestCase {
9797
9898
**Full Changelog**: https://github.com/awslabs/aws-sdk-swift/compare/1.0.0...1.0.1
9999
"""
100-
XCTAssertEqual(releaseNotes, ReleaseNotesBuilder.macOSVersionBumpAnnouncement + "\n" + expected)
100+
XCTAssertEqual(releaseNotes, expected)
101101
}
102102

103103
func testNoServiceFeatureSectionPresent() throws {
@@ -117,7 +117,7 @@ class ReleaseNotesBuilderTests: CLITestCase {
117117
118118
**Full Changelog**: https://github.com/awslabs/aws-sdk-swift/compare/1.0.0...1.0.1
119119
"""
120-
XCTAssertEqual(releaseNotes, ReleaseNotesBuilder.macOSVersionBumpAnnouncement + "\n" + expected)
120+
XCTAssertEqual(releaseNotes, expected)
121121
}
122122

123123
func testNoServiceDocSectionPresent() throws {
@@ -138,7 +138,7 @@ class ReleaseNotesBuilderTests: CLITestCase {
138138
139139
**Full Changelog**: https://github.com/awslabs/aws-sdk-swift/compare/1.0.0...1.0.1
140140
"""
141-
XCTAssertEqual(releaseNotes, ReleaseNotesBuilder.macOSVersionBumpAnnouncement + "\n" + expected)
141+
XCTAssertEqual(releaseNotes, expected)
142142
}
143143

144144
func testNoSDKChangeSectionPresent() throws {
@@ -158,7 +158,7 @@ class ReleaseNotesBuilderTests: CLITestCase {
158158
159159
**Full Changelog**: https://github.com/awslabs/aws-sdk-swift/compare/1.0.0...1.0.1
160160
"""
161-
XCTAssertEqual(releaseNotes, ReleaseNotesBuilder.macOSVersionBumpAnnouncement + "\n" + expected)
161+
XCTAssertEqual(releaseNotes, expected)
162162
}
163163

164164
func testNoSectionsPresentAndIrrelevantCommitsAreFiltered() throws {
@@ -173,7 +173,7 @@ class ReleaseNotesBuilderTests: CLITestCase {
173173
174174
**Full Changelog**: https://github.com/awslabs/aws-sdk-swift/compare/1.0.0...1.0.1
175175
"""
176-
XCTAssertEqual(releaseNotes, ReleaseNotesBuilder.macOSVersionBumpAnnouncement + "\n" + expected)
176+
XCTAssertEqual(releaseNotes, expected)
177177
}
178178

179179
func testNullReleaseNotesFieldGetsHandledWithoutError() throws {
@@ -190,7 +190,7 @@ class ReleaseNotesBuilderTests: CLITestCase {
190190
191191
**Full Changelog**: https://github.com/awslabs/aws-sdk-swift/compare/1.0.0...1.0.1
192192
"""
193-
XCTAssertEqual(releaseNotes, ReleaseNotesBuilder.macOSVersionBumpAnnouncement + "\n" + expected)
193+
XCTAssertEqual(releaseNotes, expected)
194194
}
195195

196196
private func setUpBuildRequestAndMappingJSONs(_ buildRequest: String, _ mapping: String) {

‎IntegrationTests/Package.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ extension Target.Dependency {
3232
let package = Package(
3333
name: "aws-sdk-swift-integration-tests",
3434
platforms: [
35-
.macOS(.v10_15),
35+
.macOS(.v12),
3636
.iOS(.v13),
3737
.tvOS(.v13),
3838
.watchOS(.v6)

‎IntegrationTests/Services/AWSEC2IntegrationTests/Resources/IMDSIntegTestApp/Package.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import PackageDescription
55
let package = Package(
66
name: "IMDSIntegTestApp",
77
platforms: [
8-
.macOS(.v10_15),
8+
.macOS(.v12),
99
.iOS(.v13)
1010
],
1111
dependencies: [

‎IntegrationTests/Services/AWSECSIntegrationTests/Resources/ECSIntegTestApp/Package.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import PackageDescription
55
let package = Package(
66
name: "ECSIntegTestApp",
77
platforms: [
8-
.macOS(.v10_15),
8+
.macOS(.v12),
99
.iOS(.v13)
1010
],
1111
dependencies: [

‎Package.swift‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import PackageDescription
1515

1616
// MARK: - Dynamic Content
1717

18-
let clientRuntimeVersion: Version = "0.137.0"
18+
let clientRuntimeVersion: Version = "0.139.0"
1919
let crtVersion: Version = "0.52.1"
2020

2121
let excludeRuntimeUnitTests = false
@@ -25,6 +25,7 @@ let isPreviewBuild = false
2525
let serviceTargets: [String] = [
2626
"AWSACM",
2727
"AWSACMPCA",
28+
"AWSAIOps",
2829
"AWSAPIGateway",
2930
"AWSARCZonalShift",
3031
"AWSAccessAnalyzer",
@@ -471,7 +472,7 @@ extension Target.Dependency {
471472
let package = Package(
472473
name: "aws-sdk-swift",
473474
platforms: [
474-
.macOS(.v10_15),
475+
.macOS(.v12),
475476
.iOS(.v13),
476477
.tvOS(.v13),
477478
.watchOS(.v6)

‎Package.version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.3.38
1+
1.3.40

‎Package.version.next‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.3.39
1+
1.3.41

0 commit comments

Comments
 (0)