swift 5

Cartfile.resolved

@@ -1 +1 @@
-github "teambition/RRuleSwift" "0.4.2"
+github "teambition/RRuleSwift" "0.5.0"

RecurrencePicker.xcodeproj/project.pbxproj

@@ -200,20 +200,21 @@
 				TargetAttributes = {
 					D3BB7F121CB4F26A0068A253 = {
 						CreatedOnToolsVersion = 7.3;
-						LastSwiftMigration = 0900;
+						LastSwiftMigration = 1020;
 					};
 				};
 			};
 			buildConfigurationList = D3BB7F0D1CB4F26A0068A253 /* Build configuration list for PBXProject "RecurrencePicker" */;
 			compatibilityVersion = "Xcode 3.2";
-			developmentRegion = English;
+			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
 				en,
 				ja,
 				ko,
 				"zh-Hans",
 				"zh-Hant",
+				Base,
 			);
 			mainGroup = D3BB7F091CB4F26A0068A253;
 			productRefGroup = D3BB7F141CB4F26A0068A253 /* Products */;
@@ -417,8 +418,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
@@ -441,8 +441,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = Teambition.RecurrencePicker;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
-				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
 		};

RecurrencePicker.xcodeproj/xcshareddata/xcschemes/RecurrencePicker.xcscheme

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

RecurrencePicker/CustomRecurrenceViewController.swift

@@ -298,7 +298,7 @@ extension CustomRecurrenceViewController {
                 if recurrenceRule.byweekday == [weekday] {
                     return
                 }
-                let index = recurrenceRule.byweekday.index(of: weekday)!
+                let index = recurrenceRule.byweekday.firstIndex(of: weekday)!
                 recurrenceRule.byweekday.remove(at: index)
                 cell?.accessoryType = .none
                 updateRecurrenceRuleText()
@@ -369,7 +369,7 @@ extension CustomRecurrenceViewController: MonthOrDaySelectorCellDelegate {
             tableView.endUpdates()
             updateDetailTextColor()
         }
-        if let index = recurrenceRule.bymonthday.index(of: monthday) {
+        if let index = recurrenceRule.bymonthday.firstIndex(of: monthday) {
             recurrenceRule.bymonthday.remove(at: index)
             updateRecurrenceRuleText()
         }
@@ -399,7 +399,7 @@ extension CustomRecurrenceViewController: MonthOrDaySelectorCellDelegate {
             tableView.endUpdates()
             updateDetailTextColor()
         }
-        if let index = recurrenceRule.bymonth.index(of: month) {
+        if let index = recurrenceRule.bymonth.firstIndex(of: month) {
             recurrenceRule.bymonth.remove(at: index)
             updateRecurrenceRuleText()
         }

RecurrencePicker/EKWeekday+Sequence.swift

@@ -10,7 +10,7 @@ import Foundation
 import EventKit
 
 internal extension EKWeekday {
-    internal var number: Int {
+    var number: Int {
         switch self {
         case .monday: return 0
         case .tuesday: return 1

RecurrencePicker/MonthOrDaySelectorCell.swift

@@ -163,7 +163,7 @@ extension MonthOrDaySelectorCell: UICollectionViewDataSource, UICollectionViewDe
                 let shouldDeselectDay = delegate?.monthOrDaySelectorCell(self, shouldDeselectMonthday: monthday) ?? true
                 if shouldDeselectDay {
                     cell.setItemSelected(false)
-                    if let index = bymonthday.index(of: monthday) {
+                    if let index = bymonthday.firstIndex(of: monthday) {
                         bymonthday.remove(at: index)
                     }
                     delegate?.monthOrDaySelectorCell(self, didDeselectMonthday: monthday)
@@ -179,7 +179,7 @@ extension MonthOrDaySelectorCell: UICollectionViewDataSource, UICollectionViewDe
                 let shouldDeselectMonth = delegate?.monthOrDaySelectorCell(self, shouldDeselectMonth: month) ?? true
                 if shouldDeselectMonth {
                     cell.setItemSelected(false)
-                    if let index = bymonth.index(of: month) {
+                    if let index = bymonth.firstIndex(of: month) {
                         bymonth.remove(at: index)
                     }
                     delegate?.monthOrDaySelectorCell(self, didDeselectMonth: month)

RecurrencePicker/RecurrenceFrequency+Sequence.swift

@@ -10,7 +10,7 @@ import Foundation
 import RRuleSwift
 
 internal extension RecurrenceFrequency {
-    internal var number: Int {
+    var number: Int {
         switch self {
         case .daily: return 0
         case .weekly: return 1

RecurrencePicker/RecurrenceRule+Definition.swift

@@ -10,19 +10,19 @@ import Foundation
 import RRuleSwift
 
 public extension RecurrenceRule {
-    public func isDailyRecurrence() -> Bool {
+    func isDailyRecurrence() -> Bool {
         return frequency == .daily && interval == 1
     }
 
-    public func isWeekdayRecurrence() -> Bool {
+    func isWeekdayRecurrence() -> Bool {
         guard frequency == .weekly && interval == 1 else {
             return false
         }
         let byweekday = self.byweekday.sorted(by: <)
         return byweekday == [.monday, .tuesday, .wednesday, .thursday, .friday].sorted(by: <)
     }
 
-    public func isWeeklyRecurrence(occurrence occurrenceDate: Date) -> Bool {
+    func isWeeklyRecurrence(occurrence occurrenceDate: Date) -> Bool {
         guard frequency == .weekly && interval == 1 else {
             return false
         }
@@ -36,7 +36,7 @@ public extension RecurrenceRule {
         return calendar.component(.weekday, from: occurrenceDate) == weekday.rawValue
     }
 
-    public func isBiWeeklyRecurrence(occurrence occurrenceDate: Date) -> Bool {
+    func isBiWeeklyRecurrence(occurrence occurrenceDate: Date) -> Bool {
         guard frequency == .weekly && interval == 2 else {
             return false
         }
@@ -50,7 +50,7 @@ public extension RecurrenceRule {
         return calendar.component(.weekday, from: occurrenceDate) == weekday.rawValue
     }
 
-    public func isMonthlyRecurrence(occurrence occurrenceDate: Date) -> Bool {
+    func isMonthlyRecurrence(occurrence occurrenceDate: Date) -> Bool {
         guard frequency == .monthly && interval == 1 else {
             return false
         }
@@ -64,7 +64,7 @@ public extension RecurrenceRule {
         return calendar.component(.day, from: occurrenceDate) == monthday
     }
 
-    public func isYearlyRecurrence(occurrence occurrenceDate: Date) -> Bool {
+    func isYearlyRecurrence(occurrence occurrenceDate: Date) -> Bool {
         guard frequency == .yearly && interval == 1 else {
             return false
         }
@@ -78,7 +78,7 @@ public extension RecurrenceRule {
         return calendar.component(.month, from: occurrenceDate) == month
     }
 
-    public func isCustomRecurrence(occurrence occurrenceDate: Date) -> Bool {
+    func isCustomRecurrence(occurrence occurrenceDate: Date) -> Bool {
         return !isDailyRecurrence() &&
             !isWeekdayRecurrence() &&
             !isWeeklyRecurrence(occurrence: occurrenceDate) &&

RecurrencePicker/RecurrenceRule+Generator.swift

@@ -11,34 +11,34 @@ import EventKit
 import RRuleSwift
 
 public extension RecurrenceRule {
-    public static func dailyRecurrence() -> RecurrenceRule {
+    static func dailyRecurrence() -> RecurrenceRule {
         var recurrenceRule = RecurrenceRule(frequency: .daily)
         recurrenceRule.interval = 1
         return recurrenceRule
     }
 
-    public static func weekdayRecurrence() -> RecurrenceRule {
+    static func weekdayRecurrence() -> RecurrenceRule {
         var recurrenceRule = RecurrenceRule(frequency: .weekly)
         recurrenceRule.interval = 1
         recurrenceRule.byweekday = [.monday, .tuesday, .wednesday, .thursday, .friday]
         return recurrenceRule
     }
 
-    public static func weeklyRecurrence(withWeekday weekday: EKWeekday) -> RecurrenceRule {
+    static func weeklyRecurrence(withWeekday weekday: EKWeekday) -> RecurrenceRule {
         var recurrenceRule = RecurrenceRule(frequency: .weekly)
         recurrenceRule.interval = 1
         recurrenceRule.byweekday = [weekday]
         return recurrenceRule
     }
 
-    public static func biWeeklyRecurrence(withWeekday weekday: EKWeekday) -> RecurrenceRule {
+    static func biWeeklyRecurrence(withWeekday weekday: EKWeekday) -> RecurrenceRule {
         var recurrenceRule = RecurrenceRule(frequency: .weekly)
         recurrenceRule.interval = 2
         recurrenceRule.byweekday = [weekday]
         return recurrenceRule
     }
 
-    public static func monthlyRecurrence(withMonthday monthday: Int) -> RecurrenceRule {
+    static func monthlyRecurrence(withMonthday monthday: Int) -> RecurrenceRule {
         var recurrenceRule = RecurrenceRule(frequency: .monthly)
         recurrenceRule.interval = 1
         if (-31...31 ~= monthday) && (monthday != 0) {
@@ -47,7 +47,7 @@ public extension RecurrenceRule {
         return recurrenceRule
     }
 
-    public static func yearlyRecurrence(withMonth month: Int) -> RecurrenceRule {
+    static func yearlyRecurrence(withMonth month: Int) -> RecurrenceRule {
         var recurrenceRule = RecurrenceRule(frequency: .yearly)
         recurrenceRule.interval = 1
         if 1...12 ~= month {

RecurrencePicker/RecurrenceRule+Text.swift

@@ -10,7 +10,7 @@ import Foundation
 import RRuleSwift
 
 public extension RecurrenceRule {
-    public func toText(of language: RecurrencePickerLanguage = InternationalControl.shared.language, occurrenceDate: Date) -> String? {
+    func toText(of language: RecurrencePickerLanguage = InternationalControl.shared.language, occurrenceDate: Date) -> String? {
         let internationalControl = InternationalControl(language: language)
         let unit = Constant.unitStrings(of: language)[frequency.number]
         let pluralUnit = Constant.pluralUnitStrings(of: language)[frequency.number]

RecurrencePicker/String+Extension.swift

@@ -9,11 +9,11 @@
 import Foundation
 
 internal extension String {
-    internal mutating func removeSubstring(_ substring: String) {
+    mutating func removeSubstring(_ substring: String) {
         self = replacingOccurrences(of: substring, with: "", options: .literal, range: nil)
     }
 
-    internal static func sequenceNumberString(of number: Int) -> String {
+    static func sequenceNumberString(of number: Int) -> String {
         var suffix = "th"
         let ones = number % 10
         let tens = (number / 10) % 10

RecurrencePicker/Supporting Files/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.1.3</string>
+	<string>0.1.4</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

RecurrencePickerExample.xcodeproj/project.pbxproj

@@ -116,18 +116,18 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0730;
-				LastUpgradeCheck = 0930;
+				LastUpgradeCheck = 1020;
 				ORGANIZATIONNAME = Teambition;
 				TargetAttributes = {
 					D3BB7EF31CB4F1820068A253 = {
 						CreatedOnToolsVersion = 7.3;
-						LastSwiftMigration = 0800;
+						LastSwiftMigration = 1020;
 					};
 				};
 			};
 			buildConfigurationList = D3BB7EEF1CB4F1820068A253 /* Build configuration list for PBXProject "RecurrencePickerExample" */;
 			compatibilityVersion = "Xcode 3.2";
-			developmentRegion = English;
+			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
 				en,
@@ -190,6 +190,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
@@ -247,6 +248,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
@@ -306,7 +308,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = Teambition.RecurrencePickerExample;
 				PRODUCT_NAME = RecurrencePickerExample;
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
@@ -322,7 +324,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = Teambition.RecurrencePickerExample;
 				PRODUCT_NAME = RecurrencePickerExample;
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
 		};

RecurrencePickerExample.xcodeproj/xcuserdata/hongxin.xcuserdatad/xcschemes/RecurrencePickerExample.xcscheme

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

RecurrencePickerExample/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -1,5 +1,15 @@
 {
   "images" : [
+    {
+      "idiom" : "iphone",
+      "size" : "20x20",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "iphone",
+      "size" : "20x20",
+      "scale" : "3x"
+    },
     {
       "idiom" : "iphone",
       "size" : "29x29",
@@ -30,6 +40,16 @@
       "size" : "60x60",
       "scale" : "3x"
     },
+    {
+      "idiom" : "ipad",
+      "size" : "20x20",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "20x20",
+      "scale" : "2x"
+    },
     {
       "idiom" : "ipad",
       "size" : "29x29",
@@ -64,6 +84,11 @@
       "idiom" : "ipad",
       "size" : "83.5x83.5",
       "scale" : "2x"
+    },
+    {
+      "idiom" : "ios-marketing",
+      "size" : "1024x1024",
+      "scale" : "1x"
     }
   ],
   "info" : {

RecurrencePickerExample/ExampleViewController.swift

@@ -31,7 +31,7 @@ class ExampleViewController: UIViewController {
 
     // MARK: - Helper
     fileprivate func updateLanguageButtonTitle() {
-        guard let index = languages.index(of: language) else {
+        guard let index = languages.firstIndex(of: language) else {
             return
         }
         let languageTitle = languageStrings[index]

RecurrencePickerExample/Info.plist

@@ -15,11 +15,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.1.3</string>
+	<string>0.1.4</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>11</string>
+	<string>12</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>UILaunchStoryboardName</key>