From 2d67a0aa618d016ea623495c952572b075dd54f8 Mon Sep 17 00:00:00 2001 From: Darya Date: Fri, 17 May 2024 11:58:33 +0300 Subject: [PATCH 1/8] test --- Package.swift | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Package.swift b/Package.swift index 704ab87..caf6a3b 100755 --- a/Package.swift +++ b/Package.swift @@ -52,12 +52,14 @@ let package = Package( ), .testTarget( name: "FigmaGenTests", - dependencies: ["FigmaGen"], + dependencies: ["FigmaGen", + "KeychainAccess"], path: "Tests/FigmaGenTests" ), .testTarget( name: "FigmaGenToolsTests", - dependencies: ["FigmaGenTools"], + dependencies: ["FigmaGenTools", + "KeychainAccess"], path: "Tests/FigmaGenToolsTests" ) ], From bfdb2eafab48ec39f4e57f842f67c653a659dc73 Mon Sep 17 00:00:00 2001 From: Darya Date: Fri, 17 May 2024 12:22:39 +0300 Subject: [PATCH 2/8] add if --- .../AccessToken/DefaultAccessTokenResolver.swift | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/Sources/FigmaGen/Resolvers/AccessToken/DefaultAccessTokenResolver.swift b/Sources/FigmaGen/Resolvers/AccessToken/DefaultAccessTokenResolver.swift index 34d708a..b18cebd 100644 --- a/Sources/FigmaGen/Resolvers/AccessToken/DefaultAccessTokenResolver.swift +++ b/Sources/FigmaGen/Resolvers/AccessToken/DefaultAccessTokenResolver.swift @@ -1,5 +1,7 @@ import Foundation +#if canImport(FigmaGen) import KeychainAccess +#endif final class DefaultAccessTokenResolver: AccessTokenResolver { @@ -9,9 +11,13 @@ final class DefaultAccessTokenResolver: AccessTokenResolver { } else if let environmentVariable = configuration?.environmentVariable, let accessToken = ProcessInfo.processInfo.environment[environmentVariable] { return accessToken - } else if let parameters = configuration?.keychainParameters, - let accessToken = try? Keychain(service: parameters.service).getString(parameters.key) { + } else if let parameters = configuration?.keychainParameters { + #if canImport(FigmaGen) + let accessToken = try? Keychain(service: parameters.service).getString(parameters.key) return accessToken + #else + return nil + #endif } else { return nil } From a3c995e2f7089f9f67947a2349f2d4d26998e0e1 Mon Sep 17 00:00:00 2001 From: Darya Date: Fri, 17 May 2024 12:26:35 +0300 Subject: [PATCH 3/8] fix if --- .../Resolvers/AccessToken/DefaultAccessTokenResolver.swift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Sources/FigmaGen/Resolvers/AccessToken/DefaultAccessTokenResolver.swift b/Sources/FigmaGen/Resolvers/AccessToken/DefaultAccessTokenResolver.swift index b18cebd..fd49add 100644 --- a/Sources/FigmaGen/Resolvers/AccessToken/DefaultAccessTokenResolver.swift +++ b/Sources/FigmaGen/Resolvers/AccessToken/DefaultAccessTokenResolver.swift @@ -1,5 +1,5 @@ import Foundation -#if canImport(FigmaGen) +#if canImport(KeychainAccess) import KeychainAccess #endif @@ -12,7 +12,7 @@ final class DefaultAccessTokenResolver: AccessTokenResolver { let accessToken = ProcessInfo.processInfo.environment[environmentVariable] { return accessToken } else if let parameters = configuration?.keychainParameters { - #if canImport(FigmaGen) + #if canImport(KeychainAccess) let accessToken = try? Keychain(service: parameters.service).getString(parameters.key) return accessToken #else From 9be0ac0c3fe9748c4e1437c3970a7a1ec5ef6366 Mon Sep 17 00:00:00 2001 From: Darya Date: Fri, 17 May 2024 12:43:08 +0300 Subject: [PATCH 4/8] another fix if --- .../Resolvers/AccessToken/DefaultAccessTokenResolver.swift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Sources/FigmaGen/Resolvers/AccessToken/DefaultAccessTokenResolver.swift b/Sources/FigmaGen/Resolvers/AccessToken/DefaultAccessTokenResolver.swift index fd49add..c5c9543 100644 --- a/Sources/FigmaGen/Resolvers/AccessToken/DefaultAccessTokenResolver.swift +++ b/Sources/FigmaGen/Resolvers/AccessToken/DefaultAccessTokenResolver.swift @@ -1,5 +1,5 @@ import Foundation -#if canImport(KeychainAccess) +#if !os(Linux) import KeychainAccess #endif @@ -12,7 +12,7 @@ final class DefaultAccessTokenResolver: AccessTokenResolver { let accessToken = ProcessInfo.processInfo.environment[environmentVariable] { return accessToken } else if let parameters = configuration?.keychainParameters { - #if canImport(KeychainAccess) + #if !os(Linux) let accessToken = try? Keychain(service: parameters.service).getString(parameters.key) return accessToken #else From a0913e3f991321ae03a4f24cc1697d2e7ec7befe Mon Sep 17 00:00:00 2001 From: Darya Date: Fri, 17 May 2024 12:47:22 +0300 Subject: [PATCH 5/8] fix --- Package.swift | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/Package.swift b/Package.swift index caf6a3b..fb4a077 100755 --- a/Package.swift +++ b/Package.swift @@ -45,21 +45,18 @@ let package = Package( dependencies: [ "SwiftCLI", "PathKit", - "PromiseKit", - "KeychainAccess" + "PromiseKit" ], path: "Sources/FigmaGenTools" ), .testTarget( name: "FigmaGenTests", - dependencies: ["FigmaGen", - "KeychainAccess"], + dependencies: ["FigmaGen"], path: "Tests/FigmaGenTests" ), .testTarget( name: "FigmaGenToolsTests", - dependencies: ["FigmaGenTools", - "KeychainAccess"], + dependencies: ["FigmaGenTools"], path: "Tests/FigmaGenToolsTests" ) ], From cbd81b521c6f87bbd827eae29c64e833cbea120f Mon Sep 17 00:00:00 2001 From: Darya Date: Fri, 17 May 2024 13:51:08 +0300 Subject: [PATCH 6/8] add condition --- Package.swift | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Package.swift b/Package.swift index fb4a077..109b907 100755 --- a/Package.swift +++ b/Package.swift @@ -36,7 +36,11 @@ let package = Package( "DictionaryCoder", "FigmaGenTools", "Expression", - "KeychainAccess" + .product( + name: "KeychainAccess", + package: "KeychainAccess", + condition: .when(platforms: [.macOS]) + ) ], path: "Sources/FigmaGen" ), From 251c8a5633a51dbdd75cf1de99b2ac98f497a00a Mon Sep 17 00:00:00 2001 From: Darya Date: Fri, 17 May 2024 14:04:25 +0300 Subject: [PATCH 7/8] reset first if --- .../AccessToken/DefaultAccessTokenResolver.swift | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/Sources/FigmaGen/Resolvers/AccessToken/DefaultAccessTokenResolver.swift b/Sources/FigmaGen/Resolvers/AccessToken/DefaultAccessTokenResolver.swift index c5c9543..34d708a 100644 --- a/Sources/FigmaGen/Resolvers/AccessToken/DefaultAccessTokenResolver.swift +++ b/Sources/FigmaGen/Resolvers/AccessToken/DefaultAccessTokenResolver.swift @@ -1,7 +1,5 @@ import Foundation -#if !os(Linux) import KeychainAccess -#endif final class DefaultAccessTokenResolver: AccessTokenResolver { @@ -11,13 +9,9 @@ final class DefaultAccessTokenResolver: AccessTokenResolver { } else if let environmentVariable = configuration?.environmentVariable, let accessToken = ProcessInfo.processInfo.environment[environmentVariable] { return accessToken - } else if let parameters = configuration?.keychainParameters { - #if !os(Linux) - let accessToken = try? Keychain(service: parameters.service).getString(parameters.key) + } else if let parameters = configuration?.keychainParameters, + let accessToken = try? Keychain(service: parameters.service).getString(parameters.key) { return accessToken - #else - return nil - #endif } else { return nil } From 4aa2a5a69061404ec6d97717047a7b581c6019b1 Mon Sep 17 00:00:00 2001 From: Darya Date: Fri, 17 May 2024 14:10:48 +0300 Subject: [PATCH 8/8] fix condition --- Package.swift | 7 ++++++- .../AccessToken/DefaultAccessTokenResolver.swift | 10 ++++++++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/Package.swift b/Package.swift index 109b907..21da2cd 100755 --- a/Package.swift +++ b/Package.swift @@ -49,7 +49,12 @@ let package = Package( dependencies: [ "SwiftCLI", "PathKit", - "PromiseKit" + "PromiseKit", + .product( + name: "KeychainAccess", + package: "KeychainAccess", + condition: .when(platforms: [.macOS]) + ) ], path: "Sources/FigmaGenTools" ), diff --git a/Sources/FigmaGen/Resolvers/AccessToken/DefaultAccessTokenResolver.swift b/Sources/FigmaGen/Resolvers/AccessToken/DefaultAccessTokenResolver.swift index 34d708a..1fc3cdf 100644 --- a/Sources/FigmaGen/Resolvers/AccessToken/DefaultAccessTokenResolver.swift +++ b/Sources/FigmaGen/Resolvers/AccessToken/DefaultAccessTokenResolver.swift @@ -1,5 +1,7 @@ import Foundation +#if os(macOS) import KeychainAccess +#endif final class DefaultAccessTokenResolver: AccessTokenResolver { @@ -9,9 +11,13 @@ final class DefaultAccessTokenResolver: AccessTokenResolver { } else if let environmentVariable = configuration?.environmentVariable, let accessToken = ProcessInfo.processInfo.environment[environmentVariable] { return accessToken - } else if let parameters = configuration?.keychainParameters, - let accessToken = try? Keychain(service: parameters.service).getString(parameters.key) { + } else if let parameters = configuration?.keychainParameters { + #if os(macOS) + let accessToken = try? Keychain(service: parameters.service).getString(parameters.key) return accessToken + #else + return nil + #endif } else { return nil }