Skip to content

Remove the ReadiumInternal package #855

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mickael-menu merged 4 commits into from
Jul 14, 2026
Merged

Remove the ReadiumInternal package #855

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ab017ce
Remove the `ReadiumInternal` package
mickael-menu Jul 12, 2026
8419f42
Fix TestApp
mickael-menu Jul 12, 2026
d8878d9
Move KeychainTests to LCPTests
mickael-menu Jul 14, 2026
6e01859
Make removed-utility tombstones self-contained and drop stale test-pl…
mickael-menu Jul 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ All notable changes to this project will be documented in this file. Take a look
### Removed

* The deprecated `ReadiumAdapterGCDWebServer` and `ReadiumAdapterLCPSQLite` adapter packages have been removed.
* The `ReadiumInternal` package has been removed. Its utilities were internal helpers and are now folded into `ReadiumShared` with `package` visibility. If you imported `ReadiumInternal` directly, remove the import.


## [Unreleased]
Expand Down
13 changes: 0 additions & 13 deletions Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ let package = Package(
.target(
name: "ReadiumShared",
dependencies: [
"ReadiumInternal",
"SwiftSoup",
"Zip",
.product(name: "ReadiumFuzi", package: "Fuzi"),
Expand Down Expand Up @@ -82,7 +81,6 @@ let package = Package(
.target(
name: "ReadiumNavigator",
dependencies: [
"ReadiumInternal",
"ReadiumShared",
"DifferenceKit",
"SwiftSoup",
Expand Down Expand Up @@ -126,7 +124,6 @@ let package = Package(
name: "ReadiumLCP",
dependencies: [
"CryptoSwift",
"ReadiumInternal",
"ReadiumShared",
.product(name: "ReadiumZIPFoundation", package: "ZIPFoundation"),
],
Expand All @@ -148,16 +145,6 @@ let package = Package(
// path: "Tests/LCPTests"
// ),

.target(
name: "ReadiumInternal",
path: "Sources/Internal"
),
.testTarget(
name: "ReadiumInternalTests",
dependencies: ["ReadiumInternal"],
path: "Tests/InternalTests"
),

// Shared test publications used across multiple test targets.
.target(
name: "TestPublications",
Comment thread
mickael-menu marked this conversation as resolved.
Expand Down
7 changes: 0 additions & 7 deletions Playground/Playground.xctestplan
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,6 @@
}
},
"testTargets" : [
{
"target" : {
"containerPath" : "container:..",
"identifier" : "ReadiumInternalTests",
"name" : "ReadiumInternalTests"
}
},
{
"target" : {
"containerPath" : "container:..",
Expand Down
4 changes: 3 additions & 1 deletion Playground/Sources/App/Data/DocumentRepository.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,9 @@ import OSLog
/// Returns the files at the given index offsets in the current `documents`
/// list.
func get(atOffsets offsets: IndexSet) -> [URL] {
offsets.compactMap { documents.getOrNil($0) }
offsets.compactMap {
documents.indices.contains($0) ? documents[$0] : nil
}
}

/// Copies `file` into the Documents directory, replacing any existing file
Expand Down
29 changes: 0 additions & 29 deletions Sources/Internal/Extensions/Optional.swift
View file
Open in desktop

This file was deleted.

53 changes: 0 additions & 53 deletions Sources/Internal/Extensions/Range.swift
View file
Open in desktop

This file was deleted.

78 changes: 0 additions & 78 deletions Sources/Internal/Extensions/URL.swift
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion Sources/LCP/Authentications/LCPDialog.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
// available in the top-level LICENSE file of the project.
//

import ReadiumInternal
import ReadiumShared
import SwiftUI

Expand Down
1 change: 0 additions & 1 deletion Sources/LCP/Authentications/LCPDialogViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
// available in the top-level LICENSE file of the project.
//

import ReadiumInternal
import ReadiumShared
import SwiftUI
import UIKit
Expand Down
1 change: 0 additions & 1 deletion Sources/LCP/Content Protection/EncryptionParser.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
//

import Foundation
import ReadiumInternal
import ReadiumShared

func parseEncryptionData(in asset: ContainerAsset) async -> ReadResult<[AnyURL: ReadiumShared.Encryption]> {
Expand Down
1 change: 0 additions & 1 deletion Sources/LCP/Content Protection/LCPContentProtection.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
//

import Foundation
import ReadiumInternal
import ReadiumShared

final class LCPContentProtection: ContentProtection, Loggable {
Expand Down
1 change: 0 additions & 1 deletion Sources/LCP/Content Protection/LCPDecryptor.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
//

import Foundation
import ReadiumInternal
import ReadiumShared

private let lcpScheme = "http://readium.org/2014/01/lcp"
Expand Down
1 change: 0 additions & 1 deletion Sources/LCP/License/License.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
//

import Foundation
import ReadiumInternal
import ReadiumShared

final class License: Loggable, Sendable {
Expand Down
1 change: 0 additions & 1 deletion Sources/LCP/License/LicenseValidation.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
//

import Foundation
import ReadiumInternal
import ReadiumShared

/// To modify depending of the profiles supported by liblcp.a.
Expand Down
1 change: 0 additions & 1 deletion Sources/LCP/Services/PassphrasesService.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@

import CryptoSwift
import Foundation
import ReadiumInternal
import ReadiumShared

final class PassphrasesService: Loggable, Sendable {
Expand Down
2 changes: 1 addition & 1 deletion Sources/Navigator/Audiobook/Preferences/AudioPreferencesEditor.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
//

import Foundation
import ReadiumInternal
import ReadiumShared

/// Editor for a set of `AudioPreferences`.
///
Expand Down
1 change: 0 additions & 1 deletion Sources/Navigator/Audiobook/PublicationMediaLoader.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@

import AVFoundation
import Foundation
import ReadiumInternal
import ReadiumShared

/// Serves `Publication`'s `Resource`s as an `AVURLAsset`.
Expand Down
1 change: 0 additions & 1 deletion Sources/Navigator/EPUB/CSS/ReadiumCSS.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
//

import Foundation
import ReadiumInternal
import ReadiumShared

struct ReadiumCSS {
Expand Down
1 change: 0 additions & 1 deletion Sources/Navigator/EPUB/EPUBNavigatorViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
// available in the top-level LICENSE file of the project.
//

import ReadiumInternal
import ReadiumShared
import SafariServices
import SwiftSoup
Expand Down
1 change: 0 additions & 1 deletion Sources/Navigator/EPUB/EPUBNavigatorViewModel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
//

import Foundation
import ReadiumInternal
import ReadiumShared
import UIKit

Expand Down
1 change: 0 additions & 1 deletion Sources/Navigator/EPUB/EPUBReflowableSpreadView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
//

import Foundation
import ReadiumInternal
import ReadiumShared
import UIKit
import WebKit
Expand Down
1 change: 0 additions & 1 deletion Sources/Navigator/EPUB/EPUBSpread.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
//

import Foundation
import ReadiumInternal
import ReadiumShared

/// Common interface for spread types.
Expand Down
1 change: 0 additions & 1 deletion Sources/Navigator/EPUB/EPUBSpreadView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
// available in the top-level LICENSE file of the project.
//

import ReadiumInternal
import ReadiumShared
@preconcurrency import WebKit

Expand Down
1 change: 0 additions & 1 deletion Sources/Navigator/EPUB/EPUBViewportAndLocationCalculator.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
//

import Foundation
import ReadiumInternal
import ReadiumShared

/// Computes the current `Locator` and `Viewport` from a spread's visible
Expand Down
1 change: 0 additions & 1 deletion Sources/Navigator/EPUB/Preferences/EPUBPreferences+Legacy.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
//

import Foundation
import ReadiumInternal
import ReadiumShared

public extension EPUBPreferences {
Expand Down
1 change: 0 additions & 1 deletion Sources/Navigator/EPUB/Preferences/EPUBPreferences.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
//

import Foundation
import ReadiumInternal
import ReadiumShared

/// Preferences for the `EPUBNavigatorViewController`.
Expand Down
1 change: 0 additions & 1 deletion Sources/Navigator/EPUB/Preferences/EPUBPreferencesEditor.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
//

import Foundation
import ReadiumInternal
import ReadiumShared

/// Editor for a set of `EPUBPreferences`.
Expand Down
Loading
Loading