Skip to content

Commit 3e43d02

Browse files
joncardasisjoncardasis
committed
Added Carthage support. Updated Cocoapod
Added carthage support via ChromaColorPicker framework and updated cocoapod podspec for the PR changes
1 parent 8757333 commit 3e43d02

File tree

9 files changed

+381
-13
lines changed

9 files changed

+381
-13
lines changed

‎.gitignore

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
# Xcode
2+
#
3+
# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore
4+
5+
## Build generated
6+
build/
7+
DerivedData/
8+
9+
## Various settings
10+
*.pbxuser
11+
!default.pbxuser
12+
*.mode1v3
13+
!default.mode1v3
14+
*.mode2v3
15+
!default.mode2v3
16+
*.perspectivev3
17+
!default.perspectivev3
18+
xcuserdata/
19+
20+
## Other
21+
*.moved-aside
22+
*.xccheckout
23+
*.xcscmblueprint
24+
25+
## Obj-C/Swift specific
26+
*.hmap
27+
*.ipa
28+
*.dSYM.zip
29+
*.dSYM
30+
31+
# CocoaPods
32+
#
33+
# We recommend against adding the Pods directory to your .gitignore. However
34+
# you should judge for yourself, the pros and cons are mentioned at:
35+
# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
36+
#
37+
# Pods/
38+
39+
# Carthage
40+
#
41+
# Add this line if you want to avoid checking in source code from Carthage dependencies.
42+
# Carthage/Checkouts
43+
44+
Carthage/Build
45+
46+
# fastlane
47+
#
48+
# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the
49+
# screenshots whenever they are needed.
50+
# For more information about the recommended setup visit:
51+
# https://docs.fastlane.tools/best-practices/source-control/#source-control
52+
53+
fastlane/report.xml
54+
fastlane/Preview.html
55+
fastlane/screenshots
56+
fastlane/test_output
57+
58+
# Code Injection
59+
#
60+
# After new code Injection tools there's a generated folder /iOSInjectionProject
61+
# https://github.com/johnno1962/injectionforxcode
62+
63+
iOSInjectionProject/

‎ChromaColorPicker-Demo.xcodeproj/project.pbxproj

Lines changed: 170 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,30 @@
88

99
/* Begin PBXBuildFile section */
1010
19FFA53F31A463C06785F28F /* Pods_ChromaColorPickerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 91485B6B5C58777417441794 /* Pods_ChromaColorPickerTests.framework */; };
11+
3503B8331F2689BC00750356 /* ChromaColorPicker.h in Headers */ = {isa = PBXBuildFile; fileRef = 3503B8311F2689BC00750356 /* ChromaColorPicker.h */; settings = {ATTRIBUTES = (Public, ); }; };
12+
3503B8361F2689BC00750356 /* ChromaColorPicker.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3503B82F1F2689BC00750356 /* ChromaColorPicker.framework */; };
13+
3503B8371F2689BC00750356 /* ChromaColorPicker.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 3503B82F1F2689BC00750356 /* ChromaColorPicker.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
14+
3503B83C1F2689C400750356 /* ChromaColorPicker.swift in Sources */ = {isa = PBXBuildFile; fileRef = 35C376E41D5CF9400069D7A1 /* ChromaColorPicker.swift */; };
15+
3503B83D1F2689C400750356 /* ChromaHandle.swift in Sources */ = {isa = PBXBuildFile; fileRef = 35C376E31D5CF9400069D7A1 /* ChromaHandle.swift */; };
16+
3503B83E1F2689C400750356 /* ChromaAddButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 35C376E21D5CF9400069D7A1 /* ChromaAddButton.swift */; };
17+
3503B83F1F2689C400750356 /* ChromaShadeSlider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 35C376E51D5CF9400069D7A1 /* ChromaShadeSlider.swift */; };
18+
3503B8401F2689C400750356 /* UIColor+Utilities.swift in Sources */ = {isa = PBXBuildFile; fileRef = 35C376E61D5CF9400069D7A1 /* UIColor+Utilities.swift */; };
1119
35C376D11D5CF5300069D7A1 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 35C376D01D5CF5300069D7A1 /* AppDelegate.swift */; };
1220
35C376D31D5CF5300069D7A1 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 35C376D21D5CF5300069D7A1 /* ViewController.swift */; };
1321
35C376D61D5CF5300069D7A1 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 35C376D41D5CF5300069D7A1 /* Main.storyboard */; };
1422
35C376D81D5CF5300069D7A1 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 35C376D71D5CF5300069D7A1 /* Assets.xcassets */; };
1523
35C376DB1D5CF5300069D7A1 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 35C376D91D5CF5300069D7A1 /* LaunchScreen.storyboard */; };
16-
35C376E71D5CF9400069D7A1 /* ChromaAddButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 35C376E21D5CF9400069D7A1 /* ChromaAddButton.swift */; };
17-
35C376E81D5CF9400069D7A1 /* ChromaHandle.swift in Sources */ = {isa = PBXBuildFile; fileRef = 35C376E31D5CF9400069D7A1 /* ChromaHandle.swift */; };
18-
35C376E91D5CF9400069D7A1 /* ChromaColorPicker.swift in Sources */ = {isa = PBXBuildFile; fileRef = 35C376E41D5CF9400069D7A1 /* ChromaColorPicker.swift */; };
19-
35C376EA1D5CF9400069D7A1 /* ChromaShadeSlider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 35C376E51D5CF9400069D7A1 /* ChromaShadeSlider.swift */; };
20-
35C376EB1D5CF9400069D7A1 /* UIColor+Utilities.swift in Sources */ = {isa = PBXBuildFile; fileRef = 35C376E61D5CF9400069D7A1 /* UIColor+Utilities.swift */; };
2124
FC4AE3DB1E16DEA300F02C60 /* ChromaColorPickerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = FC4AE3DA1E16DEA300F02C60 /* ChromaColorPickerTests.swift */; };
2225
/* End PBXBuildFile section */
2326

2427
/* Begin PBXContainerItemProxy section */
28+
3503B8341F2689BC00750356 /* PBXContainerItemProxy */ = {
29+
isa = PBXContainerItemProxy;
30+
containerPortal = 35C376C51D5CF5300069D7A1 /* Project object */;
31+
proxyType = 1;
32+
remoteGlobalIDString = 3503B82E1F2689BC00750356;
33+
remoteInfo = ChromaColorPicker;
34+
};
2535
FC4AE3DD1E16DEA300F02C60 /* PBXContainerItemProxy */ = {
2636
isa = PBXContainerItemProxy;
2737
containerPortal = 35C376C51D5CF5300069D7A1 /* Project object */;
@@ -31,8 +41,25 @@
3141
};
3242
/* End PBXContainerItemProxy section */
3343

44+
/* Begin PBXCopyFilesBuildPhase section */
45+
3503B83B1F2689BC00750356 /* Embed Frameworks */ = {
46+
isa = PBXCopyFilesBuildPhase;
47+
buildActionMask = 2147483647;
48+
dstPath = "";
49+
dstSubfolderSpec = 10;
50+
files = (
51+
3503B8371F2689BC00750356 /* ChromaColorPicker.framework in Embed Frameworks */,
52+
);
53+
name = "Embed Frameworks";
54+
runOnlyForDeploymentPostprocessing = 0;
55+
};
56+
/* End PBXCopyFilesBuildPhase section */
57+
3458
/* Begin PBXFileReference section */
3559
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>"; };
60+
3503B82F1F2689BC00750356 /* ChromaColorPicker.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = ChromaColorPicker.framework; sourceTree = BUILT_PRODUCTS_DIR; };
61+
3503B8311F2689BC00750356 /* ChromaColorPicker.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ChromaColorPicker.h; sourceTree = "<group>"; };
62+
3503B8321F2689BC00750356 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
3663
35C376CD1D5CF5300069D7A1 /* ChromaColorPicker-Demo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "ChromaColorPicker-Demo.app"; sourceTree = BUILT_PRODUCTS_DIR; };
3764
35C376D01D5CF5300069D7A1 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
3865
35C376D21D5CF5300069D7A1 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
@@ -53,10 +80,18 @@
5380
/* End PBXFileReference section */
5481

5582
/* Begin PBXFrameworksBuildPhase section */
83+
3503B82B1F2689BC00750356 /* Frameworks */ = {
84+
isa = PBXFrameworksBuildPhase;
85+
buildActionMask = 2147483647;
86+
files = (
87+
);
88+
runOnlyForDeploymentPostprocessing = 0;
89+
};
5690
35C376CA1D5CF5300069D7A1 /* Frameworks */ = {
5791
isa = PBXFrameworksBuildPhase;
5892
buildActionMask = 2147483647;
5993
files = (
94+
3503B8361F2689BC00750356 /* ChromaColorPicker.framework in Frameworks */,
6095
);
6196
runOnlyForDeploymentPostprocessing = 0;
6297
};
@@ -71,11 +106,21 @@
71106
/* End PBXFrameworksBuildPhase section */
72107

73108
/* Begin PBXGroup section */
109+
3503B8301F2689BC00750356 /* ChromaColorPicker */ = {
110+
isa = PBXGroup;
111+
children = (
112+
3503B8311F2689BC00750356 /* ChromaColorPicker.h */,
113+
3503B8321F2689BC00750356 /* Info.plist */,
114+
);
115+
path = ChromaColorPicker;
116+
sourceTree = "<group>";
117+
};
74118
35C376C41D5CF5300069D7A1 = {
75119
isa = PBXGroup;
76120
children = (
77121
35C376CF1D5CF5300069D7A1 /* ChromaColorPicker-Demo */,
78122
FC4AE3D91E16DEA300F02C60 /* ChromaColorPickerTests */,
123+
3503B8301F2689BC00750356 /* ChromaColorPicker */,
79124
35C376CE1D5CF5300069D7A1 /* Products */,
80125
A890856BC0D0DD14D667AEA1 /* Pods */,
81126
A18D889CBAEF3E0FD0A65ADB /* Frameworks */,
@@ -87,6 +132,7 @@
87132
children = (
88133
35C376CD1D5CF5300069D7A1 /* ChromaColorPicker-Demo.app */,
89134
FC4AE3D81E16DEA300F02C60 /* ChromaColorPickerTests.xctest */,
135+
3503B82F1F2689BC00750356 /* ChromaColorPicker.framework */,
90136
);
91137
name = Products;
92138
sourceTree = "<group>";
@@ -146,18 +192,49 @@
146192
};
147193
/* End PBXGroup section */
148194

195+
/* Begin PBXHeadersBuildPhase section */
196+
3503B82C1F2689BC00750356 /* Headers */ = {
197+
isa = PBXHeadersBuildPhase;
198+
buildActionMask = 2147483647;
199+
files = (
200+
3503B8331F2689BC00750356 /* ChromaColorPicker.h in Headers */,
201+
);
202+
runOnlyForDeploymentPostprocessing = 0;
203+
};
204+
/* End PBXHeadersBuildPhase section */
205+
149206
/* Begin PBXNativeTarget section */
207+
3503B82E1F2689BC00750356 /* ChromaColorPicker */ = {
208+
isa = PBXNativeTarget;
209+
buildConfigurationList = 3503B83A1F2689BC00750356 /* Build configuration list for PBXNativeTarget "ChromaColorPicker" */;
210+
buildPhases = (
211+
3503B82A1F2689BC00750356 /* Sources */,
212+
3503B82B1F2689BC00750356 /* Frameworks */,
213+
3503B82C1F2689BC00750356 /* Headers */,
214+
3503B82D1F2689BC00750356 /* Resources */,
215+
);
216+
buildRules = (
217+
);
218+
dependencies = (
219+
);
220+
name = ChromaColorPicker;
221+
productName = ChromaColorPicker;
222+
productReference = 3503B82F1F2689BC00750356 /* ChromaColorPicker.framework */;
223+
productType = "com.apple.product-type.framework";
224+
};
150225
35C376CC1D5CF5300069D7A1 /* ChromaColorPicker-Demo */ = {
151226
isa = PBXNativeTarget;
152227
buildConfigurationList = 35C376DF1D5CF5300069D7A1 /* Build configuration list for PBXNativeTarget "ChromaColorPicker-Demo" */;
153228
buildPhases = (
154229
35C376C91D5CF5300069D7A1 /* Sources */,
155230
35C376CA1D5CF5300069D7A1 /* Frameworks */,
156231
35C376CB1D5CF5300069D7A1 /* Resources */,
232+
3503B83B1F2689BC00750356 /* Embed Frameworks */,
157233
);
158234
buildRules = (
159235
);
160236
dependencies = (
237+
3503B8351F2689BC00750356 /* PBXTargetDependency */,
161238
);
162239
name = "ChromaColorPicker-Demo";
163240
productName = "JCColorPicker-Demo";
@@ -195,6 +272,10 @@
195272
LastUpgradeCheck = 0820;
196273
ORGANIZATIONNAME = "Jonathan Cardasis";
197274
TargetAttributes = {
275+
3503B82E1F2689BC00750356 = {
276+
CreatedOnToolsVersion = 8.2.1;
277+
ProvisioningStyle = Automatic;
278+
};
198279
35C376CC1D5CF5300069D7A1 = {
199280
CreatedOnToolsVersion = 7.3;
200281
DevelopmentTeam = 43DKZUY8C6;
@@ -222,11 +303,19 @@
222303
targets = (
223304
35C376CC1D5CF5300069D7A1 /* ChromaColorPicker-Demo */,
224305
FC4AE3D71E16DEA300F02C60 /* ChromaColorPickerTests */,
306+
3503B82E1F2689BC00750356 /* ChromaColorPicker */,
225307
);
226308
};
227309
/* End PBXProject section */
228310

229311
/* Begin PBXResourcesBuildPhase section */
312+
3503B82D1F2689BC00750356 /* Resources */ = {
313+
isa = PBXResourcesBuildPhase;
314+
buildActionMask = 2147483647;
315+
files = (
316+
);
317+
runOnlyForDeploymentPostprocessing = 0;
318+
};
230319
35C376CB1D5CF5300069D7A1 /* Resources */ = {
231320
isa = PBXResourcesBuildPhase;
232321
buildActionMask = 2147483647;
@@ -295,17 +384,24 @@
295384
/* End PBXShellScriptBuildPhase section */
296385

297386
/* Begin PBXSourcesBuildPhase section */
387+
3503B82A1F2689BC00750356 /* Sources */ = {
388+
isa = PBXSourcesBuildPhase;
389+
buildActionMask = 2147483647;
390+
files = (
391+
3503B83C1F2689C400750356 /* ChromaColorPicker.swift in Sources */,
392+
3503B83D1F2689C400750356 /* ChromaHandle.swift in Sources */,
393+
3503B83E1F2689C400750356 /* ChromaAddButton.swift in Sources */,
394+
3503B83F1F2689C400750356 /* ChromaShadeSlider.swift in Sources */,
395+
3503B8401F2689C400750356 /* UIColor+Utilities.swift in Sources */,
396+
);
397+
runOnlyForDeploymentPostprocessing = 0;
398+
};
298399
35C376C91D5CF5300069D7A1 /* Sources */ = {
299400
isa = PBXSourcesBuildPhase;
300401
buildActionMask = 2147483647;
301402
files = (
302-
35C376E91D5CF9400069D7A1 /* ChromaColorPicker.swift in Sources */,
303403
35C376D31D5CF5300069D7A1 /* ViewController.swift in Sources */,
304404
35C376D11D5CF5300069D7A1 /* AppDelegate.swift in Sources */,
305-
35C376E81D5CF9400069D7A1 /* ChromaHandle.swift in Sources */,
306-
35C376EB1D5CF9400069D7A1 /* UIColor+Utilities.swift in Sources */,
307-
35C376E71D5CF9400069D7A1 /* ChromaAddButton.swift in Sources */,
308-
35C376EA1D5CF9400069D7A1 /* ChromaShadeSlider.swift in Sources */,
309405
);
310406
runOnlyForDeploymentPostprocessing = 0;
311407
};
@@ -320,6 +416,11 @@
320416
/* End PBXSourcesBuildPhase section */
321417

322418
/* Begin PBXTargetDependency section */
419+
3503B8351F2689BC00750356 /* PBXTargetDependency */ = {
420+
isa = PBXTargetDependency;
421+
target = 3503B82E1F2689BC00750356 /* ChromaColorPicker */;
422+
targetProxy = 3503B8341F2689BC00750356 /* PBXContainerItemProxy */;
423+
};
323424
FC4AE3DE1E16DEA300F02C60 /* PBXTargetDependency */ = {
324425
isa = PBXTargetDependency;
325426
target = 35C376CC1D5CF5300069D7A1 /* ChromaColorPicker-Demo */;
@@ -347,6 +448,55 @@
347448
/* End PBXVariantGroup section */
348449

349450
/* Begin XCBuildConfiguration section */
451+
3503B8381F2689BC00750356 /* Debug */ = {
452+
isa = XCBuildConfiguration;
453+
buildSettings = {
454+
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
455+
CODE_SIGN_IDENTITY = "iPhone Developer";
456+
CURRENT_PROJECT_VERSION = 1;
457+
DEFINES_MODULE = YES;
458+
DYLIB_COMPATIBILITY_VERSION = 1;
459+
DYLIB_CURRENT_VERSION = 1;
460+
DYLIB_INSTALL_NAME_BASE = "@rpath";
461+
INFOPLIST_FILE = ChromaColorPicker/Info.plist;
462+
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
463+
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
464+
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
465+
PRODUCT_BUNDLE_IDENTIFIER = com.jonathancardasis.ChromaColorPicker;
466+
PRODUCT_NAME = "$(TARGET_NAME)";
467+
SKIP_INSTALL = YES;
468+
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
469+
SWIFT_VERSION = 3.0;
470+
TARGETED_DEVICE_FAMILY = "1,2";
471+
VERSIONING_SYSTEM = "apple-generic";
472+
VERSION_INFO_PREFIX = "";
473+
};
474+
name = Debug;
475+
};
476+
3503B8391F2689BC00750356 /* Release */ = {
477+
isa = XCBuildConfiguration;
478+
buildSettings = {
479+
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
480+
CODE_SIGN_IDENTITY = "iPhone Developer";
481+
CURRENT_PROJECT_VERSION = 1;
482+
DEFINES_MODULE = YES;
483+
DYLIB_COMPATIBILITY_VERSION = 1;
484+
DYLIB_CURRENT_VERSION = 1;
485+
DYLIB_INSTALL_NAME_BASE = "@rpath";
486+
INFOPLIST_FILE = ChromaColorPicker/Info.plist;
487+
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
488+
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
489+
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
490+
PRODUCT_BUNDLE_IDENTIFIER = com.jonathancardasis.ChromaColorPicker;
491+
PRODUCT_NAME = "$(TARGET_NAME)";
492+
SKIP_INSTALL = YES;
493+
SWIFT_VERSION = 3.0;
494+
TARGETED_DEVICE_FAMILY = "1,2";
495+
VERSIONING_SYSTEM = "apple-generic";
496+
VERSION_INFO_PREFIX = "";
497+
};
498+
name = Release;
499+
};
350500
35C376DD1D5CF5300069D7A1 /* Debug */ = {
351501
isa = XCBuildConfiguration;
352502
buildSettings = {
@@ -438,6 +588,7 @@
438588
35C376E01D5CF5300069D7A1 /* Debug */ = {
439589
isa = XCBuildConfiguration;
440590
buildSettings = {
591+
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
441592
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
442593
CODE_SIGN_IDENTITY = "iPhone Developer";
443594
DEFINES_MODULE = NO;
@@ -452,6 +603,7 @@
452603
35C376E11D5CF5300069D7A1 /* Release */ = {
453604
isa = XCBuildConfiguration;
454605
buildSettings = {
606+
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
455607
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
456608
CODE_SIGN_IDENTITY = "iPhone Developer";
457609
DEFINES_MODULE = NO;
@@ -499,6 +651,14 @@
499651
/* End XCBuildConfiguration section */
500652

501653
/* Begin XCConfigurationList section */
654+
3503B83A1F2689BC00750356 /* Build configuration list for PBXNativeTarget "ChromaColorPicker" */ = {
655+
isa = XCConfigurationList;
656+
buildConfigurations = (
657+
3503B8381F2689BC00750356 /* Debug */,
658+
3503B8391F2689BC00750356 /* Release */,
659+
);
660+
defaultConfigurationIsVisible = 0;
661+
};
502662
35C376C81D5CF5300069D7A1 /* Build configuration list for PBXProject "ChromaColorPicker-Demo" */ = {
503663
isa = XCConfigurationList;
504664
buildConfigurations = (

0 commit comments

Comments
 (0)