Skip to content

Commit 69aedef

Browse files
committed
Fixed Travis CI by removing the double linking from SDWebImageWebPCoderTests to SDWebImageWebPCoder (one via CocoaPods and the other one direct)
Deleted the Example workspace - not needed Cleaned up a bit the xcodeproj options
1 parent 7539fa4 commit 69aedef

File tree

6 files changed

+81
-128
lines changed

6 files changed

+81
-128
lines changed

.travis.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,12 @@ script:
3232

3333
- echo Build example
3434
- pod install --project-directory=Example
35-
- xcodebuild build -workspace SDWebImageWebPCoder.xcworkspace -scheme SDWebImageWebPCoderExample -sdk iphonesimulator -destination 'name=iPhone 6s' -configuration Debug | xcpretty -c
36-
37-
- echo Clean DerivedData
35+
- xcodebuild build clean -workspace SDWebImageWebPCoder.xcworkspace -scheme SDWebImageWebPCoderExample -sdk iphonesimulator -destination 'name=iPhone 6s' -configuration Debug | xcpretty -c
36+
3837
- mkdir DerivedData
39-
- rm -rf ~/Library/Developer/Xcode/DerivedData
4038

4139
- echo Run the tests
40+
- pod install --project-directory=SDWebImageWebPCoderTests
4241
- xcodebuild test -workspace SDWebImageWebPCoder.xcworkspace -scheme 'SDWebImageWebPCoderTests' -sdk iphonesimulator -destination 'name=iPhone 6s' -configuration Debug | xcpretty -c
4342
- mv ~/Library/Developer/Xcode/DerivedData/ ./DerivedData/iOS
4443

Example/Podfile

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

4+
workspace '../SDWebImageWebPCoder'
5+
46
target 'SDWebImageWebPCoderExample' do
57
pod 'SDWebImageWebPCoder', :path => '../'
68
end

Example/SDWebImageWebPCoderExample.xcodeproj/project.pbxproj

Lines changed: 54 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,17 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10+
585CD3CC13BDF493A4B3E7F9 /* Pods_SDWebImageWebPCoderExample.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A4247F756BA5BBDD6FFE3E26 /* Pods_SDWebImageWebPCoderExample.framework */; };
1011
803D79D3213597CB00C815FC /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 803D79D2213597CB00C815FC /* AppDelegate.m */; };
1112
803D79D6213597CB00C815FC /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 803D79D5213597CB00C815FC /* ViewController.m */; };
1213
803D79D9213597CB00C815FC /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 803D79D7213597CB00C815FC /* Main.storyboard */; };
1314
803D79DB213597CC00C815FC /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 803D79DA213597CC00C815FC /* Assets.xcassets */; };
1415
803D79DE213597CC00C815FC /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 803D79DC213597CC00C815FC /* LaunchScreen.storyboard */; };
1516
803D79E1213597CC00C815FC /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 803D79E0213597CC00C815FC /* main.m */; };
16-
C04477BE8FEEDC78E0968915 /* Pods_SDWebImageWebPCoderExample.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C77BDBD4B5163F7D451BCFC8 /* Pods_SDWebImageWebPCoderExample.framework */; };
1717
/* End PBXBuildFile section */
1818

1919
/* Begin PBXFileReference section */
20-
08D062B84105453A729B2E18 /* Pods_SDImageWebPCoderExample.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_SDImageWebPCoderExample.framework; sourceTree = BUILT_PRODUCTS_DIR; };
21-
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>"; };
22-
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>"; };
20+
21B3CA4F30EA7284BBF9F6DC /* 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>"; };
2321
803D79CE213597CB00C815FC /* SDWebImageWebPCoderExample.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = SDWebImageWebPCoderExample.app; sourceTree = BUILT_PRODUCTS_DIR; };
2422
803D79D1213597CB00C815FC /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
2523
803D79D2213597CB00C815FC /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
@@ -30,50 +28,29 @@
3028
803D79DD213597CC00C815FC /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
3129
803D79DF213597CC00C815FC /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
3230
803D79E0213597CC00C815FC /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
33-
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>"; };
34-
C77BDBD4B5163F7D451BCFC8 /* Pods_SDWebImageWebPCoderExample.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_SDWebImageWebPCoderExample.framework; sourceTree = BUILT_PRODUCTS_DIR; };
35-
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>"; };
31+
A4247F756BA5BBDD6FFE3E26 /* Pods_SDWebImageWebPCoderExample.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_SDWebImageWebPCoderExample.framework; sourceTree = BUILT_PRODUCTS_DIR; };
32+
ABF474EBA40C51CBDE1C9406 /* 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>"; };
3633
/* End PBXFileReference section */
3734

3835
/* Begin PBXFrameworksBuildPhase section */
3936
803D79CB213597CB00C815FC /* Frameworks */ = {
4037
isa = PBXFrameworksBuildPhase;
4138
buildActionMask = 2147483647;
4239
files = (
43-
C04477BE8FEEDC78E0968915 /* Pods_SDWebImageWebPCoderExample.framework in Frameworks */,
40+
585CD3CC13BDF493A4B3E7F9 /* Pods_SDWebImageWebPCoderExample.framework in Frameworks */,
4441
);
4542
runOnlyForDeploymentPostprocessing = 0;
4643
};
4744
/* End PBXFrameworksBuildPhase section */
4845

4946
/* Begin PBXGroup section */
50-
09A0AFCF80F579FDF7C105AC /* Pods */ = {
51-
isa = PBXGroup;
52-
children = (
53-
9C8C6854F3571B183FE25D4E /* Pods-SDImageWebPCoderExample.debug.xcconfig */,
54-
6B2A8799CA055DEFD6287E90 /* Pods-SDImageWebPCoderExample.release.xcconfig */,
55-
ECCF49FEACC8A1934D82D563 /* Pods-SDWebImageWebPCoderExample.debug.xcconfig */,
56-
5204DF62292B642922AD88A7 /* Pods-SDWebImageWebPCoderExample.release.xcconfig */,
57-
);
58-
name = Pods;
59-
sourceTree = "<group>";
60-
};
61-
4219260BABAB0FF55F41B025 /* Frameworks */ = {
62-
isa = PBXGroup;
63-
children = (
64-
08D062B84105453A729B2E18 /* Pods_SDImageWebPCoderExample.framework */,
65-
C77BDBD4B5163F7D451BCFC8 /* Pods_SDWebImageWebPCoderExample.framework */,
66-
);
67-
name = Frameworks;
68-
sourceTree = "<group>";
69-
};
7047
803D79C5213597CB00C815FC = {
7148
isa = PBXGroup;
7249
children = (
7350
803D79D0213597CB00C815FC /* SDImageWebPCoderExample */,
7451
803D79CF213597CB00C815FC /* Products */,
75-
09A0AFCF80F579FDF7C105AC /* Pods */,
76-
4219260BABAB0FF55F41B025 /* Frameworks */,
52+
C0C41A6E6F29721F39674168 /* Pods */,
53+
9D40D31457F0F448A95CD920 /* Frameworks */,
7754
);
7855
sourceTree = "<group>";
7956
};
@@ -102,18 +79,35 @@
10279
path = SDWebImageWebPCoderExample;
10380
sourceTree = "<group>";
10481
};
82+
9D40D31457F0F448A95CD920 /* Frameworks */ = {
83+
isa = PBXGroup;
84+
children = (
85+
A4247F756BA5BBDD6FFE3E26 /* Pods_SDWebImageWebPCoderExample.framework */,
86+
);
87+
name = Frameworks;
88+
sourceTree = "<group>";
89+
};
90+
C0C41A6E6F29721F39674168 /* Pods */ = {
91+
isa = PBXGroup;
92+
children = (
93+
21B3CA4F30EA7284BBF9F6DC /* Pods-SDWebImageWebPCoderExample.debug.xcconfig */,
94+
ABF474EBA40C51CBDE1C9406 /* Pods-SDWebImageWebPCoderExample.release.xcconfig */,
95+
);
96+
name = Pods;
97+
sourceTree = "<group>";
98+
};
10599
/* End PBXGroup section */
106100

107101
/* Begin PBXNativeTarget section */
108102
803D79CD213597CB00C815FC /* SDWebImageWebPCoderExample */ = {
109103
isa = PBXNativeTarget;
110104
buildConfigurationList = 803D79E4213597CC00C815FC /* Build configuration list for PBXNativeTarget "SDWebImageWebPCoderExample" */;
111105
buildPhases = (
112-
47B6AB88C962A96D10FA0EF4 /* [CP] Check Pods Manifest.lock */,
106+
7538B6270A033D5852EBA45C /* [CP] Check Pods Manifest.lock */,
113107
803D79CA213597CB00C815FC /* Sources */,
114108
803D79CB213597CB00C815FC /* Frameworks */,
115109
803D79CC213597CB00C815FC /* Resources */,
116-
3C8DAE2B7C7EB19EB08A4E7D /* [CP] Embed Pods Frameworks */,
110+
C262BFE4C3C591FCB7143F4B /* [CP] Embed Pods Frameworks */,
117111
);
118112
buildRules = (
119113
);
@@ -170,44 +164,52 @@
170164
/* End PBXResourcesBuildPhase section */
171165

172166
/* Begin PBXShellScriptBuildPhase section */
173-
3C8DAE2B7C7EB19EB08A4E7D /* [CP] Embed Pods Frameworks */ = {
167+
7538B6270A033D5852EBA45C /* [CP] Check Pods Manifest.lock */ = {
174168
isa = PBXShellScriptBuildPhase;
175169
buildActionMask = 2147483647;
176170
files = (
177171
);
172+
inputFileListPaths = (
173+
);
178174
inputPaths = (
179-
"${SRCROOT}/Pods/Target Support Files/Pods-SDWebImageWebPCoderExample/Pods-SDWebImageWebPCoderExample-frameworks.sh",
180-
"${BUILT_PRODUCTS_DIR}/SDWebImage/SDWebImage.framework",
181-
"${BUILT_PRODUCTS_DIR}/SDWebImageWebPCoder/SDWebImageWebPCoder.framework",
182-
"${BUILT_PRODUCTS_DIR}/libwebp/libwebp.framework",
175+
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
176+
"${PODS_ROOT}/Manifest.lock",
177+
);
178+
name = "[CP] Check Pods Manifest.lock";
179+
outputFileListPaths = (
183180
);
184-
name = "[CP] Embed Pods Frameworks";
185181
outputPaths = (
186-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDWebImage.framework",
187-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDWebImageWebPCoder.framework",
188-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/libwebp.framework",
182+
"$(DERIVED_FILE_DIR)/Pods-SDWebImageWebPCoderExample-checkManifestLockResult.txt",
189183
);
190184
runOnlyForDeploymentPostprocessing = 0;
191185
shellPath = /bin/sh;
192-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-SDWebImageWebPCoderExample/Pods-SDWebImageWebPCoderExample-frameworks.sh\"\n";
186+
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
193187
showEnvVarsInLog = 0;
194188
};
195-
47B6AB88C962A96D10FA0EF4 /* [CP] Check Pods Manifest.lock */ = {
189+
C262BFE4C3C591FCB7143F4B /* [CP] Embed Pods Frameworks */ = {
196190
isa = PBXShellScriptBuildPhase;
197191
buildActionMask = 2147483647;
198192
files = (
199193
);
194+
inputFileListPaths = (
195+
);
200196
inputPaths = (
201-
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
202-
"${PODS_ROOT}/Manifest.lock",
197+
"${SRCROOT}/Pods/Target Support Files/Pods-SDWebImageWebPCoderExample/Pods-SDWebImageWebPCoderExample-frameworks.sh",
198+
"${BUILT_PRODUCTS_DIR}/SDWebImage/SDWebImage.framework",
199+
"${BUILT_PRODUCTS_DIR}/SDWebImageWebPCoder/SDWebImageWebPCoder.framework",
200+
"${BUILT_PRODUCTS_DIR}/libwebp/libwebp.framework",
201+
);
202+
name = "[CP] Embed Pods Frameworks";
203+
outputFileListPaths = (
203204
);
204-
name = "[CP] Check Pods Manifest.lock";
205205
outputPaths = (
206-
"$(DERIVED_FILE_DIR)/Pods-SDWebImageWebPCoderExample-checkManifestLockResult.txt",
206+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDWebImage.framework",
207+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDWebImageWebPCoder.framework",
208+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/libwebp.framework",
207209
);
208210
runOnlyForDeploymentPostprocessing = 0;
209211
shellPath = /bin/sh;
210-
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
212+
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-SDWebImageWebPCoderExample/Pods-SDWebImageWebPCoderExample-frameworks.sh\"\n";
211213
showEnvVarsInLog = 0;
212214
};
213215
/* End PBXShellScriptBuildPhase section */
@@ -296,7 +298,7 @@
296298
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
297299
GCC_WARN_UNUSED_FUNCTION = YES;
298300
GCC_WARN_UNUSED_VARIABLE = YES;
299-
IPHONEOS_DEPLOYMENT_TARGET = 11.4;
301+
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
300302
MTL_ENABLE_DEBUG_INFO = YES;
301303
ONLY_ACTIVE_ARCH = YES;
302304
SDKROOT = iphoneos;
@@ -348,7 +350,7 @@
348350
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
349351
GCC_WARN_UNUSED_FUNCTION = YES;
350352
GCC_WARN_UNUSED_VARIABLE = YES;
351-
IPHONEOS_DEPLOYMENT_TARGET = 11.4;
353+
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
352354
MTL_ENABLE_DEBUG_INFO = NO;
353355
SDKROOT = iphoneos;
354356
VALIDATE_PRODUCT = YES;
@@ -357,7 +359,7 @@
357359
};
358360
803D79E5213597CC00C815FC /* Debug */ = {
359361
isa = XCBuildConfiguration;
360-
baseConfigurationReference = ECCF49FEACC8A1934D82D563 /* Pods-SDWebImageWebPCoderExample.debug.xcconfig */;
362+
baseConfigurationReference = 21B3CA4F30EA7284BBF9F6DC /* Pods-SDWebImageWebPCoderExample.debug.xcconfig */;
361363
buildSettings = {
362364
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
363365
CODE_SIGN_STYLE = Automatic;
@@ -374,7 +376,7 @@
374376
};
375377
803D79E6213597CC00C815FC /* Release */ = {
376378
isa = XCBuildConfiguration;
377-
baseConfigurationReference = 5204DF62292B642922AD88A7 /* Pods-SDWebImageWebPCoderExample.release.xcconfig */;
379+
baseConfigurationReference = ABF474EBA40C51CBDE1C9406 /* Pods-SDWebImageWebPCoderExample.release.xcconfig */;
378380
buildSettings = {
379381
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
380382
CODE_SIGN_STYLE = Automatic;

Example/SDWebImageWebPCoderExample.xcworkspace/contents.xcworkspacedata

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

0 commit comments

Comments
 (0)