diff --git a/.swiftlint.yml b/.swiftlint.yml index c9dbceb..10635ba 100644 --- a/.swiftlint.yml +++ b/.swiftlint.yml @@ -67,7 +67,7 @@ whitelist_rules: # - force_try # - force_unwrapping # - function_body_length -# - function_default_parameter_at_end + - function_default_parameter_at_end # - function_parameter_count - generic_type_name - identical_operands diff --git a/passKit/Models/PasswordStore.swift b/passKit/Models/PasswordStore.swift index a866600..59a8d63 100644 --- a/passKit/Models/PasswordStore.swift +++ b/passKit/Models/PasswordStore.swift @@ -182,7 +182,13 @@ public class PasswordStore { do { let credentialProvider = try credential.credentialProvider(requestCredentialPassword: requestCredentialPassword) let options = [GTRepositoryCloneOptionsCredentialProvider: credentialProvider] - try cloneRepository(remoteRepoURL: remoteRepoURL, options: options, branchName: branchName, transferProgressBlock: transferProgressBlock, checkoutProgressBlock: checkoutProgressBlock) + try cloneRepository( + remoteRepoURL: remoteRepoURL, + branchName: branchName, + transferProgressBlock: transferProgressBlock, + checkoutProgressBlock: checkoutProgressBlock, + options: options + ) } catch { credential.delete() throw (error) @@ -191,10 +197,10 @@ public class PasswordStore { public func cloneRepository( remoteRepoURL: URL, - options: [AnyHashable: Any]? = nil, branchName: String, transferProgressBlock: @escaping (UnsafePointer, UnsafeMutablePointer) -> Void, checkoutProgressBlock: @escaping (String, UInt, UInt) -> Void, + options: [AnyHashable: Any]? = nil, completion: @escaping () -> Void = {} ) throws { try? fm.removeItem(at: storeURL) diff --git a/passKitTests/Models/PasswordStoreTest.swift b/passKitTests/Models/PasswordStoreTest.swift index 0bd45b3..325861a 100644 --- a/passKitTests/Models/PasswordStoreTest.swift +++ b/passKitTests/Models/PasswordStoreTest.swift @@ -27,10 +27,10 @@ class PasswordStoreTest: XCTestCase { let expectation = self.expectation(description: "clone") try passwordStore.cloneRepository( remoteRepoURL: remoteRepoURL, - options: cloneOptions, branchName: "master", transferProgressBlock: { _, _ in }, checkoutProgressBlock: { _, _, _ in }, + options: cloneOptions, completion: { expectation.fulfill() } ) waitForExpectations(timeout: 3, handler: nil)