Migrate to Swift 5.9 Toolchain

vsanthanam · Sep 30, 2023 · 468afa6 · 468afa6
1 parent be3f523
commit 468afa6
Show file tree

Hide file tree

Showing 17 changed files with 25 additions and 25 deletions.
diff --git a/.github/workflows/xcodebuild-build-test.yml b/.github/workflows/xcodebuild-build-test.yml
@@ -8,11 +8,11 @@ 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_14.3.app
+      run: sudo xcode-select --switch /Applications/Xcode_15.0.app
     - name: Lint
       run: swift package plugin --allow-writing-to-package-directory swiftformat --lint
     - name: Build & Test

diff --git a/.swiftformat b/.swiftformat
@@ -1,4 +1,4 @@
 --enable isEmpty
 --disable blankLinesAtEndOfScope, blankLinesAtStartOfScope, redundantNilInit, unusedArguments, redundantParens, wrapMultilineStatementBraces, trailingCommas, braces, opaqueGenericParameters
---swiftversion 5.8
---header "SafariUI\n{file}\n\nMIT License\n\nCopyright (c) 2021 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."
+--swiftversion 5.9
+--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."
diff --git a/Package.swift b/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version: 5.8
+// swift-tools-version: 5.9
 // 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
@@ -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.8-critical)](https://swift.org)
+[![Swift Version](https://img.shields.io/badge/swift-5.9-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`

diff --git a/Sources/SafariUI/SafariUI.swift b/Sources/SafariUI/SafariUI.swift
@@ -3,7 +3,7 @@
 //
 // MIT License
 //
-// Copyright (c) 2021 Varun Santhanam
+// Copyright (c) 2023 Varun Santhanam
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the  Software), to deal
 //

diff --git a/Sources/SafariView/DismissButtonStyle.swift b/Sources/SafariView/DismissButtonStyle.swift
@@ -3,7 +3,7 @@
 //
 // MIT License
 //
-// Copyright (c) 2021 Varun Santhanam
+// Copyright (c) 2023 Varun Santhanam
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the  Software), to deal
 //
@@ -45,9 +45,9 @@ public extension SafariView {
 
         var uikit: SFSafariViewController.DismissButtonStyle {
             switch self {
-            case .done: return .done
-            case .close: return .close
-            case .cancel: return .cancel
+            case .done: .done
+            case .close: .close
+            case .cancel: .cancel
             }
         }
     }

diff --git a/Sources/SafariView/Environment.swift b/Sources/SafariView/Environment.swift
@@ -3,7 +3,7 @@
 //
 // MIT License
 //
-// Copyright (c) 2021 Varun Santhanam
+// Copyright (c) 2023 Varun Santhanam
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the  Software), to deal
 //

diff --git a/Sources/SafariView/ExcludedActivityTypes.swift b/Sources/SafariView/ExcludedActivityTypes.swift
@@ -3,7 +3,7 @@
 //
 // MIT License
 //
-// Copyright (c) 2021 Varun Santhanam
+// Copyright (c) 2023 Varun Santhanam
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the  Software), to deal
 //

diff --git a/Sources/SafariView/IncludedActivities.swift b/Sources/SafariView/IncludedActivities.swift
@@ -3,7 +3,7 @@
 //
 // MIT License
 //
-// Copyright (c) 2021 Varun Santhanam
+// Copyright (c) 2023 Varun Santhanam
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the  Software), to deal
 //

diff --git a/Sources/SafariView/Modifiers.swift b/Sources/SafariView/Modifiers.swift
@@ -3,7 +3,7 @@
 //
 // MIT License
 //
-// Copyright (c) 2021 Varun Santhanam
+// Copyright (c) 2023 Varun Santhanam
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the  Software), to deal
 //

diff --git a/Sources/SafariView/Presentation.swift b/Sources/SafariView/Presentation.swift
@@ -3,7 +3,7 @@
 //
 // MIT License
 //
-// Copyright (c) 2021 Varun Santhanam
+// Copyright (c) 2023 Varun Santhanam
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the  Software), to deal
 //

diff --git a/Sources/SafariView/PrewarmingToken.swift b/Sources/SafariView/PrewarmingToken.swift
@@ -3,7 +3,7 @@
 //
 // MIT License
 //
-// Copyright (c) 2021 Varun Santhanam
+// Copyright (c) 2023 Varun Santhanam
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the  Software), to deal
 //

diff --git a/Sources/SafariView/SafariView.swift b/Sources/SafariView/SafariView.swift
@@ -3,7 +3,7 @@
 //
 // MIT License
 //
-// Copyright (c) 2021 Varun Santhanam
+// Copyright (c) 2023 Varun Santhanam
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the  Software), to deal
 //
@@ -682,11 +682,11 @@ extension UIView {
 
     var controller: UIViewController? {
         if let nextResponder = next as? UIViewController {
-            return nextResponder
+            nextResponder
         } else if let nextResponder = next as? UIView {
-            return nextResponder.controller
+            nextResponder.controller
         } else {
-            return nil
+            nil
         }
     }
 

diff --git a/Sources/WebAuthentication/Environment.swift b/Sources/WebAuthentication/Environment.swift
@@ -3,7 +3,7 @@
 //
 // MIT License
 //
-// Copyright (c) 2021 Varun Santhanam
+// Copyright (c) 2023 Varun Santhanam
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the  Software), to deal
 //

diff --git a/Sources/WebAuthentication/Modifiers.swift b/Sources/WebAuthentication/Modifiers.swift
@@ -3,7 +3,7 @@
 //
 // MIT License
 //
-// Copyright (c) 2021 Varun Santhanam
+// Copyright (c) 2023 Varun Santhanam
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the  Software), to deal
 //

diff --git a/Sources/WebAuthentication/Presentation.swift b/Sources/WebAuthentication/Presentation.swift
@@ -3,7 +3,7 @@
 //
 // MIT License
 //
-// Copyright (c) 2021 Varun Santhanam
+// Copyright (c) 2023 Varun Santhanam
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the  Software), to deal
 //

diff --git a/Sources/WebAuthentication/WebAuthentication.swift b/Sources/WebAuthentication/WebAuthentication.swift
@@ -3,7 +3,7 @@
 //
 // MIT License
 //
-// Copyright (c) 2021 Varun Santhanam
+// Copyright (c) 2023 Varun Santhanam
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the  Software), to deal
 //