Merge pull request #32 from folio-sec/fix-spm

Fix archive failure when using SPM

Author: kishikawakatsumi

.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata

@@ -10,7 +10,7 @@ INFOPLIST_FILE = Sources/$(PROJECT_NAME)/Info.plist
 INSTALL_PATH = $(LOCAL_LIBRARY_DIR)/Frameworks
 LD_RUNPATH_SEARCH_PATHS = $(inherited) @executable_path/Frameworks @loader_path/Frameworks
 LIBRARY_SEARCH_PATHS = $(inherited) $(PROJECT_DIR)/Vendor/webp/lib
-MODULEMAP_FILE = $(SRCROOT)/Sources/WebPDecoder/include/module.modulemap
+MODULEMAP_FILE = $(SRCROOT)/Vendor/webp/include/module.modulemap
 PRODUCT_BUNDLE_IDENTIFIER = com.folio-sec.$(PROJECT_NAME)
 PRODUCT_NAME = $(TARGET_NAME:c99extidentifier)
 SKIP_INSTALL = YES

Configurations/ImagePipeline.xcconfig

@@ -902,7 +902,7 @@
 		1436530D21DC919500616F6C /* 13.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = 13.jpg; sourceTree = "<group>"; };
 		1436530E21DC919500616F6C /* 8.webp */ = {isa = PBXFileReference; lastKnownFileType = file; path = 8.webp; sourceTree = "<group>"; };
 		1436530F21DC919600616F6C /* 26.gif */ = {isa = PBXFileReference; lastKnownFileType = image.gif; path = 26.gif; sourceTree = "<group>"; };
-		1441E952241A96DB001B08E0 /* module.modulemap */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.module-map"; path = module.modulemap; sourceTree = "<group>"; };
+		149310E4241C22EB00CF87D3 /* module.modulemap */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.module-map"; path = module.modulemap; sourceTree = "<group>"; };
 		1496D481241A900200900064 /* Package.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Package.swift; sourceTree = "<group>"; };
 		14C3A6C421E06FAC00317536 /* FetcherTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FetcherTests.swift; sourceTree = "<group>"; };
 		14C3A6C621E0701300317536 /* DecoderTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DecoderTests.swift; sourceTree = "<group>"; };
@@ -1020,6 +1020,7 @@
 			children = (
 				140C336321D93F06007BDE61 /* types.h */,
 				140C336421D93F06007BDE61 /* decode.h */,
+				149310E4241C22EB00CF87D3 /* module.modulemap */,
 			);
 			path = include;
 			sourceTree = "<group>";
@@ -1463,27 +1464,10 @@
 			path = Fixtures;
 			sourceTree = "<group>";
 		};
-		1441E950241A96DB001B08E0 /* WebPDecoder */ = {
-			isa = PBXGroup;
-			children = (
-				1441E951241A96DB001B08E0 /* include */,
-			);
-			path = WebPDecoder;
-			sourceTree = "<group>";
-		};
-		1441E951241A96DB001B08E0 /* include */ = {
-			isa = PBXGroup;
-			children = (
-				1441E952241A96DB001B08E0 /* module.modulemap */,
-			);
-			path = include;
-			sourceTree = "<group>";
-		};
 		14D04704241A781100EDCA50 /* Sources */ = {
 			isa = PBXGroup;
 			children = (
 				140C334021D93BD3007BDE61 /* ImagePipeline */,
-				1441E950241A96DB001B08E0 /* WebPDecoder */,
 			);
 			path = Sources;
 			sourceTree = "<group>";

ImagePipeline.xcodeproj/project.pbxproj

@@ -12,16 +12,11 @@ let package = Package(
             targets: ["ImagePipeline"]),
     ],
     dependencies: [
+        .package(url: "https://github.com/kishikawakatsumi/webpdecoder.git", .branch("master")),
         .package(url: "https://github.com/pointfreeco/swift-snapshot-testing.git", from: "1.7.2"),
     ],
     targets: [
-        .target(name: "ImagePipeline", dependencies: ["WebPDecoder"]),
-        .target(
-            name: "WebPDecoder", dependencies: [],
-            linkerSettings: [.linkedLibrary("webpdecoder"), .unsafeFlags(["-L$BUILD_DIR/../../SourcePackages/checkouts/ImagePipeline/Vendor/webp/lib"])]),
-        .testTarget(
-            name: "ImagePipelineTests",
-            dependencies: ["ImagePipeline", "SnapshotTesting"]
-        ),
+        .target(name: "ImagePipeline", dependencies: ["webpdecoder"]),
+        .testTarget(name: "ImagePipelineTests", dependencies: ["ImagePipeline", "SnapshotTesting"]),
     ]
 )

Package.resolved

@@ -9,3 +9,4 @@ module WebPDecoder {
     header "decode.h"
     header "types.h"
 }
+