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

Migrate to Swift 3.0 #832

Merged
merged 59 commits into from
Dec 2, 2016
Merged

Migrate to Swift 3.0 #832

merged 59 commits into from
Dec 2, 2016

Conversation

norio-nomura
Copy link
Collaborator

No description provided.

@norio-nomura
Copy link
Collaborator Author

Failing tests are affected by jpsim/SourceKitten#269.

* master:
  changelog formatting
  Remove whitespace
  Extract literal stripping into function, add image literal stripping
  Adds newlines for consistent markdown markup
  Fix indentation
  Adds enhancement entry to changelog.md
  Adds triggering and non-triggering example, color literals are treated as any other characters
  Switches to using substring replacement of temporary string in order to detect multiple color literals in one line
  Improves line length and whitespace to satisfy linting of source file
  Color literals counts as single character towards line count

# Conflicts:
#	Source/SwiftLintFramework/Rules/LineLengthRule.swift
* master:
  Using character based init
  PR feedback
  Handling pattern matching cases (if case, for case, etc)
  Addressing PR feedback
  Add SwitchCaseOnNewline rule
  Adding CHANGELOG entry
  Validates if "return" in ConditionalReturnsOnNewline is a keyword
  Stop `make` if working tree does not have git repository

# Conflicts:
#	Source/SwiftLintFramework/Rules/ConditionalReturnsOnNewline.swift
* master: (41 commits)
  Fix formatting in CHANGELOG.md
  release 0.13.0
  Update CHANGELOG.md
  Fix check for trailing whitespace to return early
  Fix checks for some inline comments
  Replace check for comments to use SyntaxKind
  Add configuration for trailing_whitespace to ignore comments
  Unwanted space removed
  - Lint issues fixed
  Updated HTML Reporter
  PR feedback
  Add check on autocorrect for disabled range
  Use `utf8.count` instead of `utf16.count` to byte range
  Re-write `ExplicitInitRule` to `ASTRule`
  added ExplicitInitRule
  Updated CHANGELOG
  HTML Reporter added
  HTML Reporter added
  Adds information about SwiftLint plugin for AppCode into README.md
  added reasons why a new rule should be opt in
  ...

# Conflicts:
#	Source/SwiftLintFramework/Extensions/File+SwiftLint.swift
#	Source/SwiftLintFramework/Extensions/Structure+SwiftLint.swift
#	Source/SwiftLintFramework/Rules/ColonRule.swift
#	Source/SwiftLintFramework/Rules/CommaRule.swift
#	Source/SwiftLintFramework/Rules/LegacyCGGeometryFunctionsRule.swift
#	Source/SwiftLintFramework/Rules/LegacyConstantRule.swift
#	Source/SwiftLintFramework/Rules/LegacyConstructorRule.swift
#	Source/SwiftLintFramework/Rules/LegacyNSGeometryFunctionsRule.swift
#	Source/SwiftLintFramework/Rules/LineLengthRule.swift
#	Source/SwiftLintFramework/Rules/OperatorFunctionWhitespaceRule.swift
#	Source/SwiftLintFramework/Rules/ReturnArrowWhitespaceRule.swift
#	Source/SwiftLintFramework/Rules/RuleConfigurations/StatementPositionConfiguration.swift
#	Source/SwiftLintFramework/Rules/StatementPositionRule.swift
#	Source/SwiftLintFramework/Rules/TrailingWhitespaceRule.swift
#	Tests/SwiftLintFramework/RuleConfigurationTests.swift
@norio-nomura
Copy link
Collaborator Author

Updated to 0.13.0

@norio-nomura norio-nomura mentioned this pull request Nov 4, 2016
@jpsim jpsim mentioned this pull request Nov 8, 2016
* master:
  fix typo: coalesing -> coalescing

# Conflicts:
#	Source/SwiftLintFramework/Rules/RedundantNilCoalescingRule.swift
Fix crash in `hasTrailingWhitespace()` when trailing character is Emoji.
@jpsim
Copy link
Collaborator

jpsim commented Nov 25, 2016

@norio-nomura how can I help you with this?

@jpsim
Copy link
Collaborator

jpsim commented Dec 1, 2016

tests related docs are still failing because of jpsim/SourceKitten#269.

That's true, but we have that limitation when using the current master version of SwiftLint with a Swift 3 codebase right now too, it's just that we don't test that configuration.

So I'd opt for disabling those tests.


Is there anything else that needs to go in this before we can merge? Every day we don't merge this just adds extra work to keep it updated with changes to master.

@norio-nomura
Copy link
Collaborator Author

Is there anything else that needs to go in this before we can merge?

I'm trying to replace YamlSwift with Yams. But, that is not needed to be into this.
Let's merge. 👍

@jpsim
Copy link
Collaborator

jpsim commented Dec 2, 2016

Let's disable the failing docs tests before merging, you mentioned a failure with getting the version from the bundle in SPM too. Does that still happen? Hard to tell with Travis being so ridiculously backed up. It might as well be down

@norio-nomura
Copy link
Collaborator Author

Updated.

@jpsim
Copy link
Collaborator

jpsim commented Dec 2, 2016

Should we take care of Swift 3 API Guidelines in a later PR? I'm inclined to say yes.

@norio-nomura
Copy link
Collaborator Author

Yeah, as inspecting search results , those will affect to only us on github. 😉

change Array.arrayOf(_:) to Array.array(of:)
@norio-nomura
Copy link
Collaborator Author

Maybe following would have higher priority than Swift 3 API Guidelines.

Every day we don't merge this just adds extra work to keep it updated with changes to master.

Copy link
Collaborator

@jpsim jpsim left a comment

Choose a reason for hiding this comment

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

I added a changelog entry. I think this can be merged now.

@@ -2,7 +2,10 @@

##### Breaking

* None.
* SourceKitten now requires Xcode 8.x and Swift 3.0 to build.
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

SourceKitten
SwiftLint

@jpsim
Copy link
Collaborator

jpsim commented Dec 2, 2016

Anything else @norio-nomura?

@norio-nomura
Copy link
Collaborator Author

@jpsim None!

@norio-nomura
Copy link
Collaborator Author

Oh, wait a minute.

@norio-nomura
Copy link
Collaborator Author

Done! 😃👍

@codecov-io
Copy link

Current coverage is 83.86% (diff: 80.53%)

No coverage report found for master at bb515d3.

Powered by Codecov. Last update bb515d3...a0fb308

@norio-nomura
Copy link
Collaborator Author

norio-nomura commented Dec 2, 2016

I have canceled some outdated jobs on travis that triggered by my commits.

@jpsim
Copy link
Collaborator

jpsim commented Dec 2, 2016

:shipit:

@jpsim jpsim merged commit 64f67cc into master Dec 2, 2016
@norio-nomura norio-nomura deleted the swift3.0 branch December 2, 2016 07:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants