Merge pull request #480 from CVCalendar/swift4

Swift4

.swift-version

@@ -1 +1 @@
-3.0
+4.0

CVCalendar Demo/CVCalendar Demo.xcodeproj/project.pbxproj

@@ -487,7 +487,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.gameapp.production.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
@@ -500,7 +500,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.gameapp.production.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Release;

CVCalendar.podspec

@@ -1,8 +1,8 @@
 Pod::Spec.new do |s|
 
 s.name         = "CVCalendar"
-s.version      = "1.5.2"
-s.summary      = "A custom visual calendar for iOS 8+ written in Swift (3.0)."
+s.version      = "1.6.0"
+s.summary      = "A custom visual calendar for iOS 8+ written in Swift (4.0)."
 s.homepage     = "https://github.com/CVCalendar/CVCalendar"
 s.screenshot  = "https://raw.githubusercontent.com/Mozharovsky/CVCalendar/master/Screenshots/CVCalendar_White.png"
 s.license      = { :type => "MIT", :file => "LICENSE" }

CVCalendar.xcodeproj/project.pbxproj

@@ -237,12 +237,12 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0720;
-				LastUpgradeCheck = 0800;
+				LastUpgradeCheck = 0900;
 				ORGANIZATIONNAME = GameApp;
 				TargetAttributes = {
 					45D9D8B21C5006AA006673B2 = {
 						CreatedOnToolsVersion = 7.2;
-						LastSwiftMigration = 0800;
+						LastSwiftMigration = 0900;
 					};
 				};
 			};
@@ -322,14 +322,20 @@
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -372,14 +378,20 @@
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -425,7 +437,8 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = On;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Debug;
 		};
@@ -445,7 +458,8 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.gameapp.CVCalendar;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = On;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Release;
 		};
@@ -473,4 +487,4 @@
 /* End XCConfigurationList section */
 	};
 	rootObject = 45D9D8AA1C5006AA006673B2 /* Project object */;
-}
+}

CVCalendar.xcodeproj/xcshareddata/xcschemes/CVCalendar.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0800"
+   LastUpgradeVersion = "0900"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

CVCalendar/CVCalendarContentViewController.swift

@@ -63,7 +63,7 @@ open class CVCalendarContentViewController: UIViewController {
 // MARK: - UI Refresh
 
 extension CVCalendarContentViewController {
-    public func updateFrames(_ frame: CGRect) {
+    @objc public func updateFrames(_ frame: CGRect) {
         if frame != CGRect.zero {
             scrollView.frame = frame
             scrollView.removeAllSubviews()
@@ -126,15 +126,15 @@ extension CVCalendarContentViewController: UIScrollViewDelegate { }
 
 // Convenience API.
 extension CVCalendarContentViewController {
-    public func performedDayViewSelection(_ dayView: DayView) { }
+    @objc public func performedDayViewSelection(_ dayView: DayView) { }
 
-    public func togglePresentedDate(_ date: Foundation.Date) { }
+    @objc public func togglePresentedDate(_ date: Foundation.Date) { }
 
-    public func presentNextView(_ view: UIView?) { }
+    @objc public func presentNextView(_ view: UIView?) { }
 
-    public func presentPreviousView(_ view: UIView?) { }
+    @objc public func presentPreviousView(_ view: UIView?) { }
 
-    public func updateDayViews(shouldShow: Bool) { }
+    @objc public func updateDayViews(shouldShow: Bool) { }
 }
 
 // MARK: - Contsant conversion
@@ -267,4 +267,4 @@ extension UIView {
             subview.removeFromSuperview()
         }
     }
-}
+}

CVCalendar/CVCalendarDayView.swift

@@ -418,7 +418,7 @@ extension CVCalendarDayView {
 
 extension CGFloat {
     public func toRadians() -> CGFloat {
-        return CGFloat(self) * CGFloat(Double.pi / 180)
+      return CGFloat(self) * CGFloat(Double.pi / 180)
     }
 
     public func toDegrees() -> CGFloat {
@@ -624,12 +624,12 @@ extension CVCalendarDayView {
 // MARK: - Safe execution
 
 extension CVCalendarDayView {
-    public func safeExecuteBlock(_ block: (Void) -> Void, collapsingOnNil collapsing: Bool,
+    public func safeExecuteBlock(_ block: () -> Void, collapsingOnNil collapsing: Bool,
                                  withObjects objects: AnyObject?...) {
         for object in objects {
             if object == nil {
                 if collapsing {
-                    fatalError("Object { \(String(describing: object)) } must not be nil!")
+                  fatalError("Object { \(String(describing: object)) } must not be nil!")
                 } else {
                     return
                 }
@@ -638,4 +638,4 @@ extension CVCalendarDayView {
 
         block()
     }
-}
+}

CVCalendar/CVCalendarMonthView.swift

@@ -78,7 +78,7 @@ public final class CVCalendarMonthView: UIView {
 extension CVCalendarMonthView {
     public func commonInit() {
         let calendarManager = calendarView.manager
-        safeExecuteBlock({
+      safeExecuteBlock({
             let calendar = self.calendarView.delegate?.calendar?() ?? Calendar.current
             self.numberOfWeeks = calendarManager?.monthDateRange(self.date).countOfWeeks
             self.weeksIn = calendarManager?.weeksWithWeekdaysForMonthDate(self.date).weeksIn
@@ -94,7 +94,7 @@ extension CVCalendarMonthView {
     public func reloadViewsWithRect(_ frame: CGRect) {
         self.frame = frame
 
-        safeExecuteBlock({
+      safeExecuteBlock({
             for (index, weekView) in self.weekViews.enumerated() {
                 if let size = self.calendarView.weekViewSize {
                     weekView.frame = CGRect(x: 0, y: size.height * CGFloat(index),
@@ -117,11 +117,11 @@ extension CVCalendarMonthView {
     public func createWeekViews() {
         weekViews = [CVCalendarWeekView]()
 
-        safeExecuteBlock({
+      safeExecuteBlock({
             for i in 0..<self.numberOfWeeks! {
                 let weekView = CVCalendarWeekView(monthView: self, index: i)
 
-                self.safeExecuteBlock({
+              self.safeExecuteBlock({
                     self.weekViews!.append(weekView)
                     }, collapsingOnNil: true, withObjects: self.weekViews as AnyObject?)
 
@@ -135,7 +135,7 @@ extension CVCalendarMonthView {
 
 extension CVCalendarMonthView {
     public func updateInteractiveView() {
-        safeExecuteBlock({
+      safeExecuteBlock({
             let mode = self.calendarView!.calendarMode!
             if mode == .monthView {
                 if let interactiveView = self.interactiveView {
@@ -162,7 +162,7 @@ extension CVCalendarMonthView {
             }, collapsingOnNil: false, withObjects: calendarView)
     }
 
-    public func didPressInteractiveView(_ recognizer: UILongPressGestureRecognizer) {
+    @objc public func didPressInteractiveView(_ recognizer: UILongPressGestureRecognizer) {
         let location = recognizer.location(in: self.interactiveView)
         let state: UIGestureRecognizerState = recognizer.state
 
@@ -181,7 +181,7 @@ extension CVCalendarMonthView {
         }
     }
 
-    public func didTouchInteractiveView(_ recognizer: UITapGestureRecognizer) {
+    @objc public func didTouchInteractiveView(_ recognizer: UITapGestureRecognizer) {
         let location = recognizer.location(in: self.interactiveView)
         touchController.receiveTouchLocation(location, inMonthView: self,
                                              withSelectionType: .single)
@@ -191,18 +191,18 @@ extension CVCalendarMonthView {
 // MARK: - Safe execution
 
 extension CVCalendarMonthView {
-    public func safeExecuteBlock(_ block: (Void) -> Void, collapsingOnNil collapsing: Bool,
+    public func safeExecuteBlock(_ block: () -> Void, collapsingOnNil collapsing: Bool,
                                  withObjects objects: AnyObject?...) {
         for object in objects {
             if object == nil {
                 if collapsing {
-                    fatalError("Object { \(String(describing: object)) } must not be nil!")
+                  fatalError("Object { \(String(describing: object)) } must not be nil!") 
                 } else {
                     return
                 }
             }
         }
 
-        block()
+      block()
     }
-}
+}

CVCalendar/CVCalendarWeekView.swift

@@ -136,7 +136,7 @@ public final class CVCalendarWeekView: UIView {
 
 extension CVCalendarWeekView {
     public func updateInteractiveView() {
-        safeExecuteBlock({
+      safeExecuteBlock({
 
             let mode = self.monthView!.calendarView!.calendarMode!
             if mode == .weekView {
@@ -164,7 +164,7 @@ extension CVCalendarWeekView {
             }, collapsingOnNil: false, withObjects: monthView, monthView?.calendarView)
     }
 
-    public func didPressInteractiveView(_ recognizer: UILongPressGestureRecognizer) {
+    @objc public func didPressInteractiveView(_ recognizer: UILongPressGestureRecognizer) {
         let location = recognizer.location(in: self.interactiveView)
         let state: UIGestureRecognizerState = recognizer.state
 
@@ -183,7 +183,7 @@ extension CVCalendarWeekView {
         }
     }
 
-    public func didTouchInteractiveView(_ recognizer: UITapGestureRecognizer) {
+    @objc public func didTouchInteractiveView(_ recognizer: UITapGestureRecognizer) {
         let location = recognizer.location(in: self.interactiveView)
         touchController.receiveTouchLocation(location, inWeekView: self, withSelectionType: .single)
     }
@@ -197,7 +197,7 @@ extension CVCalendarWeekView {
         for i in 1...7 {
             let dayView = CVCalendarDayView(weekView: self, weekdayIndex: i)
 
-            safeExecuteBlock({
+          safeExecuteBlock({
                 self.dayViews!.append(dayView)
                 }, collapsingOnNil: true, withObjects: dayViews as AnyObject?)
 
@@ -223,18 +223,18 @@ extension CVCalendarWeekView {
 // MARK: - Safe execution
 
 extension CVCalendarWeekView {
-    public func safeExecuteBlock(_ block: (Void) -> Void, collapsingOnNil collapsing: Bool,
+    public func safeExecuteBlock(_ block: () -> Void, collapsingOnNil collapsing: Bool,
                                  withObjects objects: AnyObject?...) {
         for object in objects {
             if object == nil {
                 if collapsing {
-                    fatalError("Object { \(String(describing: object)) } must not be nil!")
+                  fatalError("Object { \(String(describing: object)) } must not be nil!")
                 } else {
                     return
                 }
             }
         }
 
-        block()
+      block()
     }
-}
+}