Skip to content

Updated repo to compile with Swift 4 #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wcarhart wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Updated repo to compile with Swift 4 #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7688e02
Fixed for Swift 4
wcarhart May 12, 2018
b90cc0b
Added entry in CHANGELOG.md
wcarhart May 12, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@
All notable changes to this project will be documented in this file.
`LyftSDK` adheres to [Semantic Versioning](http://semver.org/).

## [1.0.7](https://github.com/lyft/Lyft-iOS-sdk/releases/tag/1.0.6)

- Updated for Swift 4

## [1.0.6](https://github.com/lyft/Lyft-iOS-sdk/releases/tag/1.0.6)

- Fix deeplinking with parameters
Expand Down
3 changes: 2 additions & 1 deletion Sources/LyftAPI/LyftAPIURLEncoding.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@ func lyftURLEncodedInURL(request: URLRequest, parameters: [String: Any]?) -> (UR
.flatMap { components(forKey: $0, value: $1) }

var urlComponents = URLComponents(url: mutableURLRequest.url!, resolvingAgainstBaseURL: false)
urlComponents?.queryItems = (urlComponents?.queryItems ?? []) + queryItems
var localVariable = urlComponents
urlComponents?.queryItems = (localVariable?.queryItems ?? []) + queryItems
mutableURLRequest.url = urlComponents?.url
return (mutableURLRequest, nil)
}
2 changes: 1 addition & 1 deletion Sources/LyftUI/LyftButton.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public class LyftButton: UIView {
@IBOutlet private var price: UILabel?

private var buttonStateView: UIView?
private var pressUpAction: ((Void) -> Void)?
private var pressUpAction: (() -> Void)?

private var status: LyftButtonStatus = .noData {
didSet { self.setupNib() }
Expand Down