Skip to content

Commit 7ee16d0

Browse files
PiXeL16PiXeL16
authored
Merge pull request #13 from kennytm/master
Allow this to be actually used in Carthage.
2 parents 8ad79d7 + 64d9646 commit 7ee16d0

3 files changed

Lines changed: 19 additions & 85 deletions

File tree

‎PasswordTextField.xcodeproj/project.pbxproj‎

Lines changed: 2 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@
3737
83CBDC5B1C6B07B5006189C2 /* PasswordTextFieldDemoTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 83CBDC5A1C6B07B5006189C2 /* PasswordTextFieldDemoTests.swift */; };
3838
83CBDC661C6B07B5006189C2 /* PasswordTextFieldDemoUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 83CBDC651C6B07B5006189C2 /* PasswordTextFieldDemoUITests.swift */; };
3939
83CBDC721C6B07C9006189C2 /* PasswordTextField.swift in Sources */ = {isa = PBXBuildFile; fileRef = 83CBDC711C6B07C9006189C2 /* PasswordTextField.swift */; };
40-
86CBF3239FCBACA3C421DF4A /* Pods_PasswordTextField.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 34E05EFDA6B8A6B9ABAB6F3F /* Pods_PasswordTextField.framework */; };
4140
FA0029C2F4E7DEA2A4782F21 /* Pods_PasswordTextFieldDemoTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 95C106D8138233173A814CA7 /* Pods_PasswordTextFieldDemoTests.framework */; };
4241
/* End PBXBuildFile section */
4342

@@ -70,7 +69,6 @@
7069
07254DA8F238A12B13E91525 /* Pods-PasswordTextFieldTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-PasswordTextFieldTests.release.xcconfig"; path = "Pods/Target Support Files/Pods-PasswordTextFieldTests/Pods-PasswordTextFieldTests.release.xcconfig"; sourceTree = "<group>"; };
7170
243F7B8E60C41CDC52714D62 /* Pods-PasswordTextFieldDemoTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-PasswordTextFieldDemoTests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-PasswordTextFieldDemoTests/Pods-PasswordTextFieldDemoTests.debug.xcconfig"; sourceTree = "<group>"; };
7271
34E05EFDA6B8A6B9ABAB6F3F /* Pods_PasswordTextField.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_PasswordTextField.framework; sourceTree = BUILT_PRODUCTS_DIR; };
73-
3EDA518CBC5E3851CAAC25D8 /* Pods-PasswordTextField.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-PasswordTextField.debug.xcconfig"; path = "Pods/Target Support Files/Pods-PasswordTextField/Pods-PasswordTextField.debug.xcconfig"; sourceTree = "<group>"; };
7472
839CC8291C6B09A400531404 /* StringExtension.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StringExtension.swift; sourceTree = "<group>"; };
7573
839CC82D1C6C3CB000531404 /* SecureTextToggleButton.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SecureTextToggleButton.swift; sourceTree = "<group>"; };
7674
839CC82F1C6D756300531404 /* CustomStyle.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CustomStyle.swift; sourceTree = "<group>"; };
@@ -113,15 +111,13 @@
113111
B86F74D8E367C39DB0C3D301 /* Pods_PasswordTextFieldTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_PasswordTextFieldTests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
114112
C63B176E407379CBD8B7FBE7 /* Pods-PasswordTextFieldDemoTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-PasswordTextFieldDemoTests.release.xcconfig"; path = "Pods/Target Support Files/Pods-PasswordTextFieldDemoTests/Pods-PasswordTextFieldDemoTests.release.xcconfig"; sourceTree = "<group>"; };
115113
CEC8548427014CCFB06FE43A /* Pods_PasswordTextFieldDemoUITests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_PasswordTextFieldDemoUITests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
116-
FB0A465CAF695786CC23DCAC /* Pods-PasswordTextField.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-PasswordTextField.release.xcconfig"; path = "Pods/Target Support Files/Pods-PasswordTextField/Pods-PasswordTextField.release.xcconfig"; sourceTree = "<group>"; };
117114
/* End PBXFileReference section */
118115

119116
/* Begin PBXFrameworksBuildPhase section */
120117
83CBDC211C6B07A5006189C2 /* Frameworks */ = {
121118
isa = PBXFrameworksBuildPhase;
122119
buildActionMask = 2147483647;
123120
files = (
124-
86CBF3239FCBACA3C421DF4A /* Pods_PasswordTextField.framework in Frameworks */,
125121
);
126122
runOnlyForDeploymentPostprocessing = 0;
127123
};
@@ -175,8 +171,6 @@
175171
3C88CF8BC9797ED63185077B /* Pods */ = {
176172
isa = PBXGroup;
177173
children = (
178-
3EDA518CBC5E3851CAAC25D8 /* Pods-PasswordTextField.debug.xcconfig */,
179-
FB0A465CAF695786CC23DCAC /* Pods-PasswordTextField.release.xcconfig */,
180174
243F7B8E60C41CDC52714D62 /* Pods-PasswordTextFieldDemoTests.debug.xcconfig */,
181175
C63B176E407379CBD8B7FBE7 /* Pods-PasswordTextFieldDemoTests.release.xcconfig */,
182176
0095CA209CBEDC480227B9BC /* Pods-PasswordTextFieldDemoUITests.debug.xcconfig */,
@@ -361,12 +355,10 @@
361355
isa = PBXNativeTarget;
362356
buildConfigurationList = 83CBDC391C6B07A5006189C2 /* Build configuration list for PBXNativeTarget "PasswordTextField" */;
363357
buildPhases = (
364-
66B4D3588EF01B594E66967A /* [CP] Check Pods Manifest.lock */,
365358
83CBDC201C6B07A5006189C2 /* Sources */,
366359
83CBDC211C6B07A5006189C2 /* Frameworks */,
367360
83CBDC221C6B07A5006189C2 /* Headers */,
368361
83CBDC231C6B07A5006189C2 /* Resources */,
369-
C1FC89B458B56A5D1B8B00DE /* [CP] Copy Pods Resources */,
370362
);
371363
buildRules = (
372364
);
@@ -381,7 +373,7 @@
381373
isa = PBXNativeTarget;
382374
buildConfigurationList = 83CBDC3C1C6B07A5006189C2 /* Build configuration list for PBXNativeTarget "PasswordTextFieldTests" */;
383375
buildPhases = (
384-
E7DACECA3063EDCDB0241EB6 /* [CP] Check Pods Manifest.lock */,
376+
5F4BC36D4A5E5EE50EDD4AF9 /* [CP] Check Pods Manifest.lock */,
385377
83CBDC2B1C6B07A5006189C2 /* Sources */,
386378
83CBDC2C1C6B07A5006189C2 /* Frameworks */,
387379
83CBDC2D1C6B07A5006189C2 /* Resources */,
@@ -619,7 +611,7 @@
619611
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-PasswordTextFieldTests/Pods-PasswordTextFieldTests-frameworks.sh\"\n";
620612
showEnvVarsInLog = 0;
621613
};
622-
66B4D3588EF01B594E66967A /* [CP] Check Pods Manifest.lock */ = {
614+
5F4BC36D4A5E5EE50EDD4AF9 /* [CP] Check Pods Manifest.lock */ = {
623615
isa = PBXShellScriptBuildPhase;
624616
buildActionMask = 2147483647;
625617
files = (
@@ -649,21 +641,6 @@
649641
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-PasswordTextFieldDemoUITests/Pods-PasswordTextFieldDemoUITests-frameworks.sh\"\n";
650642
showEnvVarsInLog = 0;
651643
};
652-
C1FC89B458B56A5D1B8B00DE /* [CP] Copy Pods Resources */ = {
653-
isa = PBXShellScriptBuildPhase;
654-
buildActionMask = 2147483647;
655-
files = (
656-
);
657-
inputPaths = (
658-
);
659-
name = "[CP] Copy Pods Resources";
660-
outputPaths = (
661-
);
662-
runOnlyForDeploymentPostprocessing = 0;
663-
shellPath = /bin/sh;
664-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-PasswordTextField/Pods-PasswordTextField-resources.sh\"\n";
665-
showEnvVarsInLog = 0;
666-
};
667644
C4D5FD521237640950E4F4F8 /* [CP] Check Pods Manifest.lock */ = {
668645
isa = PBXShellScriptBuildPhase;
669646
buildActionMask = 2147483647;
@@ -694,21 +671,6 @@
694671
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-PasswordTextFieldDemoTests/Pods-PasswordTextFieldDemoTests-frameworks.sh\"\n";
695672
showEnvVarsInLog = 0;
696673
};
697-
E7DACECA3063EDCDB0241EB6 /* [CP] Check Pods Manifest.lock */ = {
698-
isa = PBXShellScriptBuildPhase;
699-
buildActionMask = 2147483647;
700-
files = (
701-
);
702-
inputPaths = (
703-
);
704-
name = "[CP] Check Pods Manifest.lock";
705-
outputPaths = (
706-
);
707-
runOnlyForDeploymentPostprocessing = 0;
708-
shellPath = /bin/sh;
709-
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";
710-
showEnvVarsInLog = 0;
711-
};
712674
ED98823D5BAE0DBD8D3C4124 /* [CP] Copy Pods Resources */ = {
713675
isa = PBXShellScriptBuildPhase;
714676
buildActionMask = 2147483647;
@@ -914,7 +876,6 @@
914876
};
915877
83CBDC3A1C6B07A5006189C2 /* Debug */ = {
916878
isa = XCBuildConfiguration;
917-
baseConfigurationReference = 3EDA518CBC5E3851CAAC25D8 /* Pods-PasswordTextField.debug.xcconfig */;
918879
buildSettings = {
919880
CLANG_ENABLE_MODULES = YES;
920881
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
@@ -935,7 +896,6 @@
935896
};
936897
83CBDC3B1C6B07A5006189C2 /* Release */ = {
937898
isa = XCBuildConfiguration;
938-
baseConfigurationReference = FB0A465CAF695786CC23DCAC /* Pods-PasswordTextField.release.xcconfig */;
939899
buildSettings = {
940900
CLANG_ENABLE_MODULES = YES;
941901
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
@@ -957,7 +917,6 @@
957917
isa = XCBuildConfiguration;
958918
baseConfigurationReference = 9D2BABDE97871541522A6481 /* Pods-PasswordTextFieldTests.debug.xcconfig */;
959919
buildSettings = {
960-
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
961920
CLANG_ENABLE_MODULES = YES;
962921
INFOPLIST_FILE = PasswordTextFieldTests/Info.plist;
963922
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
@@ -972,7 +931,6 @@
972931
isa = XCBuildConfiguration;
973932
baseConfigurationReference = 07254DA8F238A12B13E91525 /* Pods-PasswordTextFieldTests.release.xcconfig */;
974933
buildSettings = {
975-
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
976934
CLANG_ENABLE_MODULES = YES;
977935
INFOPLIST_FILE = PasswordTextFieldTests/Info.plist;
978936
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";

‎Podfile‎

Lines changed: 9 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,19 @@
1-
# Uncomment the next line to define a global platform for your project
2-
# platform :ios, '9.0'
1+
use_frameworks!
32

4-
target 'PasswordTextField' do
5-
# Comment the next line if you're not using Swift and don't want to use dynamic frameworks
6-
use_frameworks!
7-
8-
# Pods for PasswordTextField
9-
10-
target 'PasswordTextFieldDemoTests' do
3+
target 'PasswordTextFieldDemoTests' do
114
inherit! :search_paths
125
# Pods for testing
13-
end
6+
end
147

15-
target 'PasswordTextFieldDemoUITests' do
8+
target 'PasswordTextFieldDemoUITests' do
169
inherit! :search_paths
1710
# Pods for testing
18-
end
11+
end
1912

20-
target 'PasswordTextFieldTests' do
13+
target 'PasswordTextFieldTests' do
2114
inherit! :search_paths
22-
pod 'Quick', :git => 'https://github.com/Quick/Quick.git' , :branch => 'swift-3.0'
23-
pod 'Nimble', :git => 'https://github.com/Quick/Nimble.git', :commit => 'db706fc'
24-
end
25-
15+
pod 'Quick', '~> 0.10.0'
16+
pod 'Nimble', '~> 5.1.1'
2617
end
2718

19+

‎Podfile.lock‎

Lines changed: 8 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,15 @@
11
PODS:
2-
- Nimble (5.0.0-alpha.30p1)
3-
- Quick (0.9.3)
2+
- Nimble (5.1.1)
3+
- Quick (0.10.0)
44

55
DEPENDENCIES:
6-
- Nimble (from `https://github.com/Quick/Nimble.git`, commit `db706fc`)
7-
- Quick (from `https://github.com/Quick/Quick.git`, branch `swift-3.0`)
8-
9-
EXTERNAL SOURCES:
10-
Nimble:
11-
:commit: db706fc
12-
:git: https://github.com/Quick/Nimble.git
13-
Quick:
14-
:branch: swift-3.0
15-
:git: https://github.com/Quick/Quick.git
16-
17-
CHECKOUT OPTIONS:
18-
Nimble:
19-
:commit: db706fc
20-
:git: https://github.com/Quick/Nimble.git
21-
Quick:
22-
:commit: 1503fb019d72417d5d6e4fbebdbaa03c9e4a125f
23-
:git: https://github.com/Quick/Quick.git
6+
- Nimble (~> 5.1.1)
7+
- Quick (~> 0.10.0)
248

259
SPEC CHECKSUMS:
26-
Nimble: c5b995b4cd57789ec44b0cfb79640fc00e61a8c7
27-
Quick: 31fb576b6cbb6b028cc5e0016e4366accbb346f5
10+
Nimble: 415e3aa3267e7bc2c96b05fa814ddea7bb686a29
11+
Quick: 5d290df1c69d5ee2f0729956dcf0fd9a30447eaa
2812

29-
PODFILE CHECKSUM: 5fcc1934415ce6dd737b259b3870ee8d58ac9d36
13+
PODFILE CHECKSUM: 761ceea7858cc5c34bbd9e19d2a1658db07ea2bc
3014

31-
COCOAPODS: 1.1.0.rc.2
15+
COCOAPODS: 1.1.1

0 commit comments

Comments
 (0)