Skip to content

Commit f2e14bf

Browse files
committed
Update Carthage project
1 parent 31e3866 commit f2e14bf

File tree

2 files changed

+12
-5
lines changed

2 files changed

+12
-5
lines changed

Support/Carthage/.xcodegen

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -408,9 +408,11 @@
408408
../../Sources/Navigator/EditingAction.swift
409409
../../Sources/Navigator/EPUB
410410
../../Sources/Navigator/EPUB/Assets
411+
../../Sources/Navigator/EPUB/Assets/.DS_Store
411412
../../Sources/Navigator/EPUB/Assets/fxl-spread-one.html
412413
../../Sources/Navigator/EPUB/Assets/fxl-spread-two.html
413414
../../Sources/Navigator/EPUB/Assets/Static
415+
../../Sources/Navigator/EPUB/Assets/Static/.DS_Store
414416
../../Sources/Navigator/EPUB/Assets/Static/fonts
415417
../../Sources/Navigator/EPUB/Assets/Static/fonts/OpenDyslexic-Bold.otf
416418
../../Sources/Navigator/EPUB/Assets/Static/fonts/OpenDyslexic-BoldItalic.otf
@@ -628,6 +630,7 @@
628630
../../Sources/Shared/Publication/Extensions/Presentation/Presentation.swift
629631
../../Sources/Shared/Publication/Extensions/Presentation/Properties+Presentation.swift
630632
../../Sources/Shared/Publication/HREFNormalizer.swift
633+
../../Sources/Shared/Publication/Layout.swift
631634
../../Sources/Shared/Publication/Link.swift
632635
../../Sources/Shared/Publication/LinkRelation.swift
633636
../../Sources/Shared/Publication/LocalizedString.swift
@@ -823,8 +826,8 @@
823826
../../Sources/Streamer/Parser/EPUB/EPUBMetadataParser.swift
824827
../../Sources/Streamer/Parser/EPUB/EPUBParser.swift
825828
../../Sources/Streamer/Parser/EPUB/Extensions
829+
../../Sources/Streamer/Parser/EPUB/Extensions/Layout+EPUB.swift
826830
../../Sources/Streamer/Parser/EPUB/Extensions/LinkRelation+EPUB.swift
827-
../../Sources/Streamer/Parser/EPUB/Extensions/Presentation+EPUB.swift
828831
../../Sources/Streamer/Parser/EPUB/NavigationDocumentParser.swift
829832
../../Sources/Streamer/Parser/EPUB/NCXParser.swift
830833
../../Sources/Streamer/Parser/EPUB/OPFMeta.swift

Support/Carthage/Readium.xcodeproj/project.pbxproj

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
1004CE1C72C85CC3702C09C0 /* Asset.swift in Sources */ = {isa = PBXBuildFile; fileRef = AC811653B33761089E270C4A /* Asset.swift */; };
3535
10C07601930485DFA27CD231 /* PDFParser.swift in Sources */ = {isa = PBXBuildFile; fileRef = D13272E03B63E96D4246F79D /* PDFParser.swift */; };
3636
10FE85C02C2782FCD957346F /* PublicationMediaLoader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 56C489452239BF85F4D14E95 /* PublicationMediaLoader.swift */; };
37+
1107597E99B703B53FDE89AB /* Layout+EPUB.swift in Sources */ = {isa = PBXBuildFile; fileRef = 211A98219D7D1583E829DEC2 /* Layout+EPUB.swift */; };
3738
1112E4B2F49A39383D4D48F9 /* UInt64.swift in Sources */ = {isa = PBXBuildFile; fileRef = DF63FC52733A417765146AE2 /* UInt64.swift */; };
3839
1136DC853876D905FC33597F /* GCDHTTPServer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3B1597E4216CF16380AC2811 /* GCDHTTPServer.swift */; };
3940
1221E200A377D294050B8F00 /* LicenseValidation.swift in Sources */ = {isa = PBXBuildFile; fileRef = BDEFB3D1218817F835A3C5F4 /* LicenseValidation.swift */; };
@@ -115,7 +116,6 @@
115116
422FF6643B32F9BCE8043757 /* ReadiumFuzi.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2828D89EBB52CCA782ED1146 /* ReadiumFuzi.xcframework */; };
116117
44152DBECE34F063AD0E93BC /* Link.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE3E6442F0C7FE2098D71F27 /* Link.swift */; };
117118
448374F2605586249A6CB4C8 /* FailureResource.swift in Sources */ = {isa = PBXBuildFile; fileRef = 78FFDF8CF77437EDB41E4547 /* FailureResource.swift */; };
118-
46D29739FB017C62767CBE63 /* Presentation+EPUB.swift in Sources */ = {isa = PBXBuildFile; fileRef = 42EFF9139B59D763CE254F92 /* Presentation+EPUB.swift */; };
119119
47125BFFEC67DEB2C3D1B48C /* AudioNavigator.swift in Sources */ = {isa = PBXBuildFile; fileRef = DCE34D74E282834684E1C999 /* AudioNavigator.swift */; };
120120
4977279900B4BA602D92B5C4 /* ReadiumFuzi.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2828D89EBB52CCA782ED1146 /* ReadiumFuzi.xcframework */; };
121121
4A5F53CCC083D3E348379963 /* Types.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8BF64D7C05A790D9CA5DD442 /* Types.swift */; };
@@ -394,6 +394,7 @@
394394
FBC62A9EC21695FF47572E04 /* URITemplate.swift in Sources */ = {isa = PBXBuildFile; fileRef = CFE1142A6C038A35C527CE84 /* URITemplate.swift */; };
395395
FCFFE5305127D9FC72549EAA /* LCPDFPositionsService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 47B9196192A22B8AB80E6B2F /* LCPDFPositionsService.swift */; };
396396
FED01A1734FAAD72683CC79E /* CompletionList.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65C8719E9CC8EF0D2430AD85 /* CompletionList.swift */; };
397+
FFA39E29D60BE8D527192CF0 /* Layout.swift in Sources */ = {isa = PBXBuildFile; fileRef = 325DC872B215C040B8123980 /* Layout.swift */; };
397398
/* End PBXBuildFile section */
398399

399400
/* Begin PBXContainerItemProxy section */
@@ -532,6 +533,7 @@
532533
1EBC685D4A0E07997088DD2D /* DataCompression.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DataCompression.swift; sourceTree = "<group>"; };
533534
1F89BC365BDD19BE84F4D3B5 /* Collection.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Collection.swift; sourceTree = "<group>"; };
534535
1FBFAC2D57DE7EBB4E2F31BE /* ReadiumNavigatorLocalizedString.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReadiumNavigatorLocalizedString.swift; sourceTree = "<group>"; };
536+
211A98219D7D1583E829DEC2 /* Layout+EPUB.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Layout+EPUB.swift"; sourceTree = "<group>"; };
535537
212E89D9F2CC639C3E1F81C3 /* Array.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Array.swift; sourceTree = "<group>"; };
536538
218BE3110D2886B252A769A2 /* UTI.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UTI.swift; sourceTree = "<group>"; };
537539
21944E1DABB61C2CF2EA89C5 /* Sequence.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Sequence.swift; sourceTree = "<group>"; };
@@ -555,6 +557,7 @@
555557
31C1E0FDB5373E672D5FF80F /* ZIPFoundationArchiveFactory.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ZIPFoundationArchiveFactory.swift; sourceTree = "<group>"; };
556558
3230FB63D7ADDD514D74F7E6 /* LCPLicenseRepository.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LCPLicenseRepository.swift; sourceTree = "<group>"; };
557559
3231F989F7D7E560DD5364B9 /* Range.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Range.swift; sourceTree = "<group>"; };
560+
325DC872B215C040B8123980 /* Layout.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Layout.swift; sourceTree = "<group>"; };
558561
339637CCF01E665F4CB78B01 /* EPUBLayout.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EPUBLayout.swift; sourceTree = "<group>"; };
559562
342D5C0FEE79A2ABEE24A43E /* CoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreServices.framework; path = System/Library/Frameworks/CoreServices.framework; sourceTree = SDKROOT; };
560563
34AB954525AC159166C96A36 /* HTMLResourceContentIterator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HTMLResourceContentIterator.swift; sourceTree = "<group>"; };
@@ -583,7 +586,6 @@
583586
41EB258B894B86A0DA1D00D4 /* ArchiveOpener.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArchiveOpener.swift; sourceTree = "<group>"; };
584587
421AE163B6A0248637504A07 /* InputObserving.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InputObserving.swift; sourceTree = "<group>"; };
585588
42BAA4F11B7355F1962FEAD9 /* HTTPResource.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HTTPResource.swift; sourceTree = "<group>"; };
586-
42EFF9139B59D763CE254F92 /* Presentation+EPUB.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Presentation+EPUB.swift"; sourceTree = "<group>"; };
587589
42FD63C2720614E558522675 /* ReadiumInternal.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = ReadiumInternal.framework; sourceTree = BUILT_PRODUCTS_DIR; };
588590
4363E8A92B1EA9AF2561DCE9 /* NCXParser.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NCXParser.swift; sourceTree = "<group>"; };
589591
44D0B1BEF4825550464B9F62 /* PDFNavigatorViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PDFNavigatorViewController.swift; sourceTree = "<group>"; };
@@ -953,8 +955,8 @@
953955
00753735EE68A5BCEF35D787 /* Extensions */ = {
954956
isa = PBXGroup;
955957
children = (
958+
211A98219D7D1583E829DEC2 /* Layout+EPUB.swift */,
956959
FB91391C899304A1DC051C6E /* LinkRelation+EPUB.swift */,
957-
42EFF9139B59D763CE254F92 /* Presentation+EPUB.swift */,
958960
);
959961
path = Extensions;
960962
sourceTree = "<group>";
@@ -2005,6 +2007,7 @@
20052007
children = (
20062008
456192DBCB3A29ADA9C3CCB9 /* Contributor.swift */,
20072009
AC8639886BD43362741AADD0 /* HREFNormalizer.swift */,
2010+
325DC872B215C040B8123980 /* Layout.swift */,
20082011
DF92954C8C8C3EC50C835CBA /* Link.swift */,
20092012
AB0EF21FADD12D51D0619C0D /* LinkRelation.swift */,
20102013
600D8714B762FE37DE405C2E /* LocalizedString.swift */,
@@ -2467,14 +2470,14 @@
24672470
EF15E9163EBC82672B22F6E0 /* ImageParser.swift in Sources */,
24682471
FCFFE5305127D9FC72549EAA /* LCPDFPositionsService.swift in Sources */,
24692472
0BFCDAEC82CFF09AFC53A5D0 /* LCPDFTableOfContentsService.swift in Sources */,
2473+
1107597E99B703B53FDE89AB /* Layout+EPUB.swift in Sources */,
24702474
BFC777DBBFBDFDD54876BB59 /* LinkRelation+EPUB.swift in Sources */,
24712475
C1A94B2A9C446CB03650DC47 /* NCXParser.swift in Sources */,
24722476
01AD628D6DE82E1C1C4C281D /* NavigationDocumentParser.swift in Sources */,
24732477
2B8BC06B6B366E67C716DDA1 /* OPFMeta.swift in Sources */,
24742478
2C5436091DD72FDBF6FF136D /* OPFParser.swift in Sources */,
24752479
10C07601930485DFA27CD231 /* PDFParser.swift in Sources */,
24762480
E5D440B49453AC615946E7FB /* PDFPositionsService.swift in Sources */,
2477-
46D29739FB017C62767CBE63 /* Presentation+EPUB.swift in Sources */,
24782481
2F8F8B6A05F8E124BA9D6B22 /* PublicationOpener.swift in Sources */,
24792482
67F1C7C3D434D2AA542376E3 /* PublicationParser.swift in Sources */,
24802483
C9FBD23E459FB395377E149E /* ReadiumWebPubParser.swift in Sources */,
@@ -2667,6 +2670,7 @@
26672670
4D4915BB3847EF285362CF50 /* LCPLicenseFormatSniffer.swift in Sources */,
26682671
56CB87DACCA10F737710BFF6 /* Language.swift in Sources */,
26692672
AD572C6A7AD031FEC40A0BD7 /* LanguageFormatSniffer.swift in Sources */,
2673+
FFA39E29D60BE8D527192CF0 /* Layout.swift in Sources */,
26702674
DD8E2E0D394399A51F295380 /* Link.swift in Sources */,
26712675
C8A94F023B6C0F96875D5D62 /* LinkRelation.swift in Sources */,
26722676
8CCDF77696A0F2C7BF3171CC /* LocalizedString.swift in Sources */,

0 commit comments

Comments
 (0)