Skip to content

Commit fa2c7c9

Browse files
authored
fix: move AWSServiceConfiguration Platform extension (#832)
1 parent ff86550 commit fa2c7c9

File tree

3 files changed

+31
-19
lines changed

3 files changed

+31
-19
lines changed

Amplify.xcodeproj/project.pbxproj

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@
6868
21420AA0237222A900FA140C /* AWSAuthorizationType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 21420A8D237222A900FA140C /* AWSAuthorizationType.swift */; };
6969
2144226C234BDD9B009357F7 /* StorageUploadFileRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2144226B234BDD9B009357F7 /* StorageUploadFileRequest.swift */; };
7070
2144226E234BDE23009357F7 /* StorageUploadFileOperation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2144226D234BDE23009357F7 /* StorageUploadFileOperation.swift */; };
71+
214C6226253A414E0041E96D /* AmplifyAWSServiceConfiguration+Platform.swift in Sources */ = {isa = PBXBuildFile; fileRef = 214C6225253A414E0041E96D /* AmplifyAWSServiceConfiguration+Platform.swift */; };
7172
214F49772486D8A200DA616C /* UserFollowers+Schema.swift in Sources */ = {isa = PBXBuildFile; fileRef = 214F49712486D8A100DA616C /* UserFollowers+Schema.swift */; };
7273
214F49782486D8A200DA616C /* UserFollowing.swift in Sources */ = {isa = PBXBuildFile; fileRef = 214F49722486D8A200DA616C /* UserFollowing.swift */; };
7374
214F49792486D8A200DA616C /* UserFollowing+Schema.swift in Sources */ = {isa = PBXBuildFile; fileRef = 214F49732486D8A200DA616C /* UserFollowing+Schema.swift */; };
@@ -750,6 +751,7 @@
750751
21420A8D237222A900FA140C /* AWSAuthorizationType.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AWSAuthorizationType.swift; sourceTree = "<group>"; };
751752
2144226B234BDD9B009357F7 /* StorageUploadFileRequest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StorageUploadFileRequest.swift; sourceTree = "<group>"; };
752753
2144226D234BDE23009357F7 /* StorageUploadFileOperation.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StorageUploadFileOperation.swift; sourceTree = "<group>"; };
754+
214C6225253A414E0041E96D /* AmplifyAWSServiceConfiguration+Platform.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "AmplifyAWSServiceConfiguration+Platform.swift"; sourceTree = "<group>"; };
753755
214F49712486D8A100DA616C /* UserFollowers+Schema.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UserFollowers+Schema.swift"; sourceTree = "<group>"; };
754756
214F49722486D8A200DA616C /* UserFollowing.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UserFollowing.swift; sourceTree = "<group>"; };
755757
214F49732486D8A200DA616C /* UserFollowing+Schema.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UserFollowing+Schema.swift"; sourceTree = "<group>"; };
@@ -1971,6 +1973,7 @@
19711973
isa = PBXGroup;
19721974
children = (
19731975
6BBECD7023ADA7E100C8DFBE /* AmplifyAWSServiceConfiguration.swift */,
1976+
214C6225253A414E0041E96D /* AmplifyAWSServiceConfiguration+Platform.swift */,
19741977
);
19751978
path = ServiceConfiguration;
19761979
sourceTree = "<group>";
@@ -4090,6 +4093,7 @@
40904093
21420A92237222A900FA140C /* OIDCConfiguration.swift in Sources */,
40914094
21420A95237222A900FA140C /* AWSAuthServiceBehavior.swift in Sources */,
40924095
21420A98237222A900FA140C /* AuthTokenProvider.swift in Sources */,
4096+
214C6226253A414E0041E96D /* AmplifyAWSServiceConfiguration+Platform.swift in Sources */,
40934097
21420A91237222A900FA140C /* AWSAuthorizationConfiguration.swift in Sources */,
40944098
212CE70F23E9E991007D8E71 /* ModelDecorator.swift in Sources */,
40954099
21420A97237222A900FA140C /* IAMCredentialProvider.swift in Sources */,
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
//
2+
// Copyright 2018-2020 Amazon.com,
3+
// Inc. or its affiliates. All Rights Reserved.
4+
//
5+
// SPDX-License-Identifier: Apache-2.0
6+
//
7+
8+
import Foundation
9+
10+
extension AmplifyAWSServiceConfiguration {
11+
12+
static var platformMapping: [Platform: String] = [:]
13+
14+
public static func addUserAgentPlatform(_ platform: Platform, version: String) {
15+
platformMapping[platform] = version
16+
}
17+
18+
public enum Platform: String {
19+
case flutter = "amplify-flutter"
20+
}
21+
22+
static func platformInformation() -> String {
23+
var platformTokens = platformMapping.map { "\($0.rawValue)/\($1)" }
24+
platformTokens.append("amplify-iOS/\(version)")
25+
return platformTokens.joined(separator: " ")
26+
}
27+
}

AmplifyPlugins/Core/AWSPluginsCore/ServiceConfiguration/AmplifyAWSServiceConfiguration.swift

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -42,22 +42,3 @@ public class AmplifyAWSServiceConfiguration: AWSServiceConfiguration {
4242
super.init(region: regionType, credentialsProvider: nil)
4343
}
4444
}
45-
46-
extension AmplifyAWSServiceConfiguration {
47-
48-
static var platformMapping: [Platform: String] = [:]
49-
50-
public static func addUserAgentPlatform(_ platform: Platform, version: String) {
51-
platformMapping[platform] = version
52-
}
53-
54-
public enum Platform: String {
55-
case flutter = "amplify-flutter"
56-
}
57-
58-
static func platformInformation() -> String {
59-
var platformTokens = platformMapping.map { "\($0.rawValue)/\($1)" }
60-
platformTokens.append("amplify-iOS/\(version)")
61-
return platformTokens.joined(separator: " ")
62-
}
63-
}

0 commit comments

Comments
 (0)