support Xcode 10.0

.swift-version

@@ -1 +1 @@
-4.1
+4.2

Example/AppDelegate.swift

@@ -10,11 +10,9 @@ 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
     }
 
@@ -37,5 +35,4 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
     func applicationWillTerminate(_ application: UIApplication) {
 
     }
-
 }

Example/EmptyDataDemoCollectionViewController.swift

@@ -25,7 +25,7 @@ class EmptyDataDemoCollectionViewController: UICollectionViewController {
         super.viewDidLoad()
 
         navigationItem.title = "CollectionView"
-        collectionView?.backgroundColor = UIColor.white
+        collectionView?.backgroundColor = .white
 
         collectionView?.emptyDataSetDataSource = self
         collectionView?.emptyDataSetDelegate = self
@@ -87,7 +87,7 @@ extension EmptyDataDemoCollectionViewController: TBEmptyDataSetDataSource, TBEmp
 
     func titleForEmptyDataSet(in scrollView: UIScrollView) -> NSAttributedString? {
         let title = EmptyData.titles[indexPath.row]
-        var attributes: [NSAttributedStringKey: Any]?
+        var attributes: [NSAttributedString.Key: Any]?
         if indexPath.row == 1 {
             attributes = [.font: UIFont.systemFont(ofSize: 22),
                           .foregroundColor: UIColor.gray]
@@ -100,7 +100,7 @@ extension EmptyDataDemoCollectionViewController: TBEmptyDataSetDataSource, TBEmp
 
     func descriptionForEmptyDataSet(in scrollView: UIScrollView) -> NSAttributedString? {
         let description = EmptyData.descriptions[indexPath.row]
-        var attributes: [NSAttributedStringKey: Any]?
+        var attributes: [NSAttributedString.Key: Any]?
         if indexPath.row == 1 {
             attributes = [.font: UIFont.systemFont(ofSize: 17),
                           .foregroundColor: UIColor(red: 3 / 255, green: 169 / 255, blue: 244 / 255, alpha: 1)]
@@ -223,7 +223,7 @@ class ExampleCustomView: UIView {
     fileprivate lazy var contentLabel: UILabel = {
         let contentLabel = UILabel()
         contentLabel.numberOfLines = 0
-        contentLabel.textColor = UIColor.white
+        contentLabel.textColor = .white
         contentLabel.translatesAutoresizingMaskIntoConstraints = false
         return contentLabel
     }()
@@ -239,10 +239,10 @@ class ExampleCustomView: UIView {
     }
 
     fileprivate func commonInit() {
-        backgroundColor = UIColor.lightGray
+        backgroundColor = .lightGray
         layer.cornerRadius = 6
 
-        let activityIndicatorView = UIActivityIndicatorView(activityIndicatorStyle: .whiteLarge)
+        let activityIndicatorView = UIActivityIndicatorView(style: .whiteLarge)
         activityIndicatorView.translatesAutoresizingMaskIntoConstraints = false
         activityIndicatorView.startAnimating()
         contentLabel.text = "Loading... Please wait a moment...\n\n(This is a custom empty data view, which is using pure AutoLayout)"

Example/EmptyDataDemoTableViewController.swift

@@ -91,7 +91,7 @@ extension EmptyDataDemoTableViewController: TBEmptyDataSetDataSource, TBEmptyDat
 
     func titleForEmptyDataSet(in scrollView: UIScrollView) -> NSAttributedString? {
         let title = EmptyData.titles[indexPath.row]
-        var attributes: [NSAttributedStringKey: Any]?
+        var attributes: [NSAttributedString.Key: Any]?
         if indexPath.row == 1 {
             attributes = [.font: UIFont.systemFont(ofSize: 22),
                           .foregroundColor: UIColor.gray]
@@ -104,7 +104,7 @@ extension EmptyDataDemoTableViewController: TBEmptyDataSetDataSource, TBEmptyDat
 
     func descriptionForEmptyDataSet(in scrollView: UIScrollView) -> NSAttributedString? {
         let description = EmptyData.descriptions[indexPath.row]
-        var attributes: [NSAttributedStringKey: Any]?
+        var attributes: [NSAttributedString.Key: Any]?
         if indexPath.row == 1 {
             attributes = [.font: UIFont.systemFont(ofSize: 17),
                           .foregroundColor: UIColor(red: 3 / 255, green: 169 / 255, blue: 244 / 255, alpha: 1)]
@@ -128,7 +128,7 @@ extension EmptyDataDemoTableViewController: TBEmptyDataSetDataSource, TBEmptyDat
 
     func customViewForEmptyDataSet(in scrollView: UIScrollView) -> UIView? {
         if isLoading {
-            let activityIndicator = UIActivityIndicatorView(activityIndicatorStyle: .gray)
+            let activityIndicator = UIActivityIndicatorView(style: .gray)
             activityIndicator.startAnimating()
             return activityIndicator
         }

Example/Info.plist

@@ -15,11 +15,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.7</string>
+	<string>2.8</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>18</string>
+	<string>19</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>UILaunchStoryboardName</key>

TBEmptyDataSet.podspec

@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
 
   s.name         = "TBEmptyDataSet"
-  s.version      = "2.7"
+  s.version      = "2.8"
   s.summary      = "An extension of UITableView/UICollectionView's super class, it will display a placeholder when the data is empty."
 
   s.homepage     = "https://github.com/teambition/TBEmptyDataSet"

TBEmptyDataSet.xcodeproj/project.pbxproj

@@ -289,7 +289,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Debug;
 		};
@@ -309,7 +309,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = Teambition.TBEmptyDataSet;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Release;
 		};

TBEmptyDataSet/EmptyDataView.swift

@@ -21,15 +21,15 @@ internal class EmptyDataView: UIView {
     internal lazy var contentView: UIView = {
         let contentView = UIView()
         contentView.translatesAutoresizingMaskIntoConstraints = false
-        contentView.backgroundColor = UIColor.clear
+        contentView.backgroundColor = .clear
         contentView.alpha = 0
         return contentView
     }()
 
     internal lazy var imageView: UIImageView = { [unowned self] in
         let imageView = UIImageView()
         imageView.translatesAutoresizingMaskIntoConstraints = false
-        imageView.backgroundColor = UIColor.clear
+        imageView.backgroundColor = .clear
         imageView.contentMode = .scaleAspectFill
         self.contentView.addSubview(imageView)
         return imageView
@@ -38,8 +38,8 @@ internal class EmptyDataView: UIView {
     internal lazy var titleLabel: UILabel = { [unowned self] in
         let titleLabel = UILabel()
         titleLabel.translatesAutoresizingMaskIntoConstraints = false
-        titleLabel.backgroundColor = UIColor.clear
-        titleLabel.font = UIFont.systemFont(ofSize: 27)
+        titleLabel.backgroundColor = .clear
+        titleLabel.font = .systemFont(ofSize: 27)
         titleLabel.textColor = UIColor(white: 0.6, alpha: 1)
         titleLabel.textAlignment = .center
         titleLabel.lineBreakMode = .byWordWrapping
@@ -51,8 +51,8 @@ internal class EmptyDataView: UIView {
     internal lazy var descriptionLabel: UILabel = { [unowned self] in
         let descriptionLabel = UILabel()
         descriptionLabel.translatesAutoresizingMaskIntoConstraints = false
-        descriptionLabel.backgroundColor = UIColor.clear
-        descriptionLabel.font = UIFont.systemFont(ofSize: 17)
+        descriptionLabel.backgroundColor = .clear
+        descriptionLabel.font = .systemFont(ofSize: 17)
         descriptionLabel.textColor = UIColor(white: 0.6, alpha: 1)
         descriptionLabel.textAlignment = .center
         descriptionLabel.lineBreakMode = .byWordWrapping

TBEmptyDataSet/Supporting Files/Info.plist

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

TBEmptyDataSetExample.xcodeproj/project.pbxproj

@@ -166,7 +166,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "if which swiftlint >/dev/null; then\n    swiftlint\nelse\n    echo \"warning: SwiftLint not installed, download from https://github.com/realm/SwiftLint\"\nfi";
+			shellScript = "if which swiftlint >/dev/null; then\n    swiftlint\nelse\n    echo \"warning: SwiftLint not installed, download from https://github.com/realm/SwiftLint\"\nfi\n";
 		};
 /* End PBXShellScriptBuildPhase section */
 
@@ -309,7 +309,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = Teambition.TBEmptyDataSetExample;
 				PRODUCT_NAME = TBEmptyDataSetExample;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Debug;
 		};
@@ -322,7 +322,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = Teambition.TBEmptyDataSetExample;
 				PRODUCT_NAME = TBEmptyDataSetExample;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Release;
 		};