Skip to content

Commit fa1d30f

Browse files
hansemannnhansemannn
authored
Merge pull request #115 from hansemannn/feature/catalyst
feat: add macOS catalyst support
2 parents ea3adde + 6f823ff commit fa1d30f

631 files changed

Lines changed: 58027 additions & 66 deletions

File tree

Some content is hidden

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

‎ios/Cartfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
github "SDWebImage/SDWebImage" == 5.8.2
1+
github "SDWebImage/SDWebImage" == 5.11.1

‎ios/imageview-ios.xcodeproj/project.pbxproj‎

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
archiveVersion = 1;
44
classes = {
55
};
6-
objectVersion = 46;
6+
objectVersion = 52;
77
objects = {
88

99
/* Begin PBXAggregateTarget section */
@@ -26,7 +26,7 @@
2626
24DD6CFA1134B3F500162E58 /* AvImageviewModule.m in Sources */ = {isa = PBXBuildFile; fileRef = 24DD6CF81134B3F500162E58 /* AvImageviewModule.m */; };
2727
24DE9E1111C5FE74003F90F6 /* AvImageviewModuleAssets.h in Headers */ = {isa = PBXBuildFile; fileRef = 24DE9E0F11C5FE74003F90F6 /* AvImageviewModuleAssets.h */; };
2828
24DE9E1211C5FE74003F90F6 /* AvImageviewModuleAssets.m in Sources */ = {isa = PBXBuildFile; fileRef = 24DE9E1011C5FE74003F90F6 /* AvImageviewModuleAssets.m */; };
29-
3A5C53242243EB1100B8AE68 /* SDWebImage.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3A5C53232243EB1100B8AE68 /* SDWebImage.framework */; };
29+
3A4FC5E726C93DA2002D8E1E /* SDWebImage.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3A4FC5E626C93DA2002D8E1E /* SDWebImage.xcframework */; };
3030
65D4363A1CDB4B9B00EC9CC2 /* ImageIO.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 65D436391CDB4B9B00EC9CC2 /* ImageIO.framework */; };
3131
65D4363D1CDB4C2C00EC9CC2 /* AvImageviewImageViewProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = 65D4363B1CDB4C2C00EC9CC2 /* AvImageviewImageViewProxy.h */; };
3232
65D4363E1CDB4C2C00EC9CC2 /* AvImageviewImageViewProxy.m in Sources */ = {isa = PBXBuildFile; fileRef = 65D4363C1CDB4C2C00EC9CC2 /* AvImageviewImageViewProxy.m */; };
@@ -52,7 +52,7 @@
5252
24DD6D1B1134B66800162E58 /* titanium.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = titanium.xcconfig; sourceTree = "<group>"; };
5353
24DE9E0F11C5FE74003F90F6 /* AvImageviewModuleAssets.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AvImageviewModuleAssets.h; path = Classes/AvImageviewModuleAssets.h; sourceTree = "<group>"; };
5454
24DE9E1011C5FE74003F90F6 /* AvImageviewModuleAssets.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AvImageviewModuleAssets.m; path = Classes/AvImageviewModuleAssets.m; sourceTree = "<group>"; };
55-
3A5C53232243EB1100B8AE68 /* SDWebImage.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SDWebImage.framework; path = platform/SDWebImage.framework; sourceTree = "<group>"; };
55+
3A4FC5E626C93DA2002D8E1E /* SDWebImage.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = SDWebImage.xcframework; path = platform/SDWebImage.xcframework; sourceTree = "<group>"; };
5656
65D436391CDB4B9B00EC9CC2 /* ImageIO.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ImageIO.framework; path = System/Library/Frameworks/ImageIO.framework; sourceTree = SDKROOT; };
5757
65D4363B1CDB4C2C00EC9CC2 /* AvImageviewImageViewProxy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AvImageviewImageViewProxy.h; path = Classes/AvImageviewImageViewProxy.h; sourceTree = "<group>"; };
5858
65D4363C1CDB4C2C00EC9CC2 /* AvImageviewImageViewProxy.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AvImageviewImageViewProxy.m; path = Classes/AvImageviewImageViewProxy.m; sourceTree = "<group>"; };
@@ -69,7 +69,7 @@
6969
buildActionMask = 2147483647;
7070
files = (
7171
65D4363A1CDB4B9B00EC9CC2 /* ImageIO.framework in Frameworks */,
72-
3A5C53242243EB1100B8AE68 /* SDWebImage.framework in Frameworks */,
72+
3A4FC5E726C93DA2002D8E1E /* SDWebImage.xcframework in Frameworks */,
7373
AACBBE4A0F95108600F1A2B1 /* Foundation.framework in Frameworks */,
7474
);
7575
runOnlyForDeploymentPostprocessing = 0;
@@ -99,7 +99,7 @@
9999
0867D69AFE84028FC02AAC07 /* Frameworks */ = {
100100
isa = PBXGroup;
101101
children = (
102-
3A5C53232243EB1100B8AE68 /* SDWebImage.framework */,
102+
3A4FC5E626C93DA2002D8E1E /* SDWebImage.xcframework */,
103103
65D436391CDB4B9B00EC9CC2 /* ImageIO.framework */,
104104
AACBBE490F95108600F1A2B1 /* Foundation.framework */,
105105
);
@@ -171,7 +171,7 @@
171171
0867D690FE84028FC02AAC07 /* Project object */ = {
172172
isa = PBXProject;
173173
attributes = {
174-
LastUpgradeCheck = 1130;
174+
LastUpgradeCheck = 1250;
175175
};
176176
buildConfigurationList = 1DEB922208733DC00010E9CD /* Build configuration list for PBXProject "imageview-ios" */;
177177
compatibilityVersion = "Xcode 3.2";
@@ -265,7 +265,7 @@
265265
GCC_WARN_UNUSED_VALUE = NO;
266266
GCC_WARN_UNUSED_VARIABLE = NO;
267267
INSTALL_PATH = /usr/local/lib;
268-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
268+
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
269269
LIBRARY_SEARCH_PATHS = "";
270270
OTHER_CFLAGS = (
271271
"-DDEBUG",
@@ -277,6 +277,7 @@
277277
"PROVISIONING_PROFILE[sdk=iphoneos*]" = "";
278278
RUN_CLANG_STATIC_ANALYZER = NO;
279279
SDKROOT = iphoneos;
280+
TARGETED_DEVICE_FAMILY = "1,2,6";
280281
USER_HEADER_SEARCH_PATHS = "";
281282
};
282283
name = Debug;
@@ -314,13 +315,14 @@
314315
GCC_WARN_UNUSED_VALUE = NO;
315316
GCC_WARN_UNUSED_VARIABLE = NO;
316317
INSTALL_PATH = /usr/local/lib;
317-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
318+
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
318319
LIBRARY_SEARCH_PATHS = "";
319320
OTHER_CFLAGS = "-DTI_POST_1_2";
320321
OTHER_LDFLAGS = "-ObjC";
321322
PRODUCT_NAME = AvImageview;
322323
RUN_CLANG_STATIC_ANALYZER = NO;
323324
SDKROOT = iphoneos;
325+
TARGETED_DEVICE_FAMILY = "1,2,6";
324326
USER_HEADER_SEARCH_PATHS = "";
325327
};
326328
name = Release;
@@ -343,6 +345,7 @@
343345
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
344346
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
345347
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
348+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
346349
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
347350
CLANG_WARN_STRICT_PROTOTYPES = NO;
348351
CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -373,7 +376,7 @@
373376
GCC_WARN_UNUSED_VALUE = NO;
374377
GCC_WARN_UNUSED_VARIABLE = NO;
375378
INSTALL_PATH = /usr/local/lib;
376-
IPHONEOS_DEPLOYMENT_TARGET = 8.0.0;
379+
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
377380
ONLY_ACTIVE_ARCH = YES;
378381
OTHER_CFLAGS = (
379382
"-DDEBUG",
@@ -385,6 +388,7 @@
385388
"PROVISIONING_PROFILE[sdk=iphoneos*]" = "";
386389
RUN_CLANG_STATIC_ANALYZER = NO;
387390
SDKROOT = iphoneos;
391+
TARGETED_DEVICE_FAMILY = "1,2,6";
388392
USER_HEADER_SEARCH_PATHS = "";
389393
};
390394
name = Debug;
@@ -408,6 +412,7 @@
408412
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
409413
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
410414
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
415+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
411416
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
412417
CLANG_WARN_STRICT_PROTOTYPES = NO;
413418
CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -435,12 +440,13 @@
435440
GCC_WARN_UNUSED_VALUE = NO;
436441
GCC_WARN_UNUSED_VARIABLE = NO;
437442
INSTALL_PATH = /usr/local/lib;
438-
IPHONEOS_DEPLOYMENT_TARGET = 8.0.0;
443+
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
439444
OTHER_CFLAGS = "-DTI_POST_1_2";
440445
OTHER_LDFLAGS = "-ObjC";
441446
PRODUCT_NAME = AvImageview;
442447
RUN_CLANG_STATIC_ANALYZER = NO;
443448
SDKROOT = iphoneos;
449+
TARGETED_DEVICE_FAMILY = "1,2,6";
444450
USER_HEADER_SEARCH_PATHS = "";
445451
};
446452
name = Release;

‎ios/imageview-ios.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
33
<plist version="1.0">
44
<dict>
5-
<key>BuildSystemType</key>
6-
<string>Original</string>
5+
<key>PreviewsEnabled</key>
6+
<false/>
77
</dict>
88
</plist>

‎ios/manifest‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,18 @@
22
# this is your module manifest and used by Titanium
33
# during compilation, packaging, distribution, etc.
44
#
5-
version: 2.1.1
5+
version: 3.0.0
66
apiversion: 2
7-
architectures: armv7 arm64 i386 x86_64
8-
description: andreavitale-imageview
7+
architectures: arm64 x86_64
8+
description: imageview-ios
99
author: Andrea Vitale
1010
license: MIT
11+
mac: true
1112
copyright: Copyright (c) 2017-present by Andrea Vitale
1213

1314
# these should not be edited
14-
name: andreavitale-imageview
15+
name: imageview-ios
1516
moduleid: av.imageview
1617
guid: ddffa9fa-4366-40f0-9031-d32000a82138
1718
platform: iphone
18-
minsdk: 8.0.0
19+
minsdk: 9.2.0

‎ios/platform/SDWebImage.framework/PrivateHeaders/SDImageHEICCoderInternal.h‎

Lines changed: 0 additions & 25 deletions
This file was deleted.

‎ios/platform/SDWebImage.framework/SDWebImage‎

-8 MB
Binary file not shown.

‎ios/platform/SDWebImage.xcframework/Info.plist‎

Lines changed: 126 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,126 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>AvailableLibraries</key>
6+
<array>
7+
<dict>
8+
<key>LibraryIdentifier</key>
9+
<string>ios-arm64_armv7</string>
10+
<key>LibraryPath</key>
11+
<string>SDWebImage.framework</string>
12+
<key>SupportedArchitectures</key>
13+
<array>
14+
<string>arm64</string>
15+
<string>armv7</string>
16+
</array>
17+
<key>SupportedPlatform</key>
18+
<string>ios</string>
19+
</dict>
20+
<dict>
21+
<key>LibraryIdentifier</key>
22+
<string>watchos-arm64_i386_x86_64-simulator</string>
23+
<key>LibraryPath</key>
24+
<string>SDWebImage.framework</string>
25+
<key>SupportedArchitectures</key>
26+
<array>
27+
<string>arm64</string>
28+
<string>i386</string>
29+
<string>x86_64</string>
30+
</array>
31+
<key>SupportedPlatform</key>
32+
<string>watchos</string>
33+
<key>SupportedPlatformVariant</key>
34+
<string>simulator</string>
35+
</dict>
36+
<dict>
37+
<key>LibraryIdentifier</key>
38+
<string>ios-arm64_i386_x86_64-simulator</string>
39+
<key>LibraryPath</key>
40+
<string>SDWebImage.framework</string>
41+
<key>SupportedArchitectures</key>
42+
<array>
43+
<string>arm64</string>
44+
<string>i386</string>
45+
<string>x86_64</string>
46+
</array>
47+
<key>SupportedPlatform</key>
48+
<string>ios</string>
49+
<key>SupportedPlatformVariant</key>
50+
<string>simulator</string>
51+
</dict>
52+
<dict>
53+
<key>LibraryIdentifier</key>
54+
<string>macos-arm64_x86_64</string>
55+
<key>LibraryPath</key>
56+
<string>SDWebImage.framework</string>
57+
<key>SupportedArchitectures</key>
58+
<array>
59+
<string>arm64</string>
60+
<string>x86_64</string>
61+
</array>
62+
<key>SupportedPlatform</key>
63+
<string>macos</string>
64+
</dict>
65+
<dict>
66+
<key>LibraryIdentifier</key>
67+
<string>tvos-arm64_x86_64-simulator</string>
68+
<key>LibraryPath</key>
69+
<string>SDWebImage.framework</string>
70+
<key>SupportedArchitectures</key>
71+
<array>
72+
<string>arm64</string>
73+
<string>x86_64</string>
74+
</array>
75+
<key>SupportedPlatform</key>
76+
<string>tvos</string>
77+
<key>SupportedPlatformVariant</key>
78+
<string>simulator</string>
79+
</dict>
80+
<dict>
81+
<key>LibraryIdentifier</key>
82+
<string>tvos-arm64</string>
83+
<key>LibraryPath</key>
84+
<string>SDWebImage.framework</string>
85+
<key>SupportedArchitectures</key>
86+
<array>
87+
<string>arm64</string>
88+
</array>
89+
<key>SupportedPlatform</key>
90+
<string>tvos</string>
91+
</dict>
92+
<dict>
93+
<key>LibraryIdentifier</key>
94+
<string>watchos-arm64_32_armv7k</string>
95+
<key>LibraryPath</key>
96+
<string>SDWebImage.framework</string>
97+
<key>SupportedArchitectures</key>
98+
<array>
99+
<string>arm64_32</string>
100+
<string>armv7k</string>
101+
</array>
102+
<key>SupportedPlatform</key>
103+
<string>watchos</string>
104+
</dict>
105+
<dict>
106+
<key>LibraryIdentifier</key>
107+
<string>ios-arm64_x86_64-maccatalyst</string>
108+
<key>LibraryPath</key>
109+
<string>SDWebImage.framework</string>
110+
<key>SupportedArchitectures</key>
111+
<array>
112+
<string>arm64</string>
113+
<string>x86_64</string>
114+
</array>
115+
<key>SupportedPlatform</key>
116+
<string>ios</string>
117+
<key>SupportedPlatformVariant</key>
118+
<string>maccatalyst</string>
119+
</dict>
120+
</array>
121+
<key>CFBundlePackageType</key>
122+
<string>XFWK</string>
123+
<key>XCFrameworkFormatVersion</key>
124+
<string>1.0</string>
125+
</dict>
126+
</plist>

ios/platform/SDWebImage.framework/Headers/NSButton+WebCache.h renamed to ios/platform/SDWebImage.xcframework/ios-arm64_armv7/SDWebImage.framework/Headers/NSButton+WebCache.h

File renamed without changes.

ios/platform/SDWebImage.framework/Headers/NSData+ImageContentType.h renamed to ios/platform/SDWebImage.xcframework/ios-arm64_armv7/SDWebImage.framework/Headers/NSData+ImageContentType.h

File renamed without changes.

ios/platform/SDWebImage.framework/Headers/NSImage+Compatibility.h renamed to ios/platform/SDWebImage.xcframework/ios-arm64_armv7/SDWebImage.framework/Headers/NSImage+Compatibility.h

File renamed without changes.

0 commit comments

Comments
 (0)