Merge latest master (117d402) into PR - use master's CI configuration

Co-authored-by: mxcl <58962+mxcl@users.noreply.github.com>

Author: Copilot

.github/workflows/ci.yml

@@ -1,14 +1,18 @@
 name: CI
 on:
   pull_request:
+<<<<<<< HEAD
   schedule:
     - cron: '3 3 * * 5'  # 3:03 AM, every Friday
+=======
+>>>>>>> origin/master
 
 concurrency:
   group: ${{ github.head_ref || 'push' }}
   cancel-in-progress: true
 
 jobs:
+<<<<<<< HEAD
   verify-linuxmain:
     runs-on: macos-13
     steps:
@@ -18,6 +22,12 @@ jobs:
 
   apple:
     runs-on: macos-13
+=======
+  # we want to test more macOS versions but GitHub make that difficult without
+  # constant maintenance because runners are deprecated and removed
+  apple:
+    runs-on: macos-latest
+>>>>>>> origin/master
     strategy:
       matrix:
         platform:
@@ -26,16 +36,21 @@ jobs:
           - macOS
           - watchOS
     steps:
+<<<<<<< HEAD
     - uses: actions/checkout@v4
     - uses: mxcl/xcodebuild@v1
+=======
+    - uses: actions/checkout@v6
+    - uses: mxcl/xcodebuild@latest
+>>>>>>> origin/master
       with:
         platform: ${{ matrix.platform }}
         code-coverage: true
-        warnings-as-errors: true
-    - uses: codecov/codecov-action@v1
+    - uses: codecov/codecov-action@v5
 
   linux:
     runs-on: ubuntu-latest
+    continue-on-error: true
     strategy:
       matrix:
         swift:
@@ -46,10 +61,26 @@ jobs:
         - swift:5.8
         - swift:5.9
         - swift:5.10
+<<<<<<< HEAD
     container:
       image: ${{ matrix.swift }}
     steps:
     - uses: actions/checkout@v4
+=======
+        # - swift:6.0 strangely fails
+        - swift:6.1
+        - swift:6.2
+    container:
+      image: ${{ matrix.swift }}
+    steps:
+    - uses: actions/checkout@v1
+
+    - name: Get Swift version
+      id: swift
+      run: |
+        ver=$(swift --version | head -1 | sed 's/.*Swift version \([0-9]*\).*/\1/')
+        echo "marketing-version=$ver" >> $GITHUB_OUTPUT
+>>>>>>> origin/master
 
     - run: useradd -ms /bin/bash mxcl
     - run: chown -R mxcl .
@@ -64,12 +95,12 @@ jobs:
         echo "Swift version: $version (marketing: $marketing_version)"
 
     - run: echo ARGS=--enable-code-coverage >> $GITHUB_ENV
-      if: ${{ steps.swift.outputs.marketing-version > 5 }}
+      if: ${{ steps.swift.outputs.marketing-version > 6.1 }}
 
     - run: su mxcl -c "swift test --parallel $ARGS"
 
     - name: Generate `.lcov`
-      if: ${{ steps.swift.outputs.marketing-version > 5 }}
+      if: ${{ steps.swift.outputs.marketing-version > 6.1 }}
       run: |
         apt-get -qq update && apt-get -qq install curl
         b=$(swift build --show-bin-path)
@@ -81,7 +112,7 @@ jobs:
           > info.lcov
 
     - uses: codecov/codecov-action@v1
-      if: ${{ steps.swift.outputs.marketing-version > 5 }}
+      if: ${{ steps.swift.outputs.marketing-version > 6.1 }}
       with:
         file: ./info.lcov
 

Sources/Extensions.swift

@@ -44,11 +44,22 @@ public extension Bundle {
 /// Extensions on `String` that work with `Path` rather than `String` or `URL`
 public extension String {
     /// Initializes this `String` with the contents of the provided path.
+    /// - SeeAlso: `init(contentsOf:encoding:)`
+    @available(macOS, deprecated: 15, message: "Use `init(contentsOf:encoding:)` instead")
+    @available(iOS, deprecated: 18, message: "Use `init(contentsOf:encoding:)` instead")
+    @available(tvOS, deprecated: 18, message: "Use `init(contentsOf:encoding:)` instead")
+    @available(watchOS, deprecated: 11, message: "Use `init(contentsOf:encoding:)` instead")
     @inlinable
     init<P: Pathish>(contentsOf path: P) throws {
         try self.init(contentsOfFile: path.string)
     }
 
+    /// Initializes this `String` with the contents of the provided path interpreted using a given encoding.
+    @inlinable
+    init<P: Pathish>(contentsOf path: P, encoding: String.Encoding) throws {
+        try self.init(contentsOfFile: path.string, encoding: encoding)
+    }
+
     /// - Returns: `to` to allow chaining
     @inlinable
     @discardableResult

Tests/PathTests/PathTests.swift

@@ -496,6 +496,13 @@ class PathTests: XCTestCase {
         }
     }
 
+    func testStringEncodingExtensions() throws {
+        let string = try String(contentsOf: Path(#file)!, encoding: .utf8)
+        try Path.mktemp { tmpdir in
+            _ = try string.write(to: tmpdir.foo, encoding: .utf8)
+        }
+    }
+
     func testFileHandleExtensions() throws {
         _ = try FileHandle(forReadingAt: Path(#file)!)
         _ = try FileHandle(forWritingAt: Path(#file)!)