diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8ca95b8..8e92a39 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -32,7 +32,9 @@ jobs: gem install bundler bundle install --without=documentation - name: Swift - uses: fwal/setup-swift@v1 + uses: swift-actions/setup-swift@v2 + with: + swift-version: "5.9" - name: Preparation run: set -o pipefail - name: Build @@ -57,7 +59,9 @@ jobs: gem install bundler bundle install --without=documentation - name: Swift - uses: fwal/setup-swift@v1 + uses: swift-actions/setup-swift@v2 + with: + swift-version: "5.9" - name: Preparation run: set -o pipefail - name: Build diff --git a/Sources/FigmaGen/Generators/GenerationParametersError.swift b/Sources/FigmaGen/Generators/GenerationParametersError.swift index 5c4eb44..23518e7 100644 --- a/Sources/FigmaGen/Generators/GenerationParametersError.swift +++ b/Sources/FigmaGen/Generators/GenerationParametersError.swift @@ -7,6 +7,7 @@ enum GenerationParametersError: Error, CustomStringConvertible { case invalidFileConfiguration case invalidAccessToken case invalidGitHubAccessToken + case emptyGitHubAccessToken // MARK: - Instance Properties @@ -20,6 +21,9 @@ enum GenerationParametersError: Error, CustomStringConvertible { case .invalidGitHubAccessToken: return "GitHiub access token cannot be empty or nil" + + case .emptyGitHubAccessToken: + return "GitHiub access token is empty or nil, if your repository is private, add GitHiub access token." } } } diff --git a/Sources/FigmaGen/Generators/Tokens/DefaultTokensGenerator.swift b/Sources/FigmaGen/Generators/Tokens/DefaultTokensGenerator.swift index ebf186d..d6f6587 100644 --- a/Sources/FigmaGen/Generators/Tokens/DefaultTokensGenerator.swift +++ b/Sources/FigmaGen/Generators/Tokens/DefaultTokensGenerator.swift @@ -124,7 +124,7 @@ final class DefaultTokensGenerator: TokensGenerator { private func generateTypographyTokens(parameters: TokensGenerationParameters, tokenValues: TokenValues) throws { try generateTokens( typographyTokensGenerator, - tokensName: "typogrphy", + tokensName: "typography", renderParameters: parameters.tokens.typographyRenderParameters, tokenValues: tokenValues, themes: parameters.themes, diff --git a/Sources/FigmaGen/Generators/Tokens/GenerationParametersResolver/DefaultTokensGenerationParametersResolver.swift b/Sources/FigmaGen/Generators/Tokens/GenerationParametersResolver/DefaultTokensGenerationParametersResolver.swift index 540fa74..9f06b1b 100644 --- a/Sources/FigmaGen/Generators/Tokens/GenerationParametersResolver/DefaultTokensGenerationParametersResolver.swift +++ b/Sources/FigmaGen/Generators/Tokens/GenerationParametersResolver/DefaultTokensGenerationParametersResolver.swift @@ -34,11 +34,11 @@ final class DefaultTokensGenerationParametersResolver: TokensGenerationParameter ) } - let remoteFile = try configuration.remoteRepoConfig.map { remoteFileConfiguration in - guard - let accessToken = accessTokenResolver.resolveAccessToken(from: remoteFileConfiguration.accessToken) - else { - throw GenerationParametersError.invalidGitHubAccessToken + let remoteFile = configuration.remoteRepoConfig.map { remoteFileConfiguration in + let accessToken = accessTokenResolver.resolveAccessToken(from: remoteFileConfiguration.accessToken) + + if accessToken.isEmptyOrNil { + print(GenerationParametersError.emptyGitHubAccessToken.description) } return RemoteFileParameters( diff --git a/Sources/FigmaGen/Models/Parameters/RemoteFileParameters.swift b/Sources/FigmaGen/Models/Parameters/RemoteFileParameters.swift index f9872ab..ae3c957 100644 --- a/Sources/FigmaGen/Models/Parameters/RemoteFileParameters.swift +++ b/Sources/FigmaGen/Models/Parameters/RemoteFileParameters.swift @@ -5,14 +5,14 @@ struct RemoteFileParameters { let repo: String let branch: String let filePath: String - let accessToken: String + let accessToken: String? init( owner: String, repo: String, branch: String, filePath: String, - accessToken: String + accessToken: String? ) { self.owner = owner self.repo = repo diff --git a/Sources/FigmaGen/Providers/GitHubApi/GitHubAPIProvider.swift b/Sources/FigmaGen/Providers/GitHubApi/GitHubAPIProvider.swift index a36408c..de30436 100644 --- a/Sources/FigmaGen/Providers/GitHubApi/GitHubAPIProvider.swift +++ b/Sources/FigmaGen/Providers/GitHubApi/GitHubAPIProvider.swift @@ -92,7 +92,6 @@ extension GitHubAPIProvider { func request(route: Route) -> Promise where Route.Response == GitHubAPIEmptyResponse { Promise { seal in - let task = httpService.request(route: makeHTTPRoute(for: route)) task.responseJSON { response in