Skip to content
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.

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

Added Swift 5 / Xcode 10.2 Support #272

Merged
merged 5 commits into from Apr 24, 2019
Merged

Added Swift 5 / Xcode 10.2 Support #272

merged 5 commits into from Apr 24, 2019

Conversation

cocojoe
Copy link
Member

@cocojoe cocojoe commented Apr 19, 2019

Changes

Update macOS to 10.11
Update Test dependencies Swift 5
Fix Warnings
Removed ObjC Testing
Update Readme
Update Fastlane
PodSpec Minimum versions align with Xcode

Testing

Added CI test for Swift 5.0

  • This change has been tested on the latest version of the platform/language or why not

Checklist

Update macOS to 10.11
Update Test dependencies Swift 5
Fix Warnings
Removed ObjC Testing
Update Readme
Update Fastlane
PodSpec Minimum versions align with Xcode
Force try to fix nil not <nil> in Swift 4.2

Signed-off-by: Martin Walsh <martin.walsh@gmail.com>
environment:
LC_ALL: en_US.UTF-8
LANG: en_US.UTF-8
HOMEBREW_LOGS: ~/homebrew-logs
HOMEBREW_TEMP: ~/homebrew-temp
HOMEBREW_NO_AUTO_UPDATE: 1
Copy link
Member Author

@cocojoe cocojoe Apr 19, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Need this as the CI image fo 10.2.0 is on MacOS 10.14.3. However, brew now required 10.14.4 to build packages such as swiftlint. This should be fixed on Circle CI side at some point in the near future when they upgrade base image to 10.14.4

@@ -54,7 +54,7 @@ Pod::Spec.new do |s|
s.social_media_url = 'https://twitter.com/auth0'

s.ios.deployment_target = '9.0'
s.osx.deployment_target = '10.10'
s.osx.deployment_target = '10.11'
Copy link
Member Author

@cocojoe cocojoe Apr 19, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

current macOS 10.14, 10.10 was release October 16, 2014
Related to #269, this is a potential BC, although should be minimal impact.

@@ -38,7 +38,7 @@ class ResponseSpec: QuickSpec {

it("should handle HTTP 204 responses") {
let response = Response<AuthenticationError>(data: nil, response: http(204), error: nil)
expect(try? response.result()).toNot(beNil())
expect(try! response.result()).to(beNil())
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This one is a bit stranger and same for below, following the code the result should be Nil although there appears to be a difference in expectation between Swift 4.2 and 5.0 so forced try to ensure Nil vs

Cartfile Outdated
@@ -1 +1 @@
github "auth0/SimpleKeychain"
github "auth0/SimpleKeychain" "update-swift5-xcode10.2"
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Temp branch as other code not merged yet.

github "Quick/Quick" ~> 1.3
github "Quick/Nimble" ~> 7.1
github "AliSoftware/OHHTTPStubs" ~> 6.1
github "Quick/Quick" ~> 2.1
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Need new majors for Swift 5 compatibility, although these now drop Swift 3 and ObjC support in testing.

@@ -5,6 +5,8 @@ coverage:
ignore:
- Auth0Tests/*
- App/*
- Auth0/_ObjectiveWebAuth.swift
Copy link
Member Author

@cocojoe cocojoe Apr 19, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removed the codecov as the tests can't be run for the ObjC code in Quick/Nimble now.

@cocojoe cocojoe marked this pull request as ready for review April 23, 2019 14:00
@cocojoe cocojoe requested a review from hzalaz April 23, 2019 16:56
hzalaz
hzalaz previously approved these changes Apr 23, 2019
@cocojoe cocojoe merged commit 82c571e into master Apr 24, 2019
@cocojoe cocojoe deleted the update-swift5-xcode10.2 branch April 24, 2019 09:12
@cocojoe cocojoe added this to the vNext milestone Apr 24, 2019
@cocojoe cocojoe changed the title Update Swift 5 / Xcode 10.2 Added Swift 5 / Xcode 10.2 Support Apr 24, 2019
@cocojoe cocojoe mentioned this pull request Apr 24, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants