Skip to content

Commit 74ae425

Browse files
kishikawakatsumikishikawakatsumi
committed
Support Swfit Package Manager
1 parent 91b6b4d commit 74ae425

File tree

452 files changed

+153
-33
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

452 files changed

+153
-33
lines changed

‎Configurations/ImagePipeline.xcconfig‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ DEVELOPMENT_TEAM = 27AEDK3C9F
66
DYLIB_COMPATIBILITY_VERSION = 1
77
DYLIB_CURRENT_VERSION = 1
88
DYLIB_INSTALL_NAME_BASE = @rpath
9-
INFOPLIST_FILE = ImagePipeline/Info.plist
9+
INFOPLIST_FILE = Sources/$(PROJECT_NAME)/Info.plist
1010
INSTALL_PATH = $(LOCAL_LIBRARY_DIR)/Frameworks
1111
LD_RUNPATH_SEARCH_PATHS = $(inherited) @executable_path/Frameworks @loader_path/Frameworks
1212
LIBRARY_SEARCH_PATHS = $(inherited) $(PROJECT_DIR)/Vendor/webp/lib
13-
MODULEMAP_FILE = $(SRCROOT)/$(PROJECT_NAME)/module.modulemap
14-
PRODUCT_BUNDLE_IDENTIFIER = com.folio-sec.ImagePipeline
13+
MODULEMAP_FILE = $(SRCROOT)/Sources/WebPDecoder/include/module.modulemap
14+
PRODUCT_BUNDLE_IDENTIFIER = com.folio-sec.$(PROJECT_NAME)
1515
PRODUCT_NAME = $(TARGET_NAME:c99extidentifier)
1616
SKIP_INSTALL = YES
1717
SWIFT_VERSION = 4.2

‎Configurations/ImagePipelineTests.xcconfig‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES
22
CODE_SIGN_STYLE = Automatic
33
DEVELOPMENT_TEAM = 27AEDK3C9F
44
FRAMEWORK_SEARCH_PATHS = $(inherited) $(PROJECT_DIR)/Carthage/Build/iOS
5-
INFOPLIST_FILE = ImagePipelineTests/Info.plist
5+
INFOPLIST_FILE = Tests/$(TARGET_NAME)/Info.plist
66
IPHONEOS_DEPLOYMENT_TARGET = 10.0
77
LD_RUNPATH_SEARCH_PATHS = $(inherited) @executable_path/Frameworks @loader_path/Frameworks
8-
PRODUCT_BUNDLE_IDENTIFIER = com.folio-sec.ImagePipelineTests
8+
PRODUCT_BUNDLE_IDENTIFIER = com.folio-sec.$(TARGET_NAME)
99
PRODUCT_NAME = $(TARGET_NAME)
1010
SWIFT_VERSION = 4.2
1111
TARGETED_DEVICE_FAMILY = 1,2

‎ImagePipeline.xcodeproj/project.pbxproj‎

Lines changed: 42 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -454,7 +454,7 @@
454454
140C336A21D93F5B007BDE61 /* CopyFiles */ = {
455455
isa = PBXCopyFilesBuildPhase;
456456
buildActionMask = 2147483647;
457-
dstPath = include/webp;
457+
dstPath = "";
458458
dstSubfolderSpec = 6;
459459
files = (
460460
140C336B21D93F77007BDE61 /* types.h in CopyFiles */,
@@ -487,7 +487,6 @@
487487
140C336321D93F06007BDE61 /* types.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = types.h; sourceTree = "<group>"; };
488488
140C336421D93F06007BDE61 /* decode.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = decode.h; sourceTree = "<group>"; };
489489
140C336621D93F06007BDE61 /* libwebpdecoder.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libwebpdecoder.a; sourceTree = "<group>"; };
490-
140C336721D93F1D007BDE61 /* module.modulemap */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.module-map"; path = module.modulemap; sourceTree = "<group>"; };
491490
140C336F21D945CA007BDE61 /* MemoryCache.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MemoryCache.swift; sourceTree = "<group>"; };
492491
140C337121D945D9007BDE61 /* DiskCache.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DiskCache.swift; sourceTree = "<group>"; };
493492
140C337321D945EB007BDE61 /* CacheEntry.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CacheEntry.swift; sourceTree = "<group>"; };
@@ -903,6 +902,8 @@
903902
1436530D21DC919500616F6C /* 13.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = 13.jpg; sourceTree = "<group>"; };
904903
1436530E21DC919500616F6C /* 8.webp */ = {isa = PBXFileReference; lastKnownFileType = file; path = 8.webp; sourceTree = "<group>"; };
905904
1436530F21DC919600616F6C /* 26.gif */ = {isa = PBXFileReference; lastKnownFileType = image.gif; path = 26.gif; sourceTree = "<group>"; };
905+
1441E952241A96DB001B08E0 /* module.modulemap */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.module-map"; path = module.modulemap; sourceTree = "<group>"; };
906+
1496D481241A900200900064 /* Package.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Package.swift; sourceTree = "<group>"; };
906907
14C3A6C421E06FAC00317536 /* FetcherTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FetcherTests.swift; sourceTree = "<group>"; };
907908
14C3A6C621E0701300317536 /* DecoderTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DecoderTests.swift; sourceTree = "<group>"; };
908909
14C3A6C821E0706000317536 /* MemoryCacheTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MemoryCacheTests.swift; sourceTree = "<group>"; };
@@ -940,10 +941,11 @@
940941
140C333421D93BD3007BDE61 = {
941942
isa = PBXGroup;
942943
children = (
943-
140C334021D93BD3007BDE61 /* ImagePipeline */,
944+
1496D481241A900200900064 /* Package.swift */,
945+
14D04704241A781100EDCA50 /* Sources */,
946+
14D04705241A78C200EDCA50 /* Tests */,
944947
140C76CE21DA579600A4582F /* Configurations */,
945948
140C335E21D93E40007BDE61 /* Vendor */,
946-
140C334B21D93BD3007BDE61 /* ImagePipelineTests */,
947949
140C333F21D93BD3007BDE61 /* Products */,
948950
140C336D21D93F9E007BDE61 /* Frameworks */,
949951
);
@@ -973,7 +975,6 @@
973975
140C337121D945D9007BDE61 /* DiskCache.swift */,
974976
140C339721D9D47C007BDE61 /* Storage.swift */,
975977
140C337321D945EB007BDE61 /* CacheEntry.swift */,
976-
140C336721D93F1D007BDE61 /* module.modulemap */,
977978
140C334221D93BD3007BDE61 /* Info.plist */,
978979
);
979980
path = ImagePipeline;
@@ -1042,11 +1043,11 @@
10421043
140C76CE21DA579600A4582F /* Configurations */ = {
10431044
isa = PBXGroup;
10441045
children = (
1045-
140C76CF21DA579600A4582F /* Release.xcconfig */,
1046-
140C76D021DA579600A4582F /* ImagePipelineTests.xcconfig */,
10471046
140C76D121DA579600A4582F /* Shared.xcconfig */,
1048-
140C76D221DA579600A4582F /* ImagePipeline.xcconfig */,
1047+
140C76CF21DA579600A4582F /* Release.xcconfig */,
10491048
140C76D321DA579600A4582F /* Debug.xcconfig */,
1049+
140C76D221DA579600A4582F /* ImagePipeline.xcconfig */,
1050+
140C76D021DA579600A4582F /* ImagePipelineTests.xcconfig */,
10501051
);
10511052
path = Configurations;
10521053
sourceTree = "<group>";
@@ -1462,6 +1463,39 @@
14621463
path = Fixtures;
14631464
sourceTree = "<group>";
14641465
};
1466+
1441E950241A96DB001B08E0 /* WebPDecoder */ = {
1467+
isa = PBXGroup;
1468+
children = (
1469+
1441E951241A96DB001B08E0 /* include */,
1470+
);
1471+
path = WebPDecoder;
1472+
sourceTree = "<group>";
1473+
};
1474+
1441E951241A96DB001B08E0 /* include */ = {
1475+
isa = PBXGroup;
1476+
children = (
1477+
1441E952241A96DB001B08E0 /* module.modulemap */,
1478+
);
1479+
path = include;
1480+
sourceTree = "<group>";
1481+
};
1482+
14D04704241A781100EDCA50 /* Sources */ = {
1483+
isa = PBXGroup;
1484+
children = (
1485+
1441E950241A96DB001B08E0 /* WebPDecoder */,
1486+
140C334021D93BD3007BDE61 /* ImagePipeline */,
1487+
);
1488+
path = Sources;
1489+
sourceTree = "<group>";
1490+
};
1491+
14D04705241A78C200EDCA50 /* Tests */ = {
1492+
isa = PBXGroup;
1493+
children = (
1494+
140C334B21D93BD3007BDE61 /* ImagePipelineTests */,
1495+
);
1496+
path = Tests;
1497+
sourceTree = "<group>";
1498+
};
14651499
/* End PBXGroup section */
14661500

14671501
/* Begin PBXHeadersBuildPhase section */

‎ImagePipeline.xcodeproj/xcshareddata/xcschemes/ImagePipeline.xcscheme‎

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,15 @@
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
2929
shouldUseLaunchSchemeArgsEnv = "YES">
30+
<MacroExpansion>
31+
<BuildableReference
32+
BuildableIdentifier = "primary"
33+
BlueprintIdentifier = "140C333D21D93BD3007BDE61"
34+
BuildableName = "ImagePipeline.framework"
35+
BlueprintName = "ImagePipeline"
36+
ReferencedContainer = "container:ImagePipeline.xcodeproj">
37+
</BuildableReference>
38+
</MacroExpansion>
3039
<Testables>
3140
<TestableReference
3241
skipped = "NO"
@@ -40,17 +49,6 @@
4049
</BuildableReference>
4150
</TestableReference>
4251
</Testables>
43-
<MacroExpansion>
44-
<BuildableReference
45-
BuildableIdentifier = "primary"
46-
BlueprintIdentifier = "140C333D21D93BD3007BDE61"
47-
BuildableName = "ImagePipeline.framework"
48-
BlueprintName = "ImagePipeline"
49-
ReferencedContainer = "container:ImagePipeline.xcodeproj">
50-
</BuildableReference>
51-
</MacroExpansion>
52-
<AdditionalOptions>
53-
</AdditionalOptions>
5452
</TestAction>
5553
<LaunchAction
5654
buildConfiguration = "Debug"
@@ -71,8 +69,6 @@
7169
ReferencedContainer = "container:ImagePipeline.xcodeproj">
7270
</BuildableReference>
7371
</MacroExpansion>
74-
<AdditionalOptions>
75-
</AdditionalOptions>
7672
</LaunchAction>
7773
<ProfileAction
7874
buildConfiguration = "Release"

‎Package.resolved‎

Lines changed: 16 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Package.swift‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
// swift-tools-version:5.1
2+
// The swift-tools-version declares the minimum version of Swift required to build this package.
3+
4+
import PackageDescription
5+
6+
let package = Package(
7+
name: "ImagePipeline",
8+
platforms: [.iOS(.v10)],
9+
products: [
10+
.library(
11+
name: "ImagePipeline",
12+
targets: ["ImagePipeline"]),
13+
],
14+
dependencies: [
15+
.package(url: "https://github.com/pointfreeco/swift-snapshot-testing.git", from: "1.7.2"),
16+
],
17+
targets: [
18+
.target(name: "ImagePipeline", dependencies: ["WebPDecoder"]),
19+
.target(
20+
name: "WebPDecoder", dependencies: [],
21+
linkerSettings: [.linkedLibrary("webpdecoder"), .unsafeFlags(["-L$BUILD_DIR/../../SourcePackages/checkouts/ImagePipeline/Vendor/webp/lib"])]),
22+
.testTarget(
23+
name: "ImagePipelineTests",
24+
dependencies: ["ImagePipeline", "SnapshotTesting"]
25+
),
26+
]
27+
)

ImagePipeline/BlurFilter.swift renamed to Sources/ImagePipeline/BlurFilter.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import Foundation
1+
import UIKit
22
import Accelerate
33

44
public struct BlurFilter: ImageProcessing {

ImagePipeline/CacheEntry.swift renamed to Sources/ImagePipeline/CacheEntry.swift

File renamed without changes.

ImagePipeline/DiskCache.swift renamed to Sources/ImagePipeline/DiskCache.swift

File renamed without changes.

ImagePipeline/Fetcher.swift renamed to Sources/ImagePipeline/Fetcher.swift

File renamed without changes.

0 commit comments

Comments
 (0)