Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update SourceKitten to 0.26.0 #2894

Merged
merged 2 commits into from
Oct 8, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Cartfile
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
github "jpsim/SourceKitten" ~> 0.24.0
github "jpsim/SourceKitten" ~> 0.26.0
github "scottrhoyt/SwiftyTextTable" ~> 0.9.0
4 changes: 2 additions & 2 deletions Cartfile.resolved
Original file line number Diff line number Diff line change
@@ -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.24.0"
github "drmohundro/SWXMLHash" "5.0.1"
github "jpsim/SourceKitten" "0.26.0"
github "jpsim/Yams" "2.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 66 files
+1 −1 .gitignore
+0 −1 .swift-version
+51 −0 CHANGELOG.md
+1 −1 Cartfile
+1 −1 Cartfile.resolved
+1 −1 Carthage/Checkouts/SWXMLHash
+3 −3 Makefile
+24 −6 Package.resolved
+2 −2 Package.swift
+1 −1 README.md
+5 −5 Source/Clang_C/include/BuildSystem.h
+4 −4 Source/Clang_C/include/CXCompilationDatabase.h
+4 −4 Source/Clang_C/include/CXErrorCode.h
+4 −4 Source/Clang_C/include/CXString.h
+4 −4 Source/Clang_C/include/Documentation.h
+330 −150 Source/Clang_C/include/Index.h
+4 −4 Source/Clang_C/include/Platform.h
+113 −0 Source/SourceKittenFramework/Exec.swift
+2 −2 Source/SourceKittenFramework/File.swift
+1 −1 Source/SourceKittenFramework/Info.plist
+59 −11 Source/SourceKittenFramework/Module.swift
+18 −0 Source/SourceKittenFramework/String+SourceKitten.swift
+13 −1 Source/SourceKittenFramework/SwiftDeclarationAttributeKind.swift
+2 −0 Source/SourceKittenFramework/SwiftDeclarationKind.swift
+1 −1 Source/SourceKittenFramework/SyntaxKind.swift
+1 −1 Source/SourceKittenFramework/Version.swift
+5 −70 Source/SourceKittenFramework/Xcode.swift
+4 −57 Source/SourceKittenFramework/library_wrapper.swift
+11 −0 Source/SourceKittenFramework/library_wrapper_Index.swift
+2 −2 Source/SourceKittenFramework/library_wrapper_sourcekitd.swift
+1 −1 Source/sourcekitten/CompleteCommand.swift
+26 −15 Source/sourcekitten/DocCommand.swift
+1 −1 Source/sourcekitten/Info.plist
+2 −2 SourceKittenFramework.podspec
+1 −23 Tests/SourceKittenFrameworkTests/DocInfoTests.swift
+0 −715 Tests/SourceKittenFrameworkTests/Fixtures/Bicycle@swift-4.2.json
+375 −0 Tests/SourceKittenFrameworkTests/Fixtures/Bicycle@swift-5.1.json
+110 −36 Tests/SourceKittenFrameworkTests/Fixtures/BicycleIndex@swift-5.1.json
+0 −3,491 Tests/SourceKittenFrameworkTests/Fixtures/BicycleSyntax@swift-4.2.json
+1 −0 Tests/SourceKittenFrameworkTests/Fixtures/BicycleSyntax@swift-5.1.json
+386 −310 Tests/SourceKittenFrameworkTests/Fixtures/Commandant@swift-5.1.json
+284 −171 Tests/SourceKittenFrameworkTests/Fixtures/CommandantResultTVOS@swift-5.1.json
+386 −310 Tests/SourceKittenFrameworkTests/Fixtures/CommandantSPM@swift-5.1.json
+0 −13 Tests/SourceKittenFrameworkTests/Fixtures/CursorInfoUSR@swift-4.2.json
+3 −0 Tests/SourceKittenFrameworkTests/Fixtures/CursorInfoUSR@swift-5.1.json
+0 −0 Tests/SourceKittenFrameworkTests/Fixtures/DocInfo@swift-5.0.json
+158 −0 Tests/SourceKittenFrameworkTests/Fixtures/Extension@swift-5.1.json
+4 −0 Tests/SourceKittenFrameworkTests/Fixtures/ExternalRef1.swift
+3 −0 Tests/SourceKittenFrameworkTests/Fixtures/ExternalRef2.swift
+38 −37 Tests/SourceKittenFrameworkTests/Fixtures/LinuxBicycle@swift-5.1.json
+40 −11 Tests/SourceKittenFrameworkTests/Fixtures/LinuxBicycleIndex@swift-5.1.json
+386 −310 Tests/SourceKittenFrameworkTests/Fixtures/LinuxCommandantSPM@swift-5.1.json
+16 −13 Tests/SourceKittenFrameworkTests/Fixtures/LinuxExtension@swift-5.1.json
+0 −340 Tests/SourceKittenFrameworkTests/Fixtures/LinuxSimpleCodeCompletion@swift-4.2.json
+19 −67 Tests/SourceKittenFrameworkTests/Fixtures/LinuxSimpleCodeCompletion@swift-5.1.json
+3 −3 Tests/SourceKittenFrameworkTests/Fixtures/LinuxSubscript@swift-5.1.json
+0 −6,149 Tests/SourceKittenFrameworkTests/Fixtures/Realm@swift-4.2.json
+0 −374 Tests/SourceKittenFrameworkTests/Fixtures/SimpleCodeCompletion@swift-4.2.json
+20 −73 Tests/SourceKittenFrameworkTests/Fixtures/SimpleCodeCompletion@swift-5.1.json
+41 −0 Tests/SourceKittenFrameworkTests/Fixtures/Subscript@swift-5.1.json
+15 −42 Tests/SourceKittenFrameworkTests/ModuleTests.swift
+37 −69 Tests/SourceKittenFrameworkTests/SourceKitTests.swift
+12 −2 Tests/SourceKittenFrameworkTests/StringTests.swift
+29 −66 Tests/SourceKittenFrameworkTests/SwiftDocsTests.swift
+9 −15 azure-pipelines.yml
+20 −16 sourcekitten.xcodeproj/project.pbxproj
34 changes: 26 additions & 8 deletions Package.resolved
Original file line number Diff line number Diff line change
Expand Up @@ -10,22 +10,40 @@
"version": "0.16.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": "f8657642dfdec9973efc79cc68bcef43a653a2bc",
"version": "8.0.2"
"revision": "6abeb3f5c03beba2b9e4dbe20886e773b5b629b6",
"version": "8.0.4"
}
},
{
"package": "Quick",
"repositoryURL": "https://github.com/Quick/Quick.git",
"state": {
"branch": null,
"revision": "94df9b449508344667e5afc7e80f8bcbff1e4c37",
"version": "2.1.0"
"revision": "33682c2f6230c60614861dfc61df267e11a1602f",
"version": "2.2.0"
}
},
{
Expand All @@ -42,8 +60,8 @@
"repositoryURL": "https://github.com/jpsim/SourceKitten.git",
"state": {
"branch": null,
"revision": "35c9e0e437592661a51b160d80a4feaa5d4630d1",
"version": "0.24.0"
"revision": "cc1f16acc70630d27498e81078789f5fa55d7463",
"version": "0.26.0"
}
},
{
Expand All @@ -60,8 +78,8 @@
"repositoryURL": "https://github.com/drmohundro/SWXMLHash.git",
"state": {
"branch": null,
"revision": "f43166a8e18fdd0857f29e303b1bb79a5428bca0",
"version": "4.9.0"
"revision": "a4931e5c3bafbedeb1601d3bb76bbe835c6d475a",
"version": "5.0.1"
}
},
{
Expand Down
2 changes: 1 addition & 1 deletion Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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.24.0"),
.package(url: "https://github.com/jpsim/SourceKitten.git", from: "0.26.0"),
.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")] : []),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ private extension SwiftDeclarationKind {
.varGlobal, .varInstance, .varStatic, .typealias, .functionAccessorModify, .functionAccessorRead,
.functionConstructor, .functionDestructor, .functionFree, .functionMethodClass,
.functionMethodInstance, .functionMethodStatic, .functionOperator, .functionOperatorInfix,
.functionOperatorPostfix, .functionOperatorPrefix, .functionSubscript, .protocol:
.functionOperatorPostfix, .functionOperatorPrefix, .functionSubscript, .protocol, .opaqueType:
return true
case .class, .enum, .extension, .extensionClass, .extensionEnum,
.extensionProtocol, .extensionStruct, .struct:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ private extension SwiftDeclarationKind {
.extensionProtocol, .extensionStruct, .functionAccessorAddress, .functionAccessorDidset,
.functionAccessorRead, .functionAccessorModify, .functionAccessorGetter,
.functionAccessorMutableaddress, .functionAccessorSetter, .functionAccessorWillset,
.functionDestructor, .genericTypeParam, .module, .precedenceGroup, .varLocal, .varParameter:
.functionDestructor, .genericTypeParam, .module, .precedenceGroup, .varLocal, .varParameter, .opaqueType:
return false
case .class, .enum, .functionConstructor, .functionFree, .functionMethodClass, .functionMethodInstance,
.functionMethodStatic, .functionOperator, .functionOperatorInfix, .functionOperatorPostfix,
Expand Down
2 changes: 1 addition & 1 deletion SwiftLintFramework.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@ Pod::Spec.new do |s|
s.source_files = 'Source/SwiftLintFramework/**/*.swift'
s.swift_versions = ['4.2', '5.0']
s.pod_target_xcconfig = { 'APPLICATION_EXTENSION_API_ONLY' => 'YES' }
s.dependency 'SourceKittenFramework', '~> 0.24'
s.dependency 'SourceKittenFramework', '~> 0.26.0'
s.dependency 'Yams', '~> 2.0'
end
8 changes: 4 additions & 4 deletions script/oss-check
Original file line number Diff line number Diff line change
Expand Up @@ -195,15 +195,15 @@ def build(branch)
perform("git fetch && git worktree add --detach #{dir} #{target}")
end

Dir.chdir(dir) do
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why was this moved? This will slow down OSSCheck by preventing incremental builds.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was getting build failures all the time IIRC

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

unfortunately CI has deleted the build, but you can see that OSSCheck had failed before 956ea6f: https://github.com/realm/SwiftLint/runs/251739677

FileUtils.rm_rf %w[Packages .build]
end

build_command = "cd #{dir}; swift build -c release"

perform(build_command)
return if $?.success?

# Couldn't build, start fresh
Dir.chdir(dir) do
FileUtils.rm_rf %w[Packages .build]
end
return_value = nil
puts build_command if @options[:verbose]
Open3.popen3(build_command) do |_, stdout, _, wait_thr|
Expand Down