Swift 3 #30

phatblat · 2016-10-21T20:19:01Z

Continuing the work started in #20, but with support for only Swift 3.0.

TODO

Remove Swift 2 support
Update generic method where clause to non-deprecated syntax
Test with CocoaPods 1.1.1
Update README.md
Update CHANGELOG.md

Releases

The current plan for releasing Swift 3 support:

Reusable 2.5.1 with Swift 2.3 Swift 2.3 support #28
Reusable 3.0.0 with Swift 3

Fixes the following error in "Copy Swift standard libraries into Pods_ReusableDemo.framework": Found an unexpected Mach-O header code: 0x72613c21

Swift 2 warnings introduced with Swift 3 support

CocoaPods fails with the following message unless the iOS 9.3 Simulator is installed (1.5GB): - ERROR | [iOS] unknown: Encountered an unknown error (Simulator iPhone 4s is not available.

syntax differs between swift versions

Xcode 8 receommendation

This reverts commit 5fb0ab2.

# Conflicts: # .travis.yml # CHANGELOG.md # Example/ReusableDemo/TableViewCells/MyXIBSwitchCell.swift # Example/ReusableDemo/TableViewController.swift # Rakefile

Dual Swift 2 & 3 Support

AliSoftware · 2016-10-21T21:25:08Z

Example/Podfile

@@ -4,3 +4,9 @@ use_frameworks!
 target 'ReusableDemo' do
  pod 'Reusable', :path => '../'
 end
+
+post_install do |installer|
+  installer.pods_project.build_configurations.each do |config|


Reminder: you'll probably be able to get rid of that when you'll migrate to CP 1.1.1

phatblat · 2016-10-22T03:23:08Z

This is ready for review.

Grubas7

Just minor remarks :)

Grubas7 · 2016-10-22T08:10:31Z

Example/ReusableDemo/Storyboards/InfoDetailViewController.swift

-  @IBAction func closeAction(sender: UIButton) {
-    self.presentingViewController?.dismissViewControllerAnimated(true, completion: nil)
+  @IBAction func closeAction(_ sender: UIButton) {
+    self.presentingViewController?.dismiss(animated: true, completion: nil)


You can omit , completion: nil. It's optional.

Grubas7 · 2016-10-22T08:12:36Z

Example/ReusableDemoTests/ReusableDemoTests.swift

+        // This is an example of a functional test case.
+        // Use XCTAssert and related functions to verify your tests produce the correct results.
+    }
+}


Useless file?

Yeah, it's just the auto-generated example tests file. I started on #7 in this effort, but then decided to wait until the API settled before actually writing tests.

Grubas7 · 2016-10-22T08:17:50Z

Sources/Storyboard/StoryboardBased.swift

@@ -28,7 +28,7 @@ public protocol StoryboardBased: class {
 public extension StoryboardBased {
  /// By default, use the storybaord with the same name as the class
  static var storyboard: UIStoryboard {
-    return UIStoryboard(name: String(self), bundle: NSBundle(forClass: self))
+    return UIStoryboard(name: String(describing: self), bundle: Bundle(for: self))


You could use Self().sceneIdentifier and replace String(describing: self).

Looks like StoryboardBased doesn't have a sceneIdentifier class property like StoryboardSceneBased. Seems like an oversight since any view controller can have a storyboard ID.

StoryboardBased is designed for the case where you have an initialViewController with the same name as the Storyboard file. As it instantiate the VC using initialViewController (and not using a sceneIdentifier), having a sceneIdentifier for the StoryboardBased shouldn't be a requirement (as it's optional, and not required for the StoryboardBased mixin to work)

Grubas7 · 2016-10-22T08:22:54Z

Sources/Storyboard/StoryboardSceneBased.swift

-      fatalError("The viewController '\(self.sceneIdentifier)' of '\(storyboard)' is not of class '\(self)'")
+    let sb = Self().storyboard
+
+    let vc = sb?.instantiateViewController(withIdentifier: self.sceneIdentifier)


Most of let in other methods have well descriptive names. Here are sb, vc, typedVC. IMO you could use full names ;)

Grubas7 · 2016-10-22T08:23:25Z

Example/ReusableDemo/TableViewCells/MyXIBInfoCell.swift

    let detailsVC = InfoDetailViewController.instantiate()
    detailsVC.setDetails(self.details)
-    self.window?.rootViewController?.presentViewController(detailsVC, animated: true, completion: nil)
+    self.window?.rootViewController?.present(detailsVC, animated: true, completion: nil)


, completion: nil is optional.

phatblat · 2016-10-22T15:07:39Z

Thanks for the feedback, @Grubas7!

AF-cgi · 2016-11-06T09:25:50Z

When do you merge this?

AliSoftware · 2016-11-06T20:04:38Z

@phatblat If this is ready, please:

rebase on top of master (which now contains the 2.3 conversion)
and maybe cleanup the git history as it seems to have picked up a lot of history? idk, 78 commits seems like a lot probably caused by the multiple rebasing given the history of this PR, so some cleaning could make it easier to read the git history?
Add a Swift 3.0 badge at the top of the README instead of the 2.2 & 2.3 ones I added in master

So we could merge soon 👍

…ueueReusableCell(for:cellType:)` as it was done in AliSoftware#30

AliSoftware · 2016-11-13T15:58:29Z

I'm closing this one in favour of #31 .

phatblat added 30 commits July 6, 2016 14:25

Swift 3 API changes

287b9c5

Add dual Swift 2 & 3 support

a94a387

Re-integrate pod into demo project with CocoaPods 1.0.1

c5a39f2

Disable EMBEDDED_CONTENT_CONTAINS_SWIFT for Pods-ReusableDemo target

c9793ce

Fixes the following error in "Copy Swift standard libraries into Pods_ReusableDemo.framework": Found an unexpected Mach-O header code: 0x72613c21

Add dual Swift 2 & 3 support to Demo project

fcb9d50

Disable EMBEDDED_CONTENT_CONTAINS_SWIFT in post_install

519a52b

Add initial travis config and Rakefile

381ac85

Add optional xcode version argument to ci:xcodebuild task

3d3363a

Use both Xcode 7 & 8 in travis build matrix

3e0aeb1

Update changelog

5fb0ab2

Allow warnings when linting pod

677e875

Swift 2 warnings introduced with Swift 3 support

Disable linting pod with xcode8

66b8972

CocoaPods fails with the following message unless the iOS 9.3 Simulator is installed (1.5GB): - ERROR | [iOS] unknown: Encountered an unknown error (Simulator iPhone 4s is not available.

Add ReusableDemoTests target

f22d445

Remove example performance test

ed5ef89

syntax differs between swift versions

Rename task to build

acaa536

Change task to test in addition to build

11463ac

Refactor ci:build task to take DESTINATION from environment

ef2bae4

Add ci:test task

3a9a61f

Install swiftlint on travis

166b6cf

Enable ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES

8ca2dba

Xcode 8 receommendation

Order DESTINATION keys according to the hierarchy in the docs

a38bf52

Use OS=latest as the default in rake tasks

8350c3c

Disable EMBEDDED_CONTENT_CONTAINS_SWIFT using Podfile installer API

dcc09a2

Revert "Update changelog"

b57467c

This reverts commit 5fb0ab2.

Re-add Swift 3 support to changelog

b992475

Merge branch 'master' into ben/swift3

55cfa6b

# Conflicts: # .travis.yml # CHANGELOG.md # Example/ReusableDemo/TableViewCells/MyXIBSwitchCell.swift # Example/ReusableDemo/TableViewController.swift # Rakefile

Convert demo project to Swift 3

6faa759

Set SWIFT_VERSION to 3 in example Pods project

07ce39d

Create IndexPath typealias for Swift 2

5d44cb6

Update APIs

3876adb

phatblat added 7 commits September 27, 2016 19:58

Set .swift-version to 3.0

d427f33

Build Swift 2.3 using pod lib lint command on CI

2076ac2

Move SWIFT_VERSION variable to lintpod task

a6c7c33

Ignore the .DS_Store

c30f6f9

Use default DESTINATION in Rakefile

02ef079

Clean up and document Rakefile

453992f

Merge pull request #20 from phatblat/ben/swift3

c551127

Dual Swift 2 & 3 Support

AliSoftware reviewed Oct 21, 2016

View reviewed changes

phatblat added 9 commits October 21, 2016 19:46

Remove unnecesary post_install hook from Podfile

92ec656

Regen example Pods project using CocoaPods 1.1.1

805ef4f

[CI] Use released CocoaPods 1.1.1

9e607fb

Update generic where clause to new syntax

4972c38

Remove Swift 2 code

d52ec34

[CI] Remove Xcode 7 and Swift 2 builds

bd5ecb9

Remove Swift 2 from readme

53681dd

Update changelog

d2ec424

Version 3.0.0

2da70b0

Grubas7 reviewed Oct 22, 2016

View reviewed changes

phatblat added 2 commits October 22, 2016 08:53

Remove unnecessary completion parameter

6885400

Use descriptive names for local variables

a4c684d

ceyhun pushed a commit to ceyhun/Reusable that referenced this pull request Nov 9, 2016

Changed dequeueReusableCell(indexPath:cellType:) signatures to `deq…

9ad09a1

…ueueReusableCell(for:cellType:)` as it was done in AliSoftware#30

ceyhun mentioned this pull request Nov 9, 2016

Converted library and Demo project to Swift 3 #31

Merged

AliSoftware closed this Nov 13, 2016

AliSoftware mentioned this pull request Nov 14, 2016

What time can support Swift3.0? #32

Closed

AliSoftware deleted the swift3 branch July 12, 2018 23:13

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Swift 3 #30

Swift 3 #30

phatblat commented Oct 21, 2016 •

edited

Loading

AliSoftware Oct 21, 2016

phatblat Oct 22, 2016

phatblat commented Oct 22, 2016

Grubas7 left a comment

Grubas7 Oct 22, 2016

Grubas7 Oct 22, 2016

phatblat Oct 22, 2016

Grubas7 Oct 22, 2016

phatblat Oct 22, 2016

Grubas7 Oct 22, 2016

AliSoftware Oct 24, 2016

Grubas7 Oct 22, 2016

Grubas7 Oct 22, 2016

phatblat commented Oct 22, 2016

AF-cgi commented Nov 6, 2016

AliSoftware commented Nov 6, 2016 •

edited

Loading

AliSoftware commented Nov 13, 2016

Swift 3 #30

Swift 3 #30

Conversation

phatblat commented Oct 21, 2016 • edited Loading

TODO

Releases

Choose a reason for hiding this comment

Choose a reason for hiding this comment

phatblat commented Oct 22, 2016

Grubas7 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

phatblat commented Oct 22, 2016

AF-cgi commented Nov 6, 2016

AliSoftware commented Nov 6, 2016 • edited Loading

AliSoftware commented Nov 13, 2016

phatblat commented Oct 21, 2016 •

edited

Loading

AliSoftware commented Nov 6, 2016 •

edited

Loading