Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
kateinoigakukun committed Oct 23, 2018
2 parents 8abbea5 + 6ed0ab1 commit b9efb5b
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.4.7
0.4.8
5 changes: 4 additions & 1 deletion Sources/iblinter/Extensions/Config+LintablePaths.swift
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,10 @@ extension Config {
let excluded = self.excluded.flatMap { glob(pattern: workDirectory.appendingPathComponent("\($0)/**/*.\(fileExtension)").path) }.map { $0.absoluteString }
let included = self.included.flatMap { glob(pattern: workDirectory.appendingPathComponent("\($0)/**/*.\(fileExtension)").path) }.map { $0.absoluteString }
let lintablePaths = paths.filter {
excluded.contains($0.absoluteString) == included.contains($0.absoluteString)
if excluded.contains($0.absoluteString) {
return included.contains($0.absoluteString)
}
return true
}
return lintablePaths
}
Expand Down
2 changes: 1 addition & 1 deletion Sources/iblinter/Version.swift
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
public struct Version {
public let value: String

public static let current = Version(value: "0.4.7")
public static let current = Version(value: "0.4.8")
}

0 comments on commit b9efb5b

Please sign in to comment.