Rename package to Safari ahead of inclusion of other safari services

.github/workflows/xcodebuild-build-test.yml

@@ -16,4 +16,4 @@ jobs:
     - name: Lint
       run: swift package plugin --allow-writing-to-package-directory swiftformat --lint
     - name: Build & Test
-      run: xcodebuild -scheme 'SafariView' -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 14,OS=16.4' test
+      run: xcodebuild -scheme 'Safari' -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 14,OS=16.4' test

.swiftformat

@@ -1,4 +1,4 @@
 --enable isEmpty
 --disable blankLinesAtEndOfScope, blankLinesAtStartOfScope, redundantNilInit, unusedArguments, redundantParens, wrapMultilineStatementBraces, trailingCommas, braces
 --swiftversion 5.8
---header "SafariView\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."
+--header "Safari\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."

Package.swift

@@ -4,15 +4,15 @@
 import PackageDescription
 
 let package = Package(
-    name: "SafariView",
+    name: "Safari",
     platforms: [
         .iOS(.v14),
         .macCatalyst(.v14)
     ],
     products: [
         .library(
-            name: "SafariView",
-            targets: ["SafariView"]
+            name: "Safari",
+            targets: ["Safari"]
         ),
     ],
     dependencies: [
@@ -21,12 +21,12 @@ let package = Package(
     ],
     targets: [
         .target(
-            name: "SafariView",
+            name: "Safari",
             dependencies: []
         ),
         .testTarget(
-            name: "SafariViewTests",
-            dependencies: ["SafariView"]
+            name: "SafariTests",
+            dependencies: ["Safari"]
         ),
     ]
 )

Sources/SafariView/DismissButtonStyle.swift → Sources/Safari/DismissButtonStyle.swift

@@ -1,4 +1,4 @@
-// SafariView
+// Safari
 // DismissButtonStyle.swift
 //
 // MIT License

Sources/SafariView/Environment.swift → Sources/Safari/Environment.swift

@@ -1,4 +1,4 @@
-// SafariView
+// Safari
 // Environment.swift
 //
 // MIT License

Sources/SafariView/ExcludedActivityTypes.swift → Sources/Safari/ExcludedActivityTypes.swift

@@ -1,4 +1,4 @@
-// SafariView
+// Safari
 // ExcludedActivityTypes.swift
 //
 // MIT License

Sources/SafariView/IncludedActivities.swift → Sources/Safari/IncludedActivities.swift

@@ -1,4 +1,4 @@
-// SafariView
+// Safari
 // IncludedActivities.swift
 //
 // MIT License

Sources/SafariView/Modifiers.swift → Sources/Safari/Modifiers.swift

@@ -1,4 +1,4 @@
-// SafariView
+// Safari
 // Modifiers.swift
 //
 // MIT License

Sources/SafariView/Presentation.swift → Sources/Safari/Presentation.swift

@@ -1,4 +1,4 @@
-// SafariView
+// Safari
 // Presentation.swift
 //
 // MIT License

Sources/SafariView/PrewarmingToken.swift → Sources/Safari/PrewarmingToken.swift

@@ -1,4 +1,4 @@
-// SafariView
+// Safari
 // PrewarmingToken.swift
 //
 // MIT License

Sources/SafariView/SafariView.docc/ExcludedActivityTypes.md → Sources/Safari/Safari.docc/ExcludedActivityTypes.md

@@ -1,4 +1,4 @@
-# ``SafariView/SafariView/ExcludedActivityTypes``
+# ``SafariView/ExcludedActivityTypes``
 
 @Metadata {
     @DocumentationExtension(mergeBehavior: append)
@@ -12,14 +12,14 @@ You can initialize instances of this type using an array literal of `UIActivity.
 let excluded: SafariView.ExcludedActivityTypes = [.addToReadingList, .airDrop, .print, .sharePlay]
 ```
 
-To change the the excluded activity types used by ``SafariView`` at the current scope, use the ``SwiftUI/View/excludedSafariActivityTypes(_:)-tvrg`` view modifier, or the ``SwiftUI/EnvironmentValues/safariViewExcludedActivityTypes`` environment value.
+To change the the excluded activity types used by ``SafariView`` at the current scope, use the ``SwiftUI/View/excludedSafariActivityTypes(_:)-3j01b`` view modifier, or the ``SwiftUI/EnvironmentValues/safariViewExcludedActivityTypes`` environment value.
 
 ## Topics
 
 ### Initializers
 
-- ``init(_:)-1ktmq``
-- ``init(_:)-67duh``
+- ``init(_:)-4ttl7``
+- ``init(_:)-641yv``
 
 ### Operators
 

Sources/SafariView/SafariView.docc/IncludedActivities.md → Sources/Safari/Safari.docc/IncludedActivities.md

@@ -1,4 +1,4 @@
-# ``SafariView/SafariView/IncludedActivities``
+# ``SafariView/IncludedActivities``
 
 @Metadata {
     @DocumentationExtension(mergeBehavior: append)
@@ -12,14 +12,14 @@ You can initialize instances of this type using an array literal of `UIActivity`
 let excluded: SafariView.IncludedActivities = [someActivity, someOtherActivity]
 ```
 
-To change the the included activities used by ``SafariView`` at the current scope, use the ``SwiftUI/View/includedSafariActivities(_:)-2u8l9`` view modifier, or the ``SwiftUI/EnvironmentValues/safariViewIncludedActivities`` environment value.
+To change the the included activities used by ``SafariView`` at the current scope, use the ``SwiftUI/View/includedSafariActivities(_:)-5y6z0`` view modifier, or the ``SwiftUI/EnvironmentValues/safariViewIncludedActivities`` environment value.
 
 ## Topics
 
 ### Initializers
 
-- ``init(_:)-6d955``
-- ``init(_:)-9q5v6``
+- ``init(_:)-b58a``
+- ``init(_:)-7gbd7``
 
 ### Operators
 

Sources/Safari/Safari.docc/Safari.md

@@ -0,0 +1,13 @@
+# ``Safari``
+
+SafariServices in SwiftUI
+
+## Overview
+
+`Safari` is a package that wraps [`SafariServices`](https://developer.apple.com/documentation/safariservices/) for use with SwiftUI applications. Currently, it contains a single SwiftUI view, also called `SafariView`, which wraps [`SFSafariViewController`](https://developer.apple.com/documentation/safariservices/sfsafariviewcontroller).
+
+## Topics
+
+### Views
+
+- ``SafariView``

Sources/SafariView/SafariView.docc/View.md → Sources/Safari/Safari.docc/SafariView.md

@@ -1,4 +1,4 @@
-#  ``SafariView/SafariView``
+#  ``SafariView``
 
 @Metadata {
     @DocumentationExtension(mergeBehavior: append)
@@ -15,8 +15,6 @@ UI features include the following:
 - An Action button that invokes an activity view controller offering custom services from your app, and activities, such as messaging, from the system and other extensions
 - A Done button, back and forward navigation buttons, and a button to open the page directly in Safari
 
-The library contains a single `View`-conforming struct, also named `SafariView`, as well as several view modifiers used to control the appearance, behavior and presentation of a ``SafariView/SafariView``
-
 - Note: In Mac apps built with Mac Catalyst, SafariView launches the default web browser instead of displaying a modal window. SafariView is not compatible with macOS, tvOS, or watchOS.
 
 You can present a `SafariView` using the built-in presentation view modifiers:
@@ -46,7 +44,7 @@ You can also use sheet presentation, or any other presentation mechanism of your
 - ``SwiftUI/View/safariBarTintColor(_:)``
 - ``SwiftUI/View/safariControlTintColor(_:)``
 - ``SwiftUI/View/safariDismissButtonStyle(_:)``
-- ``SafariView/SafariView/DismissButtonStyle``
+- ``DismissButtonStyle``
 
 ### Presentation
 
@@ -67,12 +65,12 @@ You can also use sheet presentation, or any other presentation mechanism of your
 
 ### Custom Activities
 
-- ``SwiftUI/View/includedSafariActivities(_:)-2u8l9``
-- ``SwiftUI/View/includedSafariActivities(_:)-362lz``
-- ``SafariView/SafariView/IncludedActivities``
-- ``SwiftUI/View/excludedSafariActivityTypes(_:)-tvrg``
-- ``SwiftUI/View/excludedSafariActivityTypes(_:)-1v8zq``
-- ``SafariView/SafariView/ExcludedActivityTypes``
+- ``SwiftUI/View/includedSafariActivities(_:)-6530n``
+- ``SwiftUI/View/includedSafariActivities(_:)-5y6z0``
+- ``IncludedActivities``
+- ``SwiftUI/View/excludedSafariActivityTypes(_:)-xd5l``
+- ``SwiftUI/View/excludedSafariActivityTypes(_:)-3j01b``
+- ``ExcludedActivityTypes``
 
 ### Environment Values
 

Sources/SafariView/SafariView.swift → Sources/Safari/SafariView.swift

@@ -1,4 +1,4 @@
-// SafariView
+// Safari
 // SafariView.swift
 //
 // MIT License
@@ -712,3 +712,9 @@ private extension UIView {
     }
 
 }
+
+struct SafariView_Previews: PreviewProvider {
+    static var previews: some View {
+        SafariView(url: URL(string: "https://www.apple.com")!)
+    }
+}

Tests/SafariViewTests/SafariViewTests.swift → Tests/SafariTests/SafariViewTests.swift

@@ -1,4 +1,4 @@
-// SafariView
+// Safari
 // SafariViewTests.swift
 //
 // MIT License
@@ -23,7 +23,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-@testable import SafariView
+@testable import Safari
 import XCTest
 
 final class SafariViewTests: XCTestCase {