Skip to content

Commit

Permalink
Xcode 14 support (#1319)
Browse files Browse the repository at this point in the history
* CI to Xcode 14
* Specs update to match
* Bundle SourceKitten 0.33.0
  • Loading branch information
johnfairh committed Sep 11, 2022
1 parent fadab05 commit db170a6
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/Tests.yml
Expand Up @@ -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:
Expand Down
3 changes: 2 additions & 1 deletion CHANGELOG.md
Expand Up @@ -6,7 +6,8 @@

##### Enhancements

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

##### Bug Fixes

Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion SourceKitten
Submodule SourceKitten updated 53 files
+4 −0 .bazelrc
+31 −0 .github/workflows/bazel.yml
+5 −4 .github/workflows/jazzy.yml
+1 −3 .github/workflows/pod_lib_lint.yml
+1 −1 .github/workflows/swiftlint.yml
+4 −12 .github/workflows/swiftpm.yml
+2 −2 .github/workflows/xcodebuild.yml
+5 −1 .gitignore
+30 −0 BUILD
+26 −0 CHANGELOG.md
+56 −42 Gemfile.lock
+1 −2 Makefile
+6 −6 Package.resolved
+6 −5 Package.swift
+19 −7 README.md
+55 −0 Source/BUILD
+0 −0 Source/Clang_C/Clang_C.c
+3 −0 Source/Clang_C/Clang_C.modulemap
+0 −0 Source/SourceKit/SourceKit.c
+3 −0 Source/SourceKit/SourceKit.modulemap
+5 −12 Source/SourceKittenFramework/Request.swift
+2 −2 Source/SourceKittenFramework/SourceKitObject.swift
+0 −18 Source/SourceKittenFramework/SourceKittenConfiguration.swift
+2 −4 Source/SourceKittenFramework/StringView+SourceKitten.swift
+2 −0 Source/SourceKittenFramework/SwiftDocs.swift
+1 −1 Source/SourceKittenFramework/Version.swift
+1 −0 Source/SourceKittenFramework/Xcode.swift
+1 −0 Source/SourceKittenFramework/library_wrapper_Clang_C.swift
+1 −7 Source/SourceKittenFramework/library_wrapper_SourceKit.swift
+7 −4 Source/sourcekitten/main.swift
+32 −0 Tests/BUILD
+0 −20 Tests/LinuxMain.swift
+0 −13 Tests/SourceKittenFrameworkTests/ByteRangeTests.swift
+7 −1 Tests/SourceKittenFrameworkTests/ClangTranslationUnitTests.swift
+0 −8 Tests/SourceKittenFrameworkTests/CodeCompletionTests.swift
+0 −10 Tests/SourceKittenFrameworkTests/CursorInfoParsingTests.swift
+0 −8 Tests/SourceKittenFrameworkTests/CursorInfoUSRTests.swift
+0 −8 Tests/SourceKittenFrameworkTests/DocInfoTests.swift
+0 −10 Tests/SourceKittenFrameworkTests/FileTests.swift
+9 −12 Tests/SourceKittenFrameworkTests/ModuleTests.swift
+0 −11 Tests/SourceKittenFrameworkTests/OffsetMapTests.swift
+0 −8 Tests/SourceKittenFrameworkTests/SourceKitObjectTests.swift
+15 −23 Tests/SourceKittenFrameworkTests/SourceKitTests.swift
+3 −31 Tests/SourceKittenFrameworkTests/StringTests.swift
+8 −14 Tests/SourceKittenFrameworkTests/StructureTests.swift
+0 −8 Tests/SourceKittenFrameworkTests/SwiftDocKeyTests.swift
+0 −12 Tests/SourceKittenFrameworkTests/SwiftDocsTests.swift
+8 −13 Tests/SourceKittenFrameworkTests/SyntaxTests.swift
+34 −0 WORKSPACE
+0 −0 bazel/BUILD
+11 −0 bazel/SWXMLHash.BUILD
+17 −0 bazel/SwiftArgumentParser.BUILD
+29 −0 bazel/repos.bzl
Binary file modified bin/sourcekitten
Binary file not shown.
12 changes: 7 additions & 5 deletions spec/integration_spec.rb
Expand Up @@ -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(/<unknown>:0: remark.*?\n/, '')
end

require 'shellwords'
Expand Down Expand Up @@ -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} "
Expand Down
2 changes: 1 addition & 1 deletion spec/integration_specs
Submodule integration_specs updated 18 files
+1 −1 document_alamofire/after/docs/Structs/DataResponsePublisher.html
+1 −1 document_alamofire/after/docs/Structs/DownloadResponsePublisher.html
+1 −1 ...amofire/after/docs/docsets/Alamofire.docset/Contents/Resources/Documents/Structs/DataResponsePublisher.html
+1 −1 ...ire/after/docs/docsets/Alamofire.docset/Contents/Resources/Documents/Structs/DownloadResponsePublisher.html
+6 −0 document_realm_objc/after/execution_output.txt
+1 −1 misc_jazzy_features/after/docs/Actors/PublicActor.html
+1 −1 ...y_features/after/docs/docsets/MiscJazzyFeatures.docset/Contents/Resources/Documents/Actors/PublicActor.html
+0 −31 misc_jazzy_symgraph_features/after/docs/Classes/ObjCTopLevelClass.html
+0 −31 misc_jazzy_symgraph_features/after/docs/Classes/TopLevelObjCSubclass.html
+0 −31 misc_jazzy_symgraph_features/after/docs/Classes/TopLevelSwiftSubclass.html
+0 −31 ...res/after/docs/docsets/MiscJazzyFeatures.docset/Contents/Resources/Documents/Classes/ObjCTopLevelClass.html
+0 −31 .../after/docs/docsets/MiscJazzyFeatures.docset/Contents/Resources/Documents/Classes/TopLevelObjCSubclass.html
+0 −31 ...after/docs/docsets/MiscJazzyFeatures.docset/Contents/Resources/Documents/Classes/TopLevelSwiftSubclass.html
+1 −1 ...azzy_symgraph_features/after/docs/docsets/MiscJazzyFeatures.docset/Contents/Resources/Documents/search.json
+46 −49 misc_jazzy_symgraph_features/after/docs/docsets/MiscJazzyFeatures.docset/Contents/Resources/docSet.dsidx.csv
+1 −1 misc_jazzy_symgraph_features/after/docs/search.json
+0 −21 misc_jazzy_symgraph_features/after/docs/undocumented.json
+3 −3 misc_jazzy_symgraph_features/after/execution_output.txt

0 comments on commit db170a6

Please sign in to comment.