Skip to content

Commit 64da5bb

Browse files
authored
Merge pull request #8 from ahmetsina/development
Swift 5 & Added spesific versions to nested Libraries.
2 parents 28b3dd6 + ecd504c commit 64da5bb

File tree

11 files changed

+124
-119
lines changed

11 files changed

+124
-119
lines changed

ALFormInput.podspec

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
Pod::Spec.new do |s|
1010
s.name = 'ALFormInput'
11-
s.version = '0.1.1'
11+
s.version = '0.2.0'
1212
s.summary = 'Commonly used form inputs in our projects'
1313

1414
s.homepage = 'https://github.com/applogistdev/ALFormInput'
@@ -23,8 +23,8 @@ Pod::Spec.new do |s|
2323
s.dependency 'SkyFloatingLabelTextField', '~> 3.0'
2424
s.dependency 'PhoneNumberKit', '~> 3.1'
2525
s.dependency 'SwiftValidatorNew', '~> 4.2.0'
26-
s.dependency 'ActionSheetPicker-3.0'
27-
s.dependency 'AlExtensions'
28-
s.dependency 'FontAwesome.swift'
26+
s.dependency 'ActionSheetPicker-3.0', '2.4.2'
27+
s.dependency 'AlExtensions', '0.2.0'
28+
s.dependency 'FontAwesome.swift', '1.9.0'
2929

3030
end

ALFormInput/Classes/ALDatePicker.swift

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public protocol ALDatePickerDelegate: class {
1818
public class ALDatePicker: ALValidatableTextField {
1919

2020
weak var datePickerDelegate: ALDatePickerDelegate?
21-
private var datePickerMode: UIDatePickerMode?
21+
private var datePickerMode: UIDatePicker.Mode?
2222
private var minDate: Date?
2323
private var maxDate: Date?
2424
private var showFormat: String = "HH/mm/yyyy"
@@ -37,7 +37,7 @@ public class ALDatePicker: ALValidatableTextField {
3737
setDropDownIcon()
3838
}
3939

40-
public func setupPicker(pickerMode: UIDatePickerMode? = nil,
40+
public func setupPicker(pickerMode: UIDatePicker.Mode? = nil,
4141
minDate: Date? = nil,
4242
maxDate: Date? = nil,
4343
locale: Locale? = Locale.current,
@@ -50,8 +50,9 @@ public class ALDatePicker: ALValidatableTextField {
5050
}
5151

5252
private func showActionSheetDatePicker() {
53+
5354
let picker = ActionSheetDatePicker(title: title,
54-
datePickerMode: datePickerMode ?? UIDatePickerMode.date,
55+
datePickerMode: datePickerMode ?? UIDatePicker.Mode.date,
5556
selectedDate: selectedDate ?? Date(),
5657
doneBlock: { (_, selectedDate, _) in
5758
guard let selectedDate = selectedDate as? Date else { return }

ALFormInput/Classes/ALMonthAndYearPicker.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public class ALMonthAndYearPicker: ALDatePicker {
5858
private func showActionSheetDatePicker() {
5959
guard let minYear = minYear, let maxYear = maxYear else { return }
6060
let years = (minYear...maxYear).map { "\($0)"}
61-
let months = format == .withNumeric ? monthSymbols?.compactMap{ String((monthSymbols?.index(of: $0) ?? 0) + 1)} : (monthSymbols ?? [])
61+
let months = format == .withNumeric ? monthSymbols?.compactMap{ String((monthSymbols?.firstIndex(of: $0) ?? 0) + 1)} : (monthSymbols ?? [])
6262
let picker = ActionSheetMultipleStringPicker(title: title,
6363
rows: [months ?? [], years ],
6464
initialSelection: selectedIndexes ?? [0,0] ,

ALFormInput/Classes/ALValidatableTextFieldType.swift

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,24 +24,24 @@ public enum ALValidatableTextFieldType: String {
2424

2525

2626
private var emailRule : EmailRule {
27-
EmailRule(message: "Geçersiz E-Posta Adresi")
27+
EmailRule(message: "Geçersiz E-Posta Adresi".uppercased)
2828
}
2929

3030
private var requiredRule: RequiredRule {
31-
RequiredRule(message: "Bu alan zorunludur")
31+
RequiredRule(message: "Bu alan zorunludur".uppercased)
3232
}
3333

3434
private func minLengthRule(_ length: Int) -> MinLengthRule {
35-
MinLengthRule(length: length, message: "En %ld karakter olmalıdır")
35+
MinLengthRule(length: length, message: "En %ld karakter olmalıdır".uppercased)
3636
}
3737

3838
private func exactLengthRule(_ length: Int) -> ExactLengthRule {
39-
ExactLengthRule(length: length, message: "%ld karakter olmalıdır")
39+
ExactLengthRule(length: length, message: "%ld karakter olmalıdır".uppercased)
4040
}
4141

4242
private func passwordRule(_ length: Int) -> PasswordRule {
4343
PasswordRule(regex: "^(?=.*?[A-Z]).{\(length),}$",
44-
message: String(format: "En az %ld karakter olmalıdır", length))
44+
message: String(format: "En az %ld karakter olmalıdır".uppercased, length))
4545
}
4646

4747
public var rules : [Rule] {

ALFormInput/Classes/Extensions/AL+String.swift

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,11 @@
99
import Foundation
1010

1111
public extension String {
12+
13+
var uppercased: String {
14+
uppercased(with: Locale(identifier: "tr-TR"))
15+
}
16+
1217
func localizeWithFormat(arguments: CVarArg...) -> String{
1318
String(format: self.localized, arguments: arguments)
1419
}

Example/ALFormInput.xcodeproj/project.pbxproj

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -297,10 +297,9 @@
297297
};
298298
buildConfigurationList = 607FACCB1AFB9204008FA782 /* Build configuration list for PBXProject "ALFormInput" */;
299299
compatibilityVersion = "Xcode 3.2";
300-
developmentRegion = English;
300+
developmentRegion = en;
301301
hasScannedForEncodings = 0;
302302
knownRegions = (
303-
English,
304303
en,
305304
Base,
306305
);
@@ -610,7 +609,7 @@
610609
PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)";
611610
PRODUCT_NAME = "$(TARGET_NAME)";
612611
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
613-
SWIFT_VERSION = 4.0;
612+
SWIFT_VERSION = 5.0;
614613
};
615614
name = Debug;
616615
};
@@ -625,7 +624,7 @@
625624
PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)";
626625
PRODUCT_NAME = "$(TARGET_NAME)";
627626
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
628-
SWIFT_VERSION = 4.0;
627+
SWIFT_VERSION = 5.0;
629628
};
630629
name = Release;
631630
};

Example/ALFormInput/AppDelegate.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
1414
var window: UIWindow?
1515

1616
func application(_ application: UIApplication,
17-
didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
17+
didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
1818
return true
1919
}
2020

Example/Podfile.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ PODS:
22
- ActionSheetPicker-3.0 (2.4.2)
33
- AlExtensions (0.2.0)
44
- ALFormInput (0.1.1):
5-
- ActionSheetPicker-3.0
6-
- AlExtensions
7-
- FontAwesome.swift
5+
- ActionSheetPicker-3.0 (= 2.4.2)
6+
- AlExtensions (= 0.2.0)
7+
- FontAwesome.swift (= 1.9.0)
88
- PhoneNumberKit (~> 3.1)
99
- SkyFloatingLabelTextField (~> 3.0)
1010
- SwiftValidatorNew (~> 4.2.0)
@@ -44,7 +44,7 @@ EXTERNAL SOURCES:
4444
SPEC CHECKSUMS:
4545
ActionSheetPicker-3.0: 5b62e07b00bd970509cf5ece99cb7447eae5dd0d
4646
AlExtensions: d5c1a189e6f980dd33ca4292b9e6ddae1911a6a2
47-
ALFormInput: 37a541d67b3eceb1afd74237588acd5ffd1010c0
47+
ALFormInput: 6018150d366f7a7e11b74fdb2a64bfdd36bf1529
4848
FBSnapshotTestCase: 094f9f314decbabe373b87cc339bea235a63e07a
4949
FontAwesome.swift: a403b88cec950511745ba8f2decd1b6a07346d13
5050
PhoneNumberKit: df411d46177d1492da84e10b6c093846dd861452

Example/Pods/Local Podspecs/ALFormInput.podspec.json

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Example/Pods/Manifest.lock

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)