Skip to content

Commit 7a9fbc1

Browse files
dreampiggydreampiggy
authored
Merge pull request #1 from SDWebImage/support_watchos
Added the support for watchOS on Carthage. Update the dependency to 3.0.1
2 parents 4218995 + 5969b04 commit 7a9fbc1

File tree

8 files changed

+216
-52
lines changed

8 files changed

+216
-52
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,3 +34,4 @@ Carthage/Build
3434
# `pod install` in .travis.yml
3535
#
3636
Example/Pods/
37+
Example/Podfile.lock

‎Cartfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
github "SDWebImage/SDWebImage" ~> 5.7
2-
github "pinterest/PINCache" >= 3.0.1-beta
2+
github "pinterest/PINCache" >= 3.0.1

‎Cartfile.resolved

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
github "SDWebImage/SDWebImage" "5.7.2"
2-
github "pinterest/PINCache" "3.0.1-beta.8"
3-
github "pinterest/PINOperation" "1.1.2"
1+
github "SDWebImage/SDWebImage" "5.8.4"
2+
github "pinterest/PINCache" "3.0.1"
3+
github "pinterest/PINOperation" "1.2"

‎Example/Podfile.lock

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

‎README.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -97,10 +97,6 @@ SDWebImageFLPlugin is available through [Carthage](https://github.com/Carthage/C
9797
github "SDWebImage/SDWebImagePINPlugin"
9898
```
9999

100-
Note: Carthage integration does not support watchOS platform. If you need watchOS, use CocoaPods instead.
101-
102-
See tracked issue: [PINCache#268](https://github.com/pinterest/PINCache/issues/268)
103-
104100
## Author
105101

106102
DreamPiggy, [email protected]

‎SDWebImagePINPlugin.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,5 +34,5 @@ TODO: Add long description of the pod here.
3434
s.source_files = 'SDWebImagePINPlugin/Classes/**/*', 'SDWebImagePINPlugin/Module/SDWebImagePINPlugin.h'
3535

3636
s.dependency 'SDWebImage/Core', '~> 5.7'
37-
s.dependency 'PINCache', '>= 3.0.1-beta'
37+
s.dependency 'PINCache', '>= 3.0.1'
3838
end

‎SDWebImagePINPlugin.xcodeproj/project.pbxproj

Lines changed: 143 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,15 @@
3434
32353B082443082400AD195A /* SDWebImage.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 32353B052443082400AD195A /* SDWebImage.framework */; };
3535
32353B0D2443083600AD195A /* PINCache.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 32353B0B2443083600AD195A /* PINCache.framework */; };
3636
32353B0F2443083600AD195A /* SDWebImage.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 32353B0C2443083600AD195A /* SDWebImage.framework */; };
37+
32F9A06924F7672E0016584B /* SDWebImage.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 32353B122443084600AD195A /* SDWebImage.framework */; };
38+
32F9A06B24F767470016584B /* PINCache.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 32F9A06A24F767470016584B /* PINCache.framework */; };
39+
32F9A06C24F7674C0016584B /* PINCache+SDAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 32353AB3244306C200AD195A /* PINCache+SDAdditions.h */; settings = {ATTRIBUTES = (Public, ); }; };
40+
32F9A06D24F7674C0016584B /* PINCache+SDAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 32353AB7244306C200AD195A /* PINCache+SDAdditions.m */; };
41+
32F9A06E24F7674C0016584B /* PINDiskCache+SDAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 32353AB8244306C200AD195A /* PINDiskCache+SDAdditions.h */; settings = {ATTRIBUTES = (Public, ); }; };
42+
32F9A06F24F7674C0016584B /* PINDiskCache+SDAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 32353AB5244306C200AD195A /* PINDiskCache+SDAdditions.m */; };
43+
32F9A07024F7674C0016584B /* PINMemoryCache+SDAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 32353AB6244306C200AD195A /* PINMemoryCache+SDAdditions.h */; settings = {ATTRIBUTES = (Public, ); }; };
44+
32F9A07124F7674C0016584B /* PINMemoryCache+SDAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 32353AB2244306C200AD195A /* PINMemoryCache+SDAdditions.m */; };
45+
32F9A07224F767580016584B /* SDWebImagePINPlugin.h in Headers */ = {isa = PBXBuildFile; fileRef = 32353AA92443067C00AD195A /* SDWebImagePINPlugin.h */; settings = {ATTRIBUTES = (Public, ); }; };
3746
/* End PBXBuildFile section */
3847

3948
/* Begin PBXFileReference section */
@@ -55,6 +64,8 @@
5564
32353B0B2443083600AD195A /* PINCache.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = PINCache.framework; path = Carthage/Build/tvOS/PINCache.framework; sourceTree = "<group>"; };
5665
32353B0C2443083600AD195A /* SDWebImage.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SDWebImage.framework; path = Carthage/Build/tvOS/SDWebImage.framework; sourceTree = "<group>"; };
5766
32353B122443084600AD195A /* SDWebImage.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SDWebImage.framework; path = Carthage/Build/watchOS/SDWebImage.framework; sourceTree = "<group>"; };
67+
32F9A06124F766CC0016584B /* SDWebImagePINPlugin.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SDWebImagePINPlugin.framework; sourceTree = BUILT_PRODUCTS_DIR; };
68+
32F9A06A24F767470016584B /* PINCache.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = PINCache.framework; path = Carthage/Build/watchOS/PINCache.framework; sourceTree = "<group>"; };
5869
/* End PBXFileReference section */
5970

6071
/* Begin PBXFrameworksBuildPhase section */
@@ -85,6 +96,15 @@
8596
);
8697
runOnlyForDeploymentPostprocessing = 0;
8798
};
99+
32F9A05E24F766CC0016584B /* Frameworks */ = {
100+
isa = PBXFrameworksBuildPhase;
101+
buildActionMask = 2147483647;
102+
files = (
103+
32F9A06B24F767470016584B /* PINCache.framework in Frameworks */,
104+
32F9A06924F7672E0016584B /* SDWebImage.framework in Frameworks */,
105+
);
106+
runOnlyForDeploymentPostprocessing = 0;
107+
};
88108
/* End PBXFrameworksBuildPhase section */
89109

90110
/* Begin PBXGroup section */
@@ -103,6 +123,7 @@
103123
32353AA62443067C00AD195A /* SDWebImagePINPlugin.framework */,
104124
32353AC52443070100AD195A /* SDWebImagePINPlugin.framework */,
105125
32353AD22443070800AD195A /* SDWebImagePINPlugin.framework */,
126+
32F9A06124F766CC0016584B /* SDWebImagePINPlugin.framework */,
106127
);
107128
name = Products;
108129
sourceTree = "<group>";
@@ -133,6 +154,7 @@
133154
32353AFC2443081200AD195A /* Frameworks */ = {
134155
isa = PBXGroup;
135156
children = (
157+
32F9A06A24F767470016584B /* PINCache.framework */,
136158
32353B122443084600AD195A /* SDWebImage.framework */,
137159
32353B0B2443083600AD195A /* PINCache.framework */,
138160
32353B0C2443083600AD195A /* SDWebImage.framework */,
@@ -180,6 +202,17 @@
180202
);
181203
runOnlyForDeploymentPostprocessing = 0;
182204
};
205+
32F9A05C24F766CC0016584B /* Headers */ = {
206+
isa = PBXHeadersBuildPhase;
207+
buildActionMask = 2147483647;
208+
files = (
209+
32F9A06C24F7674C0016584B /* PINCache+SDAdditions.h in Headers */,
210+
32F9A07224F767580016584B /* SDWebImagePINPlugin.h in Headers */,
211+
32F9A06E24F7674C0016584B /* PINDiskCache+SDAdditions.h in Headers */,
212+
32F9A07024F7674C0016584B /* PINMemoryCache+SDAdditions.h in Headers */,
213+
);
214+
runOnlyForDeploymentPostprocessing = 0;
215+
};
183216
/* End PBXHeadersBuildPhase section */
184217

185218
/* Begin PBXNativeTarget section */
@@ -237,6 +270,24 @@
237270
productReference = 32353AD22443070800AD195A /* SDWebImagePINPlugin.framework */;
238271
productType = "com.apple.product-type.framework";
239272
};
273+
32F9A06024F766CC0016584B /* SDWebImagePINPlugin watchOS */ = {
274+
isa = PBXNativeTarget;
275+
buildConfigurationList = 32F9A06824F766CC0016584B /* Build configuration list for PBXNativeTarget "SDWebImagePINPlugin watchOS" */;
276+
buildPhases = (
277+
32F9A05C24F766CC0016584B /* Headers */,
278+
32F9A05D24F766CC0016584B /* Sources */,
279+
32F9A05E24F766CC0016584B /* Frameworks */,
280+
32F9A05F24F766CC0016584B /* Resources */,
281+
);
282+
buildRules = (
283+
);
284+
dependencies = (
285+
);
286+
name = "SDWebImagePINPlugin watchOS";
287+
productName = "SDWebImagePINPlugin watchOS";
288+
productReference = 32F9A06124F766CC0016584B /* SDWebImagePINPlugin.framework */;
289+
productType = "com.apple.product-type.framework";
290+
};
240291
/* End PBXNativeTarget section */
241292

242293
/* Begin PBXProject section */
@@ -255,6 +306,9 @@
255306
32353AD12443070800AD195A = {
256307
CreatedOnToolsVersion = 11.4;
257308
};
309+
32F9A06024F766CC0016584B = {
310+
CreatedOnToolsVersion = 11.3.1;
311+
};
258312
};
259313
};
260314
buildConfigurationList = 32353AA02443067C00AD195A /* Build configuration list for PBXProject "SDWebImagePINPlugin" */;
@@ -273,6 +327,7 @@
273327
32353AA52443067C00AD195A /* SDWebImagePINPlugin */,
274328
32353AC42443070100AD195A /* SDWebImagePINPlugin macOS */,
275329
32353AD12443070800AD195A /* SDWebImagePINPlugin tvOS */,
330+
32F9A06024F766CC0016584B /* SDWebImagePINPlugin watchOS */,
276331
);
277332
};
278333
/* End PBXProject section */
@@ -299,6 +354,13 @@
299354
);
300355
runOnlyForDeploymentPostprocessing = 0;
301356
};
357+
32F9A05F24F766CC0016584B /* Resources */ = {
358+
isa = PBXResourcesBuildPhase;
359+
buildActionMask = 2147483647;
360+
files = (
361+
);
362+
runOnlyForDeploymentPostprocessing = 0;
363+
};
302364
/* End PBXResourcesBuildPhase section */
303365

304366
/* Begin PBXSourcesBuildPhase section */
@@ -332,6 +394,16 @@
332394
);
333395
runOnlyForDeploymentPostprocessing = 0;
334396
};
397+
32F9A05D24F766CC0016584B /* Sources */ = {
398+
isa = PBXSourcesBuildPhase;
399+
buildActionMask = 2147483647;
400+
files = (
401+
32F9A07124F7674C0016584B /* PINMemoryCache+SDAdditions.m in Sources */,
402+
32F9A06F24F7674C0016584B /* PINDiskCache+SDAdditions.m in Sources */,
403+
32F9A06D24F7674C0016584B /* PINCache+SDAdditions.m in Sources */,
404+
);
405+
runOnlyForDeploymentPostprocessing = 0;
406+
};
335407
/* End PBXSourcesBuildPhase section */
336408

337409
/* Begin XCBuildConfiguration section */
@@ -386,7 +458,7 @@
386458
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
387459
GCC_WARN_UNUSED_FUNCTION = YES;
388460
GCC_WARN_UNUSED_VARIABLE = YES;
389-
IPHONEOS_DEPLOYMENT_TARGET = 13.4;
461+
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
390462
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
391463
MTL_FAST_MATH = YES;
392464
ONLY_ACTIVE_ARCH = YES;
@@ -441,7 +513,7 @@
441513
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
442514
GCC_WARN_UNUSED_FUNCTION = YES;
443515
GCC_WARN_UNUSED_VARIABLE = YES;
444-
IPHONEOS_DEPLOYMENT_TARGET = 13.4;
516+
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
445517
MTL_ENABLE_DEBUG_INFO = NO;
446518
MTL_FAST_MATH = YES;
447519
SDKROOT = iphoneos;
@@ -617,6 +689,66 @@
617689
};
618690
name = Release;
619691
};
692+
32F9A06624F766CC0016584B /* Debug */ = {
693+
isa = XCBuildConfiguration;
694+
buildSettings = {
695+
APPLICATION_EXTENSION_API_ONLY = YES;
696+
CODE_SIGN_STYLE = Automatic;
697+
DEFINES_MODULE = YES;
698+
DYLIB_COMPATIBILITY_VERSION = 1;
699+
DYLIB_CURRENT_VERSION = 1;
700+
DYLIB_INSTALL_NAME_BASE = "@rpath";
701+
FRAMEWORK_SEARCH_PATHS = (
702+
"$(inherited)",
703+
"$(PROJECT_DIR)/Carthage/Build/watchOS",
704+
);
705+
INFOPLIST_FILE = "$(SRCROOT)/SDWebImagePINPlugin/Module/Info.plist";
706+
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
707+
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
708+
LD_RUNPATH_SEARCH_PATHS = (
709+
"$(inherited)",
710+
"@executable_path/Frameworks",
711+
"@loader_path/Frameworks",
712+
);
713+
PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.SDWebImagePINPlugin-watchOS";
714+
PRODUCT_NAME = SDWebImagePINPlugin;
715+
SDKROOT = watchos;
716+
SKIP_INSTALL = YES;
717+
TARGETED_DEVICE_FAMILY = 4;
718+
WATCHOS_DEPLOYMENT_TARGET = 2.0;
719+
};
720+
name = Debug;
721+
};
722+
32F9A06724F766CC0016584B /* Release */ = {
723+
isa = XCBuildConfiguration;
724+
buildSettings = {
725+
APPLICATION_EXTENSION_API_ONLY = YES;
726+
CODE_SIGN_STYLE = Automatic;
727+
DEFINES_MODULE = YES;
728+
DYLIB_COMPATIBILITY_VERSION = 1;
729+
DYLIB_CURRENT_VERSION = 1;
730+
DYLIB_INSTALL_NAME_BASE = "@rpath";
731+
FRAMEWORK_SEARCH_PATHS = (
732+
"$(inherited)",
733+
"$(PROJECT_DIR)/Carthage/Build/watchOS",
734+
);
735+
INFOPLIST_FILE = "$(SRCROOT)/SDWebImagePINPlugin/Module/Info.plist";
736+
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
737+
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
738+
LD_RUNPATH_SEARCH_PATHS = (
739+
"$(inherited)",
740+
"@executable_path/Frameworks",
741+
"@loader_path/Frameworks",
742+
);
743+
PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.SDWebImagePINPlugin-watchOS";
744+
PRODUCT_NAME = SDWebImagePINPlugin;
745+
SDKROOT = watchos;
746+
SKIP_INSTALL = YES;
747+
TARGETED_DEVICE_FAMILY = 4;
748+
WATCHOS_DEPLOYMENT_TARGET = 2.0;
749+
};
750+
name = Release;
751+
};
620752
/* End XCBuildConfiguration section */
621753

622754
/* Begin XCConfigurationList section */
@@ -656,6 +788,15 @@
656788
defaultConfigurationIsVisible = 0;
657789
defaultConfigurationName = Release;
658790
};
791+
32F9A06824F766CC0016584B /* Build configuration list for PBXNativeTarget "SDWebImagePINPlugin watchOS" */ = {
792+
isa = XCConfigurationList;
793+
buildConfigurations = (
794+
32F9A06624F766CC0016584B /* Debug */,
795+
32F9A06724F766CC0016584B /* Release */,
796+
);
797+
defaultConfigurationIsVisible = 0;
798+
defaultConfigurationName = Release;
799+
};
659800
/* End XCConfigurationList section */
660801
};
661802
rootObject = 32353A9D2443067C00AD195A /* Project object */;

‎SDWebImagePINPlugin.xcodeproj/xcshareddata/xcschemes/SDWebImagePINPlugin watchOS.xcscheme

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Scheme
3+
LastUpgradeVersion = "1130"
4+
version = "1.3">
5+
<BuildAction
6+
parallelizeBuildables = "YES"
7+
buildImplicitDependencies = "YES">
8+
<BuildActionEntries>
9+
<BuildActionEntry
10+
buildForTesting = "YES"
11+
buildForRunning = "YES"
12+
buildForProfiling = "YES"
13+
buildForArchiving = "YES"
14+
buildForAnalyzing = "YES">
15+
<BuildableReference
16+
BuildableIdentifier = "primary"
17+
BlueprintIdentifier = "32F9A06024F766CC0016584B"
18+
BuildableName = "SDWebImagePINPlugin.framework"
19+
BlueprintName = "SDWebImagePINPlugin watchOS"
20+
ReferencedContainer = "container:SDWebImagePINPlugin.xcodeproj">
21+
</BuildableReference>
22+
</BuildActionEntry>
23+
</BuildActionEntries>
24+
</BuildAction>
25+
<TestAction
26+
buildConfiguration = "Debug"
27+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
28+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
shouldUseLaunchSchemeArgsEnv = "YES">
30+
<Testables>
31+
</Testables>
32+
</TestAction>
33+
<LaunchAction
34+
buildConfiguration = "Debug"
35+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
36+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
37+
launchStyle = "0"
38+
useCustomWorkingDirectory = "NO"
39+
ignoresPersistentStateOnLaunch = "NO"
40+
debugDocumentVersioning = "YES"
41+
debugServiceExtension = "internal"
42+
allowLocationSimulation = "YES">
43+
</LaunchAction>
44+
<ProfileAction
45+
buildConfiguration = "Release"
46+
shouldUseLaunchSchemeArgsEnv = "YES"
47+
savedToolIdentifier = ""
48+
useCustomWorkingDirectory = "NO"
49+
debugDocumentVersioning = "YES">
50+
<MacroExpansion>
51+
<BuildableReference
52+
BuildableIdentifier = "primary"
53+
BlueprintIdentifier = "32F9A06024F766CC0016584B"
54+
BuildableName = "SDWebImagePINPlugin.framework"
55+
BlueprintName = "SDWebImagePINPlugin watchOS"
56+
ReferencedContainer = "container:SDWebImagePINPlugin.xcodeproj">
57+
</BuildableReference>
58+
</MacroExpansion>
59+
</ProfileAction>
60+
<AnalyzeAction
61+
buildConfiguration = "Debug">
62+
</AnalyzeAction>
63+
<ArchiveAction
64+
buildConfiguration = "Release"
65+
revealArchiveInOrganizer = "YES">
66+
</ArchiveAction>
67+
</Scheme>

0 commit comments

Comments
 (0)