Skip to content

Commit 5d3873b

Browse files
marcosgrisellimarcosgriselli
authored
Merge branch 'jpsim:main' into main
2 parents e936fff + 998aefe commit 5d3873b

22 files changed

+31276
-35
lines changed

‎.github/workflows/bazel.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
MacOS:
1111
strategy:
1212
matrix:
13-
xcode_version: ['14.1', '14.3.1']
13+
xcode_version: ['14.3.1', '15.2']
1414
runs-on: macos-13
1515
env:
1616
DEVELOPER_DIR: /Applications/Xcode_${{ matrix.xcode_version }}.app
@@ -21,7 +21,7 @@ jobs:
2121
Linux:
2222
strategy:
2323
matrix:
24-
tag: ['5.7-focal', '5.8-focal']
24+
tag: ['5.8-focal', '5.9-focal']
2525
runs-on: ubuntu-latest
2626
container:
2727
image: swift:${{ matrix.tag }}

‎.github/workflows/pod_lib_lint.yml

+2
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ jobs:
1010
pod_lib_lint:
1111
name: pod lib lint
1212
runs-on: macos-13
13+
env:
14+
DEVELOPER_DIR: /Applications/Xcode_15.2.app/Contents/Developer
1315
steps:
1416
- uses: actions/checkout@v3
1517
- run: bundle install --path vendor/bundle

‎.github/workflows/swiftpm.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
Xcode:
1111
strategy:
1212
matrix:
13-
xcode_version: ['14.1', '14.3.1']
13+
xcode_version: ['14.3.1', '15.2']
1414
runs-on: macos-13
1515
env:
1616
DEVELOPER_DIR: /Applications/Xcode_${{ matrix.xcode_version }}.app
@@ -23,7 +23,7 @@ jobs:
2323
Linux:
2424
strategy:
2525
matrix:
26-
tag: ['5.7', '5.8']
26+
tag: ['5.8', '5.9']
2727
runs-on: ubuntu-latest
2828
container:
2929
image: swift:${{ matrix.tag }}

‎.github/workflows/xcodebuild.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
Xcode:
1111
strategy:
1212
matrix:
13-
xcode_version: ['14.1', '14.3.1']
13+
xcode_version: ['14.3.1', '15.2']
1414
runs-on: macos-13
1515
env:
1616
DEVELOPER_DIR: /Applications/Xcode_${{ matrix.xcode_version }}.app

‎CHANGELOG.md

+3
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@
66

77
##### Enhancements
88

9+
* Added new syntax, attribute and declaration kinds introduced in Swift 5.9.
10+
[John Fairhurst](https://github.com/johnfairh)
11+
912
* Added new syntax, attribute and declaration kinds introduced in Swift 5.8.
1013
[JP Simard](https://github.com/jpsim)
1114

‎Gemfile.lock

+43-28
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,49 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
CFPropertyList (3.0.5)
4+
CFPropertyList (3.0.7)
5+
base64
6+
nkf
57
rexml
6-
activesupport (6.1.7.6)
8+
activesupport (7.1.3.2)
9+
base64
10+
bigdecimal
711
concurrent-ruby (~> 1.0, >= 1.0.2)
12+
connection_pool (>= 2.2.5)
13+
drb
814
i18n (>= 1.6, < 2)
915
minitest (>= 5.1)
16+
mutex_m
1017
tzinfo (~> 2.0)
11-
zeitwerk (~> 2.3)
12-
addressable (2.8.0)
13-
public_suffix (>= 2.0.2, < 5.0)
18+
addressable (2.8.6)
19+
public_suffix (>= 2.0.2, < 6.0)
1420
algoliasearch (1.27.5)
1521
httpclient (~> 2.8, >= 2.8.3)
1622
json (>= 1.5.1)
1723
atomos (0.1.3)
24+
base64 (0.2.0)
25+
bigdecimal (3.1.6)
1826
claide (1.1.0)
19-
cocoapods (1.11.3)
27+
cocoapods (1.15.2)
2028
addressable (~> 2.8)
2129
claide (>= 1.0.2, < 2.0)
22-
cocoapods-core (= 1.11.3)
30+
cocoapods-core (= 1.15.2)
2331
cocoapods-deintegrate (>= 1.0.3, < 2.0)
24-
cocoapods-downloader (>= 1.4.0, < 2.0)
32+
cocoapods-downloader (>= 2.1, < 3.0)
2533
cocoapods-plugins (>= 1.0.0, < 2.0)
2634
cocoapods-search (>= 1.0.0, < 2.0)
27-
cocoapods-trunk (>= 1.4.0, < 2.0)
35+
cocoapods-trunk (>= 1.6.0, < 2.0)
2836
cocoapods-try (>= 1.1.0, < 2.0)
2937
colored2 (~> 3.1)
3038
escape (~> 0.0.4)
3139
fourflusher (>= 2.3.0, < 3.0)
3240
gh_inspector (~> 1.0)
3341
molinillo (~> 0.8.0)
3442
nap (~> 1.0)
35-
ruby-macho (>= 1.0, < 3.0)
36-
xcodeproj (>= 1.21.0, < 2.0)
37-
cocoapods-core (1.11.3)
38-
activesupport (>= 5.0, < 7)
43+
ruby-macho (>= 2.3.0, < 3.0)
44+
xcodeproj (>= 1.23.0, < 2.0)
45+
cocoapods-core (1.15.2)
46+
activesupport (>= 5.0, < 8)
3947
addressable (~> 2.8)
4048
algoliasearch (~> 1.0)
4149
concurrent-ruby (~> 1.1)
@@ -45,7 +53,7 @@ GEM
4553
public_suffix (~> 4.0)
4654
typhoeus (~> 1.0)
4755
cocoapods-deintegrate (1.0.5)
48-
cocoapods-downloader (1.6.3)
56+
cocoapods-downloader (2.1)
4957
cocoapods-plugins (1.0.0)
5058
nap
5159
cocoapods-search (1.0.1)
@@ -54,58 +62,65 @@ GEM
5462
netrc (~> 0.11)
5563
cocoapods-try (1.2.0)
5664
colored2 (3.1.2)
57-
concurrent-ruby (1.2.2)
65+
concurrent-ruby (1.2.3)
66+
connection_pool (2.4.1)
67+
drb (2.2.0)
68+
ruby2_keywords
5869
escape (0.0.4)
59-
ethon (0.15.0)
70+
ethon (0.16.0)
6071
ffi (>= 1.15.0)
61-
ffi (1.15.5)
72+
ffi (1.16.3)
6273
fourflusher (2.3.1)
6374
fuzzy_match (2.0.4)
6475
gh_inspector (1.1.3)
6576
httpclient (2.8.3)
6677
i18n (1.14.1)
6778
concurrent-ruby (~> 1.0)
68-
jazzy (0.14.2)
79+
jazzy (0.14.4)
6980
cocoapods (~> 1.5)
7081
mustache (~> 1.1)
7182
open4 (~> 1.3)
7283
redcarpet (~> 3.4)
7384
rexml (~> 3.2)
74-
rouge (>= 2.0.6, < 4.0)
85+
rouge (>= 2.0.6, < 5.0)
7586
sassc (~> 2.1)
7687
sqlite3 (~> 1.3)
7788
xcinvoke (~> 0.3.0)
78-
json (2.6.2)
89+
json (2.7.1)
7990
liferaft (0.0.6)
80-
minitest (5.19.0)
91+
mini_portile2 (2.8.5)
92+
minitest (5.22.2)
8193
molinillo (0.8.0)
8294
mustache (1.1.1)
95+
mutex_m (0.2.0)
8396
nanaimo (0.3.0)
8497
nap (1.1.0)
8598
netrc (0.11.0)
99+
nkf (0.2.0)
86100
open4 (1.3.4)
87101
public_suffix (4.0.7)
88-
redcarpet (3.5.1)
89-
rexml (3.2.5)
90-
rouge (3.28.0)
102+
redcarpet (3.6.0)
103+
rexml (3.2.6)
104+
rouge (4.2.0)
91105
ruby-macho (2.5.1)
106+
ruby2_keywords (0.0.5)
92107
sassc (2.4.0)
93108
ffi (~> 1.9)
94-
sqlite3 (1.4.2)
95-
typhoeus (1.4.0)
109+
sqlite3 (1.7.2)
110+
mini_portile2 (~> 2.8.0)
111+
typhoeus (1.4.1)
96112
ethon (>= 0.9.0)
97113
tzinfo (2.0.6)
98114
concurrent-ruby (~> 1.0)
99115
xcinvoke (0.3.0)
100116
liferaft (~> 0.0.6)
101-
xcodeproj (1.21.0)
117+
xcodeproj (1.24.0)
102118
CFPropertyList (>= 2.3.3, < 4.0)
103119
atomos (~> 0.1.3)
104120
claide (>= 1.0.2, < 2.0)
105121
colored2 (~> 3.1)
106122
nanaimo (~> 0.3.0)
107123
rexml (~> 3.2.4)
108-
zeitwerk (2.6.11)
109124

110125
PLATFORMS
111126
ruby

‎Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ package: installables
6969
release: package
7070

7171
docker_test:
72-
docker run -v `pwd`:`pwd` -w `pwd` --name sourcekitten --rm swift:5.6-focal swift test --parallel
72+
docker run -v `pwd`:`pwd` -w `pwd` --name sourcekitten --rm swift:5.9-focal swift test --parallel
7373

7474
docker_htop:
7575
docker run -it --rm --pid=container:sourcekitten terencewestphal/htop || reset

‎Source/SourceKittenFramework/SwiftDeclarationAttributeKind.swift

+12-1
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ public enum SwiftDeclarationAttributeKind: String, CaseIterable {
7171
case setterPublic = "source.decl.attribute.setter_access.public"
7272
case setterOpen = "source.decl.attribute.setter_access.open"
7373
case optimize = "source.decl.attribute._optimize"
74-
case consuming = "source.decl.attribute.__consuming"
74+
case __consuming = "source.decl.attribute.__consuming"
7575
case implicitlyUnwrappedOptional = "source.decl.attribute._implicitly_unwrapped_optional"
7676

7777
// only available in Swift >= 4.1.50
@@ -185,4 +185,15 @@ public enum SwiftDeclarationAttributeKind: String, CaseIterable {
185185
case typeWrapper = "source.decl.attribute.typeWrapper"
186186
case _expose = "source.decl.attribute._expose"
187187
case _documentation = "source.decl.attribute._documentation"
188+
189+
// Only available in Swift >= 5.9
190+
case setterAccessPackage = "source.decl.attribute.setter_access.package"
191+
case package = "source.decl.attribute.package"
192+
case initializes = "source.decl.attribute.initializes"
193+
case _lexicalLifetimes = "source.decl.attribute._lexicalLifetimes"
194+
case consuming = "source.decl.attribute.consuming"
195+
case attached = "source.decl.attribute.attached"
196+
case borrowing = "source.decl.attribute.borrowing"
197+
case storageRestrictions = "source.decl.attribute.storageRestrictions"
198+
case accesses = "source.decl.attribute.accesses"
188199
}

‎Source/SourceKittenFramework/SwiftDeclarationKind.swift

+2
Original file line numberDiff line numberDiff line change
@@ -92,4 +92,6 @@ public enum SwiftDeclarationKind: String, CaseIterable {
9292
case actor = "source.lang.swift.decl.actor"
9393
/// `macro`
9494
case macro = "source.lang.swift.decl.macro"
95+
/// `function.accessor.init`
96+
case functionAccessorInit = "source.lang.swift.decl.function.accessor.init"
9597
}

‎Source/SourceKittenFramework/library_wrapper.swift

+4
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@ struct DynamicLinkLibrary {
1010
typealias Handle = HMODULE?
1111
#else
1212
typealias Handle = UnsafeMutableRawPointer
13+
// Workaround for Swift 5.9+, see LibraryWrapperGeneratorTests
14+
private struct GetLastError {}
15+
private struct WindowsError { let code: GetLastError }
16+
// End workaround
1317
#endif
1418

1519
fileprivate let handle: Handle

0 commit comments

Comments
 (0)