Skip to content

Commit 0956e7e

Browse files
authored
Move CI to Xcode 26 (#1422)
Small spec changes Update gems too due to OS dependencies New JSON changes format of empty array New rubocop
1 parent e65282f commit 0956e7e

File tree

9 files changed

+129
-64
lines changed

9 files changed

+129
-64
lines changed

.github/workflows/Tests.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
- uses: actions/checkout@v4
1414
- uses: ruby/setup-ruby@v1
1515
with:
16-
ruby-version: 3.2
16+
ruby-version: 3.3
1717
bundler-cache: true
1818
- name: Rubocop
1919
run: |
@@ -37,10 +37,10 @@ jobs:
3737
persist-credentials: false
3838
- uses: maxim-lobanov/setup-xcode@v1
3939
with:
40-
xcode-version: '16.3'
40+
xcode-version: '26.1.0-beta'
4141
- uses: ruby/setup-ruby@v1
4242
with:
43-
ruby-version: 3.2
43+
ruby-version: 3.3
4444
bundler-cache: true
4545
- name: Cache cocoapods
4646
uses: actions/cache@v4

.rubocop.yml

Lines changed: 51 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ AllCops:
88
SuggestExtensions: false
99
TargetRubyVersion: 2.6
1010

11-
#- Pending Cops as of 1.67.0 ---------------------------------------------#
11+
#- Pending Cops as of 1.75.7 ---------------------------------------------#
1212

1313
Gemspec/AddRuntimeDependency: # new in 1.65
1414
Enabled: true
@@ -28,8 +28,14 @@ Lint/AmbiguousAssignment: # (new in 1.7)
2828
Enabled: true
2929
Lint/AmbiguousRange: # (new in 1.19)
3030
Enabled: true
31+
Lint/ArrayLiteralInRegexp: # new in 1.71
32+
Enabled: true
3133
Lint/ConstantOverwrittenInRescue: # new in 1.31
3234
Enabled: true
35+
Lint/ConstantReassignment: # new in 1.70
36+
Enabled: true
37+
Lint/CopDirectiveSyntax: # new in 1.72
38+
Enabled: true
3339
Lint/DeprecatedConstants: # (new in 1.8)
3440
Enabled: true
3541
Lint/DuplicateBranch: # (new in 1.3)
@@ -48,6 +54,8 @@ Lint/EmptyClass: # (new in 1.3)
4854
Enabled: true
4955
Lint/EmptyInPattern: # (new in 1.16)
5056
Enabled: true
57+
Lint/HashNewWithKeywordArgumentsAsDefault: # new in 1.69
58+
Enabled: true
5159
Lint/IncompatibleIoSelectWithFiberScheduler: # new in 1.21
5260
Enabled: true
5361
Lint/ItWithoutArgumentsInBlock: # new in 1.59
@@ -64,28 +72,42 @@ Lint/NoReturnInBeginEndBlocks: # (new in 1.2)
6472
Enabled: true
6573
Lint/NumberedParameterAssignment: # (new in 1.9)
6674
Enabled: true
75+
Lint/NumericOperationWithConstantResult: # new in 1.69
76+
Enabled: true
6777
Lint/OrAssignmentToConstant: # (new in 1.9)
6878
Enabled: true
6979
Lint/RedundantDirGlobSort: # (new in 1.8)
7080
Enabled: true
7181
Lint/RedundantRegexpQuantifiers: # new in 1.53
7282
Enabled: true
83+
Lint/RedundantTypeConversion: # new in 1.72
84+
Enabled: true
7385
Lint/RefinementImportMethods: # new in 1.27
7486
Enabled: true
7587
Lint/RequireRangeParentheses: # new in 1.32
7688
Enabled: true
7789
Lint/RequireRelativeSelfPath: # new in 1.22
7890
Enabled: true
91+
Lint/SharedMutableDefault: # new in 1.70
92+
Enabled: true
93+
Lint/SuppressedExceptionInNumberConversion: # new in 1.72
94+
Enabled: true
7995
Lint/SymbolConversion: # (new in 1.9)
8096
Enabled: true
8197
Lint/ToEnumArguments: # (new in 1.1)
8298
Enabled: true
8399
Lint/TripleQuotes: # (new in 1.9)
84100
Enabled: true
101+
Lint/UnescapedBracketInRegexp: # new in 1.68
102+
Enabled: true
85103
Lint/UnexpectedBlockArity: # (new in 1.5)
86104
Enabled: true
87105
Lint/UnmodifiedReduceAccumulator: # (new in 1.1)
88106
Enabled: true
107+
Lint/UselessConstantScoping: # new in 1.72
108+
Enabled: true
109+
Lint/UselessDefined: # new in 1.69
110+
Enabled: true
89111
Lint/UselessNumericOperation: # new in 1.66
90112
Enabled: true
91113
Lint/UselessRescue: # new in 1.43
@@ -100,10 +122,18 @@ Naming/InclusiveLanguage: # (new in 1.18)
100122
Enabled: true
101123
Security/CompoundHash: # new in 1.28
102124
Enabled: true
125+
Style/BitwisePredicate: # new in 1.68
126+
Enabled: true
127+
Style/CombinableDefined: # new in 1.68
128+
Enabled: true
129+
Style/ComparableBetween: # new in 1.74
130+
Enabled: true
103131
Style/ConcatArrayLiterals: # new in 1.41
104132
Enabled: true
105133
Security/IoMethods: # new in 1.22
106134
Enabled: true
135+
Style/AmbiguousEndlessMethodDefinition: # new in 1.68
136+
Enabled: true
107137
Style/ArgumentsForwarding: # (new in 1.1)
108138
Enabled: true
109139
Style/ArrayIntersect: # new in 1.40
@@ -114,6 +144,8 @@ Style/ComparableClamp: # new in 1.44
114144
Enabled: true
115145
Style/DataInheritance: # new in 1.49
116146
Enabled: true
147+
Style/DigChain: # new in 1.69
148+
Enabled: true
117149
Style/DirEmpty: # new in 1.48
118150
Enabled: true
119151
Style/DocumentDynamicEvalDefinition: # (new in 1.1)
@@ -130,18 +162,32 @@ Style/FetchEnvVar: # new in 1.28
130162
Enabled: true
131163
Style/FileEmpty: # new in 1.48
132164
Enabled: true
165+
Style/FileNull: # new in 1.69
166+
Enabled: true
133167
Style/FileRead: # new in 1.24
134168
Enabled: true
169+
Style/FileTouch: # new in 1.69
170+
Enabled: true
135171
Style/FileWrite: # new in 1.24
136172
Enabled: true
137173
Style/HashConversion: # (new in 1.10)
138174
Enabled: true
139175
Style/HashExcept: # (new in 1.7)
140176
Enabled: true
177+
Style/HashFetchChain: # new in 1.75
178+
Enabled: true
179+
Style/HashSlice: # new in 1.71
180+
Enabled: true
141181
Style/IfWithBooleanLiteralBranches: # (new in 1.9)
142182
Enabled: true
143183
Style/InPatternThen: # (new in 1.16)
144184
Enabled: true
185+
Style/ItAssignment: # new in 1.70
186+
Enabled: true
187+
Style/ItBlockParameter: # new in 1.75
188+
Enabled: true
189+
Style/KeywordArgumentsMerging: # new in 1.68
190+
Enabled: true
145191
Style/MagicCommentFormat: # new in 1.35
146192
Enabled: true
147193
Style/MapCompactWithConditionalBlock: # new in 1.30
@@ -188,6 +234,8 @@ Style/RedundantEach: # new in 1.38
188234
Enabled: true
189235
Style/RedundantFilterChain: # new in 1.52
190236
Enabled: true
237+
Style/RedundantFormat: # new in 1.72
238+
Enabled: true
191239
Style/RedundantHeredocDelimiterQuotes: # new in 1.45
192240
Enabled: true
193241
Style/RedundantInitialize: # new in 1.27
@@ -206,6 +254,8 @@ Style/RedundantStringEscape: # new in 1.37
206254
Enabled: true
207255
Style/ReturnNilInPredicateMethodDefinition: # new in 1.53
208256
Enabled: true
257+
Style/SafeNavigationChainLength: # new in 1.68
258+
Enabled: true
209259
Style/SelectByRegexp: # new in 1.22
210260
Enabled: true
211261
Style/SendWithLiteralMethodName: # new in 1.64

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
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 16.3 installed to build the integration specs.
52+
You must have Xcode 26.1 beta 1 installed to build the integration specs.
5353

5454
## Making changes to SourceKitten
5555

0 commit comments

Comments
 (0)