Skip to content

Commit 3062dca

Browse files
PiXeL16PiXeL16
authored
Merge pull request #35 from ricky641b/updated-to-latest-versions
bumped minimum version of iOS 8 to 12
2 parents 698cdf4 + 12da546 commit 3062dca

11 files changed

Lines changed: 53 additions & 166 deletions

File tree

‎.ruby-version‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎.swift-version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4.2
1+
5.0

‎PasswordTextField.xcodeproj/project.pbxproj‎

Lines changed: 23 additions & 136 deletions
Original file line numberDiff line numberDiff line change
@@ -374,7 +374,6 @@
374374
83CBDC211C6B07A5006189C2 /* Frameworks */,
375375
83CBDC221C6B07A5006189C2 /* Headers */,
376376
83CBDC231C6B07A5006189C2 /* Resources */,
377-
81C631307E9155B7AE864AE5 /* [CP] Copy Pods Resources */,
378377
);
379378
buildRules = (
380379
);
@@ -394,7 +393,6 @@
394393
83CBDC2C1C6B07A5006189C2 /* Frameworks */,
395394
83CBDC2D1C6B07A5006189C2 /* Resources */,
396395
5D9702E29321AF404C3E1044 /* [CP] Embed Pods Frameworks */,
397-
305F23D5E66EA76D61256008 /* [CP] Copy Pods Resources */,
398396
);
399397
buildRules = (
400398
);
@@ -414,8 +412,6 @@
414412
83CBDC3F1C6B07B4006189C2 /* Sources */,
415413
83CBDC401C6B07B4006189C2 /* Frameworks */,
416414
83CBDC411C6B07B4006189C2 /* Resources */,
417-
08CFB379BC7F815AB4ED89F4 /* [CP] Embed Pods Frameworks */,
418-
B89C8011FF7BBF05110D989A /* [CP] Copy Pods Resources */,
419415
);
420416
buildRules = (
421417
);
@@ -434,8 +430,6 @@
434430
83CBDC521C6B07B4006189C2 /* Sources */,
435431
83CBDC531C6B07B4006189C2 /* Frameworks */,
436432
83CBDC541C6B07B4006189C2 /* Resources */,
437-
2C568F2F667AF065A52CB6BD /* [CP] Embed Pods Frameworks */,
438-
79C5573C50DA0B6E58990D11 /* [CP] Copy Pods Resources */,
439433
);
440434
buildRules = (
441435
);
@@ -455,8 +449,6 @@
455449
83CBDC5D1C6B07B5006189C2 /* Sources */,
456450
83CBDC5E1C6B07B5006189C2 /* Frameworks */,
457451
83CBDC5F1C6B07B5006189C2 /* Resources */,
458-
C92757998D03F23FE309CC7F /* [CP] Embed Pods Frameworks */,
459-
EBF77ED6073E59619E93690D /* [CP] Copy Pods Resources */,
460452
);
461453
buildRules = (
462454
);
@@ -505,6 +497,7 @@
505497
developmentRegion = English;
506498
hasScannedForEncodings = 0;
507499
knownRegions = (
500+
English,
508501
en,
509502
Base,
510503
);
@@ -570,51 +563,6 @@
570563
/* End PBXResourcesBuildPhase section */
571564

572565
/* Begin PBXShellScriptBuildPhase section */
573-
08CFB379BC7F815AB4ED89F4 /* [CP] Embed Pods Frameworks */ = {
574-
isa = PBXShellScriptBuildPhase;
575-
buildActionMask = 2147483647;
576-
files = (
577-
);
578-
inputPaths = (
579-
);
580-
name = "[CP] Embed Pods Frameworks";
581-
outputPaths = (
582-
);
583-
runOnlyForDeploymentPostprocessing = 0;
584-
shellPath = /bin/sh;
585-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-PasswordTextFieldDemo/Pods-PasswordTextFieldDemo-frameworks.sh\"\n";
586-
showEnvVarsInLog = 0;
587-
};
588-
2C568F2F667AF065A52CB6BD /* [CP] Embed Pods Frameworks */ = {
589-
isa = PBXShellScriptBuildPhase;
590-
buildActionMask = 2147483647;
591-
files = (
592-
);
593-
inputPaths = (
594-
);
595-
name = "[CP] Embed Pods Frameworks";
596-
outputPaths = (
597-
);
598-
runOnlyForDeploymentPostprocessing = 0;
599-
shellPath = /bin/sh;
600-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-PasswordTextFieldDemoTests/Pods-PasswordTextFieldDemoTests-frameworks.sh\"\n";
601-
showEnvVarsInLog = 0;
602-
};
603-
305F23D5E66EA76D61256008 /* [CP] Copy Pods Resources */ = {
604-
isa = PBXShellScriptBuildPhase;
605-
buildActionMask = 2147483647;
606-
files = (
607-
);
608-
inputPaths = (
609-
);
610-
name = "[CP] Copy Pods Resources";
611-
outputPaths = (
612-
);
613-
runOnlyForDeploymentPostprocessing = 0;
614-
shellPath = /bin/sh;
615-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-PasswordTextFieldTests/Pods-PasswordTextFieldTests-resources.sh\"\n";
616-
showEnvVarsInLog = 0;
617-
};
618566
4A68E2733377810AF9CA9E2B /* [CP] Check Pods Manifest.lock */ = {
619567
isa = PBXShellScriptBuildPhase;
620568
buildActionMask = 2147483647;
@@ -657,7 +605,7 @@
657605
files = (
658606
);
659607
inputPaths = (
660-
"${SRCROOT}/Pods/Target Support Files/Pods-PasswordTextFieldTests/Pods-PasswordTextFieldTests-frameworks.sh",
608+
"${PODS_ROOT}/Target Support Files/Pods-PasswordTextFieldTests/Pods-PasswordTextFieldTests-frameworks.sh",
661609
"${BUILT_PRODUCTS_DIR}/Nimble/Nimble.framework",
662610
"${BUILT_PRODUCTS_DIR}/Quick/Quick.framework",
663611
);
@@ -668,7 +616,7 @@
668616
);
669617
runOnlyForDeploymentPostprocessing = 0;
670618
shellPath = /bin/sh;
671-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-PasswordTextFieldTests/Pods-PasswordTextFieldTests-frameworks.sh\"\n";
619+
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-PasswordTextFieldTests/Pods-PasswordTextFieldTests-frameworks.sh\"\n";
672620
showEnvVarsInLog = 0;
673621
};
674622
5F4BC36D4A5E5EE50EDD4AF9 /* [CP] Check Pods Manifest.lock */ = {
@@ -707,21 +655,6 @@
707655
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";
708656
showEnvVarsInLog = 0;
709657
};
710-
79C5573C50DA0B6E58990D11 /* [CP] Copy Pods Resources */ = {
711-
isa = PBXShellScriptBuildPhase;
712-
buildActionMask = 2147483647;
713-
files = (
714-
);
715-
inputPaths = (
716-
);
717-
name = "[CP] Copy Pods Resources";
718-
outputPaths = (
719-
);
720-
runOnlyForDeploymentPostprocessing = 0;
721-
shellPath = /bin/sh;
722-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-PasswordTextFieldDemoTests/Pods-PasswordTextFieldDemoTests-resources.sh\"\n";
723-
showEnvVarsInLog = 0;
724-
};
725658
7E1B4F4D897502BAAE2D3036 /* [CP] Check Pods Manifest.lock */ = {
726659
isa = PBXShellScriptBuildPhase;
727660
buildActionMask = 2147483647;
@@ -740,66 +673,6 @@
740673
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";
741674
showEnvVarsInLog = 0;
742675
};
743-
81C631307E9155B7AE864AE5 /* [CP] Copy Pods Resources */ = {
744-
isa = PBXShellScriptBuildPhase;
745-
buildActionMask = 2147483647;
746-
files = (
747-
);
748-
inputPaths = (
749-
);
750-
name = "[CP] Copy Pods Resources";
751-
outputPaths = (
752-
);
753-
runOnlyForDeploymentPostprocessing = 0;
754-
shellPath = /bin/sh;
755-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-PasswordTextField/Pods-PasswordTextField-resources.sh\"\n";
756-
showEnvVarsInLog = 0;
757-
};
758-
B89C8011FF7BBF05110D989A /* [CP] Copy Pods Resources */ = {
759-
isa = PBXShellScriptBuildPhase;
760-
buildActionMask = 2147483647;
761-
files = (
762-
);
763-
inputPaths = (
764-
);
765-
name = "[CP] Copy Pods Resources";
766-
outputPaths = (
767-
);
768-
runOnlyForDeploymentPostprocessing = 0;
769-
shellPath = /bin/sh;
770-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-PasswordTextFieldDemo/Pods-PasswordTextFieldDemo-resources.sh\"\n";
771-
showEnvVarsInLog = 0;
772-
};
773-
C92757998D03F23FE309CC7F /* [CP] Embed Pods Frameworks */ = {
774-
isa = PBXShellScriptBuildPhase;
775-
buildActionMask = 2147483647;
776-
files = (
777-
);
778-
inputPaths = (
779-
);
780-
name = "[CP] Embed Pods Frameworks";
781-
outputPaths = (
782-
);
783-
runOnlyForDeploymentPostprocessing = 0;
784-
shellPath = /bin/sh;
785-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-PasswordTextFieldDemoUITests/Pods-PasswordTextFieldDemoUITests-frameworks.sh\"\n";
786-
showEnvVarsInLog = 0;
787-
};
788-
EBF77ED6073E59619E93690D /* [CP] Copy Pods Resources */ = {
789-
isa = PBXShellScriptBuildPhase;
790-
buildActionMask = 2147483647;
791-
files = (
792-
);
793-
inputPaths = (
794-
);
795-
name = "[CP] Copy Pods Resources";
796-
outputPaths = (
797-
);
798-
runOnlyForDeploymentPostprocessing = 0;
799-
shellPath = /bin/sh;
800-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-PasswordTextFieldDemoUITests/Pods-PasswordTextFieldDemoUITests-resources.sh\"\n";
801-
showEnvVarsInLog = 0;
802-
};
803676
/* End PBXShellScriptBuildPhase section */
804677

805678
/* Begin PBXSourcesBuildPhase section */
@@ -1017,13 +890,14 @@
1017890
DYLIB_INSTALL_NAME_BASE = "@rpath";
1018891
INFOPLIST_FILE = PasswordTextField/Info.plist;
1019892
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
893+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
1020894
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
1021895
PRODUCT_BUNDLE_IDENTIFIER = com.greenpixels.PasswordTextField;
1022896
PRODUCT_NAME = "$(TARGET_NAME)";
1023897
SKIP_INSTALL = YES;
1024898
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
1025899
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
1026-
SWIFT_VERSION = 4.2;
900+
SWIFT_VERSION = 5.0;
1027901
};
1028902
name = Debug;
1029903
};
@@ -1040,12 +914,13 @@
1040914
DYLIB_INSTALL_NAME_BASE = "@rpath";
1041915
INFOPLIST_FILE = PasswordTextField/Info.plist;
1042916
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
917+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
1043918
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
1044919
PRODUCT_BUNDLE_IDENTIFIER = com.greenpixels.PasswordTextField;
1045920
PRODUCT_NAME = "$(TARGET_NAME)";
1046921
SKIP_INSTALL = YES;
1047922
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
1048-
SWIFT_VERSION = 4.2;
923+
SWIFT_VERSION = 5.0;
1049924
};
1050925
name = Release;
1051926
};
@@ -1056,12 +931,13 @@
1056931
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO;
1057932
CLANG_ENABLE_MODULES = YES;
1058933
INFOPLIST_FILE = PasswordTextFieldTests/Info.plist;
934+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
1059935
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
1060936
PRODUCT_BUNDLE_IDENTIFIER = com.greenpixels.PasswordTextFieldTests;
1061937
PRODUCT_NAME = "$(TARGET_NAME)";
1062938
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
1063939
SWIFT_SWIFT3_OBJC_INFERENCE = On;
1064-
SWIFT_VERSION = 4.2;
940+
SWIFT_VERSION = 5.0;
1065941
};
1066942
name = Debug;
1067943
};
@@ -1072,11 +948,12 @@
1072948
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO;
1073949
CLANG_ENABLE_MODULES = YES;
1074950
INFOPLIST_FILE = PasswordTextFieldTests/Info.plist;
951+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
1075952
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
1076953
PRODUCT_BUNDLE_IDENTIFIER = com.greenpixels.PasswordTextFieldTests;
1077954
PRODUCT_NAME = "$(TARGET_NAME)";
1078955
SWIFT_SWIFT3_OBJC_INFERENCE = On;
1079-
SWIFT_VERSION = 4.2;
956+
SWIFT_VERSION = 5.0;
1080957
};
1081958
name = Release;
1082959
};
@@ -1086,10 +963,11 @@
1086963
buildSettings = {
1087964
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
1088965
INFOPLIST_FILE = PasswordTextFieldDemo/Info.plist;
966+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
1089967
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
1090968
PRODUCT_BUNDLE_IDENTIFIER = com.greenpixels.PasswordTextFieldDemo;
1091969
PRODUCT_NAME = "$(TARGET_NAME)";
1092-
SWIFT_VERSION = 3.0;
970+
SWIFT_VERSION = 5.0;
1093971
};
1094972
name = Debug;
1095973
};
@@ -1099,10 +977,11 @@
1099977
buildSettings = {
1100978
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
1101979
INFOPLIST_FILE = PasswordTextFieldDemo/Info.plist;
980+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
1102981
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
1103982
PRODUCT_BUNDLE_IDENTIFIER = com.greenpixels.PasswordTextFieldDemo;
1104983
PRODUCT_NAME = "$(TARGET_NAME)";
1105-
SWIFT_VERSION = 3.0;
984+
SWIFT_VERSION = 5.0;
1106985
};
1107986
name = Release;
1108987
};
@@ -1112,9 +991,11 @@
1112991
buildSettings = {
1113992
BUNDLE_LOADER = "$(TEST_HOST)";
1114993
INFOPLIST_FILE = PasswordTextFieldDemoTests/Info.plist;
994+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
1115995
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
1116996
PRODUCT_BUNDLE_IDENTIFIER = com.greenpixels.PasswordTextFieldDemoTests;
1117997
PRODUCT_NAME = "$(TARGET_NAME)";
998+
SWIFT_VERSION = 5.0;
1118999
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/PasswordTextFieldDemo.app/PasswordTextFieldDemo";
11191000
};
11201001
name = Debug;
@@ -1125,9 +1006,11 @@
11251006
buildSettings = {
11261007
BUNDLE_LOADER = "$(TEST_HOST)";
11271008
INFOPLIST_FILE = PasswordTextFieldDemoTests/Info.plist;
1009+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
11281010
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
11291011
PRODUCT_BUNDLE_IDENTIFIER = com.greenpixels.PasswordTextFieldDemoTests;
11301012
PRODUCT_NAME = "$(TARGET_NAME)";
1013+
SWIFT_VERSION = 5.0;
11311014
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/PasswordTextFieldDemo.app/PasswordTextFieldDemo";
11321015
};
11331016
name = Release;
@@ -1137,9 +1020,11 @@
11371020
baseConfigurationReference = 04B98E6EFFA352C7A5D7C9A8 /* Pods-PasswordTextFieldDemoUITests.debug.xcconfig */;
11381021
buildSettings = {
11391022
INFOPLIST_FILE = PasswordTextFieldDemoUITests/Info.plist;
1023+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
11401024
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
11411025
PRODUCT_BUNDLE_IDENTIFIER = com.greenpixels.PasswordTextFieldDemoUITests;
11421026
PRODUCT_NAME = "$(TARGET_NAME)";
1027+
SWIFT_VERSION = 5.0;
11431028
TEST_TARGET_NAME = PasswordTextFieldDemo;
11441029
USES_XCTRUNNER = YES;
11451030
};
@@ -1150,9 +1035,11 @@
11501035
baseConfigurationReference = 5A8EA39E69D4F0B5D11C073C /* Pods-PasswordTextFieldDemoUITests.release.xcconfig */;
11511036
buildSettings = {
11521037
INFOPLIST_FILE = PasswordTextFieldDemoUITests/Info.plist;
1038+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
11531039
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
11541040
PRODUCT_BUNDLE_IDENTIFIER = com.greenpixels.PasswordTextFieldDemoUITests;
11551041
PRODUCT_NAME = "$(TARGET_NAME)";
1042+
SWIFT_VERSION = 5.0;
11561043
TEST_TARGET_NAME = PasswordTextFieldDemo;
11571044
USES_XCTRUNNER = YES;
11581045
};

‎PasswordTextField.xcodeproj/xcshareddata/xcschemes/PasswordTextField.xcscheme‎

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,17 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29-
codeCoverageEnabled = "YES"
30-
shouldUseLaunchSchemeArgsEnv = "YES">
29+
shouldUseLaunchSchemeArgsEnv = "YES"
30+
codeCoverageEnabled = "YES">
31+
<MacroExpansion>
32+
<BuildableReference
33+
BuildableIdentifier = "primary"
34+
BlueprintIdentifier = "83CBDC241C6B07A5006189C2"
35+
BuildableName = "PasswordTextField.framework"
36+
BlueprintName = "PasswordTextField"
37+
ReferencedContainer = "container:PasswordTextField.xcodeproj">
38+
</BuildableReference>
39+
</MacroExpansion>
3140
<Testables>
3241
<TestableReference
3342
skipped = "NO">
@@ -40,17 +49,6 @@
4049
</BuildableReference>
4150
</TestableReference>
4251
</Testables>
43-
<MacroExpansion>
44-
<BuildableReference
45-
BuildableIdentifier = "primary"
46-
BlueprintIdentifier = "83CBDC241C6B07A5006189C2"
47-
BuildableName = "PasswordTextField.framework"
48-
BlueprintName = "PasswordTextField"
49-
ReferencedContainer = "container:PasswordTextField.xcodeproj">
50-
</BuildableReference>
51-
</MacroExpansion>
52-
<AdditionalOptions>
53-
</AdditionalOptions>
5452
</TestAction>
5553
<LaunchAction
5654
buildConfiguration = "Debug"
@@ -71,8 +69,6 @@
7169
ReferencedContainer = "container:PasswordTextField.xcodeproj">
7270
</BuildableReference>
7371
</MacroExpansion>
74-
<AdditionalOptions>
75-
</AdditionalOptions>
7672
</LaunchAction>
7773
<ProfileAction
7874
buildConfiguration = "Release"

0 commit comments

Comments
 (0)