Create swift.yml

.github/workflows/swift.yml

@@ -0,0 +1,20 @@
+# This workflow will build a Swift project
+# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-swift
+
+name: Swift
+
+on: [push]
+
+jobs:
+  build:
+    name: Swift on ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [macos-latest]
+    runs-on: ${{ matrix.os }}
+    steps:
+    - uses: actions/checkout@v3
+    - name: Build
+      run: swift build -v
+    - name: Run tests
+      run: swift test -v

Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version: 5.9
+// swift-tools-version: 5.7
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription

Sources/ZPLBuilder/Commands/FieldOrientation.swift

@@ -30,9 +30,9 @@ public struct FieldOrientation: ZPLCommandConvertible {
     public var justification: FieldJustification?
     public var command: String {
         if let justification {
-            "^FW\(orientation.rawValue),\(justification.rawValue)"
+            return "^FW\(orientation.rawValue),\(justification.rawValue)"
         } else {
-            "^FW\(orientation.rawValue)"
+            return "^FW\(orientation.rawValue)"
         }
     }
 

Sources/ZPLBuilder/Commands/FieldOrigin.swift

@@ -32,9 +32,9 @@ public struct FieldOrigin: ZPLCommandConvertible {
     public var justification: FieldJustification?
     public var command: String {
         if let justification {
-            "^FO\(x),\(y),\(justification.rawValue)"
+            return "^FO\(x),\(y),\(justification.rawValue)"
         } else {
-            "^FO\(x),\(y)"
+            return "^FO\(x),\(y)"
         }
     }
 }

Sources/ZPLBuilder/Commands/FieldTypeset.swift

@@ -51,9 +51,9 @@ public struct FieldTypeset: ZPLCommandConvertible {
     public var justification: FieldJustification?
     public var command: String {
         if let justification {
-            "^FT\(x),\(y),\(justification.rawValue)"
+            return "^FT\(x),\(y),\(justification.rawValue)"
         } else {
-            "^FT\(x),\(y)"
+            return "^FT\(x),\(y)"
         }
     }
 

Sources/ZPLBuilder/Utils/ZPLImageEncoder.swift

@@ -32,15 +32,19 @@ public class ZPLImageEncoder {
     }
 
     public func encode(cgImage: CGImage, targetSize: CGSize?) -> ZPLImage? {
-        let width = if let width = targetSize?.width {
-            Int(width)
+        let width: Int
+        let height: Int
+
+        if let targetWidth = targetSize?.width {
+            width = Int(targetWidth)
         } else {
-            cgImage.width
+            width = cgImage.width
         }
-        let height = if let height = targetSize?.height {
-            Int(height)
+
+        if let targetHeight = targetSize?.height {
+            height = Int(targetHeight)
         } else {
-            cgImage.height
+            height = cgImage.height
         }
 
         guard width > 0, height > 0, cgImage.width > 0, cgImage.height > 0 else {
@@ -110,10 +114,12 @@ public class ZPLImageEncoder {
                         componentValue <<= Self.componentValueSize - pos
                     }
 
-                    let components = if componentValue <= 15 {
-                        "0" + String(componentValue, radix: 16, uppercase: true)
+                    let components: String
+
+                    if componentValue <= 15 {
+                        components = "0" + String(componentValue, radix: 16, uppercase: true)
                     } else {
-                        String(componentValue, radix: 16, uppercase: true)
+                        components = String(componentValue, radix: 16, uppercase: true)
                     }
 
                     block(x, y, components, x == width - 1)

Sources/ZPLBuilder/ZPLBuilder.swift

@@ -10,26 +10,26 @@ import Foundation
 @resultBuilder
 public struct ZPLBuilder {
     public static func buildBlock(_ components: ZPLComponent...) -> ZPLComponent {
-        ZPL(commands: components.flatMap(\.zpl.commands))
+        return ZPL(commands: components.flatMap(\.zpl.commands))
     }
 
     public static func buildArray(_ components: [ZPLComponent]) -> ZPLComponent {
-        ZPL(commands: components.flatMap(\.zpl.commands))
+        return ZPL(commands: components.flatMap(\.zpl.commands))
     }
 
     public static func buildEither(first component: ZPLComponent) -> ZPLComponent {
-        component
+        return component
     }
 
     public static func buildEither(second component: ZPLComponent) -> ZPLComponent {
-        component
+        return component
     }
 
     public static func buildOptional(_ component: ZPLComponent?) -> ZPLComponent {
         if let component {
-            component
+            return component
         } else {
-            ZPL(commands: [])
+            return ZPL(commands: [])
         }
     }
 }