Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Run CI on Xcode 13 / Swift 5.5 #1278

Merged
merged 3 commits into from Sep 17, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
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_12.5.app/Contents/Developer
DEVELOPER_DIR: /Applications/Xcode_13.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.
* Correct line number references with Xcode 13.
[John Fairhurst](https://github.com/johnfairh)

##### Bug Fixes

Expand Down
2 changes: 1 addition & 1 deletion lib/jazzy/doc_builder.rb
Expand Up @@ -183,7 +183,7 @@ def self.undocumented_warnings(decls)
decls.map do |decl|
{
file: decl.file,
line: decl.line || decl.start_line,
line: decl.start_line || decl.line,
symbol: decl.fully_qualified_name,
symbol_kind: decl.type.kind,
warning: 'undocumented',
Expand Down
10 changes: 6 additions & 4 deletions spec/integration_spec.rb
Expand Up @@ -188,9 +188,10 @@ def configure_cocoapods
describe 'Creates docs with a module name, author name, project URL, ' \
'xcodebuild options, and github info' do
behaves_like cli_spec 'document_alamofire',
'--skip-undocumented',
# Ignore existing docs output
'--clean'
'--skip-undocumented ' \
'--clean ' \
'--xcodebuild-arguments ' \
"-destination,'platform=OS X'"
end

describe 'Creates Realm Swift docs' do
Expand All @@ -210,7 +211,8 @@ def configure_cocoapods
'--root-url https://realm.io/docs/swift/' \
"#{realm_version}/api/ " \
'--xcodebuild-arguments ' \
'-scheme,RealmSwift,SWIFT_VERSION=4.2 ' \
'-scheme,RealmSwift,SWIFT_VERSION=4.2,' \
"-destination,'platform=OS X' " \
"--head #{realm_head.shellescape}"
end

Expand Down
2 changes: 1 addition & 1 deletion spec/integration_specs
Submodule integration_specs updated 56 files
+1 −1 document_alamofire/after/execution_output.txt
+6 −6 document_realm_objc/after/docs/Classes/RLMAPIKeyAuth.html
+5 −5 document_realm_objc/after/docs/Classes/RLMEmailPasswordAuth.html
+1 −1 document_realm_objc/after/docs/Classes/RLMNetworkTransport.html
+2 −2 document_realm_objc/after/docs/Classes/RLMPushClient.html
+3 −3 document_realm_objc/after/docs/Classes/RLMUser.html
+1 −1 document_realm_objc/after/docs/Protocols/RLMNetworkTransport.html
+6 −6 document_realm_objc/after/docs/docsets/Realm.docset/Contents/Resources/Documents/Classes/RLMAPIKeyAuth.html
+5 −5 ...t_realm_objc/after/docs/docsets/Realm.docset/Contents/Resources/Documents/Classes/RLMEmailPasswordAuth.html
+1 −1 ...nt_realm_objc/after/docs/docsets/Realm.docset/Contents/Resources/Documents/Classes/RLMNetworkTransport.html
+2 −2 document_realm_objc/after/docs/docsets/Realm.docset/Contents/Resources/Documents/Classes/RLMPushClient.html
+3 −3 document_realm_objc/after/docs/docsets/Realm.docset/Contents/Resources/Documents/Classes/RLMUser.html
+1 −1 ..._realm_objc/after/docs/docsets/Realm.docset/Contents/Resources/Documents/Protocols/RLMNetworkTransport.html
+3 −3 document_realm_swift/after/docs/Classes/List.html
+1 −1 document_realm_swift/after/docs/Enums.html
+1 −1 document_realm_swift/after/docs/Enums/ObjectChange.html
+4 −4 document_realm_swift/after/docs/Enums/RealmPublishers.html
+1 −1 document_realm_swift/after/docs/Enums/RealmPublishers/CollectionChangeset.html
+1 −1 document_realm_swift/after/docs/Enums/RealmPublishers/CollectionChangesetWithToken.html
+1 −1 document_realm_swift/after/docs/Enums/RealmPublishers/MakeThreadSafeObjectChangeset.html
+1 −1 document_realm_swift/after/docs/Enums/RealmPublishers/ObjectChangeset.html
+1 −1 document_realm_swift/after/docs/Enums/RealmPublishers/ObjectChangesetWithToken.html
+1 −1 document_realm_swift/after/docs/Extensions/Publisher.html
+2 −2 document_realm_swift/after/docs/Extensions/Publishers/WatchPublisher.html
+2 −2 document_realm_swift/after/docs/Functions.html
+1 −1 document_realm_swift/after/docs/Protocols.html
+1 −1 document_realm_swift/after/docs/Protocols/ObjectKeyIdentifiable.html
+1 −1 document_realm_swift/after/docs/Structs.html
+2 −2 document_realm_swift/after/docs/Structs/AnyRealmCollection.html
+1 −1 document_realm_swift/after/docs/Structs/LinkingObjects.html
+7 −7 document_realm_swift/after/docs/Structs/Realm.html
+1 −1 document_realm_swift/after/docs/Structs/Realm/Error.html
+2 −2 document_realm_swift/after/docs/Structs/Results.html
+2 −2 document_realm_swift/after/docs/Structs/SortDescriptor.html
+3 −3 document_realm_swift/after/docs/docsets/RealmSwift.docset/Contents/Resources/Documents/Classes/List.html
+1 −1 document_realm_swift/after/docs/docsets/RealmSwift.docset/Contents/Resources/Documents/Enums.html
+1 −1 document_realm_swift/after/docs/docsets/RealmSwift.docset/Contents/Resources/Documents/Enums/ObjectChange.html
+4 −4 ...nt_realm_swift/after/docs/docsets/RealmSwift.docset/Contents/Resources/Documents/Enums/RealmPublishers.html
+1 −1 .../docs/docsets/RealmSwift.docset/Contents/Resources/Documents/Enums/RealmPublishers/CollectionChangeset.html
+1 −1 ...sets/RealmSwift.docset/Contents/Resources/Documents/Enums/RealmPublishers/CollectionChangesetWithToken.html
+1 −1 ...ets/RealmSwift.docset/Contents/Resources/Documents/Enums/RealmPublishers/MakeThreadSafeObjectChangeset.html
+1 −1 ...fter/docs/docsets/RealmSwift.docset/Contents/Resources/Documents/Enums/RealmPublishers/ObjectChangeset.html
+1 −1 .../docsets/RealmSwift.docset/Contents/Resources/Documents/Enums/RealmPublishers/ObjectChangesetWithToken.html
+1 −1 ...ent_realm_swift/after/docs/docsets/RealmSwift.docset/Contents/Resources/Documents/Extensions/Publisher.html
+2 −2 ...after/docs/docsets/RealmSwift.docset/Contents/Resources/Documents/Extensions/Publishers/WatchPublisher.html
+2 −2 document_realm_swift/after/docs/docsets/RealmSwift.docset/Contents/Resources/Documents/Functions.html
+1 −1 document_realm_swift/after/docs/docsets/RealmSwift.docset/Contents/Resources/Documents/Protocols.html
+1 −1 ...wift/after/docs/docsets/RealmSwift.docset/Contents/Resources/Documents/Protocols/ObjectKeyIdentifiable.html
+1 −1 document_realm_swift/after/docs/docsets/RealmSwift.docset/Contents/Resources/Documents/Structs.html
+2 −2 ...alm_swift/after/docs/docsets/RealmSwift.docset/Contents/Resources/Documents/Structs/AnyRealmCollection.html
+1 −1 ...t_realm_swift/after/docs/docsets/RealmSwift.docset/Contents/Resources/Documents/Structs/LinkingObjects.html
+7 −7 document_realm_swift/after/docs/docsets/RealmSwift.docset/Contents/Resources/Documents/Structs/Realm.html
+1 −1 ...ment_realm_swift/after/docs/docsets/RealmSwift.docset/Contents/Resources/Documents/Structs/Realm/Error.html
+2 −2 document_realm_swift/after/docs/docsets/RealmSwift.docset/Contents/Resources/Documents/Structs/Results.html
+2 −2 ...t_realm_swift/after/docs/docsets/RealmSwift.docset/Contents/Resources/Documents/Structs/SortDescriptor.html
+1 −1 document_realm_swift/after/execution_output.txt