Skip to content
This repository has been archived by the owner on Oct 6, 2022. It is now read-only.

Upgrade to Xcode 12 #322

Merged
merged 7 commits into from
Nov 19, 2020
Merged

Upgrade to Xcode 12 #322

merged 7 commits into from
Nov 19, 2020

Conversation

clausjoergensen
Copy link
Contributor

@clausjoergensen clausjoergensen commented Nov 18, 2020 •
edited
Loading

  • Removed Carthage as it's not compatible with Xcode 12
  • Updated to the latest Quick&Nimble for Xcode 12 support.
  • Ran the linter (for what appears to be the first time in a while)
  • Fixed swiftlint errors.
  • Fixed various compilation errors in the tests.
  • Disabled Jazzy's check for undocumented methods, as this clearly hadn't been checked for a very long time.
  • Updated CI scripts to reflect the above changes.

@clausjoergensen clausjoergensen mentioned this pull request Nov 18, 2020
Merged
@clausjoergensen
Copy link
Contributor Author

clausjoergensen commented Nov 18, 2020 •
edited
Loading

These tests seems to be unstable

Failing tests:
	SchibstedAccountTests:
 		IdentityManagerTests.Login_with_password__Should_pass_in_a_credential()
 		TaskManagerTests.Adding_a_task__should_not_refresh_if_already_in_progress()
 		TaskManagerTests.Adding_a_task__should_not_refresh_if_already_in_progress()

zamzterz
zamzterz approved these changes Nov 19, 2020
View reviewed changes
Copy link
Contributor

@zamzterz zamzterz left a comment

Choose a reason for hiding this comment

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

Much appreciated for a long overdue cleanup! 🙇

Those flaky tests pass on my local machine, so I'd opt for keeping them for now (it's not that hard verifying it's those same requests failing in future Travis builds).

Tests/URLSessionTests.swift
@@ -261,10 +261,6 @@ class URLSessionTests: QuickSpec {
SDKConfiguration.shared.refreshRetryCount = 2
doDataTask(session, url: URL(string: wantedUrl)!) { _, _, error in
expect(error).to(matchError(ClientError.userRefreshFailed(kDummyError)))
guard let clientError = error as? ClientError, case let ClientError.userRefreshFailed(error) = clientError else {
Copy link
Contributor

Choose a reason for hiding this comment

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

Why was this removed?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Caused the test to always fail, and it didn't seem to actually contribute anything to the test itself. But maybe we should revert it and just let it fail on Travis for a bit

Copy link
Contributor

Choose a reason for hiding this comment

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

It doesn't pass on local either, so let's keep it removed 🙂

@zamzterz zamzterz merged commit 20cb25d into schibsted:master Nov 19, 2020
zamzterz pushed a commit that referenced this pull request Feb 8, 2021
Backport of upgrade to support Xcode 12.
f4e15e7 
Ref #322
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@zamzterz zamzterz zamzterz approved these changes

@sa-mao sa-mao Awaiting requested review from sa-mao

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@clausjoergensen @zamzterz