Skip to content

Commit 64e676c

Browse files
bcolvinbcolvin
committed
update
1 parent b1fdbe3 commit 64e676c

File tree

5 files changed

+312
-5
lines changed

5 files changed

+312
-5
lines changed

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ In SonarQube under Quality Profiles the used Linter can be specified by selectin
3030
| Complexity |YES |Uses [Lizard](https://github.com/terryyin/lizard)| Uses [Lizard](https://github.com/terryyin/lizard)|
3131
| Design |NO | | |
3232
| Documentation |YES | | |
33-
| Duplications |YES | | |
33+
| Duplications |Only on Sonarqube < 7.3 | | |
3434
| Issues |YES | Uses [SwiftLint](https://github.com/realm/SwiftLint) and/or [Tailor](https://github.com/sleekbyte/tailor) for Swift. [OCLint](http://oclint-docs.readthedocs.io/en/stable/) and [Faux Pas](http://fauxpasapp.com/) for Objective-C| Uses [Tailor](https://github.com/sleekbyte/tailor)|
3535
| Size |YES | | |
3636
| Tests |YES | Uses xcodebuild + xcpretty [xcpretty](https://github.com/supermarin/xcpretty) | Not Supported |

‎sonar-swift-plugin/src/main/shell/run-sonar-swift.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ if [[ "$workspaceFile" != "" ]] ; then
283283
else
284284
buildCmdPrefix="-project $projectFile"
285285
fi
286-
buildCmd=($XCODEBUILD_CMD clean build $buildCmdPrefix -scheme $appScheme)
286+
buildCmd=($XCODEBUILD_CMD clean build $buildCmdPrefix -scheme "$appScheme")
287287
if [[ ! -z "$destinationSimulator" ]]; then
288288
buildCmd+=(-destination "$destinationSimulator" -destination-timeout 360 COMPILER_INDEX_STORE_ENABLE=NO)
289289
fi
@@ -445,7 +445,7 @@ if [ "$fauxpas" = "on" ] && [ "$hasObjC" = "yes" ]; then
445445
if [ "$projectCount" = "1" ]
446446
then
447447

448-
fauxpas -o json check $projectFile --workspace $workspaceFile --scheme $appScheme > sonar-reports/fauxpas.json
448+
fauxpas -o json check $projectFile --workspace $workspaceFile --scheme "$appScheme" > sonar-reports/fauxpas.json
449449

450450

451451
else

‎swiftlang/src/main/java/com/backelite/sonarqube/swift/SwiftSquidSensor.java

-1
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,6 @@ private void save(Collection<SourceCode> squidSourceFiles) {
8282
}
8383

8484
private void saveMeasures(InputFile inputFile, SourceFile squidFile) {
85-
MeasureUtil.saveMeasure(context, inputFile, CoreMetrics.FILES, squidFile.getInt(SwiftMetric.FILES));
8685
MeasureUtil.saveMeasure(context, inputFile, CoreMetrics.LINES, squidFile.getInt(SwiftMetric.LINES));
8786
MeasureUtil.saveMeasure(context, inputFile, CoreMetrics.NCLOC, squidFile.getInt(SwiftMetric.LINES_OF_CODE));
8887
MeasureUtil.saveMeasure(context, inputFile, CoreMetrics.STATEMENTS, squidFile.getInt(SwiftMetric.STATEMENTS));

‎swiftlang/src/main/resources/org/sonar/plugins/swiftlint/profile-swiftlint.xml

+112
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,10 @@
2727
<repositoryKey>SwiftLint</repositoryKey>
2828
<key>closing_brace</key>
2929
</rule>
30+
<rule>
31+
<repositoryKey>SwiftLint</repositoryKey>
32+
<key>closure_body_length</key>
33+
</rule>
3034
<rule>
3135
<repositoryKey>SwiftLint</repositoryKey>
3236
<key>closure_end_indentation</key>
@@ -39,6 +43,10 @@
3943
<repositoryKey>SwiftLint</repositoryKey>
4044
<key>closure_spacing</key>
4145
</rule>
46+
<rule>
47+
<repositoryKey>SwiftLint</repositoryKey>
48+
<key>collection_alignment</key>
49+
</rule>
4250
<rule>
4351
<repositoryKey>SwiftLint</repositoryKey>
4452
<key>colon</key>
@@ -75,6 +83,10 @@
7583
<repositoryKey>SwiftLint</repositoryKey>
7684
<key>cyclomatic_complexity</key>
7785
</rule>
86+
<rule>
87+
<repositoryKey>SwiftLint</repositoryKey>
88+
<key>deployment_target</key>
89+
</rule>
7890
<rule>
7991
<repositoryKey>SwiftLint</repositoryKey>
8092
<key>discarded_notification_center_observer</key>
@@ -95,6 +107,10 @@
95107
<repositoryKey>SwiftLint</repositoryKey>
96108
<key>discouraged_optional_collection</key>
97109
</rule>
110+
<rule>
111+
<repositoryKey>SwiftLint</repositoryKey>
112+
<key>duplicate_imports</key>
113+
</rule>
98114
<rule>
99115
<repositoryKey>SwiftLint</repositoryKey>
100116
<key>dynamic_inline</key>
@@ -135,6 +151,10 @@
135151
<repositoryKey>SwiftLint</repositoryKey>
136152
<key>explicit_init</key>
137153
</rule>
154+
<rule>
155+
<repositoryKey>SwiftLint</repositoryKey>
156+
<key>explicit_self</key>
157+
</rule>
138158
<rule>
139159
<repositoryKey>SwiftLint</repositoryKey>
140160
<key>explicit_top_level_acl</key>
@@ -203,6 +223,10 @@
203223
<repositoryKey>SwiftLint</repositoryKey>
204224
<key>generic_type_name</key>
205225
</rule>
226+
<rule>
227+
<repositoryKey>SwiftLint</repositoryKey>
228+
<key>identical_operands</key>
229+
</rule>
206230
<rule>
207231
<repositoryKey>SwiftLint</repositoryKey>
208232
<key>identifier_name</key>
@@ -219,6 +243,10 @@
219243
<repositoryKey>SwiftLint</repositoryKey>
220244
<key>implicitly_unwrapped_optional</key>
221245
</rule>
246+
<rule>
247+
<repositoryKey>SwiftLint</repositoryKey>
248+
<key>inert_defer</key>
249+
</rule>
222250
<rule>
223251
<repositoryKey>SwiftLint</repositoryKey>
224252
<key>is_disjoint</key>
@@ -231,6 +259,10 @@
231259
<repositoryKey>SwiftLint</repositoryKey>
232260
<key>large_tuple</key>
233261
</rule>
262+
<rule>
263+
<repositoryKey>SwiftLint</repositoryKey>
264+
<key>last_where</key>
265+
</rule>
234266
<rule>
235267
<repositoryKey>SwiftLint</repositoryKey>
236268
<key>leading_whitespace</key>
@@ -247,10 +279,18 @@
247279
<repositoryKey>SwiftLint</repositoryKey>
248280
<key>legacy_constructor</key>
249281
</rule>
282+
<rule>
283+
<repositoryKey>SwiftLint</repositoryKey>
284+
<key>legacy_hashing</key>
285+
</rule>
250286
<rule>
251287
<repositoryKey>SwiftLint</repositoryKey>
252288
<key>legacy_nsgeometry_functions</key>
253289
</rule>
290+
<rule>
291+
<repositoryKey>SwiftLint</repositoryKey>
292+
<key>legacy_random</key>
293+
</rule>
254294
<rule>
255295
<repositoryKey>SwiftLint</repositoryKey>
256296
<key>let_var_whitespace</key>
@@ -283,14 +323,26 @@
283323
<repositoryKey>SwiftLint</repositoryKey>
284324
<key>multiline_arguments</key>
285325
</rule>
326+
<rule>
327+
<repositoryKey>SwiftLint</repositoryKey>
328+
<key>multiline_arguments_brackets</key>
329+
</rule>
286330
<rule>
287331
<repositoryKey>SwiftLint</repositoryKey>
288332
<key>multiline_function_chains</key>
289333
</rule>
334+
<rule>
335+
<repositoryKey>SwiftLint</repositoryKey>
336+
<key>multiline_literal_brackets</key>
337+
</rule>
290338
<rule>
291339
<repositoryKey>SwiftLint</repositoryKey>
292340
<key>multiline_parameters</key>
293341
</rule>
342+
<rule>
343+
<repositoryKey>SwiftLint</repositoryKey>
344+
<key>multiline_parameters_brackets</key>
345+
</rule>
294346
<rule>
295347
<repositoryKey>SwiftLint</repositoryKey>
296348
<key>multiple_closures_with_trailing_closure</key>
@@ -319,6 +371,10 @@
319371
<repositoryKey>SwiftLint</repositoryKey>
320372
<key>notification_center_detachment</key>
321373
</rule>
374+
<rule>
375+
<repositoryKey>SwiftLint</repositoryKey>
376+
<key>nslocalizedstring_key</key>
377+
</rule>
322378
<rule>
323379
<repositoryKey>SwiftLint</repositoryKey>
324380
<key>number_separator</key>
@@ -371,6 +427,10 @@
371427
<repositoryKey>SwiftLint</repositoryKey>
372428
<key>private_unit_test</key>
373429
</rule>
430+
<rule>
431+
<repositoryKey>SwiftLint</repositoryKey>
432+
<key>prohibited_interface_builder</key>
433+
</rule>
374434
<rule>
375435
<repositoryKey>SwiftLint</repositoryKey>
376436
<key>prohibited_super_call</key>
@@ -399,6 +459,10 @@
399459
<repositoryKey>SwiftLint</repositoryKey>
400460
<key>redundant_nil_coalescing</key>
401461
</rule>
462+
<rule>
463+
<repositoryKey>SwiftLint</repositoryKey>
464+
<key>redundant_objc_attribute</key>
465+
</rule>
402466
<rule>
403467
<repositoryKey>SwiftLint</repositoryKey>
404468
<key>redundant_optional_initialization</key>
@@ -419,6 +483,10 @@
419483
<repositoryKey>SwiftLint</repositoryKey>
420484
<key>redundant_void_return</key>
421485
</rule>
486+
<rule>
487+
<repositoryKey>SwiftLint</repositoryKey>
488+
<key>required_deinit</key>
489+
</rule>
422490
<rule>
423491
<repositoryKey>SwiftLint</repositoryKey>
424492
<key>required_enum_case</key>
@@ -447,10 +515,18 @@
447515
<repositoryKey>SwiftLint</repositoryKey>
448516
<key>statement_position</key>
449517
</rule>
518+
<rule>
519+
<repositoryKey>SwiftLint</repositoryKey>
520+
<key>static_operator</key>
521+
</rule>
450522
<rule>
451523
<repositoryKey>SwiftLint</repositoryKey>
452524
<key>strict_fileprivate</key>
453525
</rule>
526+
<rule>
527+
<repositoryKey>SwiftLint</repositoryKey>
528+
<key>strong_iboutlet</key>
529+
</rule>
454530
<rule>
455531
<repositoryKey>SwiftLint</repositoryKey>
456532
<key>superfluous_disable_command</key>
@@ -471,6 +547,10 @@
471547
<repositoryKey>SwiftLint</repositoryKey>
472548
<key>todo</key>
473549
</rule>
550+
<rule>
551+
<repositoryKey>SwiftLint</repositoryKey>
552+
<key>toggle_bool</key>
553+
</rule>
474554
<rule>
475555
<repositoryKey>SwiftLint</repositoryKey>
476556
<key>trailing_closure</key>
@@ -519,14 +599,26 @@
519599
<repositoryKey>SwiftLint</repositoryKey>
520600
<key>unused_closure_parameter</key>
521601
</rule>
602+
<rule>
603+
<repositoryKey>SwiftLint</repositoryKey>
604+
<key>unused_control_flow_label</key>
605+
</rule>
522606
<rule>
523607
<repositoryKey>SwiftLint</repositoryKey>
524608
<key>unused_enumerated</key>
525609
</rule>
610+
<rule>
611+
<repositoryKey>SwiftLint</repositoryKey>
612+
<key>unused_import</key>
613+
</rule>
526614
<rule>
527615
<repositoryKey>SwiftLint</repositoryKey>
528616
<key>unused_optional_binding</key>
529617
</rule>
618+
<rule>
619+
<repositoryKey>SwiftLint</repositoryKey>
620+
<key>unused_private_declaration</key>
621+
</rule>
530622
<rule>
531623
<repositoryKey>SwiftLint</repositoryKey>
532624
<key>unused_setter_value</key>
@@ -547,14 +639,34 @@
547639
<repositoryKey>SwiftLint</repositoryKey>
548640
<key>vertical_whitespace</key>
549641
</rule>
642+
<rule>
643+
<repositoryKey>SwiftLint</repositoryKey>
644+
<key>vertical_whitespace_between_cases</key>
645+
</rule>
646+
<rule>
647+
<repositoryKey>SwiftLint</repositoryKey>
648+
<key>vertical_whitespace_closing_braces</key>
649+
</rule>
650+
<rule>
651+
<repositoryKey>SwiftLint</repositoryKey>
652+
<key>vertical_whitespace_opening_braces</key>
653+
</rule>
550654
<rule>
551655
<repositoryKey>SwiftLint</repositoryKey>
552656
<key>void_return</key>
553657
</rule>
658+
<rule>
659+
<repositoryKey>SwiftLint</repositoryKey>
660+
<key>weak_computed_property</key>
661+
</rule>
554662
<rule>
555663
<repositoryKey>SwiftLint</repositoryKey>
556664
<key>weak_delegate</key>
557665
</rule>
666+
<rule>
667+
<repositoryKey>SwiftLint</repositoryKey>
668+
<key>xct_specific_matcher</key>
669+
</rule>
558670
<rule>
559671
<repositoryKey>SwiftLint</repositoryKey>
560672
<key>xctfail_message</key>

0 commit comments

Comments
 (0)