Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 14 additions & 37 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
- platform: iOS
scheme: "SWXMLHash iOS"
action: "build-for-testing test-without-building"
sdk-and-dest: "-sdk iphonesimulator -destination \"OS=17.2,name=iPhone 15\""
sdk-and-dest: "-sdk iphonesimulator -destination \"name=iPhone 16,OS=latest\""

- platform: tvOS
scheme: "SWXMLHash tvOS"
Expand All @@ -38,7 +38,7 @@ jobs:
- uses: maxim-lobanov/setup-xcode@ed7a3b1fda3918c0306d1b724322adc0b8cc0a90
# using @v1
with:
xcode-version: "16.2"
xcode-version: latest-stable

- name: Build and Test
env:
Expand All @@ -61,24 +61,6 @@ jobs:
fail-fast: false
matrix:
include:
- image: swift:5.8-focal
skip-testing: true

- image: swift:5.8-jammy
skip-testing: true

- image: swift:5.8-rhel-ubi9
skip-testing: true

- image: swift:5.9-focal
skip-testing: true

- image: swift:5.9-jammy
skip-testing: true

- image: swift:5.9-rhel-ubi9
skip-testing: true

- image: swift:5.10-focal
skip-testing: true

Expand All @@ -96,6 +78,15 @@ jobs:

- image: swift:6.0-rhel-ubi9
perform-testing: true

- image: swift:6.4-jammy
perform-testing: true

- image: swift:6.4-noble
perform-testing: true

- image: swift:6.4-rhel-ubi9
perform-testing: true
container:
image: ${{ matrix.image }}
timeout-minutes: 10
Expand All @@ -118,32 +109,18 @@ jobs:
name: Windows Test
runs-on: windows-2022
timeout-minutes: 10
strategy:
fail-fast: false
matrix:
include:
- branch: swift-6.1-release
tag: 6.1-RELEASE
perform-testing: true

steps:
- name: Install Swift
uses: compnerd/gha-setup-swift@eeda069c5bc95ac8a9ac5cea7d4f588ae5420ca5
# using @main
uses: SwiftyLab/setup-swift@9014d4136569075c696d4151c7810ecde8712907
# using @v1.14.1
with:
branch: ${{ matrix.branch}}
tag: ${{ matrix.tag }}
swift-version: "6.4"

- name: Checkout
uses: actions/checkout@v6
with:
persist-credentials: false
- name: Build
if: ${{ matrix.skip-testing }}
run: |
swift build
- name: Build and test
if: ${{ matrix.perform-testing }}
run: |
swift build --build-tests
swift test
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,9 @@ playground.xcworkspace
# Packages/
.build/

# Xcode-generated workspace/settings created when opening Package.swift directly
.swiftpm/

# CocoaPods
#
# We recommend against adding the Pods directory to your .gitignore. However
Expand Down
1 change: 1 addition & 0 deletions .swift-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
6.4
7 changes: 0 additions & 7 deletions .swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata

This file was deleted.

4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ The API takes a lot of inspiration from

## Requirements

- iOS 8.0+ / Mac OS X 10.9+ / tvOS 9.0+ / watchOS 2.0+
- Xcode 8.0+
- iOS 11.0+ / macOS 10.13+ / tvOS 11.0+ / watchOS 4.0+
- Xcode 16.0+ / Swift 6.0+

## Installation

Expand Down
8 changes: 0 additions & 8 deletions Source/FullXMLParser.swift
Original file line number Diff line number Diff line change
Expand Up @@ -95,17 +95,9 @@ class FullXMLParser: NSObject, SimpleXmlParser, XMLParserDelegate {
}

func parser(_ parser: XMLParser, parseErrorOccurred parseError: Error) {
#if os(Linux) && !swift(>=4.1.50)
if let err = parseError as? NSError {
parsingError = ParsingError(
line: err.userInfo["NSXMLParserErrorLineNumber"] as? Int ?? 0,
column: err.userInfo["NSXMLParserErrorColumn"] as? Int ?? 0)
}
#else
let err = parseError as NSError
parsingError = ParsingError(
line: err.userInfo["NSXMLParserErrorLineNumber"] as? Int ?? 0,
column: err.userInfo["NSXMLParserErrorColumn"] as? Int ?? 0)
#endif
}
}
Loading