Update SourceKitten and Yams
This commit is contained in:
parent
e677737fe6
commit
81e8501dd5
2
Cartfile
2
Cartfile
|
@ -1,2 +1,2 @@
|
||||||
github "jpsim/SourceKitten" ~> 0.29.0
|
github "jpsim/SourceKitten" ~> 0.30.0
|
||||||
github "scottrhoyt/SwiftyTextTable" ~> 0.9.0
|
github "scottrhoyt/SwiftyTextTable" ~> 0.9.0
|
||||||
|
|
|
@ -1,3 +1,3 @@
|
||||||
github "Carthage/Commandant" ~> 0.17.0
|
github "Carthage/Commandant" ~> 0.17.0
|
||||||
github "jpsim/Yams" ~> 2.0.0
|
github "jpsim/Yams" ~> 4.0.0
|
||||||
github "jspahrsummers/xcconfigs" ~> 0.12.0
|
github "jspahrsummers/xcconfigs" ~> 0.12.0
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
github "Carthage/Commandant" "0.17.0"
|
github "Carthage/Commandant" "0.17.0"
|
||||||
github "drmohundro/SWXMLHash" "5.0.1"
|
github "drmohundro/SWXMLHash" "5.0.1"
|
||||||
github "jpsim/SourceKitten" "0.29.0"
|
github "jpsim/SourceKitten" "0.30.0"
|
||||||
github "jpsim/Yams" "2.0.0"
|
github "jpsim/Yams" "4.0.0"
|
||||||
github "jspahrsummers/xcconfigs" "0.12"
|
github "jspahrsummers/xcconfigs" "0.12"
|
||||||
github "scottrhoyt/SwiftyTextTable" "0.9.0"
|
github "scottrhoyt/SwiftyTextTable" "0.9.0"
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
Subproject commit 77a4dbbb477a8110eb8765e3c44c70fb4929098f
|
Subproject commit b7a7df0d25981998bb9f4770ff8faf7a28a6e649
|
|
@ -1 +1 @@
|
||||||
Subproject commit c947a306d2e80ecb2c0859047b35c73b8e1ca27f
|
Subproject commit 88caa2e6fffdbef2e91c2022d038576062042907
|
|
@ -10,31 +10,13 @@
|
||||||
"version": "0.17.0"
|
"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",
|
"package": "Nimble",
|
||||||
"repositoryURL": "https://github.com/Quick/Nimble.git",
|
"repositoryURL": "https://github.com/Quick/Nimble.git",
|
||||||
"state": {
|
"state": {
|
||||||
"branch": null,
|
"branch": null,
|
||||||
"revision": "b02b00b30b6353632aa4a5fb6124f8147f7140c0",
|
"revision": "2b1809051b4a65c1d7f5233331daa24572cd7fca",
|
||||||
"version": "8.0.5"
|
"version": "8.1.1"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -42,8 +24,8 @@
|
||||||
"repositoryURL": "https://github.com/Quick/Quick.git",
|
"repositoryURL": "https://github.com/Quick/Quick.git",
|
||||||
"state": {
|
"state": {
|
||||||
"branch": null,
|
"branch": null,
|
||||||
"revision": "33682c2f6230c60614861dfc61df267e11a1602f",
|
"revision": "09b3becb37cb2163919a3842a4c5fa6ec7130792",
|
||||||
"version": "2.2.0"
|
"version": "2.2.1"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -51,8 +33,8 @@
|
||||||
"repositoryURL": "https://github.com/jpsim/SourceKitten.git",
|
"repositoryURL": "https://github.com/jpsim/SourceKitten.git",
|
||||||
"state": {
|
"state": {
|
||||||
"branch": null,
|
"branch": null,
|
||||||
"revision": "77a4dbbb477a8110eb8765e3c44c70fb4929098f",
|
"revision": "b7a7df0d25981998bb9f4770ff8faf7a28a6e649",
|
||||||
"version": "0.29.0"
|
"version": "0.30.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -78,8 +60,8 @@
|
||||||
"repositoryURL": "https://github.com/jpsim/Yams.git",
|
"repositoryURL": "https://github.com/jpsim/Yams.git",
|
||||||
"state": {
|
"state": {
|
||||||
"branch": null,
|
"branch": null,
|
||||||
"revision": "c947a306d2e80ecb2c0859047b35c73b8e1ca27f",
|
"revision": "88caa2e6fffdbef2e91c2022d038576062042907",
|
||||||
"version": "2.0.0"
|
"version": "4.0.0"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
|
|
@ -15,8 +15,8 @@ let package = Package(
|
||||||
],
|
],
|
||||||
dependencies: [
|
dependencies: [
|
||||||
.package(url: "https://github.com/Carthage/Commandant.git", .upToNextMinor(from: "0.17.0")),
|
.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/SourceKitten.git", .upToNextMinor(from: "0.30.0")),
|
||||||
.package(url: "https://github.com/jpsim/Yams.git", from: "2.0.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"),
|
.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"))] : []),
|
] + (addCryptoSwift ? [.package(url: "https://github.com/krzyzanowskim/CryptoSwift.git", .upToNextMinor(from: "1.0.0"))] : []),
|
||||||
targets: [
|
targets: [
|
||||||
|
|
|
@ -8,8 +8,8 @@ Pod::Spec.new do |s|
|
||||||
s.author = { 'JP Simard' => 'jp@jpsim.com' }
|
s.author = { 'JP Simard' => 'jp@jpsim.com' }
|
||||||
s.platform = :osx, '10.10'
|
s.platform = :osx, '10.10'
|
||||||
s.source_files = 'Source/SwiftLintFramework/**/*.swift'
|
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.pod_target_xcconfig = { 'APPLICATION_EXTENSION_API_ONLY' => 'YES' }
|
||||||
s.dependency 'SourceKittenFramework', '~> 0.29.0'
|
s.dependency 'SourceKittenFramework', '~> 0.30.0'
|
||||||
s.dependency 'Yams', '~> 2.0'
|
s.dependency 'Yams', '~> 4.0'
|
||||||
end
|
end
|
||||||
|
|
|
@ -33,6 +33,10 @@ jobs:
|
||||||
DEVELOPER_DIR: /Applications/Xcode_11.3.1.app
|
DEVELOPER_DIR: /Applications/Xcode_11.3.1.app
|
||||||
xcode114:
|
xcode114:
|
||||||
DEVELOPER_DIR: /Applications/Xcode_11.4.app
|
DEVELOPER_DIR: /Applications/Xcode_11.4.app
|
||||||
|
xcode115:
|
||||||
|
DEVELOPER_DIR: /Applications/Xcode_11.5.app
|
||||||
|
xcode116:
|
||||||
|
DEVELOPER_DIR: /Applications/Xcode_11.6.app
|
||||||
xcode12:
|
xcode12:
|
||||||
DEVELOPER_DIR: /Applications/Xcode_12_beta.app
|
DEVELOPER_DIR: /Applications/Xcode_12_beta.app
|
||||||
steps:
|
steps:
|
||||||
|
@ -71,6 +75,10 @@ jobs:
|
||||||
DEVELOPER_DIR: /Applications/Xcode_11.3.1.app
|
DEVELOPER_DIR: /Applications/Xcode_11.3.1.app
|
||||||
xcode114:
|
xcode114:
|
||||||
DEVELOPER_DIR: /Applications/Xcode_11.4.app
|
DEVELOPER_DIR: /Applications/Xcode_11.4.app
|
||||||
|
xcode115:
|
||||||
|
DEVELOPER_DIR: /Applications/Xcode_11.5.app
|
||||||
|
xcode116:
|
||||||
|
DEVELOPER_DIR: /Applications/Xcode_11.6.app
|
||||||
xcode12:
|
xcode12:
|
||||||
DEVELOPER_DIR: /Applications/Xcode_12_beta.app
|
DEVELOPER_DIR: /Applications/Xcode_12_beta.app
|
||||||
steps:
|
steps:
|
||||||
|
@ -87,7 +95,7 @@ jobs:
|
||||||
pool:
|
pool:
|
||||||
vmImage: 'macOS-10.15'
|
vmImage: 'macOS-10.15'
|
||||||
variables:
|
variables:
|
||||||
DEVELOPER_DIR: /Applications/Xcode_11.4.app
|
DEVELOPER_DIR: /Applications/Xcode_11.6.app
|
||||||
steps:
|
steps:
|
||||||
- script: bundle install --path vendor/bundle
|
- script: bundle install --path vendor/bundle
|
||||||
displayName: bundle install
|
displayName: bundle install
|
||||||
|
@ -100,7 +108,7 @@ jobs:
|
||||||
pool:
|
pool:
|
||||||
vmImage: 'macOS-10.15'
|
vmImage: 'macOS-10.15'
|
||||||
variables:
|
variables:
|
||||||
DEVELOPER_DIR: /Applications/Xcode_11.4.app
|
DEVELOPER_DIR: /Applications/Xcode_11.6.app
|
||||||
steps:
|
steps:
|
||||||
- script: make analyze
|
- script: make analyze
|
||||||
displayName: Run SwiftLint Analyze
|
displayName: Run SwiftLint Analyze
|
||||||
|
@ -109,7 +117,7 @@ jobs:
|
||||||
pool:
|
pool:
|
||||||
vmImage: 'macOS-10.15'
|
vmImage: 'macOS-10.15'
|
||||||
variables:
|
variables:
|
||||||
DEVELOPER_DIR: /Applications/Xcode_11.4.app
|
DEVELOPER_DIR: /Applications/Xcode_11.6.app
|
||||||
steps:
|
steps:
|
||||||
- script: swift run --sanitize=thread swiftlint lint --lenient
|
- script: swift run --sanitize=thread swiftlint lint --lenient
|
||||||
displayName: Pre-cache SwiftLint Run
|
displayName: Pre-cache SwiftLint Run
|
||||||
|
@ -122,7 +130,7 @@ jobs:
|
||||||
pool:
|
pool:
|
||||||
vmImage: 'macOS-10.15'
|
vmImage: 'macOS-10.15'
|
||||||
variables:
|
variables:
|
||||||
DEVELOPER_DIR: /Applications/Xcode_11.4.app
|
DEVELOPER_DIR: /Applications/Xcode_11.6.app
|
||||||
steps:
|
steps:
|
||||||
- script: swift run swiftlint generate-docs
|
- script: swift run swiftlint generate-docs
|
||||||
displayName: Run swiftlint generate-docs
|
displayName: Run swiftlint generate-docs
|
||||||
|
|
Loading…
Reference in New Issue