Skip to content

Commit

Permalink
Support Swift 5.6 (#1298)
Browse files Browse the repository at this point in the history
* Update SourceKitten to work on Swift 5.6, version 0.32.0
* Build sourcekitten binary for arm and intel
* Spec update is to fix submodule URLs
  • Loading branch information
johnfairh committed Mar 17, 2022
1 parent 04c906d commit 2867df3
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 6 deletions.
5 changes: 4 additions & 1 deletion CHANGELOG.md
Expand Up @@ -2,7 +2,7 @@

##### Breaking

* When building with Swift 5.6 and not passing `—module` to Jazzy, declarations
* When building with Swift 5.6 and not passing `-module` to Jazzy, declarations
may not be correctly identified as undocumented and docs may include unwanted
extensions. Pass `—-module MyModuleName` to fix this.
[John Fairhurst](https://github.com/johnfairh)
Expand All @@ -16,6 +16,9 @@
[John Fairhurst](https://github.com/johnfairh)
[#900](https://github.com/realm/jazzy/issues/900)

* Support Swift 5.6.
[John Fairhurst](https://github.com/johnfairh)

##### Bug Fixes

* In Swift symbolgraph mode, stop including extensions to types that are beneath
Expand Down
8 changes: 5 additions & 3 deletions Rakefile
Expand Up @@ -105,10 +105,12 @@ begin
desc 'Vendors SourceKitten'
task :sourcekitten do
sk_dir = 'SourceKitten'
Dir.chdir(sk_dir) do
`swift build -c release`
bin_path = Dir.chdir(sk_dir) do
build_cmd = 'swift build -c release --arch arm64 --arch x86_64'
`#{build_cmd}`
`#{build_cmd} --show-bin-path`.chomp
end
FileUtils.cp_r "#{sk_dir}/.build/release/sourcekitten", 'bin'
FileUtils.cp_r "#{bin_path}/sourcekitten", 'bin'
end

#-- Theme Dependencies -----------------------------------------------------#
Expand Down
2 changes: 1 addition & 1 deletion SourceKitten
Submodule SourceKitten updated 59 files
+3 −3 .github/workflows/jazzy.yml
+3 −3 .github/workflows/pod_lib_lint.yml
+6 −4 .github/workflows/swiftlint.yml
+14 −5 .github/workflows/swiftpm.yml
+4 −4 .github/workflows/xcodebuild.yml
+36 −1 CHANGELOG.md
+1 −1 Dangerfile
+3 −2 Makefile
+6 −6 Package.resolved
+4 −4 Package.swift
+7 −1 README.md
+1 −1 Releasing.md
+2 −2 Source/SourceKittenFramework/Clang+SourceKitten.swift
+2 −8 Source/SourceKittenFramework/CodeCompletionItem.swift
+1 −1 Source/SourceKittenFramework/CursorInfo+Parsing.swift
+3 −3 Source/SourceKittenFramework/File.swift
+14 −9 Source/SourceKittenFramework/JSONOutput.swift
+21 −8 Source/SourceKittenFramework/Request.swift
+18 −0 Source/SourceKittenFramework/SourceKittenConfiguration.swift
+1 −1 Source/SourceKittenFramework/StringView.swift
+26 −1 Source/SourceKittenFramework/SwiftDeclarationAttributeKind.swift
+1 −1 Source/SourceKittenFramework/Version.swift
+7 −1 Source/SourceKittenFramework/library_wrapper_SourceKit.swift
+17 −5 Source/sourcekitten/Complete.swift
+4 −4 Source/sourcekitten/Doc.swift
+4 −4 Source/sourcekitten/Format.swift
+3 −3 SourceKittenFramework.podspec
+69 −1 Tests/SourceKittenFrameworkTests/Fixtures/Bicycle@swift-5.5.json
+102 −17 Tests/SourceKittenFrameworkTests/Fixtures/Bicycle@swift-5.6.json
+914 −0 Tests/SourceKittenFrameworkTests/Fixtures/BicycleIndex@swift-5.5.2.json
+32 −28 Tests/SourceKittenFrameworkTests/Fixtures/BicycleIndex@swift-5.5.json
+908 −0 Tests/SourceKittenFrameworkTests/Fixtures/BicycleIndex@swift-5.6.json
+1 −0 Tests/SourceKittenFrameworkTests/Fixtures/BicycleSyntax@swift-5.5.json
+737 −90 Tests/SourceKittenFrameworkTests/Fixtures/Commandant@swift-5.5.json
+996 −158 Tests/SourceKittenFrameworkTests/Fixtures/Commandant@swift-5.6.json
+737 −90 Tests/SourceKittenFrameworkTests/Fixtures/CommandantSPM@swift-5.5.json
+996 −158 Tests/SourceKittenFrameworkTests/Fixtures/CommandantSPM@swift-5.6.json
+16 −0 Tests/SourceKittenFrameworkTests/Fixtures/CursorInfoUSR@swift-5.5.json
+17 −0 Tests/SourceKittenFrameworkTests/Fixtures/CursorInfoUSR@swift-5.6.json
+33 −7 Tests/SourceKittenFrameworkTests/Fixtures/Extension@swift-5.5.json
+350 −0 Tests/SourceKittenFrameworkTests/Fixtures/Extension@swift-5.6.json
+70 −4 Tests/SourceKittenFrameworkTests/Fixtures/LinuxBicycle@swift-5.5.json
+102 −19 Tests/SourceKittenFrameworkTests/Fixtures/LinuxBicycle@swift-5.6.json
+58 −4 Tests/SourceKittenFrameworkTests/Fixtures/LinuxBicycleIndex@swift-5.5.json
+766 −119 Tests/SourceKittenFrameworkTests/Fixtures/LinuxCommandantSPM@swift-5.5.json
+1,015 −177 Tests/SourceKittenFrameworkTests/Fixtures/LinuxCommandantSPM@swift-5.6.json
+33 −2 Tests/SourceKittenFrameworkTests/Fixtures/LinuxExtension@swift-5.5.json
+350 −0 Tests/SourceKittenFrameworkTests/Fixtures/LinuxExtension@swift-5.6.json
+0 −288 Tests/SourceKittenFrameworkTests/Fixtures/LinuxSimpleCodeCompletion@swift-5.1.json
+0 −317 Tests/SourceKittenFrameworkTests/Fixtures/LinuxSimpleCodeCompletion@swift-5.2.json
+861 −0 Tests/SourceKittenFrameworkTests/Fixtures/LinuxSimpleCodeCompletion@swift-5.6.json
+6,149 −0 Tests/SourceKittenFrameworkTests/Fixtures/Realm@swift-5.6.json
+0 −317 Tests/SourceKittenFrameworkTests/Fixtures/SimpleCodeCompletion@swift-5.1.json
+861 −0 Tests/SourceKittenFrameworkTests/Fixtures/SimpleCodeCompletion@swift-5.6.json
+71 −0 Tests/SourceKittenFrameworkTests/Fixtures/Subscript@swift-5.5.json
+73 −0 Tests/SourceKittenFrameworkTests/Fixtures/Subscript@swift-5.6.json
+46 −12 Tests/SourceKittenFrameworkTests/SourceKitTests.swift
+40 −0 Tests/SourceKittenFrameworkTests/StructureTests.swift
+12 −2 Tests/SourceKittenFrameworkTests/SwiftDocsTests.swift
Binary file modified bin/sourcekitten
Binary file not shown.
2 changes: 1 addition & 1 deletion spec/integration_specs
Submodule integration_specs updated 1 files
+1 −1 .gitmodules

0 comments on commit 2867df3

Please sign in to comment.