Fix ReadiumGCDWebServer integration for CocoaPods and Carthage

Cartfile

@@ -2,7 +2,7 @@ github "cezheng/Fuzi" ~> 3.1.3
 github "dexman/Minizip" ~> 1.4.0
 github "krzyzanowskim/CryptoSwift" == 1.5.1 # From 1.6.0, the build fails in GitHub actions
 github "ra1028/DifferenceKit" ~> 1.3.0
-github "readium/GCDWebServer" ~> 3.7.4
+github "readium/GCDWebServer" ~> 4.0.0
 github "scinfu/SwiftSoup" == 2.5.3 # 2.6.0 requires Xcode 14
 github "stephencelis/SQLite.swift" == 0.13.3 # 0.14 introduces a breaking change
 github "weichsel/ZIPFoundation" == 0.9.11 # 0.9.12 requires iOS 12+

Documentation/Migration Guide.md

@@ -2,6 +2,17 @@
 
 All migration steps necessary in reading apps to upgrade to major versions of the Swift Readium toolkit will be documented in this file.
 
+## 2.6.0
+
+To avoid [name collision with GCDWebServer](https://github.com/readium/swift-toolkit/issues/402), we renamed [our fork](https://github.com/readium/gcdwebserver) to `ReadiumGCDWebServer`. You will need to update your project to replace the old dependency:
+
+* Swift Package Manager: There's nothing to do.
+* Carthage:
+    * Update the Carthage dependencies and make sure the new `ReadiumGCDWebServer.xcframework` was built.
+    * Replace `GCDWebServer.xcframework` with `ReadiumGCDWebServer.xcframework` in your project.
+* CocoaPods:
+    * Rename the `pod 'GCDWebServer'` statement in your `Podfile` with `pod 'ReadiumGCDWebServer'`, then run `pod install`.
+
 ## 2.5.0
 
 In the following migration steps, only the `ReadiumInternal` one is mandatory with 2.5.0.

README.md

@@ -60,8 +60,8 @@ Refer to the following table to know which dependencies are required for each Re
 | `CryptoSwift`         |                    | :heavy_check_mark: |                    |                    | :heavy_check_mark: |
 | `DifferenceKit`       |                    |                    | :heavy_check_mark: |                    |                    |
 | `Fuzi`                | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |
-| `GCDWebServer`        |                    | :heavy_check_mark: |                    |                    |                    |
 | `Minizip`             | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |
+| `ReadiumGCDWebServer` |                    | :heavy_check_mark: |                    |                    |                    |
 | `SQLite.swift`        |                    |                    |                    |                    | :heavy_check_mark: |
 | `SwiftSoup`           | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |
 | `ZIPFoundation`       |                    |                    |                    |                    | :heavy_check_mark: |
@@ -79,7 +79,7 @@ pod 'ReadiumLCP', podspec: 'https://raw.githubusercontent.com/readium/swift-tool
 pod 'ReadiumInternal', podspec: 'https://raw.githubusercontent.com/readium/swift-toolkit/2.6.1/Support/CocoaPods/ReadiumInternal.podspec'
 
 # Required if you use R2Streamer.
-pod 'GCDWebServer', podspec: 'https://raw.githubusercontent.com/readium/GCDWebServer/3.7.4/GCDWebServer.podspec'
+pod 'ReadiumGCDWebServer', podspec: 'https://raw.githubusercontent.com/readium/GCDWebServer/3.7.4/GCDWebServer.podspec'
 ```
 
 Take a look at [CocoaPods's documentation](https://guides.cocoapods.org/using/using-cocoapods.html) for more information.

Support/Carthage/.xcodegen

@@ -147,10 +147,10 @@
           "framework" : "..\/..\/Carthage\/Build\/Fuzi.xcframework"
         },
         {
-          "framework" : "..\/..\/Carthage\/Build\/GCDWebServer.xcframework"
+          "framework" : "..\/..\/Carthage\/Build\/Minizip.xcframework"
         },
         {
-          "framework" : "..\/..\/Carthage\/Build\/Minizip.xcframework"
+          "framework" : "..\/..\/Carthage\/Build\/ReadiumGCDWebServer.xcframework"
         },
         {
           "target" : "R2Shared"
@@ -182,7 +182,7 @@
     "ReadiumAdapterGCDWebServer" : {
       "dependencies" : [
         {
-          "framework" : "..\/..\/Carthage\/Build\/GCDWebServer.xcframework"
+          "framework" : "..\/..\/Carthage\/Build\/ReadiumGCDWebServer.xcframework"
         },
         {
           "target" : "R2Shared"
@@ -7517,7 +7517,6 @@
 ../../Sources/Navigator/EPUB/Scripts/node_modules/hasown/.nycrc
 ../../Sources/Navigator/EPUB/Scripts/node_modules/hasown/CHANGELOG.md
 ../../Sources/Navigator/EPUB/Scripts/node_modules/hasown/index.d.ts
-../../Sources/Navigator/EPUB/Scripts/node_modules/hasown/index.d.ts.map
 ../../Sources/Navigator/EPUB/Scripts/node_modules/hasown/index.js
 ../../Sources/Navigator/EPUB/Scripts/node_modules/hasown/LICENSE
 ../../Sources/Navigator/EPUB/Scripts/node_modules/hasown/package.json
@@ -8947,6 +8946,22 @@
 ../../Sources/Navigator/EPUB/Scripts/node_modules/regexp.prototype.flags/implementation.js
 ../../Sources/Navigator/EPUB/Scripts/node_modules/regexp.prototype.flags/index.js
 ../../Sources/Navigator/EPUB/Scripts/node_modules/regexp.prototype.flags/LICENSE
+../../Sources/Navigator/EPUB/Scripts/node_modules/regexp.prototype.flags/node_modules
+../../Sources/Navigator/EPUB/Scripts/node_modules/regexp.prototype.flags/node_modules/call-bind
+../../Sources/Navigator/EPUB/Scripts/node_modules/regexp.prototype.flags/node_modules/call-bind/.eslintignore
+../../Sources/Navigator/EPUB/Scripts/node_modules/regexp.prototype.flags/node_modules/call-bind/.eslintrc
+../../Sources/Navigator/EPUB/Scripts/node_modules/regexp.prototype.flags/node_modules/call-bind/.github
+../../Sources/Navigator/EPUB/Scripts/node_modules/regexp.prototype.flags/node_modules/call-bind/.github/FUNDING.yml
+../../Sources/Navigator/EPUB/Scripts/node_modules/regexp.prototype.flags/node_modules/call-bind/.nycrc
+../../Sources/Navigator/EPUB/Scripts/node_modules/regexp.prototype.flags/node_modules/call-bind/callBound.js
+../../Sources/Navigator/EPUB/Scripts/node_modules/regexp.prototype.flags/node_modules/call-bind/CHANGELOG.md
+../../Sources/Navigator/EPUB/Scripts/node_modules/regexp.prototype.flags/node_modules/call-bind/index.js
+../../Sources/Navigator/EPUB/Scripts/node_modules/regexp.prototype.flags/node_modules/call-bind/LICENSE
+../../Sources/Navigator/EPUB/Scripts/node_modules/regexp.prototype.flags/node_modules/call-bind/package.json
+../../Sources/Navigator/EPUB/Scripts/node_modules/regexp.prototype.flags/node_modules/call-bind/README.md
+../../Sources/Navigator/EPUB/Scripts/node_modules/regexp.prototype.flags/node_modules/call-bind/test
+../../Sources/Navigator/EPUB/Scripts/node_modules/regexp.prototype.flags/node_modules/call-bind/test/callBound.js
+../../Sources/Navigator/EPUB/Scripts/node_modules/regexp.prototype.flags/node_modules/call-bind/test/index.js
 ../../Sources/Navigator/EPUB/Scripts/node_modules/regexp.prototype.flags/package.json
 ../../Sources/Navigator/EPUB/Scripts/node_modules/regexp.prototype.flags/polyfill.js
 ../../Sources/Navigator/EPUB/Scripts/node_modules/regexp.prototype.flags/README.md
@@ -11506,6 +11521,7 @@
 ../../Sources/Navigator/EPUB/Scripts/node_modules/yallist/README.md
 ../../Sources/Navigator/EPUB/Scripts/node_modules/yallist/yallist.js
 ../../Sources/Navigator/EPUB/Scripts/package.json
+../../Sources/Navigator/EPUB/Scripts/pnpm-lock.yaml
 ../../Sources/Navigator/EPUB/Scripts/README.md
 ../../Sources/Navigator/EPUB/Scripts/src
 ../../Sources/Navigator/EPUB/Scripts/src/decorator.js
@@ -11549,7 +11565,6 @@
 ../../Sources/Navigator/EPUB/Scripts/src/vendor/hypothesis/anchoring/xpath.js
 ../../Sources/Navigator/EPUB/Scripts/src/vendor/hypothesis/README.md
 ../../Sources/Navigator/EPUB/Scripts/webpack.config.js
-../../Sources/Navigator/EPUB/Scripts/yarn.lock
 ../../Sources/Navigator/EPUB/UserSettings.swift
 ../../Sources/Navigator/KeyEvent.swift
 ../../Sources/Navigator/Navigator.swift

Support/Carthage/Readium.xcodeproj/project.pbxproj

@@ -104,10 +104,12 @@
 		4C6E7DF3D71660E723E148CF /* LCPContentProtection.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AF56CF04F94B7BE45631897 /* LCPContentProtection.swift */; };
 		4C9EACE2732D23C37E627313 /* ContentProtectionService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8240F845F35439807CE8AF65 /* ContentProtectionService.swift */; };
 		4D4D25BA4772674DD6041C01 /* Deprecated.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0E1D7FA19C628EA8F967F580 /* Deprecated.swift */; };
+		4D5315A9EE860F43CBD2B5BC /* ReadiumGCDWebServer.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6536C07F5A50F7F25FDBF69C /* ReadiumGCDWebServer.xcframework */; };
 		4DAD724BAB72A5C6D2473770 /* Collection.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F89BC365BDD19BE84F4D3B5 /* Collection.swift */; };
 		4E2AF522FFBD929F52153DAE /* R2Shared.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 41A0528117E270B68AC75C56 /* R2Shared.framework */; };
 		4E46120D30E7B1B22A558643 /* MappedPreference.swift in Sources */ = {isa = PBXBuildFile; fileRef = 68D2804AD0439307575B3073 /* MappedPreference.swift */; };
 		4F8168F527F489AB8619A7F1 /* R2Shared.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 41A0528117E270B68AC75C56 /* R2Shared.framework */; };
+		4FB885E0DF9CF4A554130059 /* ReadiumGCDWebServer.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6536C07F5A50F7F25FDBF69C /* ReadiumGCDWebServer.xcframework */; };
 		4FE29A44B4B0966489DBCA01 /* EPUBPreferences+Legacy.swift in Sources */ = {isa = PBXBuildFile; fileRef = CF31AEFB5FF0E7892C6D903E /* EPUBPreferences+Legacy.swift */; };
 		501E7E05DEA11F7A61D60EAF /* Range.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3231F989F7D7E560DD5364B9 /* Range.swift */; };
 		502D4ABD63FE9D99AD066F31 /* DOMRange.swift in Sources */ = {isa = PBXBuildFile; fileRef = C084C255A327387F36B97A62 /* DOMRange.swift */; };
@@ -235,7 +237,6 @@
 		A6658BA380A889B8310A558F /* Facet.swift in Sources */ = {isa = PBXBuildFile; fileRef = 387B19B66C4D91A295B5EFA6 /* Facet.swift */; };
 		A8E6E488592BDBB97C4B7B87 /* XML.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CDB1B325928A873012E6149 /* XML.swift */; };
 		A90A46957B8B68EE82C4DBAD /* OPDSAvailability.swift in Sources */ = {isa = PBXBuildFile; fileRef = F2E780027410F4B6CC872B3D /* OPDSAvailability.swift */; };
-		A959A4AE4DBB03FF400D1C4B /* GCDWebServer.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = D92391897F01AC5AFD509B1D /* GCDWebServer.xcframework */; };
 		A9F15C16764A75759500505F /* ProgressionStrategy.swift in Sources */ = {isa = PBXBuildFile; fileRef = EED4C26FFA10656866E167F4 /* ProgressionStrategy.swift */; };
 		AA0CDCC2CA63228C1F35E816 /* AudioNavigator.swift in Sources */ = {isa = PBXBuildFile; fileRef = DCE34D74E282834684E1C999 /* AudioNavigator.swift */; };
 		AA6EB82E79460DB9362C16D0 /* DRM+Deprecated.swift in Sources */ = {isa = PBXBuildFile; fileRef = 56DCEA1627F7AE84298732CC /* DRM+Deprecated.swift */; };
@@ -268,7 +269,6 @@
 		C283E515CA6A8EEA1C89AD98 /* License.swift in Sources */ = {isa = PBXBuildFile; fileRef = C2C93C33347DC0A41FE15AC6 /* License.swift */; };
 		C2A1FAC4ADA33EABA1E45EF8 /* ParseData.swift in Sources */ = {isa = PBXBuildFile; fileRef = B1085F2D690A73984E675D54 /* ParseData.swift */; };
 		C2D32286200D850101D8C4FD /* SwiftSoup.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = BE09289EB0FEA5FEC8506B1F /* SwiftSoup.xcframework */; };
-		C2D8AD7329853B2CACB97B99 /* GCDWebServer.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = D92391897F01AC5AFD509B1D /* GCDWebServer.xcframework */; };
 		C3236F8A6BE55AD3B8794F10 /* CSSProperties.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0E6147EF790DE532CE1699D /* CSSProperties.swift */; };
 		C35001848411CBCAC8F03763 /* PublicationContentIterator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BF38F71FDEC1920325B62D3 /* PublicationContentIterator.swift */; };
 		C3BC5A4C44DD8CE26155C0D5 /* PDFFileParser.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8103346E73760F07800EB75E /* PDFFileParser.swift */; };
@@ -565,6 +565,7 @@
 		626CFFF131E0E840B76428F1 /* DecorableNavigator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DecorableNavigator.swift; sourceTree = "<group>"; };
 		634444C3FD707BD99E337CDC /* Result.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Result.swift; sourceTree = "<group>"; };
 		64ED7629E73022C1495081D1 /* Links.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Links.swift; sourceTree = "<group>"; };
+		6536C07F5A50F7F25FDBF69C /* ReadiumGCDWebServer.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = ReadiumGCDWebServer.xcframework; path = ../../Carthage/Build/ReadiumGCDWebServer.xcframework; sourceTree = "<group>"; };
 		6599A2A3F66206997E700303 /* MediaType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MediaType.swift; sourceTree = "<group>"; };
 		65C8719E9CC8EF0D2430AD85 /* CompletionList.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CompletionList.swift; sourceTree = "<group>"; };
 		667B76C4766DFF58D066D40B /* PublicationService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PublicationService.swift; sourceTree = "<group>"; };
@@ -698,7 +699,6 @@
 		D6C93236E313B55D8B835D9F /* EPUBPositionsService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EPUBPositionsService.swift; sourceTree = "<group>"; };
 		D81A35A8B299AD4B74915291 /* Fetcher.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Fetcher.swift; sourceTree = "<group>"; };
 		D88E58FF0AC7D506273FD8D9 /* TTSEngine.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TTSEngine.swift; sourceTree = "<group>"; };
-		D92391897F01AC5AFD509B1D /* GCDWebServer.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = GCDWebServer.xcframework; path = ../../Carthage/Build/GCDWebServer.xcframework; sourceTree = "<group>"; };
 		D93B0556DAAAF429893B0692 /* CRLService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CRLService.swift; sourceTree = "<group>"; };
 		D94EB44EC5A15FF631AE8B2E /* Rights.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Rights.swift; sourceTree = "<group>"; };
 		D9FFEB1FF4B5CD74EB35CD63 /* AudioParser.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AudioParser.swift; sourceTree = "<group>"; };
@@ -800,8 +800,8 @@
 			files = (
 				98428BC24846D534B940CE86 /* CryptoSwift.xcframework in Frameworks */,
 				F9FCCEEA9B1D9F7F878AB46F /* Fuzi.xcframework in Frameworks */,
-				A959A4AE4DBB03FF400D1C4B /* GCDWebServer.xcframework in Frameworks */,
 				B044F00F7EE207B9F9A7EA88 /* Minizip.xcframework in Frameworks */,
+				4FB885E0DF9CF4A554130059 /* ReadiumGCDWebServer.xcframework in Frameworks */,
 				4F8168F527F489AB8619A7F1 /* R2Shared.framework in Frameworks */,
 				E2491E508AFA13B83CA7C12B /* ReadiumInternal.framework in Frameworks */,
 			);
@@ -824,7 +824,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				C2D8AD7329853B2CACB97B99 /* GCDWebServer.xcframework in Frameworks */,
+				4D5315A9EE860F43CBD2B5BC /* ReadiumGCDWebServer.xcframework in Frameworks */,
 				D362CE558C13C60E46E3B2EE /* R2Shared.framework in Frameworks */,
 				EF6572C04388E4A9ABCE253B /* ReadiumInternal.framework in Frameworks */,
 			);
@@ -1555,8 +1555,8 @@
 				E37F94C388A86CB8A34812A5 /* CryptoSwift.xcframework */,
 				3F95F3F20D758BE0E7005EA3 /* DifferenceKit.xcframework */,
 				B421601FB56132514CCD9699 /* Fuzi.xcframework */,
-				D92391897F01AC5AFD509B1D /* GCDWebServer.xcframework */,
 				CFFEBDFE931745C07DACD4A3 /* Minizip.xcframework */,
+				6536C07F5A50F7F25FDBF69C /* ReadiumGCDWebServer.xcframework */,
 				F07214E263C6589987A561F9 /* SQLite.xcframework */,
 				BE09289EB0FEA5FEC8506B1F /* SwiftSoup.xcframework */,
 				8D187A577EBFCFF738D1CDC7 /* ZIPFoundation.xcframework */,

Support/Carthage/project-as-submodule.yml

@@ -39,8 +39,8 @@ targets:
     dependencies:
       - framework: CryptoSwift.framework
       - framework: Fuzi.framework
-      - framework: GCDWebServer.framework
       - framework: Minizip.framework
+      - framework: ReadiumGCDWebServer.framework
       - target: R2Shared
       - target: ReadiumInternal
     settings:
@@ -109,7 +109,7 @@ targets:
     sources: 
       - path: ../../Sources/Adapters/GCDWebServer
     dependencies:
-      - framework: GCDWebServer.framework
+      - framework: ReadiumGCDWebServer.framework
       - target: R2Shared
       - target: ReadiumInternal
     settings:

Support/Carthage/project.yml

@@ -37,8 +37,8 @@ targets:
     dependencies:
       - framework: ../../Carthage/Build/CryptoSwift.xcframework
       - framework: ../../Carthage/Build/Fuzi.xcframework
-      - framework: ../../Carthage/Build/GCDWebServer.xcframework
       - framework: ../../Carthage/Build/Minizip.xcframework
+      - framework: ../../Carthage/Build/ReadiumGCDWebServer.xcframework
       - target: R2Shared
       - target: ReadiumInternal
     settings:
@@ -107,7 +107,7 @@ targets:
     sources: 
       - path: ../../Sources/Adapters/GCDWebServer
     dependencies:
-      - framework: ../../Carthage/Build/GCDWebServer.xcframework
+      - framework: ../../Carthage/Build/ReadiumGCDWebServer.xcframework
       - target: R2Shared
       - target: ReadiumInternal
     settings:

Support/CocoaPods/ReadiumAdapterGCDWebServer.podspec

@@ -15,6 +15,6 @@ Pod::Spec.new do |s|
 
   s.dependency 'R2Shared'
   s.dependency 'ReadiumInternal'
-  s.dependency 'GCDWebServer', '~> 3.0'
+  s.dependency 'ReadiumGCDWebServer', '~> 4.0.0'
 
 end

Support/CocoaPods/ReadiumStreamer.podspec

@@ -24,7 +24,7 @@ Pod::Spec.new do |s|
   s.dependency 'ReadiumInternal'
   s.dependency 'CryptoSwift', '<= 1.5.1' # From 1.6.0, the build fails in GitHub actions
   s.dependency 'Fuzi', '~> 3.0'
-  s.dependency 'GCDWebServer', '~> 3.0'
+  s.dependency 'ReadiumGCDWebServer', '~> 4.0.0'
   s.dependency 'Minizip', '~> 1.0'
 
 end

TestApp/Integrations/Carthage/project+lcp.yml

@@ -26,13 +26,13 @@ targets:
       - framework: Carthage/Build/CryptoSwift.xcframework
       - framework: Carthage/Build/DifferenceKit.xcframework
       - framework: Carthage/Build/Fuzi.xcframework
-      - framework: Carthage/Build/GCDWebServer.xcframework
       - framework: Carthage/Build/Minizip.xcframework
       - framework: Carthage/Build/R2LCPClient.xcframework
       - framework: Carthage/Build/R2Navigator.xcframework
       - framework: Carthage/Build/R2Shared.xcframework
       - framework: Carthage/Build/R2Streamer.xcframework
       - framework: Carthage/Build/ReadiumAdapterGCDWebServer.xcframework
+      - framework: Carthage/Build/ReadiumGCDWebServer.xcframework
       - framework: Carthage/Build/ReadiumInternal.xcframework
       - framework: Carthage/Build/ReadiumLCP.xcframework
       - framework: Carthage/Build/ReadiumOPDS.xcframework

TestApp/Integrations/Carthage/project.yml

@@ -26,12 +26,12 @@ targets:
       - framework: Carthage/Build/CryptoSwift.xcframework
       - framework: Carthage/Build/DifferenceKit.xcframework
       - framework: Carthage/Build/Fuzi.xcframework
-      - framework: Carthage/Build/GCDWebServer.xcframework
       - framework: Carthage/Build/Minizip.xcframework
       - framework: Carthage/Build/R2Navigator.xcframework
       - framework: Carthage/Build/R2Shared.xcframework
       - framework: Carthage/Build/R2Streamer.xcframework
       - framework: Carthage/Build/ReadiumAdapterGCDWebServer.xcframework
+      - framework: Carthage/Build/ReadiumGCDWebServer.xcframework
       - framework: Carthage/Build/ReadiumInternal.xcframework
       - framework: Carthage/Build/ReadiumOPDS.xcframework
       - framework: Carthage/Build/SwiftSoup.xcframework

TestApp/Integrations/CocoaPods/Podfile

@@ -12,7 +12,7 @@ target 'TestApp' do
   pod 'ReadiumInternal', podspec: 'https://raw.githubusercontent.com/readium/swift-toolkit/VERSION/Support/CocoaPods/ReadiumInternal.podspec'
 
   # Required for R2Streamer and ReadiumAdapterGCDWebServer.
-  pod 'GCDWebServer', podspec: 'https://raw.githubusercontent.com/readium/GCDWebServer/master/GCDWebServer.podspec'
+  pod 'ReadiumGCDWebServer', podspec: 'https://raw.githubusercontent.com/readium/GCDWebServer/master/GCDWebServer.podspec'
 
   pod 'GRDB.swift', '~> 5.0'
   pod 'Kingfisher', '~> 5.0'