dnrops
/
SwiftLint
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update SourceKitten and Yams

This commit is contained in:
JP Simard 2020-08-24 22:22:41 -04:00
parent e677737fe6
commit 81e8501dd5
No known key found for this signature in database
GPG Key ID: 184C3F2916202C58
9 changed files with 31 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cartfile
View File

@ -1,2 +1,2 @@
github "jpsim/SourceKitten" ~> 0.29.0
github "jpsim/SourceKitten" ~> 0.30.0
github "scottrhoyt/SwiftyTextTable" ~> 0.9.0

2
Cartfile.private
View File

@ -1,3 +1,3 @@
github "Carthage/Commandant" ~> 0.17.0
github "jpsim/Yams" ~> 2.0.0
github "jpsim/Yams" ~> 4.0.0
github "jspahrsummers/xcconfigs" ~> 0.12.0

4
Cartfile.resolved
View File

@ -1,6 +1,6 @@
github "Carthage/Commandant" "0.17.0"
github "drmohundro/SWXMLHash" "5.0.1"
github "jpsim/SourceKitten" "0.29.0"
github "jpsim/Yams" "2.0.0"
github "jpsim/SourceKitten" "0.30.0"
github "jpsim/Yams" "4.0.0"
github "jspahrsummers/xcconfigs" "0.12"
github "scottrhoyt/SwiftyTextTable" "0.9.0"

2
Carthage/Checkouts/SourceKitten vendored

@ -1 +1 @@
Subproject commit 77a4dbbb477a8110eb8765e3c44c70fb4929098f
Subproject commit b7a7df0d25981998bb9f4770ff8faf7a28a6e649

2
Carthage/Checkouts/Yams vendored

@ -1 +1 @@
Subproject commit c947a306d2e80ecb2c0859047b35c73b8e1ca27f
Subproject commit 88caa2e6fffdbef2e91c2022d038576062042907

34
Package.resolved
View File

@ -10,31 +10,13 @@
"version": "0.17.0"
}
},
{
"package": "CwlCatchException",
"repositoryURL": "https://github.com/mattgallagher/CwlCatchException.git",
"state": {
"branch": null,
"revision": "7cd2f8cacc4d22f21bc0b2309c3b18acf7957b66",
"version": "1.2.0"
}
},
{
"package": "CwlPreconditionTesting",
"repositoryURL": "https://github.com/mattgallagher/CwlPreconditionTesting.git",
"state": {
"branch": null,
"revision": "c228db5d2ad1b01ebc84435e823e6cca4e3db98b",
"version": "1.2.0"
}
},
{
"package": "Nimble",
"repositoryURL": "https://github.com/Quick/Nimble.git",
"state": {
"branch": null,
"revision": "b02b00b30b6353632aa4a5fb6124f8147f7140c0",
"version": "8.0.5"
"revision": "2b1809051b4a65c1d7f5233331daa24572cd7fca",
"version": "8.1.1"
}
},
{
@ -42,8 +24,8 @@
"repositoryURL": "https://github.com/Quick/Quick.git",
"state": {
"branch": null,
"revision": "33682c2f6230c60614861dfc61df267e11a1602f",
"version": "2.2.0"
"revision": "09b3becb37cb2163919a3842a4c5fa6ec7130792",
"version": "2.2.1"
}
},
{
@ -51,8 +33,8 @@
"repositoryURL": "https://github.com/jpsim/SourceKitten.git",
"state": {
"branch": null,
"revision": "77a4dbbb477a8110eb8765e3c44c70fb4929098f",
"version": "0.29.0"
"revision": "b7a7df0d25981998bb9f4770ff8faf7a28a6e649",
"version": "0.30.0"
}
},
{
@ -78,8 +60,8 @@
"repositoryURL": "https://github.com/jpsim/Yams.git",
"state": {
"branch": null,
"revision": "c947a306d2e80ecb2c0859047b35c73b8e1ca27f",
"version": "2.0.0"
"revision": "88caa2e6fffdbef2e91c2022d038576062042907",
"version": "4.0.0"
}
}
]

4
Package.swift
View File

@ -15,8 +15,8 @@ let package = Package(
],
dependencies: [
.package(url: "https://github.com/Carthage/Commandant.git", .upToNextMinor(from: "0.17.0")),
.package(url: "https://github.com/jpsim/SourceKitten.git", .upToNextMinor(from: "0.29.0")),
.package(url: "https://github.com/jpsim/Yams.git", from: "2.0.0"),
.package(url: "https://github.com/jpsim/SourceKitten.git", .upToNextMinor(from: "0.30.0")),
.package(url: "https://github.com/jpsim/Yams.git", from: "4.0.0"),
.package(url: "https://github.com/scottrhoyt/SwiftyTextTable.git", from: "0.9.0"),
] + (addCryptoSwift ? [.package(url: "https://github.com/krzyzanowskim/CryptoSwift.git", .upToNextMinor(from: "1.0.0"))] : []),
targets: [

6
SwiftLintFramework.podspec
View File

@ -8,8 +8,8 @@ Pod::Spec.new do |s|
s.author = { 'JP Simard' => 'jp@jpsim.com' }
s.platform = :osx, '10.10'
s.source_files = 'Source/SwiftLintFramework/**/*.swift'
s.swift_versions = ['5.0', '5.1']
s.swift_versions = ['5.1', '5.2']
s.pod_target_xcconfig = { 'APPLICATION_EXTENSION_API_ONLY' => 'YES' }
s.dependency 'SourceKittenFramework', '~> 0.29.0'
s.dependency 'Yams', '~> 2.0'
s.dependency 'SourceKittenFramework', '~> 0.30.0'
s.dependency 'Yams', '~> 4.0'
end

16
azure-pipelines.yml
View File

@ -33,6 +33,10 @@ jobs:
DEVELOPER_DIR: /Applications/Xcode_11.3.1.app
xcode114:
DEVELOPER_DIR: /Applications/Xcode_11.4.app
xcode115:
DEVELOPER_DIR: /Applications/Xcode_11.5.app
xcode116:
DEVELOPER_DIR: /Applications/Xcode_11.6.app
xcode12:
DEVELOPER_DIR: /Applications/Xcode_12_beta.app
steps:
@ -71,6 +75,10 @@ jobs:
DEVELOPER_DIR: /Applications/Xcode_11.3.1.app
xcode114:
DEVELOPER_DIR: /Applications/Xcode_11.4.app
xcode115:
DEVELOPER_DIR: /Applications/Xcode_11.5.app
xcode116:
DEVELOPER_DIR: /Applications/Xcode_11.6.app
xcode12:
DEVELOPER_DIR: /Applications/Xcode_12_beta.app
steps:
@ -87,7 +95,7 @@ jobs:
pool:
vmImage: 'macOS-10.15'
variables:
DEVELOPER_DIR: /Applications/Xcode_11.4.app
DEVELOPER_DIR: /Applications/Xcode_11.6.app
steps:
- script: bundle install --path vendor/bundle
displayName: bundle install
@ -100,7 +108,7 @@ jobs:
pool:
vmImage: 'macOS-10.15'
variables:
DEVELOPER_DIR: /Applications/Xcode_11.4.app
DEVELOPER_DIR: /Applications/Xcode_11.6.app
steps:
- script: make analyze
displayName: Run SwiftLint Analyze
@ -109,7 +117,7 @@ jobs:
pool:
vmImage: 'macOS-10.15'
variables:
DEVELOPER_DIR: /Applications/Xcode_11.4.app
DEVELOPER_DIR: /Applications/Xcode_11.6.app
steps:
- script: swift run --sanitize=thread swiftlint lint --lenient
displayName: Pre-cache SwiftLint Run
@ -122,7 +130,7 @@ jobs:
pool:
vmImage: 'macOS-10.15'
variables:
DEVELOPER_DIR: /Applications/Xcode_11.4.app
DEVELOPER_DIR: /Applications/Xcode_11.6.app
steps:
- script: swift run swiftlint generate-docs
displayName: Run swiftlint generate-docs