Update to Swift 3 #40

onmyway133 · 2016-10-03T20:45:38Z

Find this a bit strange NSWorkspace.shared().open(url) vs UIApplication.shared.openURL(url)

mention-bot · 2016-10-03T20:45:38Z

@onmyway133, thanks for your PR! By analyzing the history of the files in this pull request, we identified @vadymmarkov, @zenangst and @jessearmand to be potential reviewers.

onmyway133 · 2016-10-04T07:30:49Z

Tests/Compass/Helpers.swift

-  }
-}
-
-extension MutableCollectionType where Index == Int {


Have a hard time extending MutableCollection, so extend on Array for now

vadymmarkov · 2016-10-04T07:33:42Z

Sources/Router.swift

@@ -11,7 +11,7 @@ public protocol Routable {

 public protocol ErrorRoutable {

-  func handle(routeError: ErrorType, from currentController: Controller)
+  func handle(_ routeError: Error, from currentController: Controller)


I would leave routeError in function signature, or maybe just error.

vadymmarkov · 2016-10-04T07:34:16Z

Sources/Compass.swift

@@ -42,10 +42,10 @@ public struct Compass {
    return nil
  }

-  static func parseAsURL(url: NSURL, payload: Any? = nil) -> Location? {
+  static func parseAsURL(_ url: URL, payload: Any? = nil) -> Location? {


Maybe parseAsUrl?

I think that parseAsURL is actually dealing with url components, so I rename it to parseComponents

vadymmarkov · 2016-10-04T07:35:40Z

Sources/Compass.swift

@@ -94,8 +94,8 @@ public struct Compass {

 extension Compass {

-  public static func navigate(urn: String, scheme: String = Compass.scheme) {
-    guard let url = NSURL(string: "\(scheme)\(urn)") else { return }
+  public static func navigate(_ urn: String, scheme: String = Compass.scheme) {


Maybe navigate(to urn

That makes sense

vadymmarkov · 2016-10-04T07:36:23Z

Sources/String+Extensions.swift

    return components != [""] ? components : []
  }

-  func replace(string: String, with withString: String) -> String {
-    return stringByReplacingOccurrencesOfString(string, withString: withString)
+  func replace(_ string: String, with withString: String) -> String {


Why do we need this method?

It's just a syntactic sugar

Yeah, but it makes less sense in Swift 3 I think.

I agree, lets get rid of the Sugar that are fixed by Apple in Swift 3.

@onmyway133 Would you mind to remove this functions an use replacingOccurrences(of: string, with: withString) instead?

vadymmarkov · 2016-10-04T07:37:40Z

Sources/TypeAlias.swift

@@ -7,13 +7,13 @@
 #if os(OSX)
  public typealias Controller = NSViewController

-  func openURL(URL: NSURL) {
-    NSWorkspace.sharedWorkspace().openURL(URL)
+  func openURL(_ url: URL) {


I think func open(url: URL) is better.

Putting the _ seems to be the default everywhere tho. Which is a bit stupid, since, if everyone needs underscore, why don't we delete the underscore.

@RamonGilabert I think the idea is to move the last part of the function's name to be an argument name, like in the example above (like in good old Objective C times) So we have to use _ as less as possible.

Yeah, sorry, I thought you suggested func openURL(url: URL).

vadymmarkov · 2016-10-04T07:38:01Z

Sources/TypeAlias.swift

  }
 #else
  public typealias Controller = UIViewController

-  func openURL(URL: NSURL) {
-    UIApplication.sharedApplication().openURL(URL)
+  func openURL(_ url: Foundation.URL) {


Don't need Foundation here.

onmyway133 · 2016-10-04T19:45:38Z

Fixed as you suggest @vadymmarkov 😉

vadymmarkov · 2016-10-05T09:03:26Z

Sources/Compass.swift

@@ -18,21 +18,21 @@ public struct Compass {

  public static var routes = [String]()

-  public static func parse(url: NSURL, payload: Any? = nil) -> Location? {
-    let path = url.absoluteString.substringFromIndex(scheme.endIndex)
+  public static func parse(_ url: URL, payload: Any? = nil) -> Location? {


I would leave it like public static func parse(url: NSURL, payload: Any? = nil). Thought? @onmyway133 @zenangst @RamonGilabert ?

Yeah, remove _. I like labels :)

onmyway133 · 2016-10-06T07:12:29Z

Compass.podspec

@@ -15,4 +15,6 @@ Pod::Spec.new do |s|

  s.source_files = 'Sources/**/*'
  s.frameworks = 'Foundation'
+
+  s.pod_target_xcconfig = { 'SWIFT_VERSION' => '3.0' }


vadymmarkov · 2016-10-06T07:23:05Z

I've started a GitHub review here and now it's hard to read this PR tbh, it's not clear what is fixed and what is not 😞 But there are 2 comments waiting for your reply @onmyway133 😄

onmyway133 · 2016-10-10T13:33:03Z

Sources/TypeAlias.swift

@@ -5,13 +5,13 @@
 #endif

 #if os(OSX)
-  public typealias Controller = NSViewController
+  public typealias CurrentController = NSViewController


We preserve Controller for another use case?

I had a conflict with Controller in Spots so I decided to change this one to no "kidnap" the name.

@zenangst oh ja, because we have struct Compass so the namespace is lost

I think we should try and fix that thing, now is probably a good idea to address it as we are already doing some breaking changes in the migration. (breaking as in having to adopt new Swift 3 syntax).

onmyway133 added 3 commits October 3, 2016 22:41

Update to Swift 3

1d8e71f

Add swift-version

c7df0e4

Add swift 3 badge

e720a02

onmyway133 assigned zenangst, RamonGilabert and vadymmarkov Oct 3, 2016

onmyway133 added 4 commits October 3, 2016 22:46

Use URL instead of NSURL

9bf294c

Update Mac target

16a3924

Update travis

a4af7a2

Add platform to xcodebuild

d8764b1

onmyway133 commented Oct 4, 2016

View reviewed changes

vadymmarkov suggested changes Oct 4, 2016

View reviewed changes

onmyway133 added 4 commits October 4, 2016 21:31

Use param routeError for handle

92a40ff

Use open with url as param

a3e7741

Remove Foundation namespace

39f8d46

Rename to parseAsUrl

ebbafc3

vadymmarkov reviewed Oct 5, 2016

View reviewed changes

vadymmarkov approved these changes Oct 5, 2016

View reviewed changes

onmyway133 and others added 3 commits October 5, 2016 22:52

Make url parameter

51eb803

Rename to parseComponents. Make routeString external parameter

f585b12

Add s.pod_target_xcconfig = { 'SWIFT_VERSION' => '3.0' }

ca0909a

onmyway133 commented Oct 6, 2016

View reviewed changes

onmyway133 and others added 3 commits October 6, 2016 10:11

Use replacingOccurrences

76bb282

Change Controller to CurrentController

92e20f7

Fix tests

89f4e49

onmyway133 commented Oct 10, 2016

View reviewed changes

zenangst mentioned this pull request Oct 11, 2016

Framework names and internals hyperoslo/ios-foundation#44

Closed

zenangst merged commit d5833d6 into master Oct 13, 2016

zenangst deleted the swift-3 branch October 13, 2016 10:31

zenangst mentioned this pull request Oct 13, 2016

Swift 3.0 compatibility #39

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update to Swift 3 #40

Update to Swift 3 #40

onmyway133 commented Oct 3, 2016 •

edited

Loading

mention-bot commented Oct 3, 2016

onmyway133 Oct 4, 2016

vadymmarkov Oct 4, 2016

vadymmarkov Oct 4, 2016

onmyway133 Oct 6, 2016

vadymmarkov Oct 4, 2016

onmyway133 Oct 6, 2016

vadymmarkov Oct 4, 2016

onmyway133 Oct 4, 2016

vadymmarkov Oct 4, 2016

zenangst Oct 5, 2016

vadymmarkov Oct 5, 2016

onmyway133 Oct 6, 2016

vadymmarkov Oct 4, 2016

onmyway133 Oct 4, 2016

zenangst Oct 5, 2016

RamonGilabert Oct 5, 2016

vadymmarkov Oct 5, 2016

RamonGilabert Oct 5, 2016

vadymmarkov Oct 4, 2016

onmyway133 commented Oct 4, 2016

vadymmarkov Oct 5, 2016

zenangst Oct 5, 2016

onmyway133 Oct 6, 2016

vadymmarkov commented Oct 6, 2016

onmyway133 Oct 10, 2016

zenangst Oct 10, 2016

onmyway133 Oct 10, 2016

zenangst Oct 11, 2016

Update to Swift 3 #40

Update to Swift 3 #40

Conversation

onmyway133 commented Oct 3, 2016 • edited Loading

mention-bot commented Oct 3, 2016

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

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

onmyway133 commented Oct 4, 2016

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

vadymmarkov commented Oct 6, 2016

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

onmyway133 commented Oct 3, 2016 •

edited

Loading