Update for Swift 4.0 #228

paulw11 · 2017-09-21T02:15:04Z

No description provided.

p2 · 2017-09-21T05:00:12Z

Cool, thanks! Can you please also update the .swift-version and .travis.yml files, and use tabs instead of spaces in the code files?

p2

Thanks - still some leftover spaces. Easiest to catch when looking at the diff on Github.

p2 · 2017-09-21T05:50:00Z

Sources/Base/OAuth2Base.swift

@@ -471,7 +471,7 @@ open class OAuth2ContextStore {
 	open var state: String {
 		if _state.isEmpty {
 			_state = UUID().uuidString
-			_state = _state[_state.startIndex..<_state.index(_state.startIndex, offsetBy: 8)]		// only use the first 8 chars, should be enough
+            _state = String(_state[_state.startIndex..<_state.index(_state.startIndex, offsetBy: 8)])        // only use the first 8 chars, should be enough


p2 · 2017-09-21T05:50:22Z

Sources/Flows/OAuth2CodeGrantAzure.swift

@@ -20,7 +20,7 @@

 import Foundation
 #if !NO_MODULE_IMPORT
-import Base
+    import Base


p2 · 2017-09-21T05:50:28Z

Sources/iOS/OAuth2WebViewController.swift

@@ -167,11 +167,11 @@ open class OAuth2WebViewController: UIViewController, WKNavigationDelegate {
 		let _ = webView?.load(URLRequest(url: url))
 	}

-	func goBack(_ sender: AnyObject?) {
+    @objc func goBack(_ sender: AnyObject?) {


p2 · 2017-09-21T05:50:54Z

Sources/iOS/OAuth2WebViewController.swift

 		let _ = webView?.goBack()
 	}

-	func cancel(_ sender: AnyObject?) {
+    @objc func cancel(_ sender: AnyObject?) {


p2 · 2017-09-21T05:51:14Z

Sources/macOS/OAuth2WebViewController.swift

@@ -216,7 +216,7 @@ public class OAuth2WebViewController: NSViewController, WKNavigationDelegate, NS
 	/**
 	Tells the web view to stop loading the current page, then calls the `onWillCancel` block if it has a value.
 	*/
-	func cancel(_ sender: AnyObject?) {
+    @objc func cancel(_ sender: AnyObject?) {


Still spaces.

p2 · 2017-09-21T05:51:38Z

Sources/macOS/OAuth2WebViewController.swift

@@ -280,8 +280,8 @@ public class OAuth2WebViewController: NSViewController, WKNavigationDelegate, NS


 	// MARK: - Window Delegate
-
-	public func windowShouldClose(_ sender: Any) -> Bool {
+


Still spaces.

paulw11 · 2017-09-21T08:14:01Z

Yeah, I am still working through it; I had to go do some other things.

I actually didn't touch most of that by hand. Perhaps the Xcode "fix this for Swift 4" has put spaces in.

I did change the lines near the #if because there is a bug in Xcode when it compiles for the migration tool it doesn't honour any -D in the build config, so I was trying to work around that. In the end I just ignored the migration tool.

p2 · 2017-09-22T04:58:03Z

Yeah sure! Xcode doesn't handle this well, until you switch to tabs in prefs it won't do the right thing. Let me know when you're done and I'll take another look!

paulw11 · 2017-09-22T12:28:54Z

Hi I think I have got them all now. Paul

…

Sent from my iPad

On 22 Sep 2017, at 14:58, Pascal Pfiffner ***@***.***> wrote: Yeah sure! Xcode doesn't handle this well, until you switch to tabs in prefs it won't do the right thing. Let me know when you're done and I'll take another look! — You are receiving this because you authored the thread. Reply to this email directly, view it on GitHub, or mute the thread.

p2

Still spaces left in some places. You can see them easily on Github.

p2 · 2017-09-22T15:39:22Z

Sources/Base/OAuth2Base.swift

+            _state = String(_state[_state.startIndex..<_state.index(_state.startIndex, offsetBy: 8)])        // only use the first 8 chars, should be enough
+        }
+        return _state
+    }


p2 · 2017-09-22T15:39:32Z

Sources/macOS/OAuth2WebViewController.swift

@@ -216,7 +216,7 @@ public class OAuth2WebViewController: NSViewController, WKNavigationDelegate, NS
 	/**
 	Tells the web view to stop loading the current page, then calls the `onWillCancel` block if it has a value.
 	*/
-	func cancel(_ sender: AnyObject?) {
+    @objc func cancel(_ sender: AnyObject?) {


Still spaces.

p2 · 2017-09-22T15:39:41Z

Sources/macOS/OAuth2WebViewController.swift

@@ -280,8 +280,8 @@ public class OAuth2WebViewController: NSViewController, WKNavigationDelegate, NS


 	// MARK: - Window Delegate
-
-	public func windowShouldClose(_ sender: Any) -> Bool {
+


Still spaces.

p2

Please change to tabs in Xcode, visit all the places that show up on Github, and ensure there are no spaces in indents any more.

p2 · 2017-09-22T21:43:08Z

Sources/Base/OAuth2Base.swift

@@ -468,12 +468,13 @@ open class OAuth2ContextStore {

 	We internally generate a UUID and use the first 8 chars if `_state` is empty.
 	*/
-	open var state: String {
+    open var state: String {


p2 · 2017-09-22T21:43:15Z

Sources/Base/OAuth2Base.swift

 		if _state.isEmpty {
-			_state = UUID().uuidString
-			_state = _state[_state.startIndex..<_state.index(_state.startIndex, offsetBy: 8)]		// only use the first 8 chars, should be enough
+            _state = UUID().uuidString


p2 · 2017-09-22T21:43:25Z

Sources/Base/OAuth2Base.swift

 		}
 		return _state
+


Extra newline.

p2 · 2017-09-23T01:39:48Z

Sources/macOS/OAuth2WebViewController.swift

@@ -280,8 +280,8 @@ public class OAuth2WebViewController: NSViewController, WKNavigationDelegate, NS


 	// MARK: - Window Delegate
-
-	public func windowShouldClose(_ sender: Any) -> Bool {
+


Still spaces.

p2 · 2017-09-23T01:40:20Z

(Those spaces are on the newline before public func)

paulw11 · 2017-09-23T03:56:57Z

https://stackoverflow.blog/2017/06/15/developers-use-spaces-make-money-use-tabs/ :P

p2

LOL, yeah, I saw that. Guess I'll never get rich!

In your last commit you removed the spaces but forgot to add a tab for indent. And you forgot to add yourself to CONTRIBUTORS.md! When that's gone we'll finally be able to merge. 👍🏼

p2 · 2017-09-24T04:47:27Z

Sources/macOS/OAuth2WebViewController.swift

@@ -280,8 +280,8 @@ public class OAuth2WebViewController: NSViewController, WKNavigationDelegate, NS


 	// MARK: - Window Delegate
-


Now the indent is gone. 😁

p2

Please check Sources/macOS/OAuth2WebViewController.swift:

Line 283: should have one tab, currently line is empty
Line 284: should have one tab before public func, currently has 4 spaces

ksteigerwald · 2017-09-29T22:09:19Z

When will the podspec be updated?

Update to Swift 4.0

46632b1

paulw11 added 4 commits September 21, 2017 15:38

Updated to 4.0

052a041

Delete spaces

4503a32

Remove spaces

fc37d80

Use xcode9

8b26cea

p2 requested changes Sep 21, 2017

View reviewed changes

paulw11 added 2 commits September 21, 2017 21:29

Restore p2 repo

d755f45

Swift 4.0

227b1eb

p2 requested changes Sep 22, 2017

View reviewed changes

remove more spaces

4b2e3dd

p2 requested changes Sep 22, 2017

View reviewed changes

Spaces

2c65a43

p2 requested changes Sep 23, 2017

View reviewed changes

--spaces

82fca1e

p2 requested changes Sep 24, 2017

View reviewed changes

paulw11 added 3 commits September 24, 2017 21:46

Indent

686afa1

Add @paulw11

87b098a

Indent

45ae561

p2 requested changes Sep 24, 2017

View reviewed changes

Spaces

3d62de0

p2 merged commit e630ac7 into p2:master Sep 25, 2017

p2 mentioned this pull request Nov 9, 2017

Swift4 #205

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update for Swift 4.0 #228

Update for Swift 4.0 #228

paulw11 commented Sep 21, 2017

p2 commented Sep 21, 2017

p2 left a comment

p2 Sep 21, 2017

p2 Sep 21, 2017

p2 Sep 21, 2017

p2 Sep 21, 2017

p2 Sep 21, 2017

p2 Sep 22, 2017

p2 Sep 21, 2017

p2 Sep 22, 2017

p2 Sep 23, 2017

paulw11 commented Sep 21, 2017 •

edited

Loading

p2 commented Sep 22, 2017

paulw11 commented Sep 22, 2017 via email

p2 left a comment

p2 Sep 22, 2017

p2 Sep 22, 2017

p2 Sep 22, 2017

p2 left a comment

p2 Sep 22, 2017

p2 Sep 22, 2017

p2 Sep 22, 2017

p2 Sep 23, 2017

p2 commented Sep 23, 2017 •

edited

Loading

paulw11 commented Sep 23, 2017

p2 left a comment

p2 Sep 24, 2017

p2 left a comment

ksteigerwald commented Sep 29, 2017

		@@ -280,8 +280,8 @@ public class OAuth2WebViewController: NSViewController, WKNavigationDelegate, NS


		// MARK: - Window Delegate

		public func windowShouldClose(_ sender: Any) -> Bool {

Update for Swift 4.0 #228

Update for Swift 4.0 #228

Conversation

paulw11 commented Sep 21, 2017

p2 commented Sep 21, 2017

p2 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

paulw11 commented Sep 21, 2017 • edited Loading

p2 commented Sep 22, 2017

paulw11 commented Sep 22, 2017 via email

p2 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

p2 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

p2 commented Sep 23, 2017 • edited Loading

paulw11 commented Sep 23, 2017

p2 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

p2 left a comment

Choose a reason for hiding this comment

ksteigerwald commented Sep 29, 2017

paulw11 commented Sep 21, 2017 •

edited

Loading

p2 commented Sep 23, 2017 •

edited

Loading