Skip to content

Commit f8f974a

Browse files
authored
Using Xcode 14.1 macOS 12 and Swift 5.7 (#195)
* Use new if let shorthand syntax * Bump swift-tools-version * [CI] Use macOS 12 and Xcode 14.1 * Using @main * Update dependencies
1 parent 640b645 commit f8f974a

File tree

17 files changed

+156
-160
lines changed

17 files changed

+156
-160
lines changed

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ on:
88
jobs:
99
release:
1010
name: Publish GitHub and Cocoapods release
11-
runs-on: macos-11
11+
runs-on: macos-12
1212
steps:
1313
- name: Checkout
1414
uses: actions/checkout@v2
1515

1616
- name: Select Xcode version
17-
run: sudo xcode-select --switch /Applications/Xcode_13.2.1.app
17+
run: sudo xcode-select --switch /Applications/Xcode_14.1.app
1818

1919
- name: Build
2020
run: |

.github/workflows/tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ on:
1414
jobs:
1515
test:
1616
name: Run tests
17-
runs-on: macos-11
17+
runs-on: macos-12
1818
steps:
1919
- name: Checkout
2020
uses: actions/checkout@v2
2121
- name: Select Xcode version
22-
run: sudo xcode-select --switch /Applications/Xcode_13.2.1.app
22+
run: sudo xcode-select --switch /Applications/Xcode_14.1.app
2323
- name: Build and test
2424
run: swift test --enable-code-coverage --disable-automatic-resolution
2525
shell: bash

Examples/Example/UIComponents/Source/Typography/LabelStyle.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public struct LabelStyle {
4242

4343
var baselineOffset: CGFloat = .zero
4444

45-
if let lineHeight = lineHeight {
45+
if let lineHeight {
4646
let scaledLineHeight: CGFloat = fontMetrics?.scaledValue(for: lineHeight) ?? lineHeight
4747
paragraphStyle.minimumLineHeight = scaledLineHeight
4848
paragraphStyle.maximumLineHeight = scaledLineHeight

Package.resolved

Lines changed: 128 additions & 130 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Package.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// swift-tools-version:5.4
1+
// swift-tools-version:5.7
22
// The swift-tools-version declares the minimum version of Swift required to build this package.
33

44
import PackageDescription
@@ -13,12 +13,12 @@ let package = Package(
1313
],
1414
dependencies: [
1515
.package(url: "https://github.com/apple/swift-argument-parser", from: "1.0.0"),
16-
.package(url: "https://github.com/jpsim/Yams.git", from: "4.0.0"),
16+
.package(url: "https://github.com/jpsim/Yams.git", from: "5.0.0"),
1717
.package(url: "https://github.com/apple/swift-log.git", from: "1.4.0"),
1818
.package(url: "https://github.com/stencilproject/Stencil.git", from: "0.15.1"),
1919
.package(url: "https://github.com/SwiftGen/StencilSwiftKit", from: "2.10.1"),
20-
.package(url: "https://github.com/tuist/XcodeProj.git", from: "8.5.0"),
21-
.package(url: "https://github.com/pointfreeco/swift-custom-dump", from: "0.3.0")
20+
.package(url: "https://github.com/tuist/XcodeProj.git", from: "8.8.0"),
21+
.package(url: "https://github.com/pointfreeco/swift-custom-dump", from: "0.6.0")
2222
],
2323
targets: [
2424

Sources/AndroidExport/Model/AndroidOutput.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public struct AndroidOutput {
1818
self.xmlResourcePackage = xmlResourcePackage
1919
self.packageName = packageName
2020
self.templatesPath = templatesPath
21-
if let srcDirectory = srcDirectory, let packageName = packageName {
21+
if let srcDirectory, let packageName {
2222
composeOutputDirectory = srcDirectory.appendingPathComponent(packageName.replacingOccurrences(of: ".", with: "/"))
2323
} else {
2424
composeOutputDirectory = nil

Sources/FigmaAPI/Endpoint/ImageEndpoint.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public class FormatParams: Encodable {
1919
URLQueryItem(name: "format", value: format),
2020
URLQueryItem(name: "use_absolute_bounds", value: String(useAbsoluteBounds)),
2121
]
22-
if let scale = scale {
22+
if let scale {
2323
items.append(URLQueryItem(name: "scale", value: String(scale)))
2424
}
2525
return items

Sources/FigmaExport/main.swift renamed to Sources/FigmaExport/FigmaExportCommand.swift

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ enum FigmaExportError: LocalizedError {
2929
}
3030
}
3131

32+
@main
3233
struct FigmaExportCommand: ParsableCommand {
3334

3435
static let version = "0.36.0"
@@ -52,7 +53,4 @@ struct FigmaExportCommand: ParsableCommand {
5253
],
5354
defaultSubcommand: ExportColors.self
5455
)
55-
5656
}
57-
58-
FigmaExportCommand.main()

Sources/FigmaExport/Loaders/ColorsLoader.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ final class ColorsLoader {
6868
private func loadColors(fileId: String, filter: String?) throws -> [Color] {
6969
var styles = try loadStyles(fileId: fileId)
7070

71-
if let filter = filter {
71+
if let filter {
7272
let assetsFilter = AssetsFilter(filter: filter)
7373
styles = styles.filter { style -> Bool in
7474
assetsFilter.match(name: style.name)

0 commit comments

Comments
 (0)