Converted to Swift 3 and made some iOS 10 bugfixes

mikaoj · mikaoj · commit ffd43d9d96a9 · 2016-09-15T15:07:22.000+02:00
diff --git a/Example/BSGridCollectionViewLayout.xcodeproj/project.pbxproj b/Example/BSGridCollectionViewLayout.xcodeproj/project.pbxproj
@@ -219,14 +219,16 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0710;
-				LastUpgradeCheck = 0710;
+				LastUpgradeCheck = 0800;
 				ORGANIZATIONNAME = CocoaPods;
 				TargetAttributes = {
 					607FACCF1AFB9204008FA782 = {
 						CreatedOnToolsVersion = 6.3.1;
+						LastSwiftMigration = 0800;
 					};
 					607FACE41AFB9204008FA782 = {
 						CreatedOnToolsVersion = 6.3.1;
+						LastSwiftMigration = 0800;
 					};
 				};
 			};
@@ -499,34 +501,40 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = BA5C906E5223E03FBDBBF0C9 /* Pods-BSGridCollectionViewLayout_Example.debug.xcconfig */;
 			buildSettings = {
+				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				INFOPLIST_FILE = BSGridCollectionViewLayout/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				MODULE_NAME = ExampleApp;
 				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_VERSION = 3.0;
 			};
 			name = Debug;
 		};
 		607FACF11AFB9204008FA782 /* Release */ = {
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = FE75FEF4ECD19E3E17826E56 /* Pods-BSGridCollectionViewLayout_Example.release.xcconfig */;
 			buildSettings = {
+				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				INFOPLIST_FILE = BSGridCollectionViewLayout/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				MODULE_NAME = ExampleApp;
 				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
+				SWIFT_VERSION = 3.0;
 			};
 			name = Release;
 		};
 		607FACF31AFB9204008FA782 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = F04D8B05088B4DF749D43009 /* Pods-BSGridCollectionViewLayout_Tests.debug.xcconfig */;
 			buildSettings = {
+				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"DEBUG=1",
 					"$(inherited)",
@@ -535,17 +543,21 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_VERSION = 3.0;
 			};
 			name = Debug;
 		};
 		607FACF41AFB9204008FA782 /* Release */ = {
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 4DD8060D12E59B1B67378F47 /* Pods-BSGridCollectionViewLayout_Tests.release.xcconfig */;
 			buildSettings = {
+				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				INFOPLIST_FILE = Tests/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
+				SWIFT_VERSION = 3.0;
 			};
 			name = Release;
 		};
diff --git a/Example/BSGridCollectionViewLayout.xcodeproj/xcshareddata/xcschemes/BSGridCollectionViewLayout-Example.xcscheme b/Example/BSGridCollectionViewLayout.xcodeproj/xcshareddata/xcschemes/BSGridCollectionViewLayout-Example.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0730"
+   LastUpgradeVersion = "0800"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/Example/BSGridCollectionViewLayout/AppDelegate.swift b/Example/BSGridCollectionViewLayout/AppDelegate.swift
@@ -27,8 +27,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 
     var window: UIWindow?
 
-    func application(application: UIApplication, didFinishLaunchingWithOptions launchOptions: [NSObject: AnyObject]?) -> Bool {
-        // Override point for customization after application launch.
+    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey : Any]? = nil) -> Bool {
         return true
     }
 }
diff --git a/Example/BSGridCollectionViewLayout/ViewController.swift b/Example/BSGridCollectionViewLayout/ViewController.swift
@@ -27,7 +27,7 @@ class ViewController: UICollectionViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
         
-        collectionView?.backgroundColor = UIColor.whiteColor()
+        collectionView?.backgroundColor = UIColor.white
         
         let layout = GridCollectionViewLayout()
         layout.itemsPerRow = 3
@@ -36,28 +36,28 @@ class ViewController: UICollectionViewController {
         
         collectionView?.collectionViewLayout = layout
         
-        collectionView?.registerClass(UICollectionViewCell.self, forCellWithReuseIdentifier: "cell")
+        collectionView?.register(UICollectionViewCell.self, forCellWithReuseIdentifier: "cell")
     }
     
     // MARK: Data source
-    override func numberOfSectionsInCollectionView(collectionView: UICollectionView) -> Int {
+    override func numberOfSections(in collectionView: UICollectionView) -> Int {
         return 2
     }
     
-    override func collectionView(collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
+    override func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
         if section == 0 {
             return 11
         } else {
             return 18
         }
     }
     
-    override func collectionView(collectionView: UICollectionView, cellForItemAtIndexPath indexPath: NSIndexPath) -> UICollectionViewCell {
-        let cell = collectionView.dequeueReusableCellWithReuseIdentifier("cell", forIndexPath: indexPath)
-        if indexPath.section == 0 {
-            cell.backgroundColor = UIColor.blueColor()
+    override func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
+        let cell = collectionView.dequeueReusableCell(withReuseIdentifier: "cell", for: indexPath)
+        if (indexPath as NSIndexPath).section == 0 {
+            cell.backgroundColor = UIColor.blue
         } else {
-            cell.backgroundColor = UIColor.redColor()
+            cell.backgroundColor = UIColor.red
         }
         
         return cell
diff --git a/Example/Pods/Pods.xcodeproj/project.pbxproj b/Example/Pods/Pods.xcodeproj/project.pbxproj
diff --git a/Example/Pods/Pods.xcodeproj/xcshareddata/xcschemes/BSGridCollectionViewLayout.xcscheme b/Example/Pods/Pods.xcodeproj/xcshareddata/xcschemes/BSGridCollectionViewLayout.xcscheme
diff --git a/Example/Tests/FirstRowTests.swift b/Example/Tests/FirstRowTests.swift
@@ -27,7 +27,7 @@ import XCTest
 class FirstRowTests: XCTestCase {
     
     func testFirstRowInZeroRect() {
-        let firstRow = GridCollectionViewLayout.firstRowInRect(CGRectZero, withRowHeight: 100.0)
+        let firstRow = GridCollectionViewLayout.firstRowInRect(CGRect.zero, withRowHeight: 100.0)
         XCTAssertEqual(firstRow, 0)
     }
     
diff --git a/Example/Tests/LastRowTests.swift b/Example/Tests/LastRowTests.swift
@@ -26,7 +26,7 @@ import XCTest
 class LastRowTests: XCTestCase {
     
     func testLastRowInZeroRect() {
-        let lastRow = GridCollectionViewLayout.lastRowInRect(CGRectZero, withRowHeight: 100, max: 3)
+        let lastRow = GridCollectionViewLayout.lastRowInRect(CGRect.zero, withRowHeight: 100, max: 3)
         XCTAssertEqual(lastRow, 0)
     }
     
diff --git a/Pod/Classes/GridCollectionViewLayout.swift b/Pod/Classes/GridCollectionViewLayout.swift

Original file line number	Diff line number	Diff line change
`@@ -27,8 +27,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {`
`27`	`27`
`28`	`28`	`var window: UIWindow?`
`29`	`29`
`30`		`- func application(application: UIApplication, didFinishLaunchingWithOptions launchOptions: [NSObject: AnyObject]?) -> Bool {`
`31`		`- // Override point for customization after application launch.`
	`30`	`+ func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey : Any]? = nil) -> Bool {`
`32`	`31`	`return true`
`33`	`32`	`}`
`34`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ import XCTest`
`27`	`27`	`class FirstRowTests: XCTestCase {`
`28`	`28`
`29`	`29`	`func testFirstRowInZeroRect() {`
`30`		`- let firstRow = GridCollectionViewLayout.firstRowInRect(CGRectZero, withRowHeight: 100.0)`
	`30`	`+ let firstRow = GridCollectionViewLayout.firstRowInRect(CGRect.zero, withRowHeight: 100.0)`
`31`	`31`	`XCTAssertEqual(firstRow, 0)`
`32`	`32`	`}`
`33`	`33`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ import XCTest`
`26`	`26`	`class LastRowTests: XCTestCase {`
`27`	`27`
`28`	`28`	`func testLastRowInZeroRect() {`
`29`		`- let lastRow = GridCollectionViewLayout.lastRowInRect(CGRectZero, withRowHeight: 100, max: 3)`
	`29`	`+ let lastRow = GridCollectionViewLayout.lastRowInRect(CGRect.zero, withRowHeight: 100, max: 3)`
`30`	`30`	`XCTAssertEqual(lastRow, 0)`
`31`	`31`	`}`
`32`	`32`