Skip to content

Commit d92efaf

Browse files
Jon CardasisJon Cardasis
Jon Cardasis
authored and
Jon Cardasis
committed
Added Swift 3 support. Added UI Tests
1 parent 18947a5 commit d92efaf

File tree

137 files changed

+12038
-181
lines changed

Some content is hidden

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

137 files changed

+12038
-181
lines changed

‎ChromaColorPicker-Demo.xcodeproj/project.pbxproj‎

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

99
/* Begin PBXBuildFile section */
10+
19FFA53F31A463C06785F28F /* Pods_ChromaColorPickerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 91485B6B5C58777417441794 /* Pods_ChromaColorPickerTests.framework */; };
1011
35C376D11D5CF5300069D7A1 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 35C376D01D5CF5300069D7A1 /* AppDelegate.swift */; };
1112
35C376D31D5CF5300069D7A1 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 35C376D21D5CF5300069D7A1 /* ViewController.swift */; };
1213
35C376D61D5CF5300069D7A1 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 35C376D41D5CF5300069D7A1 /* Main.storyboard */; };
@@ -17,9 +18,21 @@
1718
35C376E91D5CF9400069D7A1 /* ChromaColorPicker.swift in Sources */ = {isa = PBXBuildFile; fileRef = 35C376E41D5CF9400069D7A1 /* ChromaColorPicker.swift */; };
1819
35C376EA1D5CF9400069D7A1 /* ChromaShadeSlider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 35C376E51D5CF9400069D7A1 /* ChromaShadeSlider.swift */; };
1920
35C376EB1D5CF9400069D7A1 /* UIColor+Utilities.swift in Sources */ = {isa = PBXBuildFile; fileRef = 35C376E61D5CF9400069D7A1 /* UIColor+Utilities.swift */; };
21+
FC4AE3DB1E16DEA300F02C60 /* ChromaColorPickerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = FC4AE3DA1E16DEA300F02C60 /* ChromaColorPickerTests.swift */; };
2022
/* End PBXBuildFile section */
2123

24+
/* Begin PBXContainerItemProxy section */
25+
FC4AE3DD1E16DEA300F02C60 /* PBXContainerItemProxy */ = {
26+
isa = PBXContainerItemProxy;
27+
containerPortal = 35C376C51D5CF5300069D7A1 /* Project object */;
28+
proxyType = 1;
29+
remoteGlobalIDString = 35C376CC1D5CF5300069D7A1;
30+
remoteInfo = "ChromaColorPicker-Demo";
31+
};
32+
/* End PBXContainerItemProxy section */
33+
2234
/* Begin PBXFileReference section */
35+
0722B34CBD5489ADC94F7B91 /* Pods-ChromaColorPickerTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ChromaColorPickerTests.release.xcconfig"; path = "Pods/Target Support Files/Pods-ChromaColorPickerTests/Pods-ChromaColorPickerTests.release.xcconfig"; sourceTree = "<group>"; };
2336
35C376CD1D5CF5300069D7A1 /* ChromaColorPicker-Demo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "ChromaColorPicker-Demo.app"; sourceTree = BUILT_PRODUCTS_DIR; };
2437
35C376D01D5CF5300069D7A1 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
2538
35C376D21D5CF5300069D7A1 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
@@ -32,6 +45,11 @@
3245
35C376E41D5CF9400069D7A1 /* ChromaColorPicker.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ChromaColorPicker.swift; path = ChromaColorPicker/ChromaColorPicker.swift; sourceTree = SOURCE_ROOT; };
3346
35C376E51D5CF9400069D7A1 /* ChromaShadeSlider.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ChromaShadeSlider.swift; path = ChromaColorPicker/ChromaShadeSlider.swift; sourceTree = SOURCE_ROOT; };
3447
35C376E61D5CF9400069D7A1 /* UIColor+Utilities.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = "UIColor+Utilities.swift"; path = "ChromaColorPicker/UIColor+Utilities.swift"; sourceTree = SOURCE_ROOT; };
48+
91485B6B5C58777417441794 /* Pods_ChromaColorPickerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_ChromaColorPickerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
49+
E0C887E58E73DFD65E9DEB81 /* Pods-ChromaColorPickerTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ChromaColorPickerTests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-ChromaColorPickerTests/Pods-ChromaColorPickerTests.debug.xcconfig"; sourceTree = "<group>"; };
50+
FC4AE3D81E16DEA300F02C60 /* ChromaColorPickerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = ChromaColorPickerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
51+
FC4AE3DA1E16DEA300F02C60 /* ChromaColorPickerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChromaColorPickerTests.swift; sourceTree = "<group>"; };
52+
FC4AE3DC1E16DEA300F02C60 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
3553
/* End PBXFileReference section */
3654

3755
/* Begin PBXFrameworksBuildPhase section */
@@ -42,21 +60,33 @@
4260
);
4361
runOnlyForDeploymentPostprocessing = 0;
4462
};
63+
FC4AE3D51E16DEA300F02C60 /* Frameworks */ = {
64+
isa = PBXFrameworksBuildPhase;
65+
buildActionMask = 2147483647;
66+
files = (
67+
19FFA53F31A463C06785F28F /* Pods_ChromaColorPickerTests.framework in Frameworks */,
68+
);
69+
runOnlyForDeploymentPostprocessing = 0;
70+
};
4571
/* End PBXFrameworksBuildPhase section */
4672

4773
/* Begin PBXGroup section */
4874
35C376C41D5CF5300069D7A1 = {
4975
isa = PBXGroup;
5076
children = (
5177
35C376CF1D5CF5300069D7A1 /* ChromaColorPicker-Demo */,
78+
FC4AE3D91E16DEA300F02C60 /* ChromaColorPickerTests */,
5279
35C376CE1D5CF5300069D7A1 /* Products */,
80+
A890856BC0D0DD14D667AEA1 /* Pods */,
81+
A18D889CBAEF3E0FD0A65ADB /* Frameworks */,
5382
);
5483
sourceTree = "<group>";
5584
};
5685
35C376CE1D5CF5300069D7A1 /* Products */ = {
5786
isa = PBXGroup;
5887
children = (
5988
35C376CD1D5CF5300069D7A1 /* ChromaColorPicker-Demo.app */,
89+
FC4AE3D81E16DEA300F02C60 /* ChromaColorPickerTests.xctest */,
6090
);
6191
name = Products;
6292
sourceTree = "<group>";
@@ -88,6 +118,32 @@
88118
path = ../ChromaPicker;
89119
sourceTree = "<group>";
90120
};
121+
A18D889CBAEF3E0FD0A65ADB /* Frameworks */ = {
122+
isa = PBXGroup;
123+
children = (
124+
91485B6B5C58777417441794 /* Pods_ChromaColorPickerTests.framework */,
125+
);
126+
name = Frameworks;
127+
sourceTree = "<group>";
128+
};
129+
A890856BC0D0DD14D667AEA1 /* Pods */ = {
130+
isa = PBXGroup;
131+
children = (
132+
E0C887E58E73DFD65E9DEB81 /* Pods-ChromaColorPickerTests.debug.xcconfig */,
133+
0722B34CBD5489ADC94F7B91 /* Pods-ChromaColorPickerTests.release.xcconfig */,
134+
);
135+
name = Pods;
136+
sourceTree = "<group>";
137+
};
138+
FC4AE3D91E16DEA300F02C60 /* ChromaColorPickerTests */ = {
139+
isa = PBXGroup;
140+
children = (
141+
FC4AE3DA1E16DEA300F02C60 /* ChromaColorPickerTests.swift */,
142+
FC4AE3DC1E16DEA300F02C60 /* Info.plist */,
143+
);
144+
path = ChromaColorPickerTests;
145+
sourceTree = "<group>";
146+
};
91147
/* End PBXGroup section */
92148

93149
/* Begin PBXNativeTarget section */
@@ -108,19 +164,46 @@
108164
productReference = 35C376CD1D5CF5300069D7A1 /* ChromaColorPicker-Demo.app */;
109165
productType = "com.apple.product-type.application";
110166
};
167+
FC4AE3D71E16DEA300F02C60 /* ChromaColorPickerTests */ = {
168+
isa = PBXNativeTarget;
169+
buildConfigurationList = FC4AE3DF1E16DEA300F02C60 /* Build configuration list for PBXNativeTarget "ChromaColorPickerTests" */;
170+
buildPhases = (
171+
4D2433E263D98635B3C35D0C /* [CP] Check Pods Manifest.lock */,
172+
FC4AE3D41E16DEA300F02C60 /* Sources */,
173+
FC4AE3D51E16DEA300F02C60 /* Frameworks */,
174+
FC4AE3D61E16DEA300F02C60 /* Resources */,
175+
4E4A672D11FCEFCA120BEF47 /* [CP] Embed Pods Frameworks */,
176+
67A1FC05E66B991777CBB6D5 /* [CP] Copy Pods Resources */,
177+
);
178+
buildRules = (
179+
);
180+
dependencies = (
181+
FC4AE3DE1E16DEA300F02C60 /* PBXTargetDependency */,
182+
);
183+
name = ChromaColorPickerTests;
184+
productName = ChromaColorPickerTests;
185+
productReference = FC4AE3D81E16DEA300F02C60 /* ChromaColorPickerTests.xctest */;
186+
productType = "com.apple.product-type.bundle.unit-test";
187+
};
111188
/* End PBXNativeTarget section */
112189

113190
/* Begin PBXProject section */
114191
35C376C51D5CF5300069D7A1 /* Project object */ = {
115192
isa = PBXProject;
116193
attributes = {
117-
LastSwiftUpdateCheck = 0730;
118-
LastUpgradeCheck = 0730;
194+
LastSwiftUpdateCheck = 0820;
195+
LastUpgradeCheck = 0820;
119196
ORGANIZATIONNAME = "Jonathan Cardasis";
120197
TargetAttributes = {
121198
35C376CC1D5CF5300069D7A1 = {
122199
CreatedOnToolsVersion = 7.3;
123200
DevelopmentTeam = 43DKZUY8C6;
201+
LastSwiftMigration = 0820;
202+
};
203+
FC4AE3D71E16DEA300F02C60 = {
204+
CreatedOnToolsVersion = 8.2.1;
205+
ProvisioningStyle = Automatic;
206+
TestTargetID = 35C376CC1D5CF5300069D7A1;
124207
};
125208
};
126209
};
@@ -138,6 +221,7 @@
138221
projectRoot = "";
139222
targets = (
140223
35C376CC1D5CF5300069D7A1 /* ChromaColorPicker-Demo */,
224+
FC4AE3D71E16DEA300F02C60 /* ChromaColorPickerTests */,
141225
);
142226
};
143227
/* End PBXProject section */
@@ -153,8 +237,63 @@
153237
);
154238
runOnlyForDeploymentPostprocessing = 0;
155239
};
240+
FC4AE3D61E16DEA300F02C60 /* Resources */ = {
241+
isa = PBXResourcesBuildPhase;
242+
buildActionMask = 2147483647;
243+
files = (
244+
);
245+
runOnlyForDeploymentPostprocessing = 0;
246+
};
156247
/* End PBXResourcesBuildPhase section */
157248

249+
/* Begin PBXShellScriptBuildPhase section */
250+
4D2433E263D98635B3C35D0C /* [CP] Check Pods Manifest.lock */ = {
251+
isa = PBXShellScriptBuildPhase;
252+
buildActionMask = 2147483647;
253+
files = (
254+
);
255+
inputPaths = (
256+
);
257+
name = "[CP] Check Pods Manifest.lock";
258+
outputPaths = (
259+
);
260+
runOnlyForDeploymentPostprocessing = 0;
261+
shellPath = /bin/sh;
262+
shellScript = "diff \"${PODS_ROOT}/../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";
263+
showEnvVarsInLog = 0;
264+
};
265+
4E4A672D11FCEFCA120BEF47 /* [CP] Embed Pods Frameworks */ = {
266+
isa = PBXShellScriptBuildPhase;
267+
buildActionMask = 2147483647;
268+
files = (
269+
);
270+
inputPaths = (
271+
);
272+
name = "[CP] Embed Pods Frameworks";
273+
outputPaths = (
274+
);
275+
runOnlyForDeploymentPostprocessing = 0;
276+
shellPath = /bin/sh;
277+
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-ChromaColorPickerTests/Pods-ChromaColorPickerTests-frameworks.sh\"\n";
278+
showEnvVarsInLog = 0;
279+
};
280+
67A1FC05E66B991777CBB6D5 /* [CP] Copy Pods Resources */ = {
281+
isa = PBXShellScriptBuildPhase;
282+
buildActionMask = 2147483647;
283+
files = (
284+
);
285+
inputPaths = (
286+
);
287+
name = "[CP] Copy Pods Resources";
288+
outputPaths = (
289+
);
290+
runOnlyForDeploymentPostprocessing = 0;
291+
shellPath = /bin/sh;
292+
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-ChromaColorPickerTests/Pods-ChromaColorPickerTests-resources.sh\"\n";
293+
showEnvVarsInLog = 0;
294+
};
295+
/* End PBXShellScriptBuildPhase section */
296+
158297
/* Begin PBXSourcesBuildPhase section */
159298
35C376C91D5CF5300069D7A1 /* Sources */ = {
160299
isa = PBXSourcesBuildPhase;
@@ -170,8 +309,24 @@
170309
);
171310
runOnlyForDeploymentPostprocessing = 0;
172311
};
312+
FC4AE3D41E16DEA300F02C60 /* Sources */ = {
313+
isa = PBXSourcesBuildPhase;
314+
buildActionMask = 2147483647;
315+
files = (
316+
FC4AE3DB1E16DEA300F02C60 /* ChromaColorPickerTests.swift in Sources */,
317+
);
318+
runOnlyForDeploymentPostprocessing = 0;
319+
};
173320
/* End PBXSourcesBuildPhase section */
174321

322+
/* Begin PBXTargetDependency section */
323+
FC4AE3DE1E16DEA300F02C60 /* PBXTargetDependency */ = {
324+
isa = PBXTargetDependency;
325+
target = 35C376CC1D5CF5300069D7A1 /* ChromaColorPicker-Demo */;
326+
targetProxy = FC4AE3DD1E16DEA300F02C60 /* PBXContainerItemProxy */;
327+
};
328+
/* End PBXTargetDependency section */
329+
175330
/* Begin PBXVariantGroup section */
176331
35C376D41D5CF5300069D7A1 /* Main.storyboard */ = {
177332
isa = PBXVariantGroup;
@@ -206,8 +361,10 @@
206361
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
207362
CLANG_WARN_EMPTY_BODY = YES;
208363
CLANG_WARN_ENUM_CONVERSION = YES;
364+
CLANG_WARN_INFINITE_RECURSION = YES;
209365
CLANG_WARN_INT_CONVERSION = YES;
210366
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
367+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
211368
CLANG_WARN_UNREACHABLE_CODE = YES;
212369
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
213370
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
@@ -251,8 +408,10 @@
251408
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
252409
CLANG_WARN_EMPTY_BODY = YES;
253410
CLANG_WARN_ENUM_CONVERSION = YES;
411+
CLANG_WARN_INFINITE_RECURSION = YES;
254412
CLANG_WARN_INT_CONVERSION = YES;
255413
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
414+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
256415
CLANG_WARN_UNREACHABLE_CODE = YES;
257416
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
258417
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
@@ -271,6 +430,7 @@
271430
IPHONEOS_DEPLOYMENT_TARGET = 9.3;
272431
MTL_ENABLE_DEBUG_INFO = NO;
273432
SDKROOT = iphoneos;
433+
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
274434
VALIDATE_PRODUCT = YES;
275435
};
276436
name = Release;
@@ -280,10 +440,12 @@
280440
buildSettings = {
281441
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
282442
CODE_SIGN_IDENTITY = "iPhone Developer";
443+
DEFINES_MODULE = NO;
283444
INFOPLIST_FILE = "ChromaColorPicker-Demo/Info.plist";
284445
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
285446
PRODUCT_BUNDLE_IDENTIFIER = "com.jonathancardasis.ChromaPicker-Demo";
286447
PRODUCT_NAME = "ChromaColorPicker-Demo";
448+
SWIFT_VERSION = 3.0;
287449
};
288450
name = Debug;
289451
};
@@ -292,10 +454,45 @@
292454
buildSettings = {
293455
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
294456
CODE_SIGN_IDENTITY = "iPhone Developer";
457+
DEFINES_MODULE = NO;
295458
INFOPLIST_FILE = "ChromaColorPicker-Demo/Info.plist";
296459
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
297460
PRODUCT_BUNDLE_IDENTIFIER = "com.jonathancardasis.ChromaPicker-Demo";
298461
PRODUCT_NAME = "ChromaColorPicker-Demo";
462+
SWIFT_VERSION = 3.0;
463+
};
464+
name = Release;
465+
};
466+
FC4AE3E01E16DEA300F02C60 /* Debug */ = {
467+
isa = XCBuildConfiguration;
468+
baseConfigurationReference = E0C887E58E73DFD65E9DEB81 /* Pods-ChromaColorPickerTests.debug.xcconfig */;
469+
buildSettings = {
470+
BUNDLE_LOADER = "$(TEST_HOST)";
471+
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
472+
INFOPLIST_FILE = ChromaColorPickerTests/Info.plist;
473+
IPHONEOS_DEPLOYMENT_TARGET = 10.2;
474+
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
475+
PRODUCT_BUNDLE_IDENTIFIER = com.jonathancardasis.ChromaColorPickerTests;
476+
PRODUCT_NAME = "$(TARGET_NAME)";
477+
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
478+
SWIFT_VERSION = 3.0;
479+
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/ChromaColorPicker-Demo.app/ChromaColorPicker-Demo";
480+
};
481+
name = Debug;
482+
};
483+
FC4AE3E11E16DEA300F02C60 /* Release */ = {
484+
isa = XCBuildConfiguration;
485+
baseConfigurationReference = 0722B34CBD5489ADC94F7B91 /* Pods-ChromaColorPickerTests.release.xcconfig */;
486+
buildSettings = {
487+
BUNDLE_LOADER = "$(TEST_HOST)";
488+
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
489+
INFOPLIST_FILE = ChromaColorPickerTests/Info.plist;
490+
IPHONEOS_DEPLOYMENT_TARGET = 10.2;
491+
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
492+
PRODUCT_BUNDLE_IDENTIFIER = com.jonathancardasis.ChromaColorPickerTests;
493+
PRODUCT_NAME = "$(TARGET_NAME)";
494+
SWIFT_VERSION = 3.0;
495+
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/ChromaColorPicker-Demo.app/ChromaColorPicker-Demo";
299496
};
300497
name = Release;
301498
};
@@ -320,6 +517,15 @@
320517
defaultConfigurationIsVisible = 0;
321518
defaultConfigurationName = Release;
322519
};
520+
FC4AE3DF1E16DEA300F02C60 /* Build configuration list for PBXNativeTarget "ChromaColorPickerTests" */ = {
521+
isa = XCConfigurationList;
522+
buildConfigurations = (
523+
FC4AE3E01E16DEA300F02C60 /* Debug */,
524+
FC4AE3E11E16DEA300F02C60 /* Release */,
525+
);
526+
defaultConfigurationIsVisible = 0;
527+
defaultConfigurationName = Release;
528+
};
323529
/* End XCConfigurationList section */
324530
};
325531
rootObject = 35C376C51D5CF5300069D7A1 /* Project object */;

‎ChromaColorPicker-Demo.xcodeproj/project.xcworkspace/xcuserdata/jon.xcuserdatad/UserInterfaceState.xcuserstate‎

14.8 KB
Binary file not shown.

0 commit comments

Comments
 (0)