Skip to content

Commit c7e28f2

Browse files
mickael-menumickael-menu
authored
Fix ReadiumGCDWebServer integration for CocoaPods and Carthage (#406)
1 parent cddfa94 commit c7e28f2

File tree

13 files changed

+50
-24
lines changed

13 files changed

+50
-24
lines changed

‎Cartfile

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

‎Documentation/Migration Guide.md

+11
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,17 @@
22

33
All migration steps necessary in reading apps to upgrade to major versions of the Swift Readium toolkit will be documented in this file.
44

5+
## 2.6.0
6+
7+
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:
8+
9+
* Swift Package Manager: There's nothing to do.
10+
* Carthage:
11+
* Update the Carthage dependencies and make sure the new `ReadiumGCDWebServer.xcframework` was built.
12+
* Replace `GCDWebServer.xcframework` with `ReadiumGCDWebServer.xcframework` in your project.
13+
* CocoaPods:
14+
* Rename the `pod 'GCDWebServer'` statement in your `Podfile` with `pod 'ReadiumGCDWebServer'`, then run `pod install`.
15+
516
## 2.5.0
617

718
In the following migration steps, only the `ReadiumInternal` one is mandatory with 2.5.0.

‎README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@ Refer to the following table to know which dependencies are required for each Re
6060
| `CryptoSwift` | | :heavy_check_mark: | | | :heavy_check_mark: |
6161
| `DifferenceKit` | | | :heavy_check_mark: | | |
6262
| `Fuzi` | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |
63-
| `GCDWebServer` | | :heavy_check_mark: | | | |
6463
| `Minizip` | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |
64+
| `ReadiumGCDWebServer` | | :heavy_check_mark: | | | |
6565
| `SQLite.swift` | | | | | :heavy_check_mark: |
6666
| `SwiftSoup` | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |
6767
| `ZIPFoundation` | | | | | :heavy_check_mark: |
@@ -79,7 +79,7 @@ pod 'ReadiumLCP', podspec: 'https://raw.githubusercontent.com/readium/swift-tool
7979
pod 'ReadiumInternal', podspec: 'https://raw.githubusercontent.com/readium/swift-toolkit/2.6.1/Support/CocoaPods/ReadiumInternal.podspec'
8080
8181
# Required if you use R2Streamer.
82-
pod 'GCDWebServer', podspec: 'https://raw.githubusercontent.com/readium/GCDWebServer/3.7.4/GCDWebServer.podspec'
82+
pod 'ReadiumGCDWebServer', podspec: 'https://raw.githubusercontent.com/readium/GCDWebServer/3.7.4/GCDWebServer.podspec'
8383
```
8484

8585
Take a look at [CocoaPods's documentation](https://guides.cocoapods.org/using/using-cocoapods.html) for more information.

‎Support/Carthage/.xcodegen

+20-5
Original file line numberDiff line numberDiff line change
@@ -147,10 +147,10 @@
147147
"framework" : "..\/..\/Carthage\/Build\/Fuzi.xcframework"
148148
},
149149
{
150-
"framework" : "..\/..\/Carthage\/Build\/GCDWebServer.xcframework"
150+
"framework" : "..\/..\/Carthage\/Build\/Minizip.xcframework"
151151
},
152152
{
153-
"framework" : "..\/..\/Carthage\/Build\/Minizip.xcframework"
153+
"framework" : "..\/..\/Carthage\/Build\/ReadiumGCDWebServer.xcframework"
154154
},
155155
{
156156
"target" : "R2Shared"
@@ -182,7 +182,7 @@
182182
"ReadiumAdapterGCDWebServer" : {
183183
"dependencies" : [
184184
{
185-
"framework" : "..\/..\/Carthage\/Build\/GCDWebServer.xcframework"
185+
"framework" : "..\/..\/Carthage\/Build\/ReadiumGCDWebServer.xcframework"
186186
},
187187
{
188188
"target" : "R2Shared"
@@ -7517,7 +7517,6 @@
75177517
../../Sources/Navigator/EPUB/Scripts/node_modules/hasown/.nycrc
75187518
../../Sources/Navigator/EPUB/Scripts/node_modules/hasown/CHANGELOG.md
75197519
../../Sources/Navigator/EPUB/Scripts/node_modules/hasown/index.d.ts
7520-
../../Sources/Navigator/EPUB/Scripts/node_modules/hasown/index.d.ts.map
75217520
../../Sources/Navigator/EPUB/Scripts/node_modules/hasown/index.js
75227521
../../Sources/Navigator/EPUB/Scripts/node_modules/hasown/LICENSE
75237522
../../Sources/Navigator/EPUB/Scripts/node_modules/hasown/package.json
@@ -8947,6 +8946,22 @@
89478946
../../Sources/Navigator/EPUB/Scripts/node_modules/regexp.prototype.flags/implementation.js
89488947
../../Sources/Navigator/EPUB/Scripts/node_modules/regexp.prototype.flags/index.js
89498948
../../Sources/Navigator/EPUB/Scripts/node_modules/regexp.prototype.flags/LICENSE
8949+
../../Sources/Navigator/EPUB/Scripts/node_modules/regexp.prototype.flags/node_modules
8950+
../../Sources/Navigator/EPUB/Scripts/node_modules/regexp.prototype.flags/node_modules/call-bind
8951+
../../Sources/Navigator/EPUB/Scripts/node_modules/regexp.prototype.flags/node_modules/call-bind/.eslintignore
8952+
../../Sources/Navigator/EPUB/Scripts/node_modules/regexp.prototype.flags/node_modules/call-bind/.eslintrc
8953+
../../Sources/Navigator/EPUB/Scripts/node_modules/regexp.prototype.flags/node_modules/call-bind/.github
8954+
../../Sources/Navigator/EPUB/Scripts/node_modules/regexp.prototype.flags/node_modules/call-bind/.github/FUNDING.yml
8955+
../../Sources/Navigator/EPUB/Scripts/node_modules/regexp.prototype.flags/node_modules/call-bind/.nycrc
8956+
../../Sources/Navigator/EPUB/Scripts/node_modules/regexp.prototype.flags/node_modules/call-bind/callBound.js
8957+
../../Sources/Navigator/EPUB/Scripts/node_modules/regexp.prototype.flags/node_modules/call-bind/CHANGELOG.md
8958+
../../Sources/Navigator/EPUB/Scripts/node_modules/regexp.prototype.flags/node_modules/call-bind/index.js
8959+
../../Sources/Navigator/EPUB/Scripts/node_modules/regexp.prototype.flags/node_modules/call-bind/LICENSE
8960+
../../Sources/Navigator/EPUB/Scripts/node_modules/regexp.prototype.flags/node_modules/call-bind/package.json
8961+
../../Sources/Navigator/EPUB/Scripts/node_modules/regexp.prototype.flags/node_modules/call-bind/README.md
8962+
../../Sources/Navigator/EPUB/Scripts/node_modules/regexp.prototype.flags/node_modules/call-bind/test
8963+
../../Sources/Navigator/EPUB/Scripts/node_modules/regexp.prototype.flags/node_modules/call-bind/test/callBound.js
8964+
../../Sources/Navigator/EPUB/Scripts/node_modules/regexp.prototype.flags/node_modules/call-bind/test/index.js
89508965
../../Sources/Navigator/EPUB/Scripts/node_modules/regexp.prototype.flags/package.json
89518966
../../Sources/Navigator/EPUB/Scripts/node_modules/regexp.prototype.flags/polyfill.js
89528967
../../Sources/Navigator/EPUB/Scripts/node_modules/regexp.prototype.flags/README.md
@@ -11506,6 +11521,7 @@
1150611521
../../Sources/Navigator/EPUB/Scripts/node_modules/yallist/README.md
1150711522
../../Sources/Navigator/EPUB/Scripts/node_modules/yallist/yallist.js
1150811523
../../Sources/Navigator/EPUB/Scripts/package.json
11524+
../../Sources/Navigator/EPUB/Scripts/pnpm-lock.yaml
1150911525
../../Sources/Navigator/EPUB/Scripts/README.md
1151011526
../../Sources/Navigator/EPUB/Scripts/src
1151111527
../../Sources/Navigator/EPUB/Scripts/src/decorator.js
@@ -11549,7 +11565,6 @@
1154911565
../../Sources/Navigator/EPUB/Scripts/src/vendor/hypothesis/anchoring/xpath.js
1155011566
../../Sources/Navigator/EPUB/Scripts/src/vendor/hypothesis/README.md
1155111567
../../Sources/Navigator/EPUB/Scripts/webpack.config.js
11552-
../../Sources/Navigator/EPUB/Scripts/yarn.lock
1155311568
../../Sources/Navigator/EPUB/UserSettings.swift
1155411569
../../Sources/Navigator/KeyEvent.swift
1155511570
../../Sources/Navigator/Navigator.swift

‎Support/Carthage/Readium.xcodeproj/project.pbxproj

+6-6
Original file line numberDiff line numberDiff line change
@@ -104,10 +104,12 @@
104104
4C6E7DF3D71660E723E148CF /* LCPContentProtection.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AF56CF04F94B7BE45631897 /* LCPContentProtection.swift */; };
105105
4C9EACE2732D23C37E627313 /* ContentProtectionService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8240F845F35439807CE8AF65 /* ContentProtectionService.swift */; };
106106
4D4D25BA4772674DD6041C01 /* Deprecated.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0E1D7FA19C628EA8F967F580 /* Deprecated.swift */; };
107+
4D5315A9EE860F43CBD2B5BC /* ReadiumGCDWebServer.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6536C07F5A50F7F25FDBF69C /* ReadiumGCDWebServer.xcframework */; };
107108
4DAD724BAB72A5C6D2473770 /* Collection.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F89BC365BDD19BE84F4D3B5 /* Collection.swift */; };
108109
4E2AF522FFBD929F52153DAE /* R2Shared.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 41A0528117E270B68AC75C56 /* R2Shared.framework */; };
109110
4E46120D30E7B1B22A558643 /* MappedPreference.swift in Sources */ = {isa = PBXBuildFile; fileRef = 68D2804AD0439307575B3073 /* MappedPreference.swift */; };
110111
4F8168F527F489AB8619A7F1 /* R2Shared.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 41A0528117E270B68AC75C56 /* R2Shared.framework */; };
112+
4FB885E0DF9CF4A554130059 /* ReadiumGCDWebServer.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6536C07F5A50F7F25FDBF69C /* ReadiumGCDWebServer.xcframework */; };
111113
4FE29A44B4B0966489DBCA01 /* EPUBPreferences+Legacy.swift in Sources */ = {isa = PBXBuildFile; fileRef = CF31AEFB5FF0E7892C6D903E /* EPUBPreferences+Legacy.swift */; };
112114
501E7E05DEA11F7A61D60EAF /* Range.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3231F989F7D7E560DD5364B9 /* Range.swift */; };
113115
502D4ABD63FE9D99AD066F31 /* DOMRange.swift in Sources */ = {isa = PBXBuildFile; fileRef = C084C255A327387F36B97A62 /* DOMRange.swift */; };
@@ -235,7 +237,6 @@
235237
A6658BA380A889B8310A558F /* Facet.swift in Sources */ = {isa = PBXBuildFile; fileRef = 387B19B66C4D91A295B5EFA6 /* Facet.swift */; };
236238
A8E6E488592BDBB97C4B7B87 /* XML.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CDB1B325928A873012E6149 /* XML.swift */; };
237239
A90A46957B8B68EE82C4DBAD /* OPDSAvailability.swift in Sources */ = {isa = PBXBuildFile; fileRef = F2E780027410F4B6CC872B3D /* OPDSAvailability.swift */; };
238-
A959A4AE4DBB03FF400D1C4B /* GCDWebServer.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = D92391897F01AC5AFD509B1D /* GCDWebServer.xcframework */; };
239240
A9F15C16764A75759500505F /* ProgressionStrategy.swift in Sources */ = {isa = PBXBuildFile; fileRef = EED4C26FFA10656866E167F4 /* ProgressionStrategy.swift */; };
240241
AA0CDCC2CA63228C1F35E816 /* AudioNavigator.swift in Sources */ = {isa = PBXBuildFile; fileRef = DCE34D74E282834684E1C999 /* AudioNavigator.swift */; };
241242
AA6EB82E79460DB9362C16D0 /* DRM+Deprecated.swift in Sources */ = {isa = PBXBuildFile; fileRef = 56DCEA1627F7AE84298732CC /* DRM+Deprecated.swift */; };
@@ -268,7 +269,6 @@
268269
C283E515CA6A8EEA1C89AD98 /* License.swift in Sources */ = {isa = PBXBuildFile; fileRef = C2C93C33347DC0A41FE15AC6 /* License.swift */; };
269270
C2A1FAC4ADA33EABA1E45EF8 /* ParseData.swift in Sources */ = {isa = PBXBuildFile; fileRef = B1085F2D690A73984E675D54 /* ParseData.swift */; };
270271
C2D32286200D850101D8C4FD /* SwiftSoup.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = BE09289EB0FEA5FEC8506B1F /* SwiftSoup.xcframework */; };
271-
C2D8AD7329853B2CACB97B99 /* GCDWebServer.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = D92391897F01AC5AFD509B1D /* GCDWebServer.xcframework */; };
272272
C3236F8A6BE55AD3B8794F10 /* CSSProperties.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0E6147EF790DE532CE1699D /* CSSProperties.swift */; };
273273
C35001848411CBCAC8F03763 /* PublicationContentIterator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BF38F71FDEC1920325B62D3 /* PublicationContentIterator.swift */; };
274274
C3BC5A4C44DD8CE26155C0D5 /* PDFFileParser.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8103346E73760F07800EB75E /* PDFFileParser.swift */; };
@@ -565,6 +565,7 @@
565565
626CFFF131E0E840B76428F1 /* DecorableNavigator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DecorableNavigator.swift; sourceTree = "<group>"; };
566566
634444C3FD707BD99E337CDC /* Result.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Result.swift; sourceTree = "<group>"; };
567567
64ED7629E73022C1495081D1 /* Links.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Links.swift; sourceTree = "<group>"; };
568+
6536C07F5A50F7F25FDBF69C /* ReadiumGCDWebServer.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = ReadiumGCDWebServer.xcframework; path = ../../Carthage/Build/ReadiumGCDWebServer.xcframework; sourceTree = "<group>"; };
568569
6599A2A3F66206997E700303 /* MediaType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MediaType.swift; sourceTree = "<group>"; };
569570
65C8719E9CC8EF0D2430AD85 /* CompletionList.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CompletionList.swift; sourceTree = "<group>"; };
570571
667B76C4766DFF58D066D40B /* PublicationService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PublicationService.swift; sourceTree = "<group>"; };
@@ -698,7 +699,6 @@
698699
D6C93236E313B55D8B835D9F /* EPUBPositionsService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EPUBPositionsService.swift; sourceTree = "<group>"; };
699700
D81A35A8B299AD4B74915291 /* Fetcher.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Fetcher.swift; sourceTree = "<group>"; };
700701
D88E58FF0AC7D506273FD8D9 /* TTSEngine.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TTSEngine.swift; sourceTree = "<group>"; };
701-
D92391897F01AC5AFD509B1D /* GCDWebServer.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = GCDWebServer.xcframework; path = ../../Carthage/Build/GCDWebServer.xcframework; sourceTree = "<group>"; };
702702
D93B0556DAAAF429893B0692 /* CRLService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CRLService.swift; sourceTree = "<group>"; };
703703
D94EB44EC5A15FF631AE8B2E /* Rights.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Rights.swift; sourceTree = "<group>"; };
704704
D9FFEB1FF4B5CD74EB35CD63 /* AudioParser.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AudioParser.swift; sourceTree = "<group>"; };
@@ -800,8 +800,8 @@
800800
files = (
801801
98428BC24846D534B940CE86 /* CryptoSwift.xcframework in Frameworks */,
802802
F9FCCEEA9B1D9F7F878AB46F /* Fuzi.xcframework in Frameworks */,
803-
A959A4AE4DBB03FF400D1C4B /* GCDWebServer.xcframework in Frameworks */,
804803
B044F00F7EE207B9F9A7EA88 /* Minizip.xcframework in Frameworks */,
804+
4FB885E0DF9CF4A554130059 /* ReadiumGCDWebServer.xcframework in Frameworks */,
805805
4F8168F527F489AB8619A7F1 /* R2Shared.framework in Frameworks */,
806806
E2491E508AFA13B83CA7C12B /* ReadiumInternal.framework in Frameworks */,
807807
);
@@ -824,7 +824,7 @@
824824
isa = PBXFrameworksBuildPhase;
825825
buildActionMask = 2147483647;
826826
files = (
827-
C2D8AD7329853B2CACB97B99 /* GCDWebServer.xcframework in Frameworks */,
827+
4D5315A9EE860F43CBD2B5BC /* ReadiumGCDWebServer.xcframework in Frameworks */,
828828
D362CE558C13C60E46E3B2EE /* R2Shared.framework in Frameworks */,
829829
EF6572C04388E4A9ABCE253B /* ReadiumInternal.framework in Frameworks */,
830830
);
@@ -1555,8 +1555,8 @@
15551555
E37F94C388A86CB8A34812A5 /* CryptoSwift.xcframework */,
15561556
3F95F3F20D758BE0E7005EA3 /* DifferenceKit.xcframework */,
15571557
B421601FB56132514CCD9699 /* Fuzi.xcframework */,
1558-
D92391897F01AC5AFD509B1D /* GCDWebServer.xcframework */,
15591558
CFFEBDFE931745C07DACD4A3 /* Minizip.xcframework */,
1559+
6536C07F5A50F7F25FDBF69C /* ReadiumGCDWebServer.xcframework */,
15601560
F07214E263C6589987A561F9 /* SQLite.xcframework */,
15611561
BE09289EB0FEA5FEC8506B1F /* SwiftSoup.xcframework */,
15621562
8D187A577EBFCFF738D1CDC7 /* ZIPFoundation.xcframework */,

‎Support/Carthage/project-as-submodule.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ targets:
3939
dependencies:
4040
- framework: CryptoSwift.framework
4141
- framework: Fuzi.framework
42-
- framework: GCDWebServer.framework
4342
- framework: Minizip.framework
43+
- framework: ReadiumGCDWebServer.framework
4444
- target: R2Shared
4545
- target: ReadiumInternal
4646
settings:
@@ -109,7 +109,7 @@ targets:
109109
sources:
110110
- path: ../../Sources/Adapters/GCDWebServer
111111
dependencies:
112-
- framework: GCDWebServer.framework
112+
- framework: ReadiumGCDWebServer.framework
113113
- target: R2Shared
114114
- target: ReadiumInternal
115115
settings:

‎Support/Carthage/project.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ targets:
3737
dependencies:
3838
- framework: ../../Carthage/Build/CryptoSwift.xcframework
3939
- framework: ../../Carthage/Build/Fuzi.xcframework
40-
- framework: ../../Carthage/Build/GCDWebServer.xcframework
4140
- framework: ../../Carthage/Build/Minizip.xcframework
41+
- framework: ../../Carthage/Build/ReadiumGCDWebServer.xcframework
4242
- target: R2Shared
4343
- target: ReadiumInternal
4444
settings:
@@ -107,7 +107,7 @@ targets:
107107
sources:
108108
- path: ../../Sources/Adapters/GCDWebServer
109109
dependencies:
110-
- framework: ../../Carthage/Build/GCDWebServer.xcframework
110+
- framework: ../../Carthage/Build/ReadiumGCDWebServer.xcframework
111111
- target: R2Shared
112112
- target: ReadiumInternal
113113
settings:

‎Support/CocoaPods/ReadiumAdapterGCDWebServer.podspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@ Pod::Spec.new do |s|
1515

1616
s.dependency 'R2Shared'
1717
s.dependency 'ReadiumInternal'
18-
s.dependency 'GCDWebServer', '~> 3.0'
18+
s.dependency 'ReadiumGCDWebServer', '~> 4.0.0'
1919

2020
end

‎Support/CocoaPods/ReadiumStreamer.podspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Pod::Spec.new do |s|
2424
s.dependency 'ReadiumInternal'
2525
s.dependency 'CryptoSwift', '<= 1.5.1' # From 1.6.0, the build fails in GitHub actions
2626
s.dependency 'Fuzi', '~> 3.0'
27-
s.dependency 'GCDWebServer', '~> 3.0'
27+
s.dependency 'ReadiumGCDWebServer', '~> 4.0.0'
2828
s.dependency 'Minizip', '~> 1.0'
2929

3030
end

‎TestApp/Integrations/Carthage/project+lcp.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,13 @@ targets:
2626
- framework: Carthage/Build/CryptoSwift.xcframework
2727
- framework: Carthage/Build/DifferenceKit.xcframework
2828
- framework: Carthage/Build/Fuzi.xcframework
29-
- framework: Carthage/Build/GCDWebServer.xcframework
3029
- framework: Carthage/Build/Minizip.xcframework
3130
- framework: Carthage/Build/R2LCPClient.xcframework
3231
- framework: Carthage/Build/R2Navigator.xcframework
3332
- framework: Carthage/Build/R2Shared.xcframework
3433
- framework: Carthage/Build/R2Streamer.xcframework
3534
- framework: Carthage/Build/ReadiumAdapterGCDWebServer.xcframework
35+
- framework: Carthage/Build/ReadiumGCDWebServer.xcframework
3636
- framework: Carthage/Build/ReadiumInternal.xcframework
3737
- framework: Carthage/Build/ReadiumLCP.xcframework
3838
- framework: Carthage/Build/ReadiumOPDS.xcframework

‎TestApp/Integrations/Carthage/project.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@ targets:
2626
- framework: Carthage/Build/CryptoSwift.xcframework
2727
- framework: Carthage/Build/DifferenceKit.xcframework
2828
- framework: Carthage/Build/Fuzi.xcframework
29-
- framework: Carthage/Build/GCDWebServer.xcframework
3029
- framework: Carthage/Build/Minizip.xcframework
3130
- framework: Carthage/Build/R2Navigator.xcframework
3231
- framework: Carthage/Build/R2Shared.xcframework
3332
- framework: Carthage/Build/R2Streamer.xcframework
3433
- framework: Carthage/Build/ReadiumAdapterGCDWebServer.xcframework
34+
- framework: Carthage/Build/ReadiumGCDWebServer.xcframework
3535
- framework: Carthage/Build/ReadiumInternal.xcframework
3636
- framework: Carthage/Build/ReadiumOPDS.xcframework
3737
- framework: Carthage/Build/SwiftSoup.xcframework

‎TestApp/Integrations/CocoaPods/Podfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ target 'TestApp' do
1212
pod 'ReadiumInternal', podspec: 'https://raw.githubusercontent.com/readium/swift-toolkit/VERSION/Support/CocoaPods/ReadiumInternal.podspec'
1313

1414
# Required for R2Streamer and ReadiumAdapterGCDWebServer.
15-
pod 'GCDWebServer', podspec: 'https://raw.githubusercontent.com/readium/GCDWebServer/master/GCDWebServer.podspec'
15+
pod 'ReadiumGCDWebServer', podspec: 'https://raw.githubusercontent.com/readium/GCDWebServer/master/GCDWebServer.podspec'
1616

1717
pod 'GRDB.swift', '~> 5.0'
1818
pod 'Kingfisher', '~> 5.0'

0 commit comments

Comments
 (0)