Skip to content

Commit 27d6b50

Browse files
bpoplauschibpoplauschi
committed
Renamed project to SDWebImageWebPCoder - it matches the format for the other repos and, as a workaround:
- `SDWebImageWebPCoder.h` and `SDImageWebPCoder.h` can co-exist
1 parent 091a6fd commit 27d6b50

File tree

33 files changed

+1385
-59
lines changed

33 files changed

+1385
-59
lines changed

‎Cartfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
github "rs/SDWebImage" ~> 5.0.0-beta
2-
github "SDWebImage/libwebp-Xcode" >= 1.0.0
1+
github "rs/SDWebImage" "remove_webp"
2+
github "SDWebImage/libwebp-Xcode" >= 1.0.0

‎Cartfile.resolved

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
github "SDWebImage/libwebp-Xcode" "1.0.0"
2-
github "rs/SDWebImage" "5.0.0-beta2"
2+
github "rs/SDWebImage" "bfb2b560923635558c8528cfff0270ba1b5dff64"

‎Example/Podfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
platform :ios, '8.0'
22
use_frameworks!
33

4-
target 'SDImageWebPCoderExample' do
5-
pod 'SDImageWebPCoder', :path => '../'
4+
target 'SDWebImageWebPCoderExample' do
5+
pod 'SDWebImageWebPCoder', :path => '../'
66
end

‎Example/SDImageWebPCoderExample.xcodeproj/project.pbxproj renamed to ‎Example/SDWebImageWebPCoderExample.xcodeproj/project.pbxproj

Lines changed: 39 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,14 @@
1414
803D79DB213597CC00C815FC /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 803D79DA213597CC00C815FC /* Assets.xcassets */; };
1515
803D79DE213597CC00C815FC /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 803D79DC213597CC00C815FC /* LaunchScreen.storyboard */; };
1616
803D79E1213597CC00C815FC /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 803D79E0213597CC00C815FC /* main.m */; };
17+
C04477BE8FEEDC78E0968915 /* Pods_SDWebImageWebPCoderExample.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C77BDBD4B5163F7D451BCFC8 /* Pods_SDWebImageWebPCoderExample.framework */; };
1718
/* End PBXBuildFile section */
1819

1920
/* Begin PBXFileReference section */
2021
08D062B84105453A729B2E18 /* Pods_SDImageWebPCoderExample.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_SDImageWebPCoderExample.framework; sourceTree = BUILT_PRODUCTS_DIR; };
22+
5204DF62292B642922AD88A7 /* Pods-SDWebImageWebPCoderExample.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-SDWebImageWebPCoderExample.release.xcconfig"; path = "Pods/Target Support Files/Pods-SDWebImageWebPCoderExample/Pods-SDWebImageWebPCoderExample.release.xcconfig"; sourceTree = "<group>"; };
2123
6B2A8799CA055DEFD6287E90 /* Pods-SDImageWebPCoderExample.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-SDImageWebPCoderExample.release.xcconfig"; path = "Pods/Target Support Files/Pods-SDImageWebPCoderExample/Pods-SDImageWebPCoderExample.release.xcconfig"; sourceTree = "<group>"; };
22-
803D79CE213597CB00C815FC /* SDImageWebPCoderExample.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = SDImageWebPCoderExample.app; sourceTree = BUILT_PRODUCTS_DIR; };
24+
803D79CE213597CB00C815FC /* SDWebImageWebPCoderExample.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = SDWebImageWebPCoderExample.app; sourceTree = BUILT_PRODUCTS_DIR; };
2325
803D79D1213597CB00C815FC /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
2426
803D79D2213597CB00C815FC /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
2527
803D79D4213597CB00C815FC /* ViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ViewController.h; sourceTree = "<group>"; };
@@ -30,6 +32,8 @@
3032
803D79DF213597CC00C815FC /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
3133
803D79E0213597CC00C815FC /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
3234
9C8C6854F3571B183FE25D4E /* Pods-SDImageWebPCoderExample.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-SDImageWebPCoderExample.debug.xcconfig"; path = "Pods/Target Support Files/Pods-SDImageWebPCoderExample/Pods-SDImageWebPCoderExample.debug.xcconfig"; sourceTree = "<group>"; };
35+
C77BDBD4B5163F7D451BCFC8 /* Pods_SDWebImageWebPCoderExample.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_SDWebImageWebPCoderExample.framework; sourceTree = BUILT_PRODUCTS_DIR; };
36+
ECCF49FEACC8A1934D82D563 /* Pods-SDWebImageWebPCoderExample.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-SDWebImageWebPCoderExample.debug.xcconfig"; path = "Pods/Target Support Files/Pods-SDWebImageWebPCoderExample/Pods-SDWebImageWebPCoderExample.debug.xcconfig"; sourceTree = "<group>"; };
3337
/* End PBXFileReference section */
3438

3539
/* Begin PBXFrameworksBuildPhase section */
@@ -38,6 +42,7 @@
3842
buildActionMask = 2147483647;
3943
files = (
4044
0358F0904AE0B377A509E317 /* Pods_SDImageWebPCoderExample.framework in Frameworks */,
45+
C04477BE8FEEDC78E0968915 /* Pods_SDWebImageWebPCoderExample.framework in Frameworks */,
4146
);
4247
runOnlyForDeploymentPostprocessing = 0;
4348
};
@@ -49,6 +54,8 @@
4954
children = (
5055
9C8C6854F3571B183FE25D4E /* Pods-SDImageWebPCoderExample.debug.xcconfig */,
5156
6B2A8799CA055DEFD6287E90 /* Pods-SDImageWebPCoderExample.release.xcconfig */,
57+
ECCF49FEACC8A1934D82D563 /* Pods-SDWebImageWebPCoderExample.debug.xcconfig */,
58+
5204DF62292B642922AD88A7 /* Pods-SDWebImageWebPCoderExample.release.xcconfig */,
5259
);
5360
name = Pods;
5461
sourceTree = "<group>";
@@ -57,6 +64,7 @@
5764
isa = PBXGroup;
5865
children = (
5966
08D062B84105453A729B2E18 /* Pods_SDImageWebPCoderExample.framework */,
67+
C77BDBD4B5163F7D451BCFC8 /* Pods_SDWebImageWebPCoderExample.framework */,
6068
);
6169
name = Frameworks;
6270
sourceTree = "<group>";
@@ -74,7 +82,7 @@
7482
803D79CF213597CB00C815FC /* Products */ = {
7583
isa = PBXGroup;
7684
children = (
77-
803D79CE213597CB00C815FC /* SDImageWebPCoderExample.app */,
85+
803D79CE213597CB00C815FC /* SDWebImageWebPCoderExample.app */,
7886
);
7987
name = Products;
8088
sourceTree = "<group>";
@@ -92,15 +100,16 @@
92100
803D79DF213597CC00C815FC /* Info.plist */,
93101
803D79E0213597CC00C815FC /* main.m */,
94102
);
95-
path = SDImageWebPCoderExample;
103+
name = SDImageWebPCoderExample;
104+
path = SDWebImageWebPCoderExample;
96105
sourceTree = "<group>";
97106
};
98107
/* End PBXGroup section */
99108

100109
/* Begin PBXNativeTarget section */
101-
803D79CD213597CB00C815FC /* SDImageWebPCoderExample */ = {
110+
803D79CD213597CB00C815FC /* SDWebImageWebPCoderExample */ = {
102111
isa = PBXNativeTarget;
103-
buildConfigurationList = 803D79E4213597CC00C815FC /* Build configuration list for PBXNativeTarget "SDImageWebPCoderExample" */;
112+
buildConfigurationList = 803D79E4213597CC00C815FC /* Build configuration list for PBXNativeTarget "SDWebImageWebPCoderExample" */;
104113
buildPhases = (
105114
47B6AB88C962A96D10FA0EF4 /* [CP] Check Pods Manifest.lock */,
106115
803D79CA213597CB00C815FC /* Sources */,
@@ -112,9 +121,9 @@
112121
);
113122
dependencies = (
114123
);
115-
name = SDImageWebPCoderExample;
124+
name = SDWebImageWebPCoderExample;
116125
productName = SDImageWebPCoderExample;
117-
productReference = 803D79CE213597CB00C815FC /* SDImageWebPCoderExample.app */;
126+
productReference = 803D79CE213597CB00C815FC /* SDWebImageWebPCoderExample.app */;
118127
productType = "com.apple.product-type.application";
119128
};
120129
/* End PBXNativeTarget section */
@@ -131,7 +140,7 @@
131140
};
132141
};
133142
};
134-
buildConfigurationList = 803D79C9213597CB00C815FC /* Build configuration list for PBXProject "SDImageWebPCoderExample" */;
143+
buildConfigurationList = 803D79C9213597CB00C815FC /* Build configuration list for PBXProject "SDWebImageWebPCoderExample" */;
135144
compatibilityVersion = "Xcode 9.3";
136145
developmentRegion = en;
137146
hasScannedForEncodings = 0;
@@ -144,7 +153,7 @@
144153
projectDirPath = "";
145154
projectRoot = "";
146155
targets = (
147-
803D79CD213597CB00C815FC /* SDImageWebPCoderExample */,
156+
803D79CD213597CB00C815FC /* SDWebImageWebPCoderExample */,
148157
);
149158
};
150159
/* End PBXProject section */
@@ -169,20 +178,20 @@
169178
files = (
170179
);
171180
inputPaths = (
172-
"${SRCROOT}/Pods/Target Support Files/Pods-SDImageWebPCoderExample/Pods-SDImageWebPCoderExample-frameworks.sh",
173-
"${BUILT_PRODUCTS_DIR}/SDImageWebPCoder/SDImageWebPCoder.framework",
181+
"${SRCROOT}/Pods/Target Support Files/Pods-SDWebImageWebPCoderExample/Pods-SDWebImageWebPCoderExample-frameworks.sh",
174182
"${BUILT_PRODUCTS_DIR}/SDWebImage/SDWebImage.framework",
183+
"${BUILT_PRODUCTS_DIR}/SDWebImageWebPCoder/SDWebImageWebPCoder.framework",
175184
"${BUILT_PRODUCTS_DIR}/libwebp/libwebp.framework",
176185
);
177186
name = "[CP] Embed Pods Frameworks";
178187
outputPaths = (
179-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDImageWebPCoder.framework",
180188
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDWebImage.framework",
189+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDWebImageWebPCoder.framework",
181190
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/libwebp.framework",
182191
);
183192
runOnlyForDeploymentPostprocessing = 0;
184193
shellPath = /bin/sh;
185-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-SDImageWebPCoderExample/Pods-SDImageWebPCoderExample-frameworks.sh\"\n";
194+
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-SDWebImageWebPCoderExample/Pods-SDWebImageWebPCoderExample-frameworks.sh\"\n";
186195
showEnvVarsInLog = 0;
187196
};
188197
47B6AB88C962A96D10FA0EF4 /* [CP] Check Pods Manifest.lock */ = {
@@ -196,7 +205,7 @@
196205
);
197206
name = "[CP] Check Pods Manifest.lock";
198207
outputPaths = (
199-
"$(DERIVED_FILE_DIR)/Pods-SDImageWebPCoderExample-checkManifestLockResult.txt",
208+
"$(DERIVED_FILE_DIR)/Pods-SDWebImageWebPCoderExample-checkManifestLockResult.txt",
200209
);
201210
runOnlyForDeploymentPostprocessing = 0;
202211
shellPath = /bin/sh;
@@ -350,27 +359,33 @@
350359
};
351360
803D79E5213597CC00C815FC /* Debug */ = {
352361
isa = XCBuildConfiguration;
353-
baseConfigurationReference = 9C8C6854F3571B183FE25D4E /* Pods-SDImageWebPCoderExample.debug.xcconfig */;
362+
baseConfigurationReference = ECCF49FEACC8A1934D82D563 /* Pods-SDWebImageWebPCoderExample.debug.xcconfig */;
354363
buildSettings = {
355364
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
356365
CODE_SIGN_STYLE = Automatic;
357-
INFOPLIST_FILE = SDImageWebPCoderExample/Info.plist;
358-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
359-
PRODUCT_BUNDLE_IDENTIFIER = org.SDWebImage.SDImageWebPCoderExample;
366+
INFOPLIST_FILE = SDWebImageWebPCoderExample/Info.plist;
367+
LD_RUNPATH_SEARCH_PATHS = (
368+
"$(inherited)",
369+
"@executable_path/Frameworks",
370+
);
371+
PRODUCT_BUNDLE_IDENTIFIER = org.SDWebImage.SDWebImageWebPCoderExample;
360372
PRODUCT_NAME = "$(TARGET_NAME)";
361373
TARGETED_DEVICE_FAMILY = "1,2";
362374
};
363375
name = Debug;
364376
};
365377
803D79E6213597CC00C815FC /* Release */ = {
366378
isa = XCBuildConfiguration;
367-
baseConfigurationReference = 6B2A8799CA055DEFD6287E90 /* Pods-SDImageWebPCoderExample.release.xcconfig */;
379+
baseConfigurationReference = 5204DF62292B642922AD88A7 /* Pods-SDWebImageWebPCoderExample.release.xcconfig */;
368380
buildSettings = {
369381
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
370382
CODE_SIGN_STYLE = Automatic;
371-
INFOPLIST_FILE = SDImageWebPCoderExample/Info.plist;
372-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
373-
PRODUCT_BUNDLE_IDENTIFIER = org.SDWebImage.SDImageWebPCoderExample;
383+
INFOPLIST_FILE = SDWebImageWebPCoderExample/Info.plist;
384+
LD_RUNPATH_SEARCH_PATHS = (
385+
"$(inherited)",
386+
"@executable_path/Frameworks",
387+
);
388+
PRODUCT_BUNDLE_IDENTIFIER = org.SDWebImage.SDWebImageWebPCoderExample;
374389
PRODUCT_NAME = "$(TARGET_NAME)";
375390
TARGETED_DEVICE_FAMILY = "1,2";
376391
};
@@ -379,7 +394,7 @@
379394
/* End XCBuildConfiguration section */
380395

381396
/* Begin XCConfigurationList section */
382-
803D79C9213597CB00C815FC /* Build configuration list for PBXProject "SDImageWebPCoderExample" */ = {
397+
803D79C9213597CB00C815FC /* Build configuration list for PBXProject "SDWebImageWebPCoderExample" */ = {
383398
isa = XCConfigurationList;
384399
buildConfigurations = (
385400
803D79E2213597CC00C815FC /* Debug */,
@@ -388,7 +403,7 @@
388403
defaultConfigurationIsVisible = 0;
389404
defaultConfigurationName = Release;
390405
};
391-
803D79E4213597CC00C815FC /* Build configuration list for PBXNativeTarget "SDImageWebPCoderExample" */ = {
406+
803D79E4213597CC00C815FC /* Build configuration list for PBXNativeTarget "SDWebImageWebPCoderExample" */ = {
392407
isa = XCConfigurationList;
393408
buildConfigurations = (
394409
803D79E5213597CC00C815FC /* Debug */,

‎Example/SDImageWebPCoderExample.xcodeproj/project.xcworkspace/contents.xcworkspacedata renamed to ‎Example/SDWebImageWebPCoderExample.xcodeproj/project.xcworkspace/contents.xcworkspacedata

File renamed without changes.

‎Example/SDWebImageWebPCoderExample.xcodeproj/xcshareddata/xcschemes/SDWebImageWebPCoderExample.xcscheme

Lines changed: 91 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,91 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Scheme
3+
LastUpgradeVersion = "0940"
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 = "803D79CD213597CB00C815FC"
18+
BuildableName = "SDWebImageWebPCoderExample.app"
19+
BlueprintName = "SDWebImageWebPCoderExample"
20+
ReferencedContainer = "container:SDWebImageWebPCoderExample.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+
<MacroExpansion>
33+
<BuildableReference
34+
BuildableIdentifier = "primary"
35+
BlueprintIdentifier = "803D79CD213597CB00C815FC"
36+
BuildableName = "SDWebImageWebPCoderExample.app"
37+
BlueprintName = "SDWebImageWebPCoderExample"
38+
ReferencedContainer = "container:SDWebImageWebPCoderExample.xcodeproj">
39+
</BuildableReference>
40+
</MacroExpansion>
41+
<AdditionalOptions>
42+
</AdditionalOptions>
43+
</TestAction>
44+
<LaunchAction
45+
buildConfiguration = "Debug"
46+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
47+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
48+
launchStyle = "0"
49+
useCustomWorkingDirectory = "NO"
50+
ignoresPersistentStateOnLaunch = "NO"
51+
debugDocumentVersioning = "YES"
52+
debugServiceExtension = "internal"
53+
allowLocationSimulation = "YES">
54+
<BuildableProductRunnable
55+
runnableDebuggingMode = "0">
56+
<BuildableReference
57+
BuildableIdentifier = "primary"
58+
BlueprintIdentifier = "803D79CD213597CB00C815FC"
59+
BuildableName = "SDWebImageWebPCoderExample.app"
60+
BlueprintName = "SDWebImageWebPCoderExample"
61+
ReferencedContainer = "container:SDWebImageWebPCoderExample.xcodeproj">
62+
</BuildableReference>
63+
</BuildableProductRunnable>
64+
<AdditionalOptions>
65+
</AdditionalOptions>
66+
</LaunchAction>
67+
<ProfileAction
68+
buildConfiguration = "Release"
69+
shouldUseLaunchSchemeArgsEnv = "YES"
70+
savedToolIdentifier = ""
71+
useCustomWorkingDirectory = "NO"
72+
debugDocumentVersioning = "YES">
73+
<BuildableProductRunnable
74+
runnableDebuggingMode = "0">
75+
<BuildableReference
76+
BuildableIdentifier = "primary"
77+
BlueprintIdentifier = "803D79CD213597CB00C815FC"
78+
BuildableName = "SDWebImageWebPCoderExample.app"
79+
BlueprintName = "SDWebImageWebPCoderExample"
80+
ReferencedContainer = "container:SDWebImageWebPCoderExample.xcodeproj">
81+
</BuildableReference>
82+
</BuildableProductRunnable>
83+
</ProfileAction>
84+
<AnalyzeAction
85+
buildConfiguration = "Debug">
86+
</AnalyzeAction>
87+
<ArchiveAction
88+
buildConfiguration = "Release"
89+
revealArchiveInOrganizer = "YES">
90+
</ArchiveAction>
91+
</Scheme>

‎Example/SDImageWebPCoderExample.xcworkspace/contents.xcworkspacedata renamed to ‎Example/SDWebImageWebPCoderExample.xcworkspace/contents.xcworkspacedata

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Example/SDImageWebPCoderExample/AppDelegate.h renamed to ‎Example/SDWebImageWebPCoderExample/AppDelegate.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//
22
// AppDelegate.h
3-
// SDImageWebPCoderExample
3+
// SDWebImageWebPCoderExample
44
//
55
// Created by Bogdan Poplauschi on 28/08/2018.
66
// Copyright © 2018 SDWebImage. All rights reserved.

‎Example/SDImageWebPCoderExample/AppDelegate.m renamed to ‎Example/SDWebImageWebPCoderExample/AppDelegate.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//
22
// AppDelegate.m
3-
// SDImageWebPCoderExample
3+
// SDWebImageWebPCoderExample
44
//
55
// Created by Bogdan Poplauschi on 28/08/2018.
66
// Copyright © 2018 SDWebImage. All rights reserved.

‎Example/SDImageWebPCoderExample/Assets.xcassets/AppIcon.appiconset/Contents.json renamed to ‎Example/SDWebImageWebPCoderExample/Assets.xcassets/AppIcon.appiconset/Contents.json

File renamed without changes.

0 commit comments

Comments
 (0)