Skip to content
This repository was archived by the owner on Aug 12, 2022. It is now read-only.

Commit 3a7953b

Browse files
Merge pull request #306 from readium/fixes/gcd-server
updated gcd server dependency
2 parents 7de3ed4 + 03e5b95 commit 3a7953b

File tree

3 files changed

+8
-6
lines changed

3 files changed

+8
-6
lines changed

Cartfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ github "onevcat/Kingfisher" == 5.9.0
22
github "weichsel/ZIPFoundation" == 0.9.9
33
github "jdg/MBProgressHUD" == 1.1.0
44
github "stephencelis/SQLite.swift" == 0.12.2
5-
github "swisspol/GCDWebServer" == 3.5.3
5+
github "edrlab/GCDWebServer" == 3.6.2
66
github "krzyzanowskim/CryptoSwift" == 1.2.0
77
github "cezheng/Fuzi" == 3.1.1
88
github "dexman/Minizip" == 1.4.0
99
github "readium/r2-shared-swift" == 1.4.2
10-
github "readium/r2-streamer-swift" == 1.2.3
10+
github "readium/r2-streamer-swift" == 1.2.4
1111
github "readium/r2-navigator-swift" == 1.2.5
1212
github "readium/readium-opds-swift" == 1.2.2

Cartfile.resolved

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
github "cezheng/Fuzi" "3.1.1"
22
github "dexman/Minizip" "1.4.0"
3+
github "edrlab/GCDWebServer" "3.6.2"
34
github "jdg/MBProgressHUD" "1.1.0"
45
github "krzyzanowskim/CryptoSwift" "1.2.0"
56
github "onevcat/Kingfisher" "5.9.0"
67
github "readium/r2-navigator-swift" "1.2.5"
78
github "readium/r2-shared-swift" "1.4.2"
8-
github "readium/r2-streamer-swift" "1.2.3"
9+
github "readium/r2-streamer-swift" "1.2.4"
910
github "readium/readium-opds-swift" "1.2.2"
1011
github "stephencelis/SQLite.swift" "0.12.2"
11-
github "swisspol/GCDWebServer" "3.5.3"
1212
github "weichsel/ZIPFoundation" "0.9.9"

r2-testapp-swift.xcodeproj/project.pbxproj

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
03061922222D72AB00646F1F /* R2Streamer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 03061921222D72AB00646F1F /* R2Streamer.framework */; };
2121
03061923222D72AB00646F1F /* R2Streamer.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 03061921222D72AB00646F1F /* R2Streamer.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
2222
03061934222D936100646F1F /* CryptoSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0306192E222D936100646F1F /* CryptoSwift.framework */; };
23-
03061936222D936100646F1F /* GCDWebServers.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 03061930222D936100646F1F /* GCDWebServers.framework */; };
2423
03061937222D936100646F1F /* Minizip.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 03061931222D936100646F1F /* Minizip.framework */; };
2524
03061938222D936100646F1F /* ZIPFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 03061932222D936100646F1F /* ZIPFoundation.framework */; };
2625
03061939222D936100646F1F /* Fuzi.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 03061933222D936100646F1F /* Fuzi.framework */; };
@@ -111,6 +110,7 @@
111110
03AE30962259F4D400AA4C7C /* BooksDatabase.swift in Sources */ = {isa = PBXBuildFile; fileRef = 03AE308E2259F3E400AA4C7C /* BooksDatabase.swift */; };
112111
03AE30972259F4D400AA4C7C /* BooksDatabase.swift in Sources */ = {isa = PBXBuildFile; fileRef = 03AE308E2259F3E400AA4C7C /* BooksDatabase.swift */; };
113112
03AE30982259F4D400AA4C7C /* BooksDatabase.swift in Sources */ = {isa = PBXBuildFile; fileRef = 03AE308E2259F3E400AA4C7C /* BooksDatabase.swift */; };
113+
03B94499238D43FF0027986F /* GCDWebServer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 03B94498238D43FF0027986F /* GCDWebServer.framework */; };
114114
03BB67AD223874EE009A03C5 /* CryptoSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0306192E222D936100646F1F /* CryptoSwift.framework */; };
115115
03BB67AE223874EE009A03C5 /* Fuzi.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 03061933222D936100646F1F /* Fuzi.framework */; };
116116
03BB67AF223874EE009A03C5 /* GCDWebServers.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 03061930222D936100646F1F /* GCDWebServers.framework */; };
@@ -443,6 +443,7 @@
443443
0380490A21166627009F48BD /* Toast.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Toast.swift; sourceTree = "<group>"; };
444444
03AE308E2259F3E400AA4C7C /* BooksDatabase.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BooksDatabase.swift; sourceTree = "<group>"; };
445445
03BB67B5223874FA009A03C5 /* R2LCPClient.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = R2LCPClient.framework; sourceTree = BUILT_PRODUCTS_DIR; };
446+
03B94498238D43FF0027986F /* GCDWebServer.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GCDWebServer.framework; path = Carthage/Build/iOS/GCDWebServer.framework; sourceTree = "<group>"; };
446447
03BB67B8223874FA009A03C5 /* ReadiumLCP.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = ReadiumLCP.framework; sourceTree = BUILT_PRODUCTS_DIR; };
447448
03BB67BB223875CC009A03C5 /* R2Shared.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = R2Shared.framework; path = Carthage/Build/iOS/R2Shared.framework; sourceTree = "<group>"; };
448449
03BB67BC223875CC009A03C5 /* R2Navigator.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = R2Navigator.framework; path = Carthage/Build/iOS/R2Navigator.framework; sourceTree = "<group>"; };
@@ -582,12 +583,12 @@
582583
buildActionMask = 2147483647;
583584
files = (
584585
03061934222D936100646F1F /* CryptoSwift.framework in Frameworks */,
585-
03061936222D936100646F1F /* GCDWebServers.framework in Frameworks */,
586586
03061937222D936100646F1F /* Minizip.framework in Frameworks */,
587587
03061938222D936100646F1F /* ZIPFoundation.framework in Frameworks */,
588588
03061939222D936100646F1F /* Fuzi.framework in Frameworks */,
589589
03061919222D72AB00646F1F /* ReadiumOPDS.framework in Frameworks */,
590590
0306191F222D72AB00646F1F /* R2Shared.framework in Frameworks */,
591+
03B94499238D43FF0027986F /* GCDWebServer.framework in Frameworks */,
591592
0352073E222D69330000F0A4 /* SQLite.framework in Frameworks */,
592593
0306191C222D72AB00646F1F /* R2Navigator.framework in Frameworks */,
593594
0352073C222D68EA0000F0A4 /* MBProgressHUD.framework in Frameworks */,
@@ -911,6 +912,7 @@
911912
F3E7D4691F4EFE8700DF166D /* Frameworks */ = {
912913
isa = PBXGroup;
913914
children = (
915+
03B94498238D43FF0027986F /* GCDWebServer.framework */,
914916
03BB67C32238763E009A03C5 /* R2Navigator.framework */,
915917
03BB67C52238763E009A03C5 /* R2Shared.framework */,
916918
03BB67C72238763E009A03C5 /* R2Streamer.framework */,

0 commit comments

Comments
 (0)