Skip to content

Commit 36bc39a

Browse files
dreampiggydreampiggy
committed
Totally remove all previous Animated on watchOS implementation (which use WKInterfaceObject SPI)
1 parent 0a176f4 commit 36bc39a

10 files changed

+1
-659
lines changed

‎Package.swift

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,16 +24,9 @@ let package = Package(
2424
// Targets can depend on other targets in this package, and on products in packages which this package depends on.
2525
.target(
2626
name: "SDWebImageSwiftUI",
27-
dependencies: ["SDWebImage", "SDWebImageSwiftUIObjC"],
27+
dependencies: ["SDWebImage"],
2828
path: "SDWebImageSwiftUI/Classes",
2929
exclude: ["ObjC"]
3030
),
31-
// This is implementation detail because SwiftPM does not support mixed Objective-C/Swift code, don't dependent this target
32-
.target(
33-
name: "SDWebImageSwiftUIObjC",
34-
dependencies: ["SDWebImage"],
35-
path: "SDWebImageSwiftUI/Classes/ObjC",
36-
publicHeadersPath: "."
37-
)
3831
]
3932
)

‎SDWebImageSwiftUI.xcodeproj/project.pbxproj

Lines changed: 0 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -7,22 +7,6 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10-
324F61C7235E07EC003973B8 /* SDAnimatedImageInterface.h in Headers */ = {isa = PBXBuildFile; fileRef = 324F61C5235E07EC003973B8 /* SDAnimatedImageInterface.h */; settings = {ATTRIBUTES = (Public, ); }; };
11-
324F61C8235E07EC003973B8 /* SDAnimatedImageInterface.h in Headers */ = {isa = PBXBuildFile; fileRef = 324F61C5235E07EC003973B8 /* SDAnimatedImageInterface.h */; settings = {ATTRIBUTES = (Public, ); }; };
12-
324F61C9235E07EC003973B8 /* SDAnimatedImageInterface.h in Headers */ = {isa = PBXBuildFile; fileRef = 324F61C5235E07EC003973B8 /* SDAnimatedImageInterface.h */; settings = {ATTRIBUTES = (Public, ); }; };
13-
324F61CA235E07EC003973B8 /* SDAnimatedImageInterface.h in Headers */ = {isa = PBXBuildFile; fileRef = 324F61C5235E07EC003973B8 /* SDAnimatedImageInterface.h */; settings = {ATTRIBUTES = (Public, ); }; };
14-
324F61CB235E07EC003973B8 /* SDAnimatedImageInterface.m in Sources */ = {isa = PBXBuildFile; fileRef = 324F61C6235E07EC003973B8 /* SDAnimatedImageInterface.m */; };
15-
324F61CC235E07EC003973B8 /* SDAnimatedImageInterface.m in Sources */ = {isa = PBXBuildFile; fileRef = 324F61C6235E07EC003973B8 /* SDAnimatedImageInterface.m */; };
16-
324F61CD235E07EC003973B8 /* SDAnimatedImageInterface.m in Sources */ = {isa = PBXBuildFile; fileRef = 324F61C6235E07EC003973B8 /* SDAnimatedImageInterface.m */; };
17-
324F61CE235E07EC003973B8 /* SDAnimatedImageInterface.m in Sources */ = {isa = PBXBuildFile; fileRef = 324F61C6235E07EC003973B8 /* SDAnimatedImageInterface.m */; };
18-
3253E05823879A6F007ACAD8 /* SDAnimatedImageInterface+WebCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 3253E05623879A6F007ACAD8 /* SDAnimatedImageInterface+WebCache.h */; settings = {ATTRIBUTES = (Public, ); }; };
19-
3253E05923879A6F007ACAD8 /* SDAnimatedImageInterface+WebCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 3253E05623879A6F007ACAD8 /* SDAnimatedImageInterface+WebCache.h */; settings = {ATTRIBUTES = (Public, ); }; };
20-
3253E05A23879A6F007ACAD8 /* SDAnimatedImageInterface+WebCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 3253E05623879A6F007ACAD8 /* SDAnimatedImageInterface+WebCache.h */; settings = {ATTRIBUTES = (Public, ); }; };
21-
3253E05B23879A6F007ACAD8 /* SDAnimatedImageInterface+WebCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 3253E05623879A6F007ACAD8 /* SDAnimatedImageInterface+WebCache.h */; settings = {ATTRIBUTES = (Public, ); }; };
22-
3253E05C23879A6F007ACAD8 /* SDAnimatedImageInterface+WebCache.m in Sources */ = {isa = PBXBuildFile; fileRef = 3253E05723879A6F007ACAD8 /* SDAnimatedImageInterface+WebCache.m */; };
23-
3253E05D23879A6F007ACAD8 /* SDAnimatedImageInterface+WebCache.m in Sources */ = {isa = PBXBuildFile; fileRef = 3253E05723879A6F007ACAD8 /* SDAnimatedImageInterface+WebCache.m */; };
24-
3253E05E23879A6F007ACAD8 /* SDAnimatedImageInterface+WebCache.m in Sources */ = {isa = PBXBuildFile; fileRef = 3253E05723879A6F007ACAD8 /* SDAnimatedImageInterface+WebCache.m */; };
25-
3253E05F23879A6F007ACAD8 /* SDAnimatedImageInterface+WebCache.m in Sources */ = {isa = PBXBuildFile; fileRef = 3253E05723879A6F007ACAD8 /* SDAnimatedImageInterface+WebCache.m */; };
2610
326B84822363350C0011BDFB /* Indicator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 326B84812363350C0011BDFB /* Indicator.swift */; };
2711
326B84832363350C0011BDFB /* Indicator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 326B84812363350C0011BDFB /* Indicator.swift */; };
2812
326B84842363350C0011BDFB /* Indicator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 326B84812363350C0011BDFB /* Indicator.swift */; };
@@ -39,14 +23,6 @@
3923
326E480B23431C0F00C633E9 /* ImageViewWrapper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 326E480923431C0F00C633E9 /* ImageViewWrapper.swift */; };
4024
326E480C23431C0F00C633E9 /* ImageViewWrapper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 326E480923431C0F00C633E9 /* ImageViewWrapper.swift */; };
4125
326E480D23431C0F00C633E9 /* ImageViewWrapper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 326E480923431C0F00C633E9 /* ImageViewWrapper.swift */; };
42-
3276EB00237760D800B385D4 /* SDAnimatedImageInterfaceWrapper.h in Headers */ = {isa = PBXBuildFile; fileRef = 3276EAFE237760D800B385D4 /* SDAnimatedImageInterfaceWrapper.h */; settings = {ATTRIBUTES = (Public, ); }; };
43-
3276EB01237760D800B385D4 /* SDAnimatedImageInterfaceWrapper.h in Headers */ = {isa = PBXBuildFile; fileRef = 3276EAFE237760D800B385D4 /* SDAnimatedImageInterfaceWrapper.h */; settings = {ATTRIBUTES = (Public, ); }; };
44-
3276EB02237760D800B385D4 /* SDAnimatedImageInterfaceWrapper.h in Headers */ = {isa = PBXBuildFile; fileRef = 3276EAFE237760D800B385D4 /* SDAnimatedImageInterfaceWrapper.h */; settings = {ATTRIBUTES = (Public, ); }; };
45-
3276EB03237760D800B385D4 /* SDAnimatedImageInterfaceWrapper.h in Headers */ = {isa = PBXBuildFile; fileRef = 3276EAFE237760D800B385D4 /* SDAnimatedImageInterfaceWrapper.h */; settings = {ATTRIBUTES = (Public, ); }; };
46-
3276EB04237760D800B385D4 /* SDAnimatedImageInterfaceWrapper.m in Sources */ = {isa = PBXBuildFile; fileRef = 3276EAFF237760D800B385D4 /* SDAnimatedImageInterfaceWrapper.m */; };
47-
3276EB05237760D800B385D4 /* SDAnimatedImageInterfaceWrapper.m in Sources */ = {isa = PBXBuildFile; fileRef = 3276EAFF237760D800B385D4 /* SDAnimatedImageInterfaceWrapper.m */; };
48-
3276EB06237760D800B385D4 /* SDAnimatedImageInterfaceWrapper.m in Sources */ = {isa = PBXBuildFile; fileRef = 3276EAFF237760D800B385D4 /* SDAnimatedImageInterfaceWrapper.m */; };
49-
3276EB07237760D800B385D4 /* SDAnimatedImageInterfaceWrapper.m in Sources */ = {isa = PBXBuildFile; fileRef = 3276EAFF237760D800B385D4 /* SDAnimatedImageInterfaceWrapper.m */; };
5026
32B933E523659A1900BB7CAD /* Transition.swift in Sources */ = {isa = PBXBuildFile; fileRef = 32B933E423659A1900BB7CAD /* Transition.swift */; };
5127
32B933E623659A1900BB7CAD /* Transition.swift in Sources */ = {isa = PBXBuildFile; fileRef = 32B933E423659A1900BB7CAD /* Transition.swift */; };
5228
32B933E723659A1900BB7CAD /* Transition.swift in Sources */ = {isa = PBXBuildFile; fileRef = 32B933E423659A1900BB7CAD /* Transition.swift */; };
@@ -129,16 +105,10 @@
129105
/* End PBXCopyFilesBuildPhase section */
130106

131107
/* Begin PBXFileReference section */
132-
324F61C5235E07EC003973B8 /* SDAnimatedImageInterface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDAnimatedImageInterface.h; sourceTree = "<group>"; };
133-
324F61C6235E07EC003973B8 /* SDAnimatedImageInterface.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDAnimatedImageInterface.m; sourceTree = "<group>"; };
134-
3253E05623879A6F007ACAD8 /* SDAnimatedImageInterface+WebCache.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "SDAnimatedImageInterface+WebCache.h"; sourceTree = "<group>"; };
135-
3253E05723879A6F007ACAD8 /* SDAnimatedImageInterface+WebCache.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "SDAnimatedImageInterface+WebCache.m"; sourceTree = "<group>"; };
136108
326B84812363350C0011BDFB /* Indicator.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Indicator.swift; sourceTree = "<group>"; };
137109
326B8486236335110011BDFB /* ActivityIndicator.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ActivityIndicator.swift; sourceTree = "<group>"; };
138110
326B848B236335400011BDFB /* ProgressIndicator.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ProgressIndicator.swift; sourceTree = "<group>"; };
139111
326E480923431C0F00C633E9 /* ImageViewWrapper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImageViewWrapper.swift; sourceTree = "<group>"; };
140-
3276EAFE237760D800B385D4 /* SDAnimatedImageInterfaceWrapper.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDAnimatedImageInterfaceWrapper.h; sourceTree = "<group>"; };
141-
3276EAFF237760D800B385D4 /* SDAnimatedImageInterfaceWrapper.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SDAnimatedImageInterfaceWrapper.m; sourceTree = "<group>"; };
142112
32B933E423659A1900BB7CAD /* Transition.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Transition.swift; sourceTree = "<group>"; };
143113
32C43DCC22FD540D00BE87F5 /* SDWebImageSwiftUI.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SDWebImageSwiftUI.framework; sourceTree = BUILT_PRODUCTS_DIR; };
144114
32C43DDC22FD54C600BE87F5 /* ImageManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ImageManager.swift; sourceTree = "<group>"; };
@@ -192,19 +162,6 @@
192162
/* End PBXFrameworksBuildPhase section */
193163

194164
/* Begin PBXGroup section */
195-
324F61C4235E07EC003973B8 /* ObjC */ = {
196-
isa = PBXGroup;
197-
children = (
198-
324F61C5235E07EC003973B8 /* SDAnimatedImageInterface.h */,
199-
324F61C6235E07EC003973B8 /* SDAnimatedImageInterface.m */,
200-
3253E05623879A6F007ACAD8 /* SDAnimatedImageInterface+WebCache.h */,
201-
3253E05723879A6F007ACAD8 /* SDAnimatedImageInterface+WebCache.m */,
202-
3276EAFE237760D800B385D4 /* SDAnimatedImageInterfaceWrapper.h */,
203-
3276EAFF237760D800B385D4 /* SDAnimatedImageInterfaceWrapper.m */,
204-
);
205-
path = ObjC;
206-
sourceTree = "<group>";
207-
};
208165
326099472362E09E006EBB22 /* Indicator */ = {
209166
isa = PBXGroup;
210167
children = (
@@ -258,7 +215,6 @@
258215
children = (
259216
32B933E323659A0700BB7CAD /* Transition */,
260217
326099472362E09E006EBB22 /* Indicator */,
261-
324F61C4235E07EC003973B8 /* ObjC */,
262218
32C43DDC22FD54C600BE87F5 /* ImageManager.swift */,
263219
32C43DDE22FD54C600BE87F5 /* WebImage.swift */,
264220
32C43DDF22FD54C600BE87F5 /* AnimatedImage.swift */,
@@ -286,9 +242,6 @@
286242
isa = PBXHeadersBuildPhase;
287243
buildActionMask = 2147483647;
288244
files = (
289-
3253E05823879A6F007ACAD8 /* SDAnimatedImageInterface+WebCache.h in Headers */,
290-
3276EB00237760D800B385D4 /* SDAnimatedImageInterfaceWrapper.h in Headers */,
291-
324F61C7235E07EC003973B8 /* SDAnimatedImageInterface.h in Headers */,
292245
32C43DE622FD54CD00BE87F5 /* SDWebImageSwiftUI.h in Headers */,
293246
);
294247
runOnlyForDeploymentPostprocessing = 0;
@@ -297,9 +250,6 @@
297250
isa = PBXHeadersBuildPhase;
298251
buildActionMask = 2147483647;
299252
files = (
300-
3253E05923879A6F007ACAD8 /* SDAnimatedImageInterface+WebCache.h in Headers */,
301-
3276EB01237760D800B385D4 /* SDAnimatedImageInterfaceWrapper.h in Headers */,
302-
324F61C8235E07EC003973B8 /* SDAnimatedImageInterface.h in Headers */,
303253
32C43E2222FD583A00BE87F5 /* SDWebImageSwiftUI.h in Headers */,
304254
);
305255
runOnlyForDeploymentPostprocessing = 0;
@@ -308,9 +258,6 @@
308258
isa = PBXHeadersBuildPhase;
309259
buildActionMask = 2147483647;
310260
files = (
311-
3253E05A23879A6F007ACAD8 /* SDAnimatedImageInterface+WebCache.h in Headers */,
312-
3276EB02237760D800B385D4 /* SDAnimatedImageInterfaceWrapper.h in Headers */,
313-
324F61C9235E07EC003973B8 /* SDAnimatedImageInterface.h in Headers */,
314261
32C43E2322FD583B00BE87F5 /* SDWebImageSwiftUI.h in Headers */,
315262
);
316263
runOnlyForDeploymentPostprocessing = 0;
@@ -319,9 +266,6 @@
319266
isa = PBXHeadersBuildPhase;
320267
buildActionMask = 2147483647;
321268
files = (
322-
3253E05B23879A6F007ACAD8 /* SDAnimatedImageInterface+WebCache.h in Headers */,
323-
3276EB03237760D800B385D4 /* SDAnimatedImageInterfaceWrapper.h in Headers */,
324-
324F61CA235E07EC003973B8 /* SDAnimatedImageInterface.h in Headers */,
325269
32C43E2422FD583C00BE87F5 /* SDWebImageSwiftUI.h in Headers */,
326270
);
327271
runOnlyForDeploymentPostprocessing = 0;
@@ -489,7 +433,6 @@
489433
isa = PBXSourcesBuildPhase;
490434
buildActionMask = 2147483647;
491435
files = (
492-
3276EB04237760D800B385D4 /* SDAnimatedImageInterfaceWrapper.m in Sources */,
493436
32B933E523659A1900BB7CAD /* Transition.swift in Sources */,
494437
32C43E1722FD583700BE87F5 /* WebImage.swift in Sources */,
495438
326B848C236335400011BDFB /* ProgressIndicator.swift in Sources */,
@@ -498,17 +441,14 @@
498441
326E480A23431C0F00C633E9 /* ImageViewWrapper.swift in Sources */,
499442
326B8487236335110011BDFB /* ActivityIndicator.swift in Sources */,
500443
32C43E1622FD583700BE87F5 /* ImageManager.swift in Sources */,
501-
3253E05C23879A6F007ACAD8 /* SDAnimatedImageInterface+WebCache.m in Sources */,
502444
32C43E1822FD583700BE87F5 /* AnimatedImage.swift in Sources */,
503-
324F61CB235E07EC003973B8 /* SDAnimatedImageInterface.m in Sources */,
504445
);
505446
runOnlyForDeploymentPostprocessing = 0;
506447
};
507448
32C43DF022FD57FD00BE87F5 /* Sources */ = {
508449
isa = PBXSourcesBuildPhase;
509450
buildActionMask = 2147483647;
510451
files = (
511-
3276EB05237760D800B385D4 /* SDAnimatedImageInterfaceWrapper.m in Sources */,
512452
32B933E623659A1900BB7CAD /* Transition.swift in Sources */,
513453
32C43E1A22FD583700BE87F5 /* WebImage.swift in Sources */,
514454
326B848D236335400011BDFB /* ProgressIndicator.swift in Sources */,
@@ -517,17 +457,14 @@
517457
326E480B23431C0F00C633E9 /* ImageViewWrapper.swift in Sources */,
518458
326B8488236335110011BDFB /* ActivityIndicator.swift in Sources */,
519459
32C43E1922FD583700BE87F5 /* ImageManager.swift in Sources */,
520-
3253E05D23879A6F007ACAD8 /* SDAnimatedImageInterface+WebCache.m in Sources */,
521460
32C43E1B22FD583700BE87F5 /* AnimatedImage.swift in Sources */,
522-
324F61CC235E07EC003973B8 /* SDAnimatedImageInterface.m in Sources */,
523461
);
524462
runOnlyForDeploymentPostprocessing = 0;
525463
};
526464
32C43DFD22FD581400BE87F5 /* Sources */ = {
527465
isa = PBXSourcesBuildPhase;
528466
buildActionMask = 2147483647;
529467
files = (
530-
3276EB06237760D800B385D4 /* SDAnimatedImageInterfaceWrapper.m in Sources */,
531468
32B933E723659A1900BB7CAD /* Transition.swift in Sources */,
532469
32C43E1D22FD583800BE87F5 /* WebImage.swift in Sources */,
533470
326B848E236335400011BDFB /* ProgressIndicator.swift in Sources */,
@@ -536,17 +473,14 @@
536473
326E480C23431C0F00C633E9 /* ImageViewWrapper.swift in Sources */,
537474
326B8489236335110011BDFB /* ActivityIndicator.swift in Sources */,
538475
32C43E1C22FD583800BE87F5 /* ImageManager.swift in Sources */,
539-
3253E05E23879A6F007ACAD8 /* SDAnimatedImageInterface+WebCache.m in Sources */,
540476
32C43E1E22FD583800BE87F5 /* AnimatedImage.swift in Sources */,
541-
324F61CD235E07EC003973B8 /* SDAnimatedImageInterface.m in Sources */,
542477
);
543478
runOnlyForDeploymentPostprocessing = 0;
544479
};
545480
32C43E0A22FD581C00BE87F5 /* Sources */ = {
546481
isa = PBXSourcesBuildPhase;
547482
buildActionMask = 2147483647;
548483
files = (
549-
3276EB07237760D800B385D4 /* SDAnimatedImageInterfaceWrapper.m in Sources */,
550484
32B933E823659A1900BB7CAD /* Transition.swift in Sources */,
551485
32C43E2022FD583800BE87F5 /* WebImage.swift in Sources */,
552486
326B848F236335400011BDFB /* ProgressIndicator.swift in Sources */,
@@ -555,9 +489,7 @@
555489
326E480D23431C0F00C633E9 /* ImageViewWrapper.swift in Sources */,
556490
326B848A236335110011BDFB /* ActivityIndicator.swift in Sources */,
557491
32C43E1F22FD583800BE87F5 /* ImageManager.swift in Sources */,
558-
3253E05F23879A6F007ACAD8 /* SDAnimatedImageInterface+WebCache.m in Sources */,
559492
32C43E2122FD583800BE87F5 /* AnimatedImage.swift in Sources */,
560-
324F61CE235E07EC003973B8 /* SDAnimatedImageInterface.m in Sources */,
561493
);
562494
runOnlyForDeploymentPostprocessing = 0;
563495
};

‎SDWebImageSwiftUI/Classes/ImageViewWrapper.swift

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,6 @@
88

99
import Foundation
1010
import SDWebImage
11-
#if canImport(SDWebImageSwiftUIObjC)
12-
import SDWebImageSwiftUIObjC
13-
#endif
14-
15-
#if os(watchOS)
16-
/// Use wrapper to solve the `WKInterfaceImage` aspect issue (SwiftUI's Bug)
17-
public typealias AnimatedImageViewWrapper = SDAnimatedImageInterfaceWrapper
18-
#endif
1911

2012
#if !os(watchOS)
2113

‎SDWebImageSwiftUI/Classes/ObjC/SDAnimatedImageInterface+WebCache.h

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

‎SDWebImageSwiftUI/Classes/ObjC/SDAnimatedImageInterface+WebCache.m

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

0 commit comments

Comments
 (0)