diff --git a/RRuleSwift.xcodeproj/project.pbxproj b/RRuleSwift.xcodeproj/project.pbxproj
index a7989e7..bdddd99 100644
--- a/RRuleSwift.xcodeproj/project.pbxproj
+++ b/RRuleSwift.xcodeproj/project.pbxproj
@@ -397,7 +397,7 @@
SKIP_INSTALL = YES;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
- SWIFT_VERSION = 4.0;
+ SWIFT_VERSION = 4.2;
};
name = Debug;
};
@@ -417,7 +417,7 @@
PRODUCT_NAME = RRuleSwift;
SKIP_INSTALL = YES;
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
- SWIFT_VERSION = 4.0;
+ SWIFT_VERSION = 4.2;
};
name = Release;
};
@@ -441,7 +441,7 @@
SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(SWIFT_MODULE_NAME)-Swift.h";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
- SWIFT_VERSION = 4.0;
+ SWIFT_VERSION = 4.2;
TARGETED_DEVICE_FAMILY = 4;
WATCHOS_DEPLOYMENT_TARGET = 2.0;
};
@@ -466,7 +466,7 @@
SKIP_INSTALL = YES;
SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(SWIFT_MODULE_NAME)-Swift.h";
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
- SWIFT_VERSION = 4.0;
+ SWIFT_VERSION = 4.2;
TARGETED_DEVICE_FAMILY = 4;
WATCHOS_DEPLOYMENT_TARGET = 2.0;
};
diff --git a/RRuleSwiftExample-TodayExtension/Info.plist b/RRuleSwiftExample-TodayExtension/Info.plist
index 40c4170..9bd71b5 100644
--- a/RRuleSwiftExample-TodayExtension/Info.plist
+++ b/RRuleSwiftExample-TodayExtension/Info.plist
@@ -17,11 +17,11 @@
CFBundlePackageType
XPC!
CFBundleShortVersionString
- 0.4.1
+ 0.4.2
CFBundleSignature
????
CFBundleVersion
- 16
+ 17
NSExtension
NSExtensionMainStoryboard
diff --git a/RRuleSwiftExample-Watch Extension/Info.plist b/RRuleSwiftExample-Watch Extension/Info.plist
index 7766f20..eb573a5 100644
--- a/RRuleSwiftExample-Watch Extension/Info.plist
+++ b/RRuleSwiftExample-Watch Extension/Info.plist
@@ -17,11 +17,11 @@
CFBundlePackageType
XPC!
CFBundleShortVersionString
- 0.4.1
+ 0.4.2
CFBundleSignature
????
CFBundleVersion
- 16
+ 17
NSExtension
NSExtensionAttributes
diff --git a/RRuleSwiftExample-Watch/Info.plist b/RRuleSwiftExample-Watch/Info.plist
index 3b7d687..745f8e9 100644
--- a/RRuleSwiftExample-Watch/Info.plist
+++ b/RRuleSwiftExample-Watch/Info.plist
@@ -17,11 +17,11 @@
CFBundlePackageType
APPL
CFBundleShortVersionString
- 0.4.1
+ 0.4.2
CFBundleSignature
????
CFBundleVersion
- 16
+ 17
UISupportedInterfaceOrientations
UIInterfaceOrientationPortrait
diff --git a/RRuleSwiftExample.xcodeproj/project.pbxproj b/RRuleSwiftExample.xcodeproj/project.pbxproj
index 016df7b..caaa6cc 100644
--- a/RRuleSwiftExample.xcodeproj/project.pbxproj
+++ b/RRuleSwiftExample.xcodeproj/project.pbxproj
@@ -575,7 +575,7 @@
PRODUCT_BUNDLE_IDENTIFIER = Teambition.RRuleSwiftExample;
PRODUCT_NAME = RRuleSwiftExample;
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
- SWIFT_VERSION = 4.0;
+ SWIFT_VERSION = 4.2;
};
name = Debug;
};
@@ -588,7 +588,7 @@
PRODUCT_BUNDLE_IDENTIFIER = Teambition.RRuleSwiftExample;
PRODUCT_NAME = RRuleSwiftExample;
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
- SWIFT_VERSION = 4.0;
+ SWIFT_VERSION = 4.2;
};
name = Release;
};
@@ -601,7 +601,7 @@
PRODUCT_BUNDLE_IDENTIFIER = Teambition.RRuleSwiftExample.TodayExtension;
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
- SWIFT_VERSION = 4.0;
+ SWIFT_VERSION = 4.2;
};
name = Debug;
};
@@ -614,7 +614,7 @@
PRODUCT_BUNDLE_IDENTIFIER = Teambition.RRuleSwiftExample.TodayExtension;
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
- SWIFT_VERSION = 4.0;
+ SWIFT_VERSION = 4.2;
};
name = Release;
};
@@ -630,7 +630,7 @@
SDKROOT = watchos;
SKIP_INSTALL = YES;
SWIFT_SWIFT3_OBJC_INFERENCE = On;
- SWIFT_VERSION = 4.0;
+ SWIFT_VERSION = 4.2;
TARGETED_DEVICE_FAMILY = 4;
WATCHOS_DEPLOYMENT_TARGET = 2.0;
};
@@ -648,7 +648,7 @@
SDKROOT = watchos;
SKIP_INSTALL = YES;
SWIFT_SWIFT3_OBJC_INFERENCE = On;
- SWIFT_VERSION = 4.0;
+ SWIFT_VERSION = 4.2;
TARGETED_DEVICE_FAMILY = 4;
WATCHOS_DEPLOYMENT_TARGET = 2.0;
};
@@ -664,7 +664,7 @@
SDKROOT = watchos;
SKIP_INSTALL = YES;
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
- SWIFT_VERSION = 4.0;
+ SWIFT_VERSION = 4.2;
TARGETED_DEVICE_FAMILY = 4;
WATCHOS_DEPLOYMENT_TARGET = 2.0;
};
@@ -680,7 +680,7 @@
SDKROOT = watchos;
SKIP_INSTALL = YES;
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
- SWIFT_VERSION = 4.0;
+ SWIFT_VERSION = 4.2;
TARGETED_DEVICE_FAMILY = 4;
WATCHOS_DEPLOYMENT_TARGET = 2.0;
};
diff --git a/RRuleSwiftExample/AppDelegate.swift b/RRuleSwiftExample/AppDelegate.swift
index 5a18590..e0f3476 100644
--- a/RRuleSwiftExample/AppDelegate.swift
+++ b/RRuleSwiftExample/AppDelegate.swift
@@ -10,37 +10,29 @@ import UIKit
@UIApplicationMain
class AppDelegate: UIResponder, UIApplicationDelegate {
-
var window: UIWindow?
-
- func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
- // Override point for customization after application launch.
+ func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]? = nil) -> Bool {
return true
}
func applicationWillResignActive(_ application: UIApplication) {
- // Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state.
- // Use this method to pause ongoing tasks, disable timers, and throttle down OpenGL ES frame rates. Games should use this method to pause the game.
+
}
func applicationDidEnterBackground(_ application: UIApplication) {
- // Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later.
- // If your application supports background execution, this method is called instead of applicationWillTerminate: when the user quits.
+
}
func applicationWillEnterForeground(_ application: UIApplication) {
- // Called as part of the transition from the background to the inactive state; here you can undo many of the changes made on entering the background.
+
}
func applicationDidBecomeActive(_ application: UIApplication) {
- // Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface.
- }
- func applicationWillTerminate(_ application: UIApplication) {
- // Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:.
}
+ func applicationWillTerminate(_ application: UIApplication) {
+ }
}
-
diff --git a/RRuleSwiftExample/Info.plist b/RRuleSwiftExample/Info.plist
index 9dd83be..ecbbd74 100644
--- a/RRuleSwiftExample/Info.plist
+++ b/RRuleSwiftExample/Info.plist
@@ -15,11 +15,11 @@
CFBundlePackageType
APPL
CFBundleShortVersionString
- 0.4.1
+ 0.4.2
CFBundleSignature
????
CFBundleVersion
- 16
+ 17
LSRequiresIPhoneOS
UILaunchStoryboardName
diff --git a/RRuleSwiftExample/RRuleExampleViewController.swift b/RRuleSwiftExample/RRuleExampleViewController.swift
index 0d657f5..197bdfe 100644
--- a/RRuleSwiftExample/RRuleExampleViewController.swift
+++ b/RRuleSwiftExample/RRuleExampleViewController.swift
@@ -198,7 +198,7 @@ extension RRuleExampleViewController: UITableViewDataSource, UITableViewDelegate
cell = UITableViewCell(style: .default, reuseIdentifier: "Cell")
}
cell?.selectionStyle = .none
- cell?.textLabel?.font = UIFont.systemFont(ofSize: 15)
+ cell?.textLabel?.font = .systemFont(ofSize: 15)
cell?.textLabel?.text = kWeekdays[indexPath.row]
let weekdays = rule.byweekday.map({ (weekday) -> IndexPath in
return IndexPath(row: weekday.toNumberSymbol(), section: 6)
@@ -215,7 +215,7 @@ extension RRuleExampleViewController: UITableViewDataSource, UITableViewDelegate
cell = UITableViewCell(style: .default, reuseIdentifier: "Cell")
}
cell?.selectionStyle = .none
- cell?.textLabel?.font = UIFont.systemFont(ofSize: 15)
+ cell?.textLabel?.font = .systemFont(ofSize: 15)
cell?.textLabel?.text = kMonths[indexPath.row]
let months = rule.bymonth.map({ (month) -> IndexPath in
return IndexPath(row: month - 1, section: 7)
@@ -232,7 +232,7 @@ extension RRuleExampleViewController: UITableViewDataSource, UITableViewDelegate
cell = UITableViewCell(style: .default, reuseIdentifier: "Cell")
}
cell?.selectionStyle = .none
- cell?.textLabel?.font = UIFont.systemFont(ofSize: 15)
+ cell?.textLabel?.font = .systemFont(ofSize: 15)
cell?.textLabel?.text = String(indexPath.row + 1)
let monthdays = rule.bymonthday.map({ (month) -> IndexPath in
return IndexPath(row: month - 1, section: 8)
@@ -248,7 +248,7 @@ extension RRuleExampleViewController: UITableViewDataSource, UITableViewDelegate
if cell == nil {
cell = UITableViewCell(style: .default, reuseIdentifier: "Cell")
}
- cell?.textLabel?.font = UIFont.systemFont(ofSize: 15)
+ cell?.textLabel?.font = .systemFont(ofSize: 15)
return cell!
}
}
diff --git a/Sources/Supporting Files/Info-iOS.plist b/Sources/Supporting Files/Info-iOS.plist
index 2bb1ea9..7c9f8bd 100644
--- a/Sources/Supporting Files/Info-iOS.plist
+++ b/Sources/Supporting Files/Info-iOS.plist
@@ -15,7 +15,7 @@
CFBundlePackageType
FMWK
CFBundleShortVersionString
- 0.4.1
+ 0.4.2
CFBundleSignature
????
CFBundleVersion
diff --git a/Sources/Supporting Files/Info-watchOS.plist b/Sources/Supporting Files/Info-watchOS.plist
index 2bb1ea9..7c9f8bd 100644
--- a/Sources/Supporting Files/Info-watchOS.plist
+++ b/Sources/Supporting Files/Info-watchOS.plist
@@ -15,7 +15,7 @@
CFBundlePackageType
FMWK
CFBundleShortVersionString
- 0.4.1
+ 0.4.2
CFBundleSignature
????
CFBundleVersion