Fixes for Swift 6

.github/workflows/checks.yml

@@ -9,35 +9,32 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
+permissions:
+  contents: read
+
 env:
-  platform: ${{ 'iOS Simulator' }}
-  device: ${{ 'iPhone 16 Pro' }}
+  platform: iOS Simulator
+  device: iPhone 17 Pro
   commit_sha: ${{ github.sha }}
-  DEVELOPER_DIR: /Applications/Xcode_16.4.app/Contents/Developer
+  DEVELOPER_DIR: /Applications/Xcode_26.4.app/Contents/Developer
 
 jobs:
   build:
     name: Build
-    runs-on: macos-15
+    runs-on: macos-26
     if: ${{ !github.event.pull_request.draft }}
+    timeout-minutes: 60
     env:
-      scheme: ${{ 'Readium-Package' }}
+      scheme: Readium-Package
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v6
       - name: Install dependencies
         run: |
-          brew update
           brew install xcodegen
           # Preload the list of simulator for xcodebuild. The workflow is flaky without it.
           xcrun simctl list
-      - name: Check CocoaPods podspecs
-        run: |
-          # Check that the podspecs are up to date.
-          make podspecs
-          git diff --exit-code Support/CocoaPods/
-          if git ls-files --others --exclude-standard Support/CocoaPods/ | grep -q .; then echo "Untracked podspec files found. Run 'make podspecs' and commit the result."; exit 1; fi
       - name: Build
         run: |
           set -eo pipefail
@@ -50,66 +47,49 @@ jobs:
         run: |
           jq -r '.pins[] | "\(.identity): \(.state.version)"' Package.resolved
 
-  # navigator-ui-tests:
-  #   name: Navigator UI Tests
-  #   runs-on: macos-15
-  #   if: ${{ !github.event.pull_request.draft }}
-  #   steps:
-  #     - name: Checkout
-  #       uses: actions/checkout@v3
-  #     - name: Install dependencies
-  #       run: |
-  #         brew update
-  #         brew install xcodegen
-  #         # Preload the list of simulator for xcodebuild. The workflow is flaky without it.
-  #         xcrun simctl list
-  #     - name: Test
-  #       run: |
-  #         set -eo pipefail
-  #         make navigator-ui-tests-project
-  #         xcodebuild test -project Tests/NavigatorTests/UITests/NavigatorUITests.xcodeproj -scheme NavigatorTestHost -destination "platform=$platform,name=$device" | xcbeautify --renderer github-actions
+  # Runs the test suite under the Thread Sanitizer to validate the
+  # `@unchecked Sendable` and `nonisolated(unsafe)` sites at runtime.
+  # Only runs on pushes to main/develop to keep pull requests light.
+  test-tsan:
+    name: Test (Thread Sanitizer)
+    runs-on: macos-26
+    if: github.event_name == 'push'
+    timeout-minutes: 60
+    env:
+      scheme: Readium-Package
 
-  playground:
-    name: Playground
-    runs-on: macos-15
-    if: ${{ !github.event.pull_request.draft }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v6
       - name: Install dependencies
         run: |
-          brew update
-          brew install xcodegen
           # Preload the list of simulator for xcodebuild. The workflow is flaky without it.
           xcrun simctl list
-      - name: Check Playground project is up-to-date
-        run: |
-          make playground
-          git diff --exit-code Playground/.xcodegen
-      - name: Build
+      - name: Test
         run: |
           set -eo pipefail
-          xcodebuild build -scheme Playground -project Playground/Playground.xcodeproj -destination "platform=$platform,name=$device" | xcbeautify --renderer github-actions
+          xcodebuild test -scheme "$scheme" -destination "platform=$platform,name=$device" -enableThreadSanitizer YES | xcbeautify --renderer github-actions
 
   lint:
     name: Lint
-    runs-on: macos-15
+    runs-on: macos-26
     if: ${{ !github.event.pull_request.draft }}
+    timeout-minutes: 60
     env:
-      scripts: ${{ 'Sources/Navigator/EPUB/Scripts' }}
+      scripts: Sources/Navigator/EPUB/Scripts
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v6
       - name: Install pnpm
-        uses: pnpm/action-setup@v2
+        uses: pnpm/action-setup@v6
         with:
           package_json_file: Sources/Navigator/EPUB/Scripts/package.json
           run_install: false
       - name: Setup cache
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v6
         with:
-          node-version: 20
+          node-version: 24
           cache: 'pnpm'
           cache-dependency-path: Sources/Navigator/EPUB/Scripts/pnpm-lock.yaml
       - name: Install dependencies
@@ -122,44 +102,66 @@ jobs:
         run: |
             make scripts
             git diff --exit-code --name-only Sources/Navigator/EPUB/Assets/Static/scripts/*.js
+            if git ls-files --others --exclude-standard Sources/Navigator/EPUB/Assets/Static/scripts/ | grep -q .; then echo "Untracked bundled scripts found. Run 'make scripts' and commit the result."; exit 1; fi
       - name: Lint Swift formatting
         run: make lint-format
+      - name: Check CocoaPods podspecs
+        run: |
+          # Check that the podspecs are up to date.
+          make podspecs
+          git diff --exit-code Support/CocoaPods/
+          if git ls-files --others --exclude-standard Support/CocoaPods/ | grep -q .; then echo "Untracked podspec files found. Run 'make podspecs' and commit the result."; exit 1; fi
 
   int-dev:
     name: Integration (Local)
-    runs-on: macos-15
+    runs-on: macos-26
     if: ${{ !github.event.pull_request.draft }}
-    defaults:
-      run:
-        working-directory: TestApp
-    environment: LCP
+    timeout-minutes: 60
+    environment:
+      name: LCP
+      deployment: false
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v6
       - name: Install dependencies
         run: |
-          brew update
           brew install xcodegen
           # Preload the list of simulator for xcodebuild. The workflow is flaky without it.
           xcrun simctl list
-      - name: Generate project
-        run: make dev lcp=${{ secrets.LCP_URL_SPM }}
-      - name: Build
+      - name: Check Playground project is up-to-date
+        run: |
+          make playground
+          git diff --exit-code Playground/.xcodegen
+          if git ls-files --others --exclude-standard Playground/Playground.xcodeproj/ | grep -q .; then echo "Untracked Playground project files found. Run 'make playground' and commit the result."; exit 1; fi
+      - name: Build Playground
+        run: |
+          set -eo pipefail
+          xcodebuild build -scheme Playground -project Playground/Playground.xcodeproj -destination "platform=$platform,name=$device" | xcbeautify --renderer github-actions
+      - name: Generate TestApp project
+        working-directory: TestApp
+        env:
+          LCP_URL_SPM: ${{ secrets.LCP_URL_SPM }}
+        run: make dev lcp="$LCP_URL_SPM"
+      - name: Build TestApp
+        working-directory: TestApp
         run: |
           set -eo pipefail
           xcodebuild build -scheme TestApp -destination "platform=$platform,name=$device" | xcbeautify --renderer github-actions
 
   int-spm:
     name: Integration (Swift Package Manager)
-    runs-on: macos-15
+    runs-on: macos-26
     if: ${{ !github.event.pull_request.draft }}
+    timeout-minutes: 60
     defaults:
       run:
         working-directory: TestApp
-    environment: LCP
+    environment:
+      name: LCP
+      deployment: false
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v6
       # We can't use the current github.sha with pull_request event, because they will
       # reference the merge commit which cannot be fetched with SPM.
       - name: Set commit SHA
@@ -168,15 +170,14 @@ jobs:
           echo "commit_sha=${{ github.event.pull_request.head.sha }}" >> "$GITHUB_ENV"
       - name: Install dependencies
         run: |
-          brew update
           brew install xcodegen
           # Preload the list of simulator for xcodebuild. The workflow is flaky without it.
           xcrun simctl list
       - name: Generate project
-        run: make spm lcp=${{ secrets.LCP_URL_SPM }} commit=$commit_sha
+        env:
+          LCP_URL_SPM: ${{ secrets.LCP_URL_SPM }}
+        run: make spm lcp="$LCP_URL_SPM" commit="$commit_sha"
       - name: Build
         run: |
           set -eo pipefail
           xcodebuild build -scheme TestApp -destination "platform=$platform,name=$device" | xcbeautify --renderer github-actions
-
-

.github/workflows/docs.yml

@@ -16,7 +16,8 @@ concurrency:
 
 jobs:
   build-and-deploy:
-    runs-on: macos-15
+    runs-on: macos-26
+    timeout-minutes: 60
     steps:
       - name: Checkout
         uses: actions/checkout@v6
@@ -28,16 +29,19 @@ jobs:
         run: |
           git fetch --tags --force
           VERSION=$(git describe --tag --match "[0-9]*" --abbrev=0)
-          echo "READIUM_VERSION=$VERSION" >> $GITHUB_OUTPUT
+          echo "READIUM_VERSION=$VERSION" >> "$GITHUB_OUTPUT"
           if [[ $GITHUB_REF == refs/tags/* ]]; then
              echo "folder=${GITHUB_REF#refs/tags/}" >> $GITHUB_OUTPUT
           else
              echo "folder=latest" >> $GITHUB_OUTPUT
           fi
 
+      # The docs are generated twice because the version is baked into the
+      # output (DocC --hosting-base-path and the 404/redirect pages embed
+      # /swift-toolkit/<version>/ URLs), so the "latest" site cannot be a
+      # plain copy of the versioned one.
       - name: Generate Documentation
         run: |
-          chmod +x scripts/generate-docs.sh
           ./scripts/generate-docs.sh ${{ steps.versioning.outputs.READIUM_VERSION }}
           ./scripts/generate-docs.sh latest
 

CHANGELOG.md

@@ -2,6 +2,34 @@
 
 All notable changes to this project will be documented in this file. Take a look at [the migration guide](docs/Migration%20Guide.md) to upgrade between two major versions.
 
+
+## [Unreleased: swift6]
+
+### Changed
+
+* The toolkit is migrated to Swift 6 with strict concurrency checking. All packages compile in the Swift 6 language mode. See [the migration guide](docs/Migration%20Guide.md).
+    * The toolkit adopts the `NonisolatedNonsendingByDefault` (SE-0461), `InferIsolatedConformances` and `MemberImportVisibility` upcoming Swift features.
+
+#### Shared
+
+* OPDS models (`Feed`, `Group`, `Facet`, `OpdsMetadata`) are now structs with value semantics.
+* `Publication`, `Resource`, `Container` and related types are now `Sendable`. Custom implementations of `Resource`, `Container`, `HTTPClient` or `PublicationService` must be `Sendable` too.
+* `Resource.stream()` now cooperates with task cancellation: the built-in resources fail with `ReadError.cancelled` when the surrounding task is cancelled, and custom implementations are expected to do the same.
+
+#### Navigator
+
+* The `Navigator` and `VisualNavigator` protocols and their delegates are now isolated to the main actor.
+
+#### LCP
+
+* `LCPService.init` now requires an explicit `deviceName` parameter. We recommend passing `UIDevice.current.name`. See [the migration guide](docs/Migration%20Guide.md).
+* `LCPDialogAuthentication` no longer takes a `sender` view controller. It now presents its passphrase dialog through a new `LCPDialogAuthenticationDelegate` that you implement and retain for the lifetime of the authentication. See [the Readium LCP guide](docs/Guides/Readium%20LCP.md) and [the migration guide](docs/Migration%20Guide.md).
+
+### Removed
+
+* The deprecated `ReadiumAdapterGCDWebServer` and `ReadiumAdapterLCPSQLite` adapter packages have been removed.
+
+
 ## [Unreleased]
 
 ### Added

Makefile

@@ -11,6 +11,12 @@ help:
 	  update-locales\tUpdate the localization files\n\
 	"
 
+.PHONY: test
+test:
+	xcodebuild test -project "TestApp/TestApp.xcodeproj" -scheme TestApp -destination "platform=iOS Simulator,name=iPhone Air" 2> /dev/null \
+		| xcbeautify --quieter --disable-logging \
+		| grep -Ev "^Executed |Test Suite 'All tests'|Test run started\.|Test session results:"; true
+
 .SILENT:
 .PHONY: playground
 playground:

Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version:5.10
+// swift-tools-version:6.2
 //
 //  Copyright 2026 Readium Foundation. All rights reserved.
 //  Use of this source code is governed by the BSD-style license
@@ -17,20 +17,14 @@ let package = Package(
         .library(name: "ReadiumNavigator", targets: ["ReadiumNavigator"]),
         .library(name: "ReadiumOPDS", targets: ["ReadiumOPDS"]),
         .library(name: "ReadiumLCP", targets: ["ReadiumLCP"]),
-
-        // Adapters to third-party dependencies.
-        .library(name: "ReadiumAdapterGCDWebServer", targets: ["ReadiumAdapterGCDWebServer"]),
-        .library(name: "ReadiumAdapterLCPSQLite", targets: ["ReadiumAdapterLCPSQLite"]),
     ],
     dependencies: [
         .package(url: "https://github.com/krzyzanowskim/CryptoSwift.git", from: "1.10.0"),
         .package(url: "https://github.com/marmelroy/Zip.git", from: "2.1.2"),
         .package(url: "https://github.com/ra1028/DifferenceKit.git", from: "1.3.0"),
         .package(url: "https://github.com/readium/Fuzi.git", from: "4.0.0"),
-        .package(url: "https://github.com/readium/GCDWebServer.git", from: "4.0.0"),
         .package(url: "https://github.com/readium/ZIPFoundation.git", from: "3.0.1"),
         .package(url: "https://github.com/scinfu/SwiftSoup.git", from: "2.13.5"),
-        .package(url: "https://github.com/stephencelis/SQLite.swift.git", from: "0.16.0"),
         .package(url: "https://github.com/apple/swift-docc-plugin", from: "1.5.0"),
     ],
     targets: [
@@ -154,24 +148,6 @@ let package = Package(
         //     path: "Tests/LCPTests"
         // ),
 
-        .target(
-            name: "ReadiumAdapterGCDWebServer",
-            dependencies: [
-                .product(name: "ReadiumGCDWebServer", package: "GCDWebServer"),
-                "ReadiumShared",
-            ],
-            path: "Sources/Adapters/GCDWebServer"
-        ),
-
-        .target(
-            name: "ReadiumAdapterLCPSQLite",
-            dependencies: [
-                .product(name: "SQLite", package: "SQLite.swift"),
-                "ReadiumLCP",
-            ],
-            path: "Sources/Adapters/LCPSQLite"
-        ),
-
         .target(
             name: "ReadiumInternal",
             path: "Sources/Internal"
@@ -192,3 +168,16 @@ let package = Package(
         ),
     ]
 )
+
+for target in package.targets {
+    // Adopt the future language defaults now, to avoid a second
+    // behavioral break for integrators when they become the default.
+    // In particular, `NonisolatedNonsendingByDefault` (SE-0461) runs
+    // `nonisolated async` functions on the caller's actor; CPU-heavy
+    // implementations are marked `@concurrent` to stay off-actor.
+    target.swiftSettings = (target.swiftSettings ?? []) + [
+        .enableUpcomingFeature("NonisolatedNonsendingByDefault"),
+        .enableUpcomingFeature("InferIsolatedConformances"),
+        .enableUpcomingFeature("MemberImportVisibility"),
+    ]
+}

Playground/.xcodegen

@@ -53,7 +53,8 @@
       "platform" : "iOS",
       "settings" : {
         "SWIFT_APPROACHABLE_CONCURRENCY" : true,
-        "SWIFT_DEFAULT_ACTOR_ISOLATION" : "MainActor"
+        "SWIFT_DEFAULT_ACTOR_ISOLATION" : "MainActor",
+        "SWIFT_VERSION" : 6
       },
       "sources" : [
         {