From 6e4fa107072a88f2a46bf8e05d89ce7e6a65ab7b Mon Sep 17 00:00:00 2001 From: Varun Santhanam Date: Fri, 5 Apr 2024 20:54:20 -0700 Subject: [PATCH] Migrate to Swift 5.10 --- .github/workflows/xcodebuild-build-test.yml | 6 +++--- .swiftformat | 2 +- Package.swift | 2 +- README.md | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/xcodebuild-build-test.yml b/.github/workflows/xcodebuild-build-test.yml index 2c08bc5d3..311360d09 100644 --- a/.github/workflows/xcodebuild-build-test.yml +++ b/.github/workflows/xcodebuild-build-test.yml @@ -8,12 +8,12 @@ on: jobs: build: - runs-on: macos-13 + runs-on: macos-14 steps: - uses: actions/checkout@v3 - name: Xcode Version - run: sudo xcode-select --switch /Applications/Xcode_15.0.app + run: sudo xcode-select --switch /Applications/Xcode_15.3.app - name: Lint run: swift package plugin --allow-writing-to-package-directory swiftformat --lint - name: Build & Test - run: xcodebuild -scheme 'SafariUI' -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 15,OS=17.0' + run: xcodebuild -scheme 'SafariUI' -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 15,OS=17.2' diff --git a/.swiftformat b/.swiftformat index 9cd5c04be..b8b6ee418 100644 --- a/.swiftformat +++ b/.swiftformat @@ -1,4 +1,4 @@ --enable isEmpty --disable blankLinesAtEndOfScope, blankLinesAtStartOfScope, redundantNilInit, unusedArguments, redundantParens, wrapMultilineStatementBraces, trailingCommas, braces, opaqueGenericParameters ---swiftversion 5.9 +--swiftversion 5.10 --header "SafariUI\n{file}\n\nMIT License\n\nCopyright (c) 2023 Varun Santhanam\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the "Software"), to deal\n\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\nSOFTWARE." \ No newline at end of file diff --git a/Package.swift b/Package.swift index 6d5d0901c..0863df2c5 100644 --- a/Package.swift +++ b/Package.swift @@ -1,4 +1,4 @@ -// swift-tools-version: 5.9 +// swift-tools-version: 5.10 // The swift-tools-version declares the minimum version of Swift required to build this package. import PackageDescription diff --git a/README.md b/README.md index 529139277..bad91ec37 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ [![MIT License](https://img.shields.io/github/license/vsanthanam/SafariUI)](https://github.com/vsanthanam/SafariUI/blob/main/LICENSE) [![Package Releases](https://img.shields.io/github/v/release/vsanthanam/SafariUI)](https://github.com/vsanthanam/SafariUI/releases) [![Build Status](https://img.shields.io/github/actions/workflow/status/vsanthanam/SafariUI/xcodebuild-build-test.yml)](https://github.com/vsanthanam/SafariUI/actions) -[![Swift Version](https://img.shields.io/badge/swift-5.9-critical)](https://swift.org) +[![Swift Version](https://img.shields.io/badge/swift-5.10-critical)](https://swift.org) [![Supported Platforms](https://img.shields.io/badge/platform-iOS%2014.0%20%7C%20Catalyst%2014.0-lightgrey)](https://developer.apple.com) A SwiftUI wrappers for `SFSafariViewController` and `ASWebAuthenticationSession`