diff --git a/CHANGELOG.md b/CHANGELOG.md index a57d50c8f..3e3280fef 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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) @@ -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 diff --git a/Rakefile b/Rakefile index 71bd8ec88..7315a8c44 100644 --- a/Rakefile +++ b/Rakefile @@ -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 -----------------------------------------------------# diff --git a/SourceKitten b/SourceKitten index eeb2bed8b..817dfa6f2 160000 --- a/SourceKitten +++ b/SourceKitten @@ -1 +1 @@ -Subproject commit eeb2bed8ba9c73a72843b7769dfce96c5dc8bc13 +Subproject commit 817dfa6f2e09b0476f3a6c9dbc035991f02f0241 diff --git a/bin/sourcekitten b/bin/sourcekitten index 1a83a78eb..aeb87434c 100755 Binary files a/bin/sourcekitten and b/bin/sourcekitten differ diff --git a/spec/integration_specs b/spec/integration_specs index ccab94e22..511760c23 160000 --- a/spec/integration_specs +++ b/spec/integration_specs @@ -1 +1 @@ -Subproject commit ccab94e225e1d62f27889deae98d815ecaef26a6 +Subproject commit 511760c236415b9c463615a9752e9cc9536e9086