Fix SwiftLint warnings

bcylin · May 24, 2020 · 23d95ae · 23d95ae
1 parent f9240ba
commit 23d95ae
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/.swiftlint.yml b/.swiftlint.yml
@@ -3,6 +3,7 @@ disabled_rules:
   - force_cast
   - function_body_length
   - identifier_name
+  - implicit_return
   - line_length
   - vertical_whitespace
 opt_in_rules:
@@ -14,7 +15,6 @@ opt_in_rules:
   - explicit_top_level_acl
   - fatal_error_message
   - first_where
-  - implicit_return
   - implicitly_unwrapped_optional
   - let_var_whitespace
   - multiline_parameters

diff --git a/Tests/ViewController/QuickTableViewDataSourceTests.swift b/Tests/ViewController/QuickTableViewDataSourceTests.swift
@@ -29,7 +29,7 @@ import XCTest
 
 internal final class QuickTableViewDataSourceTests: XCTestCase {
 
-  private var controller: QuickTableViewController!
+  private var controller: QuickTableViewController! // swiftlint:disable:this implicitly_unwrapped_optional
 
   override func setUp() {
     super.setUp()
@@ -252,7 +252,7 @@ internal final class QuickTableViewDataSourceTests: XCTestCase {
       ])
     ]
 
-    for index in [2, 3]  {
+    for index in [2, 3] {
       // When
       let cell = controller.tableView(controller.tableView, cellForRowAt: IndexPath(row: index, section: 0))
 

diff --git a/Tests/ViewController/QuickTableViewDelegateTests.swift b/Tests/ViewController/QuickTableViewDelegateTests.swift
@@ -29,7 +29,7 @@ import XCTest
 
 internal final class QuickTableViewDelegateTests: XCTestCase {
 
-  private var controller: QuickTableViewController!
+  private var controller: QuickTableViewController! // swiftlint:disable:this implicitly_unwrapped_optional
 
   override func setUp() {
     super.setUp()

diff --git a/scripts/swiftlint.rb b/scripts/swiftlint.rb
@@ -1,9 +1,9 @@
 #!/usr/local/env ruby
 
-not_ci = !ENV["TRAVIS"] || ENV["TRAVIS"]&.empty?
+is_ci = !!ENV["CI"]
 
-if not_ci
-  system "${PODS_ROOT}/SwiftLint/swiftlint --config .swiftlint.yml"
-else
+if is_ci
   puts "Skip SwiftLint"
+else
+  system "./Pods/SwiftLint/swiftlint --config .swiftlint.yml"
 end