diff --git a/.github/workflows/Tests.yml b/.github/workflows/Tests.yml index ca846231a..1a15ed848 100644 --- a/.github/workflows/Tests.yml +++ b/.github/workflows/Tests.yml @@ -31,7 +31,7 @@ jobs: matrix: spec: ["objc_spec", "swift_spec", "cocoapods_spec"] env: - DEVELOPER_DIR: /Applications/Xcode_13.3.app/Contents/Developer + DEVELOPER_DIR: /Applications/Xcode_14.0.app/Contents/Developer steps: - uses: actions/checkout@v2 with: diff --git a/CHANGELOG.md b/CHANGELOG.md index b8ebb1c77..d5d6396c2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,8 @@ ##### Enhancements -* None. +* Support Swift 5.7 and Xcode 14. + [John Fairhurst](https://github.com/johnfairh) ##### Bug Fixes diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index a9ce5a126..f732e9aec 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -49,7 +49,7 @@ git push You'll need push access to the integration specs repo to do this. You can request access from one of the maintainers when filing your PR. -You must have Xcode 13.3 installed to build the integration specs. +You must have Xcode 14 installed to build the integration specs. ## Making changes to SourceKitten diff --git a/SourceKitten b/SourceKitten index 817dfa6f2..b5f9bb749 160000 --- a/SourceKitten +++ b/SourceKitten @@ -1 +1 @@ -Subproject commit 817dfa6f2e09b0476f3a6c9dbc035991f02f0241 +Subproject commit b5f9bb749057dd396e93f97956bef64672bc2a04 diff --git a/bin/sourcekitten b/bin/sourcekitten index aeb87434c..d7b0f64a1 100755 Binary files a/bin/sourcekitten and b/bin/sourcekitten differ diff --git a/spec/integration_spec.rb b/spec/integration_spec.rb index 5b75a5465..1d7cd6a27 100644 --- a/spec/integration_spec.rb +++ b/spec/integration_spec.rb @@ -110,8 +110,10 @@ def configure_cocoapods # Remove version numbers from CocoaPods dependencies # to make specs resilient against dependency updates. s.replace_pattern(/(Installing \w+ )\((.*)\)/, '\1(X.Y.Z)') - # Xcode 13.3 workaround - s.replace_pattern(/202.*?IDEWatchSupportCore\n/, '') + # Xcode 13.3 etc workaround + s.replace_pattern(/202[\d.:\- ]+xcodebuild.*?\n/, '') + # Xcode 14 / in-proc sourcekitd workaround + s.replace_pattern(/:0: remark.*?\n/, '') end require 'shellwords' @@ -230,11 +232,11 @@ def configure_cocoapods end describe 'Creates docs for Swift project from a .swiftmodule' do - build_path = Dir.getwd + 'tmp/.build' + build_path = Dir.getwd + '/tmp/.build' package_path = ROOT + 'spec/integration_specs/misc_jazzy_symgraph_features/before' - `swift build --package-path #{package_path} --build-path #{build_path}` - module_path = `swift build --build-path #{build_path} --show-bin-path` + `swift build --package-path #{package_path} --scratch-path #{build_path}` + module_path = `swift build --scratch-path #{build_path} --show-bin-path` behaves_like cli_spec 'misc_jazzy_symgraph_features', '--swift-build-tool symbolgraph ' \ "--build-tool-arguments -I,#{module_path} " diff --git a/spec/integration_specs b/spec/integration_specs index e26e46f3e..e9eb466c4 160000 --- a/spec/integration_specs +++ b/spec/integration_specs @@ -1 +1 @@ -Subproject commit e26e46f3e73b23606b6a28f62f65ef4ae3705d10 +Subproject commit e9eb466c4df55e40f7a1a270cdb763f674e94c45