Skip to content

Commit 9e3f3ab

Browse files
Merge pull request #93 from malikmani/Swift-4-2
Updated code base to Swift 4.2
2 parents be4284f + af8d7b2 commit 9e3f3ab

File tree

6 files changed

+24
-16
lines changed

6 files changed

+24
-16
lines changed

DatePickerDialog.xcodeproj/project.pbxproj

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@
205205
isa = PBXProject;
206206
attributes = {
207207
LastSwiftUpdateCheck = 0800;
208-
LastUpgradeCheck = 0900;
208+
LastUpgradeCheck = 1020;
209209
ORGANIZATIONNAME = squimer;
210210
TargetAttributes = {
211211
4B1E9F361D8F3C9A00C1EF25 = {
@@ -227,7 +227,7 @@
227227
};
228228
buildConfigurationList = 4BDE059D1D8F3AF000DEF7F3 /* Build configuration list for PBXProject "DatePickerDialog" */;
229229
compatibilityVersion = "Xcode 3.2";
230-
developmentRegion = English;
230+
developmentRegion = en;
231231
hasScannedForEncodings = 0;
232232
knownRegions = (
233233
en,
@@ -353,13 +353,15 @@
353353
CLANG_WARN_BOOL_CONVERSION = YES;
354354
CLANG_WARN_COMMA = YES;
355355
CLANG_WARN_CONSTANT_CONVERSION = YES;
356+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
356357
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
357358
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
358359
CLANG_WARN_EMPTY_BODY = YES;
359360
CLANG_WARN_ENUM_CONVERSION = YES;
360361
CLANG_WARN_INFINITE_RECURSION = YES;
361362
CLANG_WARN_INT_CONVERSION = YES;
362363
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
364+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
363365
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
364366
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
365367
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -413,13 +415,15 @@
413415
CLANG_WARN_BOOL_CONVERSION = YES;
414416
CLANG_WARN_COMMA = YES;
415417
CLANG_WARN_CONSTANT_CONVERSION = YES;
418+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
416419
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
417420
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
418421
CLANG_WARN_EMPTY_BODY = YES;
419422
CLANG_WARN_ENUM_CONVERSION = YES;
420423
CLANG_WARN_INFINITE_RECURSION = YES;
421424
CLANG_WARN_INT_CONVERSION = YES;
422425
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
426+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
423427
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
424428
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
425429
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -471,7 +475,7 @@
471475
SKIP_INSTALL = YES;
472476
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
473477
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
474-
SWIFT_VERSION = 4.0;
478+
SWIFT_VERSION = 4.2;
475479
};
476480
name = Debug;
477481
};
@@ -492,7 +496,7 @@
492496
PRODUCT_NAME = "$(TARGET_NAME)";
493497
SKIP_INSTALL = YES;
494498
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
495-
SWIFT_VERSION = 4.0;
499+
SWIFT_VERSION = 4.2;
496500
};
497501
name = Release;
498502
};
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>IDEDidComputeMac32BitWarning</key>
6+
<true/>
7+
</dict>
8+
</plist>

DatePickerDialog.xcodeproj/xcshareddata/xcschemes/DatePickerDialog.xcscheme

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0900"
3+
LastUpgradeVersion = "1020"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -26,7 +26,6 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29-
language = ""
3029
shouldUseLaunchSchemeArgsEnv = "YES">
3130
<Testables>
3231
<TestableReference
@@ -56,7 +55,6 @@
5655
buildConfiguration = "Debug"
5756
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
5857
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
59-
language = ""
6058
launchStyle = "0"
6159
useCustomWorkingDirectory = "NO"
6260
ignoresPersistentStateOnLaunch = "NO"

DatePickerDialog.xcodeproj/xcshareddata/xcschemes/DatePickerDialogExample.xcscheme

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0900"
3+
LastUpgradeVersion = "1020"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -26,7 +26,6 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29-
language = ""
3029
shouldUseLaunchSchemeArgsEnv = "YES">
3130
<Testables>
3231
</Testables>
@@ -46,7 +45,6 @@
4645
buildConfiguration = "Debug"
4746
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
4847
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
49-
language = ""
5048
launchStyle = "0"
5149
useCustomWorkingDirectory = "NO"
5250
ignoresPersistentStateOnLaunch = "NO"

Sources/DatePickerDialog.swift

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ open class DatePickerDialog: UIView {
2424

2525
// MARK: - Variables
2626
private var defaultDate: Date?
27-
private var datePickerMode: UIDatePickerMode?
27+
private var datePickerMode: UIDatePicker.Mode?
2828
private var callback: DatePickerCallback?
2929
var showCancelButton: Bool = false
3030
var locale: Locale?
@@ -86,7 +86,7 @@ open class DatePickerDialog: UIView {
8686
cancelButtonTitle: String = "Cancel",
8787
defaultDate: Date = Date(),
8888
minimumDate: Date? = nil, maximumDate: Date? = nil,
89-
datePickerMode: UIDatePickerMode = .dateAndTime,
89+
datePickerMode: UIDatePicker.Mode = .dateAndTime,
9090
callback: @escaping DatePickerCallback) {
9191
self.titleLabel.text = title
9292
self.doneButton.setTitle(doneButtonTitle, for: .normal)
@@ -96,7 +96,7 @@ open class DatePickerDialog: UIView {
9696
self.datePickerMode = datePickerMode
9797
self.callback = callback
9898
self.defaultDate = defaultDate
99-
self.datePicker.datePickerMode = self.datePickerMode ?? UIDatePickerMode.date
99+
self.datePicker.datePickerMode = self.datePickerMode ?? UIDatePicker.Mode.date
100100
self.datePicker.date = self.defaultDate ?? Date()
101101
self.datePicker.maximumDate = maximumDate
102102
self.datePicker.minimumDate = minimumDate
@@ -107,12 +107,12 @@ open class DatePickerDialog: UIView {
107107
guard let appDelegate = UIApplication.shared.delegate else { fatalError() }
108108
guard let window = appDelegate.window else { fatalError() }
109109
window?.addSubview(self)
110-
window?.bringSubview(toFront: self)
110+
window?.bringSubviewToFront(self)
111111
window?.endEditing(true)
112112

113113
NotificationCenter.default.addObserver(self,
114114
selector: .deviceOrientationDidChange,
115-
name: NSNotification.Name.UIDeviceOrientationDidChange, object: nil)
115+
name: UIDevice.orientationDidChangeNotification, object: nil)
116116

117117
/* Anim */
118118
UIView.animate(

Sources/Info.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<key>CFBundlePackageType</key>
1616
<string>FMWK</string>
1717
<key>CFBundleShortVersionString</key>
18-
<string>2.0</string>
18+
<string>2.1</string>
1919
<key>CFBundleVersion</key>
2020
<string>$(CURRENT_PROJECT_VERSION)</string>
2121
<key>NSPrincipalClass</key>

0 commit comments

Comments
 (0)