Skip to content

Commit db170a6

Browse files
authored
Xcode 14 support (#1319)
* CI to Xcode 14 * Specs update to match * Bundle SourceKitten 0.33.0
1 parent fadab05 commit db170a6

File tree

7 files changed

+13
-10
lines changed

7 files changed

+13
-10
lines changed

.github/workflows/Tests.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
matrix:
3232
spec: ["objc_spec", "swift_spec", "cocoapods_spec"]
3333
env:
34-
DEVELOPER_DIR: /Applications/Xcode_13.3.app/Contents/Developer
34+
DEVELOPER_DIR: /Applications/Xcode_14.0.app/Contents/Developer
3535
steps:
3636
- uses: actions/checkout@v2
3737
with:

CHANGELOG.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66

77
##### Enhancements
88

9-
* None.
9+
* Support Swift 5.7 and Xcode 14.
10+
[John Fairhurst](https://github.com/johnfairh)
1011

1112
##### Bug Fixes
1213

CONTRIBUTING.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ git push
4949
You'll need push access to the integration specs repo to do this. You can
5050
request access from one of the maintainers when filing your PR.
5151

52-
You must have Xcode 13.3 installed to build the integration specs.
52+
You must have Xcode 14 installed to build the integration specs.
5353

5454
## Making changes to SourceKitten
5555

SourceKitten

Submodule SourceKitten updated 53 files

bin/sourcekitten

48.1 KB
Binary file not shown.

spec/integration_spec.rb

+7-5
Original file line numberDiff line numberDiff line change
@@ -110,8 +110,10 @@ def configure_cocoapods
110110
# Remove version numbers from CocoaPods dependencies
111111
# to make specs resilient against dependency updates.
112112
s.replace_pattern(/(Installing \w+ )\((.*)\)/, '\1(X.Y.Z)')
113-
# Xcode 13.3 workaround
114-
s.replace_pattern(/202.*?IDEWatchSupportCore\n/, '')
113+
# Xcode 13.3 etc workaround
114+
s.replace_pattern(/202[\d.:\- ]+xcodebuild.*?\n/, '')
115+
# Xcode 14 / in-proc sourcekitd workaround
116+
s.replace_pattern(/<unknown>:0: remark.*?\n/, '')
115117
end
116118

117119
require 'shellwords'
@@ -230,11 +232,11 @@ def configure_cocoapods
230232
end
231233

232234
describe 'Creates docs for Swift project from a .swiftmodule' do
233-
build_path = Dir.getwd + 'tmp/.build'
235+
build_path = Dir.getwd + '/tmp/.build'
234236
package_path =
235237
ROOT + 'spec/integration_specs/misc_jazzy_symgraph_features/before'
236-
`swift build --package-path #{package_path} --build-path #{build_path}`
237-
module_path = `swift build --build-path #{build_path} --show-bin-path`
238+
`swift build --package-path #{package_path} --scratch-path #{build_path}`
239+
module_path = `swift build --scratch-path #{build_path} --show-bin-path`
238240
behaves_like cli_spec 'misc_jazzy_symgraph_features',
239241
'--swift-build-tool symbolgraph ' \
240242
"--build-tool-arguments -I,#{module_path} "

spec/integration_specs

Submodule integration_specs updated 18 files

0 commit comments

Comments
 (0)