Skip to content

Commit

Permalink
Merge pull request #3319 from realm/update-sourcekitten-and-yams
Browse files Browse the repository at this point in the history 
Update SourceKitten and Yams
  • Loading branch information
@jpsim
jpsim authored Aug 25, 2020
2 parents e677737 + 81e8501 commit ff0e9f4
Show file tree
Hide file tree
Showing 9 changed files with 31 additions and 41 deletions.
2 changes: 1 addition & 1 deletion Cartfile
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
github "jpsim/SourceKitten" ~> 0.29.0
github "jpsim/SourceKitten" ~> 0.30.0
github "scottrhoyt/SwiftyTextTable" ~> 0.9.0
2 changes: 1 addition & 1 deletion Cartfile.private
View file
Original file line number Diff line number Diff line change
@@ -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 changes: 2 additions & 2 deletions Cartfile.resolved
View file
Original file line number Diff line number Diff line change
@@ -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 changes: 1 addition & 1 deletion Carthage/Checkouts/SourceKitten
Submodule SourceKitten updated 42 files
+25 −0 CHANGELOG.md
+1 −1 Cartfile
+1 −1 Cartfile.resolved
+1 −1 Carthage/Checkouts/Yams
+7 −7 Makefile
+6 −24 Package.resolved
+1 −1 Package.swift
+1 −1 README.md
+11 −5 Source/SourceKittenFramework/Clang+SourceKitten.swift
+1 −1 Source/SourceKittenFramework/CodeCompletionItem.swift
+1 −1 Source/SourceKittenFramework/Info.plist
+12 −3 Source/SourceKittenFramework/Module.swift
+4 −0 Source/SourceKittenFramework/ObjCDeclarationKind.swift
+12 −7 Source/SourceKittenFramework/SourceDeclaration.swift
+3 −0 Source/SourceKittenFramework/SourceLocation.swift
+3 −0 Source/SourceKittenFramework/StringView.swift
+7 −0 Source/SourceKittenFramework/SwiftDeclarationAttributeKind.swift
+1 −1 Source/SourceKittenFramework/Version.swift
+6 −6 Source/SourceKittenFramework/Xcode.swift
+1 −1 Source/sourcekitten/Info.plist
+2 −2 SourceKittenFramework.podspec
+17 −14 Tests/SourceKittenFrameworkTests/Fixtures/Bicycle@swift-5.2.json
+0 −821 Tests/SourceKittenFrameworkTests/Fixtures/BicycleIndex@swift-5.0.json
+0 −1 Tests/SourceKittenFrameworkTests/Fixtures/BicycleSyntax@swift-5.0.json
+232 −159 Tests/SourceKittenFrameworkTests/Fixtures/Commandant@swift-5.2.json
+232 −159 Tests/SourceKittenFrameworkTests/Fixtures/CommandantSPM@swift-5.2.json
+0 −0 Tests/SourceKittenFrameworkTests/Fixtures/CursorInfoUSR@swift-5.1.json
+0 −0 Tests/SourceKittenFrameworkTests/Fixtures/DocInfo@swift-5.1.json
+0 −0 Tests/SourceKittenFrameworkTests/Fixtures/Extension@swift-5.1.json
+308 −0 Tests/SourceKittenFrameworkTests/Fixtures/Extension@swift-5.2.json
+18 −14 Tests/SourceKittenFrameworkTests/Fixtures/LinuxBicycle@swift-5.2.json
+0 −728 Tests/SourceKittenFrameworkTests/Fixtures/LinuxBicycleIndex@swift-5.0.json
+228 −155 Tests/SourceKittenFrameworkTests/Fixtures/LinuxCommandantSPM@swift-5.2.json
+0 −286 Tests/SourceKittenFrameworkTests/Fixtures/LinuxSimpleCodeCompletion@swift-5.0.json
+2 −0 Tests/SourceKittenFrameworkTests/Fixtures/LinuxSimpleCodeCompletion@swift-5.2.json
+220 −0 Tests/SourceKittenFrameworkTests/Fixtures/Musician@swift-5.2.json
+0 −0 Tests/SourceKittenFrameworkTests/Fixtures/Realm@swift-5.1.json
+6,149 −0 Tests/SourceKittenFrameworkTests/Fixtures/Realm@swift-5.2.json
+1 −1 Tests/SourceKittenFrameworkTests/Fixtures/Subscript@swift-5.1.json
+12 −1 Tests/SourceKittenFrameworkTests/SourceKitTests.swift
+6 −2 Tests/SourceKittenFrameworkTests/SwiftDocsTests.swift
+13 −17 azure-pipelines.yml
2 changes: 1 addition & 1 deletion Carthage/Checkouts/Yams
Submodule Yams updated 63 files
+2 −0 .codecov.yml
+38 −0 .github/workflows/cmake.yml
+69 −0 .github/workflows/jazzy.yml
+34 −0 .github/workflows/nightly.yml
+29 −0 .github/workflows/pod_lib_lint.yml
+16 −0 .github/workflows/swiftlint.yml
+35 −0 .github/workflows/swiftlint_analyze.yml
+48 −0 .github/workflows/swiftpm.yml
+77 −0 .github/workflows/xcodebuild.yml
+5 −0 .gitignore
+0 −1 .swift-version
+1 −1 .swiftlint.yml
+82 −0 CHANGELOG.md
+36 −0 CMakeLists.txt
+42 −35 Gemfile.lock
+2 −2 Package.swift
+0 −15 Package@swift-4.2.swift
+0 −15 Package@swift-5.swift
+48 −7 README.md
+2 −0 Sources/CMakeLists.txt
+27 −0 Sources/CYaml/CMakeLists.txt
+3 −0 Sources/CYaml/include/module.modulemap
+25 −20 Sources/CYaml/include/yaml.h
+11 −11 Sources/CYaml/src/api.c
+1 −1 Sources/CYaml/src/emitter.c
+2 −2 Sources/CYaml/src/scanner.c
+33 −0 Sources/Yams/CMakeLists.txt
+34 −66 Sources/Yams/Constructor.swift
+37 −4 Sources/Yams/Decoder.swift
+10 −10 Sources/Yams/Emitter.swift
+1 −1 Sources/Yams/Encoder.swift
+36 −15 Sources/Yams/Node.Mapping.swift
+0 −2 Sources/Yams/Node.Scalar.swift
+0 −2 Sources/Yams/Node.Sequence.swift
+6 −44 Sources/Yams/Node.swift
+38 −40 Sources/Yams/Parser.swift
+48 −39 Sources/Yams/Representer.swift
+1 −1 Sources/Yams/Resolver.swift
+2 −27 Sources/Yams/Tag.swift
+7 −7 Sources/Yams/YamlError.swift
+0 −25 Sources/Yams/shim.swift
+12 −0 Tests/CMakeLists.txt
+22 −0 Tests/YamsTests/CMakeLists.txt
+6 −10 Tests/YamsTests/ConstructorTests.swift
+42 −1 Tests/YamsTests/EmitterTests.swift
+50 −72 Tests/YamsTests/EncoderTests.swift
+0 −16 Tests/YamsTests/MarkTests.swift
+3 −0 Tests/YamsTests/NodeTests.swift
+14 −3 Tests/YamsTests/PerformanceTests.swift
+23 −6 Tests/YamsTests/RepresenterTests.swift
+1 −1 Tests/YamsTests/SpecTests.swift
+15 −28 Tests/YamsTests/TestHelper.swift
+36 −0 Tests/YamsTests/TopLevelDecoderTests.swift
+16 −1 Tests/YamsTests/YamlErrorTests.swift
+2 −1 Yams.podspec
+42 −0 Yams.xcodeproj/Yams.xctestplan
+1 −1 Yams.xcodeproj/Yams_Info.plist
+15 −14 Yams.xcodeproj/project.pbxproj
+11 −31 Yams.xcodeproj/xcshareddata/xcschemes/Yams.xcscheme
+0 −192 azure-pipelines.yml
+9 −0 cmake/modules/CMakeLists.txt
+113 −0 cmake/modules/SwiftSupport.cmake
+3 −0 cmake/modules/YamsConfig.cmake.in
34 changes: 8 additions & 26 deletions Package.resolved
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,49 +10,31 @@
"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"
}
},
{
"package": "Quick",
"repositoryURL": "https://github.com/Quick/Quick.git",
"state": {
"branch": null,
"revision": "33682c2f6230c60614861dfc61df267e11a1602f",
"version": "2.2.0"
"revision": "09b3becb37cb2163919a3842a4c5fa6ec7130792",
"version": "2.2.1"
}
},
{
"package": "SourceKitten",
"repositoryURL": "https://github.com/jpsim/SourceKitten.git",
"state": {
"branch": null,
"revision": "77a4dbbb477a8110eb8765e3c44c70fb4929098f",
"version": "0.29.0"
"revision": "b7a7df0d25981998bb9f4770ff8faf7a28a6e649",
"version": "0.30.0"
}
},
{
Expand All @@ -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"
}
}
]
Expand Down
4 changes: 2 additions & 2 deletions Package.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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: [
Expand Down
6 changes: 3 additions & 3 deletions SwiftLintFramework.podspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 changes: 12 additions & 4 deletions azure-pipelines.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down

0 comments on commit ff0e9f4

Please sign in to comment.