diff --git a/.swift-version b/.swift-version index fae6e3d04b..819e07a224 100644 --- a/.swift-version +++ b/.swift-version @@ -1 +1 @@ -4.2.1 +5.0 diff --git a/Cartfile b/Cartfile index 13e4712928..c123504d05 100644 --- a/Cartfile +++ b/Cartfile @@ -1,2 +1,2 @@ -github "jpsim/SourceKitten" ~> 0.23.0 +github "jpsim/SourceKitten" ~> 0.23.1 github "scottrhoyt/SwiftyTextTable" ~> 0.9.0 diff --git a/Cartfile.resolved b/Cartfile.resolved index b8dec7ad5b..c84b4efa81 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1,7 +1,7 @@ github "Carthage/Commandant" "0.16.0" github "antitypical/Result" "4.1.0" github "drmohundro/SWXMLHash" "4.8.0" -github "jpsim/SourceKitten" "0.23.0" +github "jpsim/SourceKitten" "0.23.1" github "jpsim/Yams" "2.0.0" github "jspahrsummers/xcconfigs" "0.12" github "scottrhoyt/SwiftyTextTable" "0.9.0" diff --git a/Carthage/Checkouts/SourceKitten b/Carthage/Checkouts/SourceKitten index 421a1ec611..4870ca3e99 160000 --- a/Carthage/Checkouts/SourceKitten +++ b/Carthage/Checkouts/SourceKitten @@ -1 +1 @@ -Subproject commit 421a1ec6112b83265b63a163107c9b638dc56e86 +Subproject commit 4870ca3e99887a7cd05dd3ba0ac9c5831922e1f3 diff --git a/Makefile b/Makefile index f3bad17d8c..345ed983ea 100644 --- a/Makefile +++ b/Makefile @@ -133,8 +133,8 @@ display_compilation_time: publish: brew update && brew bump-formula-pr --tag=$(shell git describe --tags) --revision=$(shell git rev-parse HEAD) swiftlint - pod trunk push SwiftLintFramework.podspec --swift-version=4.2 - pod trunk push SwiftLint.podspec --swift-version=4.2 + pod trunk push SwiftLintFramework.podspec + pod trunk push SwiftLint.podspec get_version: @echo $(VERSION_STRING) diff --git a/Package.swift b/Package.swift index 84b5ab87ae..08f81bd22f 100644 --- a/Package.swift +++ b/Package.swift @@ -15,7 +15,7 @@ let package = Package( ], dependencies: [ .package(url: "https://github.com/Carthage/Commandant.git", .upToNextMinor(from: "0.16.0")), - .package(url: "https://github.com/jpsim/SourceKitten.git", from: "0.23.0"), + .package(url: "https://github.com/jpsim/SourceKitten.git", from: "0.23.1"), .package(url: "https://github.com/jpsim/Yams.git", from: "2.0.0"), .package(url: "https://github.com/scottrhoyt/SwiftyTextTable.git", from: "0.9.0"), ] + (addCryptoSwift ? [.package(url: "https://github.com/krzyzanowskim/CryptoSwift.git", from: "1.0.0")] : []), diff --git a/README.md b/README.md index 9efa7b1009..1e246cd54f 100644 --- a/README.md +++ b/README.md @@ -213,7 +213,7 @@ Here's a reference of which SwiftLint version to use for a given Swift version. | Swift 2.x | SwiftLint 0.18.1 | | Swift 3.x | SwiftLint 0.25.1 | | Swift 4.0-4.1.x | SwiftLint 0.28.2 | -| Swift 4.2+ | Latest | +| Swift 4.2.x-5.0 | Latest | ## Rules diff --git a/README_CN.md b/README_CN.md index e851123703..1e8e8528be 100644 --- a/README_CN.md +++ b/README_CN.md @@ -171,7 +171,7 @@ $ TOOLCHAINS=com.apple.dt.toolchain.Swift_2_3 swiftlint autocorrect | Swift 2.x | SwiftLint 0.18.1 | | Swift 3.x | SwiftLint 0.25.1 | | Swift 4.0-4.1.x | SwiftLint 0.28.2 | -| Swift 4.2+ | 最新的 | +| Swift 4.2.x-5.0 | 最新的 | ## 规则 diff --git a/SwiftLint.podspec b/SwiftLint.podspec index 9e7d9e94c6..3745b5b453 100644 --- a/SwiftLint.podspec +++ b/SwiftLint.podspec @@ -3,9 +3,9 @@ Pod::Spec.new do |s| s.version = `make get_version` s.summary = 'A tool to enforce Swift style and conventions.' s.homepage = 'https://github.com/realm/SwiftLint' - s.license = { :type => 'MIT', :file => 'LICENSE' } + s.license = { type: 'MIT', file: 'LICENSE' } s.author = { 'JP Simard' => 'jp@jpsim.com' } - s.source = { :http => "#{s.homepage}/releases/download/#{s.version}/portable_swiftlint.zip" } + s.source = { http: "#{s.homepage}/releases/download/#{s.version}/portable_swiftlint.zip" } s.preserve_paths = '*' s.exclude_files = '**/file.zip' end diff --git a/SwiftLintFramework.podspec b/SwiftLintFramework.podspec index eb603371a2..d00ba14516 100644 --- a/SwiftLintFramework.podspec +++ b/SwiftLintFramework.podspec @@ -3,11 +3,12 @@ Pod::Spec.new do |s| s.version = `make get_version` s.summary = 'A tool to enforce Swift style and conventions.' s.homepage = 'https://github.com/realm/SwiftLint' - s.source = { :git => s.homepage + '.git', :tag => s.version } - s.license = { :type => 'MIT', :file => 'LICENSE' } + s.source = { git: s.homepage + '.git', tag: s.version } + s.license = { type: 'MIT', file: 'LICENSE' } s.author = { 'JP Simard' => 'jp@jpsim.com' } s.platform = :osx, '10.10' s.source_files = 'Source/SwiftLintFramework/**/*.swift' + s.swift_version = '5.0' # TODO: Add Swift 4.2 when CocoaPods 1.7.0 is out. s.pod_target_xcconfig = { 'APPLICATION_EXTENSION_API_ONLY' => 'YES' } s.dependency 'SourceKittenFramework', '~> 0.23' s.dependency 'Yams', '~> 2.0'