From d93209013f0cab88eb65fe35d14b2bee0659676e Mon Sep 17 00:00:00 2001 From: Darya Date: Fri, 17 May 2024 14:09:25 +0300 Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=B4=D0=B6=D0=BE=D0=B1=D1=8B=20?= =?UTF-8?q?=D0=B4=D0=BB=D1=8F=20Linux?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Package.swift | 12 ++++++++++-- .../AccessToken/DefaultAccessTokenResolver.swift | 10 ++++++++-- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/Package.swift b/Package.swift index 704ab87..21da2cd 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" ), @@ -46,7 +50,11 @@ let package = Package( "SwiftCLI", "PathKit", "PromiseKit", - "KeychainAccess" + .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 }