Skip to content

Commit

Permalink
AMP-63100 Swift v2 app: update Ampli.swift
Browse files Browse the repository at this point in the history
  • Loading branch information
falconandy committed Aug 17, 2023
1 parent e9370ea commit 04637f4
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ class AmpliTests: XCTestCase {
}

func initAmpliWithNewInstance(_ instanceName: String) {
ampli.load(LoadOptions(client: LoadClientOptions(config: Configuration(
ampli.load(LoadOptions(client: LoadClientOptions(configuration: Configuration(
apiKey: "test-api-key",
instanceName: instanceName,
trackingSessionEvents: false,
Expand Down
12 changes: 6 additions & 6 deletions ios/swift/v2/AmpliSwiftSampleApp/Shared/Ampli/Ampli.swift
Original file line number Diff line number Diff line change
Expand Up @@ -507,12 +507,12 @@ public class EventMaxIntForTest : GenericEvent<EventMaxIntForTest> {
public struct LoadClientOptions {
public let apiKey: String?
public let instance: Amplitude?
public let config: Configuration?
public let configuration: Configuration?

public init(apiKey: String? = nil, instance: Amplitude? = nil, config: Configuration? = nil) {
public init(apiKey: String? = nil, instance: Amplitude? = nil, configuration: Configuration? = nil) {
self.apiKey = apiKey
self.instance = instance
self.config = config
self.configuration = configuration
}
}

Expand Down Expand Up @@ -571,16 +571,16 @@ public class Ampli {

if let clientApiKey = options.client?.apiKey {
apiKey = clientApiKey
} else if let configApiKey = options.client?.config?.apiKey {
apiKey = configApiKey
} else if let configurationApiKey = options.client?.configuration?.apiKey {
apiKey = configurationApiKey
} else if let environment = options.environment {
apiKey = ApiKey[environment]
}

if let instance = options.client?.instance {
self.amplitude = instance
} else if let apiKey = apiKey {
let configuration = options.client?.config ?? Configuration(
let configuration = options.client?.configuration ?? Configuration(
apiKey: apiKey
)
if configuration.plan == nil {
Expand Down

0 comments on commit 04637f4

Please sign in to comment.