Fix build for Carthage and CocoaPods

readium · Aug 20, 2024 · 940c60a · 940c60a
1 parent dfec043
commit 940c60a
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 8 deletions.
diff --git a/Sources/Streamer/Toolkit/Extensions/Bundle.swift b/Sources/Streamer/Toolkit/Extensions/Bundle.swift
@@ -15,7 +15,7 @@ import Foundation
     extension Bundle {
         #if !COCOAPODS
             /// Returns ReadiumStreamer's bundle by querying an arbitrary type.
-            static let module = Bundle(for: Streamer.self)
+            static let module = Bundle(for: PublicationOpener.self)
         #else
             /// Returns ReadiumStreamer's bundle by querying for the cocoapods bundle.
             static let module = Bundle.getCocoaPodsBundle()

diff --git a/Support/Carthage/.xcodegen b/Support/Carthage/.xcodegen
@@ -264,7 +264,7 @@
       "sources" : [
         {
           "excludes" : [
-            "Toolkit\/Archive\/ZIPFoundation.swift"
+            "Toolkit\/ZIP\/ZIPFoundation.swift"
           ],
           "path" : "..\/..\/Sources\/Shared"
         }

diff --git a/Support/Carthage/Readium.xcodeproj/project.pbxproj b/Support/Carthage/Readium.xcodeproj/project.pbxproj
@@ -157,7 +157,6 @@
 		66018235ED40B89D27EE9F33 /* Group.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9FAAD26EE52713DB9F103610 /* Group.swift */; };
 		66A251DA78C53384E94F169F /* PublicationServer.swift in Sources */ = {isa = PBXBuildFile; fileRef = F6D87AB6FB1B213E6269736B /* PublicationServer.swift */; };
 		6719F981514309A65D206A85 /* LCPAcquisition.swift in Sources */ = {isa = PBXBuildFile; fileRef = F622773881411FB8BE686B9F /* LCPAcquisition.swift */; };
-		6724EAA0D931CF252E5FAEDF /* ZIPFoundation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 59624A8738EB3A791CEF8E4C /* ZIPFoundation.swift */; };
 		674BEEF110667C3051296E9B /* Double.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2F3481F848A616A9A825A4BD /* Double.swift */; };
 		67F1C7C3D434D2AA542376E3 /* PublicationParser.swift in Sources */ = {isa = PBXBuildFile; fileRef = F609C27F073E40D662CFE093 /* PublicationParser.swift */; };
 		682DFC1AF2BD7CAE0862B331 /* CryptoSwift.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = E37F94C388A86CB8A34812A5 /* CryptoSwift.xcframework */; };
@@ -622,7 +621,6 @@
 		567C115FF0939F69AD83AE82 /* UserRights.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserRights.swift; sourceTree = "<group>"; };
 		56C489452239BF85F4D14E95 /* PublicationMediaLoader.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PublicationMediaLoader.swift; sourceTree = "<group>"; };
 		57338C29681D4872D425AB81 /* UInt64.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UInt64.swift; sourceTree = "<group>"; };
-		59624A8738EB3A791CEF8E4C /* ZIPFoundation.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ZIPFoundation.swift; sourceTree = "<group>"; };
 		5A85DB4931BA5D965042CC6F /* CompositePublicationParser.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CompositePublicationParser.swift; sourceTree = "<group>"; };
 		5BC6AE42A31D77B548CB0BB4 /* Observable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Observable.swift; sourceTree = "<group>"; };
 		5E788FD34BE635B4B80C18A6 /* UIColor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UIColor.swift; sourceTree = "<group>"; };
@@ -1126,7 +1124,6 @@
 			children = (
 				DD824370ACE916C9BB9CAF84 /* Minizip.swift */,
 				C51C74A5990A3BA93B3DC587 /* ZIPArchiveOpener.swift */,
-				59624A8738EB3A791CEF8E4C /* ZIPFoundation.swift */,
 			);
 			path = ZIP;
 			sourceTree = "<group>";
@@ -2720,7 +2717,6 @@
 				5591563FD08A956B80C37716 /* XMLFormatSniffer.swift in Sources */,
 				BBF5AAEEE90BD88D58191DA3 /* ZIPArchiveOpener.swift in Sources */,
 				B49522888052E9F41D0DD013 /* ZIPFormatSniffer.swift in Sources */,
-				6724EAA0D931CF252E5FAEDF /* ZIPFoundation.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

diff --git a/Support/Carthage/project.yml b/Support/Carthage/project.yml
@@ -13,7 +13,7 @@ targets:
     sources: 
       - path: ../../Sources/Shared
         excludes:
-          - Toolkit/Archive/ZIPFoundation.swift
+          - Toolkit/ZIP/ZIPFoundation.swift
     dependencies:
       - framework: ../../Carthage/Build/Fuzi.xcframework
       - framework: ../../Carthage/Build/Minizip.xcframework

diff --git a/Support/CocoaPods/ReadiumShared.podspec b/Support/CocoaPods/ReadiumShared.podspec
@@ -7,7 +7,7 @@ Pod::Spec.new do |s|
   s.homepage     = "http://readium.github.io"
   s.author       = { "Readium" => "[email protected]" }
   s.source       = { :git => 'https://github.com/readium/swift-toolkit.git', :branch => "develop" }
-  s.exclude_files = ["Sources/Shared/Toolkit/Archive/ZIPFoundation.swift"]
+  s.exclude_files = ["Sources/Shared/Toolkit/ZIP/ZIPFoundation.swift"]
   s.requires_arc = true
   s.resource_bundles = {
     "ReadiumShared" => ["Sources/Shared/Resources/**"],