Skip to content

Commit 46864ec

Browse files
authored
chore(build): resolve build warnings in amplify package (#4031)
1 parent 96738f5 commit 46864ec

File tree

54 files changed

+103
-147
lines changed

Some content is hidden

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

54 files changed

+103
-147
lines changed

Amplify/DevMenu/AmplifyDevMenu.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import UIKit
1313
/// Presents a developer menu using the provided `DevMenuPresentationContextProvider`
1414
/// upon notification from a `TriggerRecognizer`. Default recognizer is a `LongPressGestureRecognizer`
1515
@MainActor
16-
public final class AmplifyDevMenu: DevMenuBehavior, TriggerDelegate {
16+
public final class AmplifyDevMenu: @preconcurrency DevMenuBehavior, @preconcurrency TriggerDelegate {
1717

1818
weak var devMenuPresentationContextProvider: DevMenuPresentationContextProvider?
1919
var triggerRecognizer: TriggerRecognizer?

Amplify/DevMenu/View/IssueReporter.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -97,11 +97,11 @@ struct IssueReporter: View {
9797
/// Open Amplify iOS issue logging screen on Github
9898
private func reportToGithub() {
9999
Task {
100-
let issue = await IssueInfo(issueDescription: issueDescription,
100+
let issue = IssueInfo(issueDescription: issueDescription,
101101
includeEnvInfo: includeEnvInfo,
102102
includeDeviceInfo: includeDeviceInfo)
103103
let issueDescriptionMarkdown =
104-
await IssueInfoHelper.generateMarkdownForIssue(
104+
IssueInfoHelper.generateMarkdownForIssue(
105105
issue: issue)
106106

107107
let urlString = amplifyIosNewIssueUrl + issueDescriptionMarkdown
@@ -122,10 +122,10 @@ struct IssueReporter: View {
122122
/// Copy issue as a markdown string to clipboard
123123
private func copyToClipboard() {
124124
Task {
125-
let issue = await IssueInfo(issueDescription: issueDescription,
125+
let issue = IssueInfo(issueDescription: issueDescription,
126126
includeEnvInfo: includeEnvInfo,
127127
includeDeviceInfo: includeDeviceInfo)
128-
let value = await IssueInfoHelper.generateMarkdownForIssue(issue: issue)
128+
let value = IssueInfoHelper.generateMarkdownForIssue(issue: issue)
129129
#if os(iOS)
130130
UIPasteboard.general.string = value
131131
#elseif canImport(AppKit)

AmplifyPlugins/API/Sources/AWSAPIPlugin/Operation/AWSGraphQLSubscriptionTaskRunner.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -407,7 +407,7 @@ fileprivate func toAPIError<R: Decodable>(_ errors: [Error], type: R.Type) -> AP
407407
GraphQLResponseError<R>.error(errors)
408408
)
409409

410-
case let errors as [WebSocketClient.Error]:
410+
case _ as [WebSocketClient.Error]:
411411
return APIError.networkError("WebSocketClient connection aborted", nil, URLError(.networkConnectionLost))
412412
default:
413413
return APIError.operationError(

AmplifyPlugins/API/Tests/AWSAPIPluginTests/APISwiftCompatibility/APISwiftTests.swift

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,14 @@ final class APISwiftTests: XCTestCase {
1313
func testCreateBlogMutation() {
1414
let file = S3ObjectInput(bucket: "bucket", key: "let", region: "region")
1515
let input = CreateBlogInput(name: "name", file: file)
16-
let condition = ModelBlogConditionInput(name: .init(eq: "name"))
1716
let mutation = CreateBlogMutation(input: input)
1817

1918
let request = GraphQLRequest<CreateBlogMutation.Data>(
2019
document: CreateBlogMutation.requestString,
2120
variables: mutation.variables?.jsonObject,
2221
responseType: CreateBlogMutation.Data.self)
2322

24-
var expectedDocument = """
23+
let expectedDocument = """
2524
mutation CreateBlog($input: CreateBlogInput!, $condition: ModelBlogConditionInput) {
2625
createBlog(input: $input, condition: $condition) {
2726
__typename

AmplifyPlugins/API/Tests/AWSAPIPluginTests/AppSyncRealTimeClient/AppSyncRealTimeClientTests.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -554,7 +554,6 @@ class AppSyncRealTimeClientTests: XCTestCase {
554554

555555
func testReconnect_whenHeartBeatSignalIsNotReceived() async throws {
556556
var cancellables = Set<AnyCancellable>()
557-
let timeout = 1.0
558557
let mockWebSocketClient = MockWebSocketClient()
559558
let mockAppSyncRequestInterceptor = MockAppSyncRequestInterceptor()
560559
let appSyncClient = AppSyncRealTimeClient(

AmplifyPlugins/API/Tests/AWSAPIPluginTests/Interceptor/AuthTokenURLRequestInterceptorTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ class AuthTokenURLRequestInterceptorTests: XCTestCase {
4646
do {
4747
_ = try await interceptor.intercept(request).allHTTPHeaderFields
4848
} catch {
49-
guard case .operationError(let description, _, let underlyingError) = error as? APIError,
49+
guard case .operationError(_, _, let underlyingError) = error as? APIError,
5050
let authError = underlyingError as? AuthError,
5151
case .sessionExpired = authError else {
5252
XCTFail("Should be API.operationError with underlying AuthError.sessionExpired")

AmplifyPlugins/API/Tests/AWSAPIPluginTests/Support/Decode/GraphQLResponseDecoderPostComment4V2Tests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,7 @@ class GraphQLResponseDecoderPostComment4V2Tests: XCTestCase, SharedTestCasesPost
320320
XCTAssertEqual(input["postID"] as? String, post.id)
321321

322322
let decoder = GraphQLResponseDecoder(request: request.toOperationRequest(operationType: .query))
323-
var graphQLData: [String: JSONValue] = [
323+
let graphQLData: [String: JSONValue] = [
324324
"\(request.decodePath!)": [
325325
"id": "id",
326326
"content": "content",

AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/ASF/CognitoUserPoolASF+KeyChain.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ extension CognitoUserPoolASF {
3333
asfDeviceId: String,
3434
asfClient: AdvancedSecurityBehavior,
3535
userPoolConfiguration: UserPoolConfigurationData) async -> String? {
36-
let deviceInfo: ASFDeviceBehavior = await ASFDeviceInfo(id: asfDeviceId)
36+
let deviceInfo: ASFDeviceBehavior = ASFDeviceInfo(id: asfDeviceId)
3737
let appInfo: ASFAppInfoBehavior = ASFAppInfo()
3838

3939
do {

AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Models/AWSAuthCognitoSession.swift

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -64,12 +64,7 @@ public struct AWSAuthCognitoSession: AuthSession,
6464
return .failure(AuthError.signedOut(
6565
AuthPluginErrorConstants.userSubSignOutError.errorDescription,
6666
AuthPluginErrorConstants.userSubSignOutError.recoverySuggestion))
67-
} catch let error as AuthError {
68-
return .failure(error)
6967
} catch {
70-
let error = AuthError.unknown("""
71-
Could not retreive user sub from the fetched Cognito tokens.
72-
""")
7368
return .failure(error)
7469
}
7570
}

AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/StateMachine/CodeGen/Errors/AuthenticationError.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ extension AuthenticationError: Codable {
4242
switch self {
4343
case .configuration(let message):
4444
try container.encode(message, forKey: .configuration)
45-
case .service(let message, let error):
45+
case .service(let message, _):
4646
try container.encode(message, forKey: .service)
4747
case .unknown(let message):
4848
try container.encode(message, forKey: .unknown)

0 commit comments

Comments
 (0)