0.17

.github/workflows/build.yml

@@ -6,19 +6,19 @@ on:
   workflow_dispatch:
 
 jobs:
-  xcode_15_3:
-    runs-on: macos-14
+  xcode_16_4:
+    runs-on: macos-15
     env:
-      DEVELOPER_DIR: /Applications/Xcode_15.3.app/Contents/Developer
+      DEVELOPER_DIR: /Applications/Xcode_16.4.app/Contents/Developer
     steps:
       - name: Checkout
         uses: actions/checkout@v4
       - name: Version
         run: swift --version
       - name: Build
-        run: swift test --enable-code-coverage --filter do_not_test
+        run: swift build --build-tests --enable-code-coverage
       - name: Test
-        run: swift test --enable-code-coverage --skip-build
+        run: swift test --skip-build --enable-code-coverage
       - name: Gather code coverage
         run: xcrun llvm-cov export -format="lcov" .build/debug/SwiftDrawPackageTests.xctest/Contents/MacOS/SwiftDrawPackageTests -instr-profile .build/debug/codecov/default.profdata > coverage_report.lcov
       - name: Upload Coverage
@@ -27,10 +27,10 @@ jobs:
           token: ${{ secrets.CODECOV_TOKEN }}
           files: ./coverage_report.lcov
 
-  xcode_15_2:
-    runs-on: macos-14
+  xcode_26:
+    runs-on: macos-15
     env:
-      DEVELOPER_DIR: /Applications/Xcode_15.2.app/Contents/Developer
+      DEVELOPER_DIR: /Applications/Xcode_26.0.app/Contents/Developer
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -41,10 +41,10 @@ jobs:
       - name: Test
         run: swift test --skip-build
 
-  xcode_14_3:
-    runs-on: macos-13
+  xcode_16_3:
+    runs-on: macos-15
     env:
-      DEVELOPER_DIR: /Applications/Xcode_14.3.app/Contents/Developer
+      DEVELOPER_DIR: /Applications/Xcode_16.2.app/Contents/Developer
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -55,9 +55,10 @@ jobs:
       - name: Test
         run: swift test --skip-build
 
-  linux_5_7:
+
+  linux_6:
     runs-on: ubuntu-latest
-    container: swift:5.7
+    container: swift:6.0.3
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -68,9 +69,9 @@ jobs:
       - name: Test
         run: swift test --skip-build
 
-  linux_5_9:
+  linux_6_1:
     runs-on: ubuntu-latest
-    container: swift:5.9
+    container: swift:6.1.2
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -81,9 +82,9 @@ jobs:
       - name: Test
         run: swift test --skip-build
 
-  linux_5_10:
+  linux_swift_6_2:
     runs-on: ubuntu-latest
-    container: swift:5.10
+    container: swiftlang/swift:nightly-6.2-noble
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -93,3 +94,11 @@ jobs:
         run: swift build --build-tests
       - name: Test
         run: swift test --skip-build
+
+  android:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Build and Test
+        uses: skiptools/swift-android-action@v2

.swiftpm/SwiftDraw.xctestplan

@@ -1,7 +1,7 @@
 {
   "configurations" : [
     {
-      "id" : "B46FBA9F-0EC4-486D-8336-66AB23577319",
+      "id" : "5E425660-B3D3-4E55-A5EE-21100C436313",
       "name" : "Test Scheme Action",
       "options" : {
 

.swiftpm/xcode/xcshareddata/xcschemes/SwiftDraw.xcscheme

@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1540"
+   version = "1.7">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES"
+      buildArchitectures = "Automatic">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "SwiftDraw"
+               BuildableName = "SwiftDraw"
+               BlueprintName = "SwiftDraw"
+               ReferencedContainer = "container:">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <TestPlans>
+         <TestPlanReference
+            reference = "container:.swiftpm/SwiftDraw.xctestplan"
+            default = "YES">
+         </TestPlanReference>
+      </TestPlans>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "SwiftDraw"
+            BuildableName = "SwiftDraw"
+            BlueprintName = "SwiftDraw"
+            ReferencedContainer = "container:">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>

CommandLine/CommandLine.swift

@@ -31,6 +31,7 @@
 
 import Foundation
 import SwiftDraw
+import SwiftDrawDOM
 
 extension SwiftDraw.CommandLine {
 
@@ -68,8 +69,8 @@ extension SwiftDraw.CommandLine {
     static func printHelp() {
         print("")
         print("""
-swiftdraw, version 0.16.0
-copyright (c) 2023 Simon Whitty
+swiftdraw, version 0.25.0
+copyright (c) 2025 Simon Whitty
 
 usage: swiftdraw <file.svg> [--format png | pdf | jpeg | swift | sfsymbol] [--size wxh] [--scale 1x | 2x | 3x]
 
@@ -83,17 +84,19 @@ Options:
  --precision   maximum number of decimal places
  --output      optional path of output file
 
- --hideUnsupportedFilters   hide elements with unsupported filters.
+ --hide-unsupported-filters   hide elements with unsupported filters.
 
 Available keys for --format swift:
  --api                api of generated code:  appkit | uikit
 
 Available keys for --format sfsymbol:
  --insets             alignment of regular variant: top,left,bottom,right | auto
+ --size               size category to generate: small, medium large. (default is small)
  --ultralight         svg file of ultralight variant
- --ultralightInsets   alignment of ultralight variant: top,left,bottom,right | auto
+ --ultralight-insets  alignment of ultralight variant: top,left,bottom,right | auto
  --black              svg file of black variant
- --blackInsets        alignment of black variant: top,left,bottom,right | auto
+ --black-insets       alignment of black variant: top,left,bottom,right | auto
+ --legacy             use the original, less precise alignment logic from earlier swiftdraw versions.
 
 
 """)

CommandLine/main.swift

@@ -31,6 +31,8 @@
 
 #if canImport(Darwin)
 import Darwin.POSIX
+#elseif canImport(Android)
+import Android
 #else
 import Glibc
 #endif