Merge branch 'Swift4.2'

# Conflicts: # Podfile # Podfile.lock # Pods/Eureka/README.md # Pods/Eureka/Source/Core/Core.swift # Pods/Eureka/Source/Core/Form.swift # Pods/Eureka/Source/Core/Section.swift # Pods/Eureka/Source/Core/SwipeActions.swift # Pods/Eureka/Source/Rows/ActionSheetRow.swift # Pods/Eureka/Source/Rows/Common/FieldRow.swift # Pods/Eureka/Source/Rows/Controllers/SelectorAlertController.swift # Pods/Eureka/Source/Rows/SliderRow.swift # Pods/Manifest.lock # Pods/Pods.xcodeproj/project.pbxproj # Pods/Target Support Files/Eureka/Info.plist
EurekaCommunity · Sep 28, 2018 · 3c1be59 · 3c1be59
2 parents 2d7accc + a96f57a
commit 3c1be59
Show file tree

Hide file tree

Showing 61 changed files with 1,724 additions and 726 deletions.
diff --git a/ColorPicker/ColorPickerRow.swift b/ColorPicker/ColorPickerRow.swift
@@ -47,7 +47,7 @@ public final class ColorPickerCell : Cell<UIColor>, CellType, UICollectionViewDe
     private var dynamicConstraints = [NSLayoutConstraint]()
     private var notificationObserver : NSObjectProtocol?
 
-    required public init(style: UITableViewCellStyle, reuseIdentifier: String?) {
+    required public init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
         let layout = UICollectionViewFlowLayout()
         layout.sectionInset = UIEdgeInsets(top: 0, left: 5, bottom: 6, right: 10)
         layout.itemSize = CGSize(width: 30, height: 30)
@@ -73,7 +73,7 @@ public final class ColorPickerCell : Cell<UIColor>, CellType, UICollectionViewDe
         colorsView.showsHorizontalScrollIndicator = true
         colorsView.showsVerticalScrollIndicator = false
         colorsView.register(ColorSwatchCell.self, forCellWithReuseIdentifier: "swatch")
-        colorsView.register(UICollectionReusableView.self, forSupplementaryViewOfKind: UICollectionElementKindSectionHeader, withReuseIdentifier: "header")
+        colorsView.register(UICollectionReusableView.self, forSupplementaryViewOfKind: UICollectionView.elementKindSectionHeader, withReuseIdentifier: "header")
         colorsView.delegate = self
         colorsView.dataSource = self
     }
@@ -88,11 +88,11 @@ public final class ColorPickerCell : Cell<UIColor>, CellType, UICollectionViewDe
         }
     }
 
-    open override func update() {
+    public override func update() {
         super.update()
     }
 
-    open override func setup() {
+    public override func setup() {
         super.setup()
 
         selectionStyle = .none
@@ -104,7 +104,7 @@ public final class ColorPickerCell : Cell<UIColor>, CellType, UICollectionViewDe
 
         setNeedsUpdateConstraints()
 
-        notificationObserver = NotificationCenter.default.addObserver(forName: NSNotification.Name.UIContentSizeCategoryDidChange,
+        notificationObserver = NotificationCenter.default.addObserver(forName: UIContentSizeCategory.didChangeNotification,
                                                                       object: nil,
                                                                       queue: nil,
                                                                       using: { [weak self] (note) in
@@ -113,16 +113,16 @@ public final class ColorPickerCell : Cell<UIColor>, CellType, UICollectionViewDe
         })
     }
 
-    open override func didSelect() {
+    public override func didSelect() {
 
     }
 
-    open override func updateConstraints(){
+    public override func updateConstraints(){
         customConstraints()
         super.updateConstraints()
     }
 
-    open override func layoutSubviews() {
+    public override func layoutSubviews() {
         super.layoutSubviews()
 
         var frame = contentView.frame
@@ -131,7 +131,7 @@ public final class ColorPickerCell : Cell<UIColor>, CellType, UICollectionViewDe
         contentView.frame = frame
     }
 
-    open func customConstraints() {
+    public func customConstraints() {
         contentView.removeConstraints(dynamicConstraints)
         dynamicConstraints = []
 
@@ -220,7 +220,7 @@ public final class ColorPickerCell : Cell<UIColor>, CellType, UICollectionViewDe
     }
 
     public func collectionView(_ collectionView: UICollectionView, viewForSupplementaryElementOfKind kind: String, at indexPath: IndexPath) -> UICollectionReusableView {
-        let v = collectionView.dequeueReusableSupplementaryView(ofKind: UICollectionElementKindSectionHeader, withReuseIdentifier: "header", for: indexPath)
+        let v = collectionView.dequeueReusableSupplementaryView(ofKind: UICollectionView.elementKindSectionHeader, withReuseIdentifier: "header", for: indexPath)
 
         if v.subviews.count == 0 {
             let label = UILabel(frame: CGRect(x: -36.0, y: 40.0, width: 96.0, height: 16.0))

diff --git a/ColorPicker/ColorRow.swift b/ColorPicker/ColorRow.swift
@@ -21,7 +21,7 @@ public final class ColorCell : Cell<UIColor>, CellType {
 
     private var dynamicConstraints = [NSLayoutConstraint]()
 
-    required public init(style: UITableViewCellStyle, reuseIdentifier: String?) {
+    required public init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
         swatchView = ColorSwatchView(frame: CGRect(x: 0, y: 0, width: 30, height: 30))
 
         super.init(style: style, reuseIdentifier: reuseIdentifier)
@@ -34,11 +34,11 @@ public final class ColorCell : Cell<UIColor>, CellType {
         fatalError("init(coder:) has not been implemented")
     }
 
-    open override func update() {
+    public override func update() {
         super.update()
     }
 
-    open override func setup() {
+    public override func setup() {
         super.setup()
 
         swatchView.color = row.value

diff --git a/ColorPicker/InlineColorPickerRow.swift b/ColorPicker/InlineColorPickerRow.swift
@@ -21,7 +21,7 @@ public final class InlineColorPickerCell : Cell<UIColor>, CellType {
 
     private var dynamicConstraints = [NSLayoutConstraint]()
 
-    required public init(style: UITableViewCellStyle, reuseIdentifier: String?) {
+    required public init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
         swatchView = ColorSwatchView(frame: CGRect(x: 0, y: 0, width: 30, height: 30))
 
         super.init(style: style, reuseIdentifier: reuseIdentifier)
@@ -34,11 +34,11 @@ public final class InlineColorPickerCell : Cell<UIColor>, CellType {
         fatalError("init(coder:) has not been implemented")
     }
 
-    open override func update() {
+    public override func update() {
         super.update()
     }
 
-    open override func setup() {
+    public override func setup() {
         super.setup()
 
         swatchView.color = row.value

diff --git a/Example.xcodeproj/project.pbxproj b/Example.xcodeproj/project.pbxproj
@@ -147,12 +147,12 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0810;
-				LastUpgradeCheck = 0920;
+				LastUpgradeCheck = 1000;
 				ORGANIZATIONNAME = "Late Night Software Ltd.";
 				TargetAttributes = {
 					A56E45541DF6534B0094372A = {
 						CreatedOnToolsVersion = 8.1;
-						LastSwiftMigration = 0810;
+						LastSwiftMigration = 1000;
 						ProvisioningStyle = Manual;
 					};
 				};
@@ -280,13 +280,15 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				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_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -337,13 +339,15 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				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_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -389,7 +393,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.latenightsw.EurekaCustomView;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Debug;
 		};
@@ -408,7 +412,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.latenightsw.EurekaCustomView;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Release;
 		};

diff --git a/Example.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/Example.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>
diff --git a/....xcodeproj/project.xcworkspace/xcuserdata/mall.xcuserdatad/UserInterfaceState.xcuserstate b/....xcodeproj/project.xcworkspace/xcuserdata/mall.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/Example/AppDelegate.swift b/Example/AppDelegate.swift
@@ -14,7 +14,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
     var window: UIWindow?
 
 
-    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
+    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
         // Override point for customization after application launch.
         return true
     }

diff --git a/Podfile b/Podfile
@@ -4,7 +4,7 @@ source 'https://github.com/CocoaPods/Specs.git'
 target 'ColorPicker' do
   use_frameworks!
 
-  pod 'Eureka', '~> 4.1.0'
+  pod 'Eureka', '>= 4.3.0'
   pod 'UIColor_Hex_Swift'
 
 end
diff --git a/Podfile.lock b/Podfile.lock
@@ -1,9 +1,9 @@
 PODS:
-  - Eureka (4.1.1)
+  - Eureka (4.3.0)
   - UIColor_Hex_Swift (4.2.0)
 
 DEPENDENCIES:
-  - Eureka (~> 4.1.0)
+  - Eureka (>= 4.0.0)
   - UIColor_Hex_Swift
 
 SPEC REPOS:
@@ -12,9 +12,9 @@ SPEC REPOS:
     - UIColor_Hex_Swift
 
 SPEC CHECKSUMS:
-  Eureka: b88fb930e42c79f8c03c373d0fcdc28c1d6c50ed
+  Eureka: 6d711cb30ca333b4bc893110285a722ae3840114
   UIColor_Hex_Swift: bc07fc197421ee896b9ed6dcfa2054b7fbf75145
 
-PODFILE CHECKSUM: de47075ab7c530d76f2ac35daa520d460a95b0b7
+PODFILE CHECKSUM: 118eac6f74e47cc80838c661be9361037b459f8e
 
 COCOAPODS: 1.5.3