Skip to content

Commit f302e50

Browse files
committed
Change the Carthage to use xcframework
1 parent 19ccb78 commit f302e50

File tree

3 files changed

+12
-21
lines changed

3 files changed

+12
-21
lines changed

Example/Podfile

+1-2
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,5 @@ platform :ios, '10.0'
66

77
target 'SDWebImageJPEGXLCoder_Example' do
88
pod 'SDWebImageJPEGXLCoder', :path => '../'
9-
pod 'libjxl', :path => '../../libjxl-Xcode'
10-
# pod 'libjxl', :git => 'git@github.com:SDWebImage/libjxl-Xcode.git', :branch => 'master', :submodules => true
9+
pod 'libjxl'
1110
end

README.md

+3-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ See: [Why JPEG-XL](https://jpegxl.info/why-jxl.html)
1212

1313
This coder supports the HDR/SDR decoding, as well as JPEG-XL aniamted image.
1414

15-
## TODO
15+
## Notes
1616

1717
1. This coder supports animation via UIImageView/NSImageView, no SDAnimatedImageView currently (Because the current coder API need codec supports non-sequential frame decoding, but libjxl does not have. Will remove this limit in SDWebImage 6.0)
1818
2. This coder does not supports JPEG-XL encoding (Because I have no time :))
@@ -44,6 +44,8 @@ SDWebImageJPEGXLCoder is available through [Carthage](https://github.com/Carthag
4444
github "SDWebImage/SDWebImageJPEGXLCoder"
4545
```
4646

47+
Note: You must use `carthage build --use-xcframeworks` for integration (because it supports 5 Apple platforms. You can limit platforms you need by using `--platform iOS,visionOS`)
48+
4749
#### Swift Package Manager
4850

4951
SDWebImageJPEGXLCoder is available through [Swift Package Manager](https://swift.org/package-manager).

SDWebImageJPEGXLCoder.xcodeproj/project.pbxproj

+8-18
Original file line numberDiff line numberDiff line change
@@ -7,32 +7,31 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10-
320EB3252B8F49BD00C466C8 /* jxl.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 320EB3242B8F49BD00C466C8 /* jxl.framework */; platformFilters = (macos, ); };
11-
325FD3C82B8F440900DCAD9A /* SDWebImage.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 325FD3C62B8F440900DCAD9A /* SDWebImage.framework */; platformFilters = (macos, ); };
1210
325FD3CD2B8F446A00DCAD9A /* SDWebImageJPEGXLCoder.h in Headers */ = {isa = PBXBuildFile; fileRef = 325FD3CB2B8F446A00DCAD9A /* SDWebImageJPEGXLCoder.h */; settings = {ATTRIBUTES = (Public, ); }; };
1311
326AA2462B8F272500B7D7B4 /* SDImageJPEGXLCoder.h in Headers */ = {isa = PBXBuildFile; fileRef = 326AA2412B8F272500B7D7B4 /* SDImageJPEGXLCoder.h */; settings = {ATTRIBUTES = (Public, ); }; };
1412
326AA2482B8F272500B7D7B4 /* SDImageJPEGXLCoder.m in Sources */ = {isa = PBXBuildFile; fileRef = 326AA2432B8F272500B7D7B4 /* SDImageJPEGXLCoder.m */; };
13+
32A429D72B8F9B6100327685 /* jxl.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 32A429D62B8F9B6100327685 /* jxl.xcframework */; };
14+
32A429D92B8F9B6800327685 /* SDWebImage.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 32A429D82B8F9B6800327685 /* SDWebImage.xcframework */; };
1515
/* End PBXBuildFile section */
1616

1717
/* Begin PBXFileReference section */
18-
320EB3242B8F49BD00C466C8 /* jxl.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = jxl.framework; path = Carthage/Build/Mac/jxl.framework; sourceTree = "<group>"; };
19-
325FD3C52B8F440900DCAD9A /* libjxl.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = libjxl.framework; path = Carthage/Build/Mac/libjxl.framework; sourceTree = "<group>"; };
20-
325FD3C62B8F440900DCAD9A /* SDWebImage.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SDWebImage.framework; path = Carthage/Build/Mac/SDWebImage.framework; sourceTree = "<group>"; };
2118
325FD3CA2B8F446A00DCAD9A /* SDWebImageJPEGXLCoder.modulemap */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = "sourcecode.module-map"; path = SDWebImageJPEGXLCoder.modulemap; sourceTree = "<group>"; };
2219
325FD3CB2B8F446A00DCAD9A /* SDWebImageJPEGXLCoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDWebImageJPEGXLCoder.h; sourceTree = "<group>"; };
2320
325FD3CC2B8F446A00DCAD9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
2421
326AA2352B8F26F000B7D7B4 /* SDWebImageJPEGXLCoder.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SDWebImageJPEGXLCoder.framework; sourceTree = BUILT_PRODUCTS_DIR; };
2522
326AA2412B8F272500B7D7B4 /* SDImageJPEGXLCoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDImageJPEGXLCoder.h; sourceTree = "<group>"; };
2623
326AA2432B8F272500B7D7B4 /* SDImageJPEGXLCoder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDImageJPEGXLCoder.m; sourceTree = "<group>"; };
24+
32A429D62B8F9B6100327685 /* jxl.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = jxl.xcframework; path = Carthage/Build/jxl.xcframework; sourceTree = "<group>"; };
25+
32A429D82B8F9B6800327685 /* SDWebImage.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = SDWebImage.xcframework; path = Carthage/Build/SDWebImage.xcframework; sourceTree = "<group>"; };
2726
/* End PBXFileReference section */
2827

2928
/* Begin PBXFrameworksBuildPhase section */
3029
326AA2322B8F26F000B7D7B4 /* Frameworks */ = {
3130
isa = PBXFrameworksBuildPhase;
3231
buildActionMask = 2147483647;
3332
files = (
34-
320EB3252B8F49BD00C466C8 /* jxl.framework in Frameworks */,
35-
325FD3C82B8F440900DCAD9A /* SDWebImage.framework in Frameworks */,
33+
32A429D92B8F9B6800327685 /* SDWebImage.xcframework in Frameworks */,
34+
32A429D72B8F9B6100327685 /* jxl.xcframework in Frameworks */,
3635
);
3736
runOnlyForDeploymentPostprocessing = 0;
3837
};
@@ -42,9 +41,8 @@
4241
325FD3C42B8F440800DCAD9A /* Frameworks */ = {
4342
isa = PBXGroup;
4443
children = (
45-
320EB3242B8F49BD00C466C8 /* jxl.framework */,
46-
325FD3C52B8F440900DCAD9A /* libjxl.framework */,
47-
325FD3C62B8F440900DCAD9A /* SDWebImage.framework */,
44+
32A429D82B8F9B6800327685 /* SDWebImage.xcframework */,
45+
32A429D62B8F9B6100327685 /* jxl.xcframework */,
4846
);
4947
name = Frameworks;
5048
sourceTree = "<group>";
@@ -312,10 +310,6 @@
312310
DYLIB_COMPATIBILITY_VERSION = 1;
313311
DYLIB_CURRENT_VERSION = 1;
314312
DYLIB_INSTALL_NAME_BASE = "@rpath";
315-
FRAMEWORK_SEARCH_PATHS = (
316-
"$(inherited)",
317-
"$(PROJECT_DIR)/Carthage/Build/Mac",
318-
);
319313
INFOPLIST_FILE = "$(PROJECT_DIR)/SDWebImageJPEGXLCoder/Module/Info.plist";
320314
INFOPLIST_KEY_NSHumanReadableCopyright = "";
321315
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
@@ -354,10 +348,6 @@
354348
DYLIB_COMPATIBILITY_VERSION = 1;
355349
DYLIB_CURRENT_VERSION = 1;
356350
DYLIB_INSTALL_NAME_BASE = "@rpath";
357-
FRAMEWORK_SEARCH_PATHS = (
358-
"$(inherited)",
359-
"$(PROJECT_DIR)/Carthage/Build/Mac",
360-
);
361351
INFOPLIST_FILE = "$(PROJECT_DIR)/SDWebImageJPEGXLCoder/Module/Info.plist";
362352
INFOPLIST_KEY_NSHumanReadableCopyright = "";
363353
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";

0 commit comments

Comments
 (0)