Merge pull request #80 from tayloraswift/device-support

add support for iDevices, and add CI workflows
tayloraswift · Nov 15, 2024 · e677ba0 · e677ba0
2 parents 467f8b6 + 88a7dec
commit e677ba0
Show file tree

Hide file tree

Showing 10 changed files with 123 additions and 100 deletions.
diff --git a/.github/workflows/docs.yml → .github/workflows/Documentation.yml b/.github/workflows/docs.yml → .github/workflows/Documentation.yml
@@ -18,8 +18,8 @@ jobs:
             -   name: Install Swift
                 uses: tayloraswift/swift-install-action@master
                 with:
-                    swift-prefix: "swift-6.0.1-release/ubuntu2404/swift-6.0.1-RELEASE"
-                    swift-id: "swift-6.0.1-RELEASE-ubuntu24.04"
+                    swift-prefix: "swift-6.0.2-release/ubuntu2404/swift-6.0.2-RELEASE"
+                    swift-id: "swift-6.0.2-RELEASE-ubuntu24.04"
 
             -   name: Install Unidoc
                 uses: tayloraswift/swift-unidoc-action@master

diff --git a/.github/workflows/Tests.yml b/.github/workflows/Tests.yml
@@ -0,0 +1,42 @@
+name: tests
+
+on:
+    push:
+        branches: [ master ]
+    pull_request:
+        branches: [ master ]
+
+jobs:
+    linux:
+        runs-on: ubuntu-24.04
+        name: Ubuntu 24.04
+
+        steps:
+            -   name: Install Swift
+                uses: tayloraswift/swift-install-action@master
+                with:
+                    swift-prefix: "swift-6.0.2-release/ubuntu2404/swift-6.0.2-RELEASE"
+                    swift-id: "swift-6.0.2-RELEASE-ubuntu24.04"
+
+            -   name: Checkout repository
+                uses: actions/checkout@v3
+
+            -   name: Run tests
+                run: Scripts/TestAll
+
+    macos:
+        runs-on: macos-15
+        name: macOS
+
+        steps:
+            -   name: Install Swift
+                uses: tayloraswift/swift-install-action@master
+                with:
+                    swift-prefix: "swift-6.0.2-release/xcode/swift-6.0.2-RELEASE"
+                    swift-id: "swift-6.0.2-RELEASE"
+
+            -   name: Checkout repository
+                uses: actions/checkout@v3
+
+            -   name: Run tests
+                run: Scripts/TestAll
diff --git a/.github/workflows/iOS.yml b/.github/workflows/iOS.yml
@@ -0,0 +1,14 @@
+name: iOS
+
+on:
+    push:
+        branches: [ master ]
+    pull_request:
+        branches: [ master ]
+
+jobs:
+    build:
+        uses: tayloraswift/swift-device-action/.github/workflows/build.yml@master
+        with:
+            xcode-scheme: 'PNG'
+            destination: ${{ github.workflow }}
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
diff --git a/.github/workflows/tvOS.yml b/.github/workflows/tvOS.yml
@@ -0,0 +1,14 @@
+name: tvOS
+
+on:
+    push:
+        branches: [ master ]
+    pull_request:
+        branches: [ master ]
+
+jobs:
+    build:
+        uses: tayloraswift/swift-device-action/.github/workflows/build.yml@master
+        with:
+            xcode-scheme: 'PNG'
+            destination: ${{ github.workflow }}
diff --git a/.github/workflows/visionOS.yml b/.github/workflows/visionOS.yml
@@ -0,0 +1,14 @@
+name: visionOS
+
+on:
+    push:
+        branches: [ master ]
+    pull_request:
+        branches: [ master ]
+
+jobs:
+    build:
+        uses: tayloraswift/swift-device-action/.github/workflows/build.yml@master
+        with:
+            xcode-scheme: 'PNG'
+            destination: ${{ github.workflow }}
diff --git a/.github/workflows/watchOS.yml b/.github/workflows/watchOS.yml
@@ -0,0 +1,14 @@
+name: watchOS
+
+on:
+    push:
+        branches: [ master ]
+    pull_request:
+        branches: [ master ]
+
+jobs:
+    build:
+        uses: tayloraswift/swift-device-action/.github/workflows/build.yml@master
+        with:
+            xcode-scheme: 'PNG'
+            destination: ${{ github.workflow }}
diff --git a/README.md b/README.md
@@ -1,13 +1,9 @@
 <div align="center">
 
-***`png`***<br>`4.4`
+***`png`***
 
-[![ci status](https://github.com/tayloraswift/swift-png/actions/workflows/test.yml/badge.svg)](https://github.com/tayloraswift/swift-png/actions/workflows/test.yml)
-[![ci status](https://github.com/tayloraswift/swift-png/actions/workflows/docs.yml/badge.svg)](https://github.com/tayloraswift/swift-png/actions/workflows/docs.yml)
-
-
-[![swift package index versions](https://img.shields.io/endpoint?url=https%3A%2F%2Fswiftpackageindex.com%2Fapi%2Fpackages%2Ftayloraswift%2Fswift-png%2Fbadge%3Ftype%3Dswift-versions)](https://swiftpackageindex.com/tayloraswift/swift-png)
-[![swift package index platforms](https://img.shields.io/endpoint?url=https%3A%2F%2Fswiftpackageindex.com%2Fapi%2Fpackages%2Ftayloraswift%2Fswift-png%2Fbadge%3Ftype%3Dplatforms)](https://swiftpackageindex.com/tayloraswift/swift-png)
+[![Tests](https://github.com/tayloraswift/swift-png/actions/workflows/Tests.yml/badge.svg)](https://github.com/tayloraswift/swift-png/actions/workflows/Tests.yml)
+[![Documentation](https://github.com/tayloraswift/swift-png/actions/workflows/Documentation.yml/badge.svg)](https://github.com/tayloraswift/swift-png/actions/workflows/Documentation.yml)
 
 </div>
 
@@ -19,6 +15,24 @@ Swift *PNG* is [available](LICENSE) under the [Apache 2.0 license](https://www.a
 
 Swift *PNG*’s [documentation](https://swiftinit.org/docs/swift-png/png) is available on Swiftinit!
 
+
+## Requirements
+
+The swift-png library requires Swift 5.10 or later.
+
+| Platform | Status |
+| -------- | ------ |
+| 🐧 Linux | [![Tests](https://github.com/tayloraswift/swift-png/actions/workflows/Tests.yml/badge.svg)](https://github.com/tayloraswift/swift-png/actions/workflows/Tests.yml) |
+| 🍏 Darwin | [![Tests](https://github.com/tayloraswift/swift-png/actions/workflows/Tests.yml/badge.svg)](https://github.com/tayloraswift/swift-png/actions/workflows/Tests.yml) |
+| 🍏 Darwin (iOS) | [![iOS](https://github.com/tayloraswift/swift-png/actions/workflows/iOS.yml/badge.svg)](https://github.com/tayloraswift/swift-png/actions/workflows/iOS.yml) |
+| 🍏 Darwin (tvOS) | [![tvOS](https://github.com/tayloraswift/swift-png/actions/workflows/tvOS.yml/badge.svg)](https://github.com/tayloraswift/swift-png/actions/workflows/tvOS.yml) |
+| 🍏 Darwin (visionOS) | [![visionOS](https://github.com/tayloraswift/swift-png/actions/workflows/visionOS.yml/badge.svg)](https://github.com/tayloraswift/swift-png/actions/workflows/visionOS.yml) |
+| 🍏 Darwin (watchOS) | [![watchOS](https://github.com/tayloraswift/swift-png/actions/workflows/watchOS.yml/badge.svg)](https://github.com/tayloraswift/swift-png/actions/workflows/watchOS.yml) |
+
+
+[Check deployment minimums](https://swiftinit.org/docs/swift-png#ss:platform-requirements)
+
+
 ## Getting started
 
 To use *Swift PNG* in a project, add this descriptor to the `dependencies` list in your `Package.swift` file:

diff --git a/.github/pipeline → Scripts/TestAll b/.github/pipeline → Scripts/TestAll
diff --git a/Sources/PNG/System.swift b/Sources/PNG/System.swift
@@ -2,7 +2,7 @@
 //  License, v. 2.0. If a copy of the MPL was not distributed with this
 //  file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
-#if os(macOS) || os(iOS)
+#if canImport(Darwin)
     import Darwin
 #elseif canImport(Glibc)
     import Glibc
@@ -15,7 +15,7 @@
     #warning("unsupported or untested platform (please open an issue at https://github.com/tayloraswift/swift-png/issues)")
 #endif
 
-#if os(macOS) || os(iOS) || os(Linux) || os(Windows)
+#if canImport(Darwin) || canImport(Glibc) || canImport(Musl) || os(Windows)
 
 /// A namespace for platform-dependent functionality.
 ///