Update CocoaPods (1.6.0.rc.1), SwiftLint (0.30.1), Kanna (4.0.3) and StencilSwiftKit (2.7.2)

.swiftlint.yml

@@ -1,4 +1,4 @@
-swiftlint_version: 0.29.3
+swiftlint_version: 0.30.1
 
 opt_in_rules:
  - anyobject_protocol
@@ -8,12 +8,14 @@ opt_in_rules:
  - closure_end_indentation
  - closure_spacing
  - collection_alignment
+ - conditional_returns_on_newline
  - contains_over_first_not_nil
  - convenience_type
  - discouraged_optional_boolean
  - discouraged_optional_collection
  - empty_count
  - empty_string
+ - empty_xctest_method
  - fallthrough
  - fatal_error_message
  - file_header
@@ -22,10 +24,8 @@ opt_in_rules:
  - identical_operands
  - implicit_return
  - implicitly_unwrapped_optional
- - inert_defer
  - joined_default_parameter
  - last_where
- - legacy_hashing
  - legacy_random
  - literal_expression_end_indentation
  - lower_acl_than_parent
@@ -36,6 +36,7 @@ opt_in_rules:
  - multiline_literal_brackets
  - multiline_parameters
  - multiline_parameters_brackets
+ - nslocalizedstring_key
  - number_separator
  - operator_usage_whitespace
  - overridden_super_call
@@ -44,22 +45,25 @@ opt_in_rules:
  - private_outlet
  - prohibited_super_call
  - redundant_nil_coalescing
- - redundant_objc_attribute
  - sorted_first_last
  - sorted_imports
  - static_operator
+ - strong_iboutlet
+ - switch_case_on_newline
  - toggle_bool
  - trailing_closure
  - unavailable_function
  - unneeded_parentheses_in_closure_argument
- - unused_control_flow_label
  - vertical_parameter_alignment_on_call
  - vertical_whitespace_closing_braces
  - vertical_whitespace_opening_braces
  - xct_specific_matcher
  - yoda_condition
 
 # Rules customization
+conditional_returns_on_newline:
+  if_only: true
+
 file_header:
   required_pattern: |
                     \/\/(

CHANGELOG.md

@@ -41,9 +41,10 @@ _None_
 * Resolve path if the binary is a symbolic link in order to find bundled templates.  
   [Liquidsoul](https://github.com/liquidsoul)
   [#559](https://github.com/SwiftGen/SwiftGen/issues/559)
-* Update to SwiftLint 0.29.3 and enable some extra SwiftLint rules.  
+* Update to SwiftLint 0.30.1 and enable some extra SwiftLint rules.  
   [David Jennes](https://github.com/djbe)
   [#574](https://github.com/SwiftGen/SwiftGen/pull/574)
+  [#583](https://github.com/SwiftGen/SwiftGen/pull/583)
 
 ## 6.0.2
 

Gemfile

@@ -10,8 +10,8 @@ end
 
 # In addition to :build, for contributing
 group :development do
-	gem 'cocoapods', '~> 1.6.0.beta.2'
-	gem 'rubocop', '~> 0.62'
+	gem 'cocoapods', '~> 1.6.0.rc.1'
+	gem 'rubocop', '~> 0.63'
 	gem 'danger'
 end
 

Gemfile.lock

@@ -16,10 +16,10 @@ GEM
       cork
       nap
       open4 (~> 1.3)
-    cocoapods (1.6.0.beta.2)
+    cocoapods (1.6.0.rc.1)
       activesupport (>= 4.0.2, < 5)
       claide (>= 1.0.2, < 2.0)
-      cocoapods-core (= 1.6.0.beta.2)
+      cocoapods-core (= 1.6.0.rc.1)
       cocoapods-deintegrate (>= 1.0.2, < 2.0)
       cocoapods-downloader (>= 1.2.2, < 2.0)
       cocoapods-plugins (>= 1.0.0, < 2.0)
@@ -29,13 +29,13 @@ GEM
       cocoapods-try (>= 1.1.0, < 2.0)
       colored2 (~> 3.1)
       escape (~> 0.0.4)
-      fourflusher (~> 2.0.1)
+      fourflusher (~> 2.1.0)
       gh_inspector (~> 1.0)
       molinillo (~> 0.6.6)
       nap (~> 1.0)
       ruby-macho (~> 1.3, >= 1.3.1)
-      xcodeproj (>= 1.7.0, < 2.0)
-    cocoapods-core (1.6.0.beta.2)
+      xcodeproj (>= 1.8.0, < 2.0)
+    cocoapods-core (1.6.0.rc.1)
       activesupport (>= 4.0.2, < 6)
       fuzzy_match (~> 2.0.4)
       nap (~> 1.0)
@@ -44,7 +44,7 @@ GEM
     cocoapods-plugins (1.0.0)
       nap
     cocoapods-search (1.0.0)
-    cocoapods-stats (1.0.0)
+    cocoapods-stats (1.1.0)
     cocoapods-trunk (1.3.1)
       nap (>= 0.8, < 2.0)
       netrc (~> 0.11)
@@ -53,7 +53,7 @@ GEM
     concurrent-ruby (1.1.4)
     cork (0.3.0)
       colored2 (~> 3.1)
-    danger (5.11.0)
+    danger (5.12.0)
       claide (~> 1.0)
       claide-plugins (>= 0.9.2)
       colored2 (~> 3.1)
@@ -70,13 +70,13 @@ GEM
       multipart-post (>= 1.2, < 3)
     faraday-http-cache (1.3.1)
       faraday (~> 0.8)
-    fourflusher (2.0.1)
+    fourflusher (2.1.0)
     fuzzy_match (2.0.4)
     gh_inspector (1.1.3)
     git (1.5.0)
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)
-    jaro_winkler (1.5.1)
+    jaro_winkler (1.5.2)
     kramdown (1.17.0)
     minitest (5.11.3)
     molinillo (0.6.6)
@@ -88,16 +88,16 @@ GEM
     octokit (4.13.0)
       sawyer (~> 0.8.0, >= 0.5.3)
     open4 (1.3.4)
-    parallel (1.12.1)
-    parser (2.5.3.0)
+    parallel (1.13.0)
+    parser (2.6.0.0)
       ast (~> 2.4.0)
     plist (3.5.0)
     powerpack (0.1.2)
     public_suffix (3.0.3)
     rainbow (3.0.0)
     rake (12.3.2)
     rouge (2.0.7)
-    rubocop (0.62.0)
+    rubocop (0.63.1)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
       parser (>= 2.5, != 2.5.1.1)
@@ -116,7 +116,7 @@ GEM
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
     unicode-display_width (1.4.1)
-    xcodeproj (1.7.0)
+    xcodeproj (1.8.0)
       CFPropertyList (>= 2.3.3, < 4.0)
       atomos (~> 0.1.3)
       claide (>= 1.0.2, < 2.0)
@@ -129,12 +129,12 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  cocoapods (~> 1.6.0.beta.2)
+  cocoapods (~> 1.6.0.rc.1)
   danger
   octokit (~> 4.13)
   plist (~> 3.5)
   rake (~> 12.3)
-  rubocop (~> 0.62)
+  rubocop (~> 0.63)
   xcpretty
 
 BUNDLED WITH

Package.resolved

@@ -15,8 +15,8 @@
         "repositoryURL": "https://github.com/tid-kijyun/Kanna.git",
         "state": {
           "branch": null,
-          "revision": "aec73a69619cf9bb540002a17793fb54633f372d",
-          "version": "4.0.2"
+          "revision": "0534d5d4917410870fcac8907e06f69b58a23417",
+          "version": "4.0.3"
         }
       },
       {
@@ -51,8 +51,8 @@
         "repositoryURL": "https://github.com/SwiftGen/StencilSwiftKit.git",
         "state": {
           "branch": null,
-          "revision": "a50ab97b9380fbf75fedaeac2da79f4d52464b8f",
-          "version": "2.7.1"
+          "revision": "dbf02bd6afe71b65ead2bd250aaf974abc688094",
+          "version": "2.7.2"
         }
       },
       {

Podfile

@@ -5,7 +5,7 @@ raise 'Please use bundle exec to run the pod command' unless defined?(Bundler)
 
 def common_pods
   podspec :path => 'SwiftGenKit.podspec'
-  pod 'SwiftLint', '~> 0.29'
+  pod 'SwiftLint', '~> 0.30'
 end
 
 target 'swiftgen' do

Podfile.lock

@@ -1,20 +1,20 @@
 PODS:
   - Commander (0.8.0)
-  - Kanna (4.0.2)
+  - Kanna (4.0.3)
   - PathKit (0.9.2)
   - Stencil (0.13.1):
     - PathKit (~> 0.9.0)
-  - StencilSwiftKit (2.7.1):
+  - StencilSwiftKit (2.7.2):
     - Stencil (~> 0.13.1)
-  - SwiftLint (0.29.3)
+  - SwiftLint (0.30.1)
   - Yams (1.0.1)
 
 DEPENDENCIES:
   - Commander (~> 0.8)
   - Kanna (~> 4.0.0)
   - PathKit (~> 0.9.0)
   - StencilSwiftKit (~> 2.7)
-  - SwiftLint (~> 0.29)
+  - SwiftLint (~> 0.30)
   - Yams (~> 1.0.0)
 
 SPEC REPOS:
@@ -29,13 +29,13 @@ SPEC REPOS:
 
 SPEC CHECKSUMS:
   Commander: 6eda7635b133e239faa85bf75dcab88d6fd63aaa
-  Kanna: c60b61d72554bf04ed1ee074f9b379855cab4892
+  Kanna: 0ebbdd0e7e3308f0aafbd569e79c8cadc5eb877c
   PathKit: 273f59a38e3218eb95abd9f6a61730a8bcfd2f06
   Stencil: b5128a0a43ece9225db5cbd94d6569fe6fba609b
-  StencilSwiftKit: e16b4580ae8cec0af6deea1924200ae733042162
-  SwiftLint: bfa7ca7b4d170cfaf0d236ca3ffd969e88a2f002
+  StencilSwiftKit: 9ebd42556b6c7396440f286b6c9aca1549c963ff
+  SwiftLint: a54bf1fe12b55c68560eb2a7689dfc81458508f7
   Yams: 572f625a8b719b73e0b57fd313c680f3e2161fe9
 
-PODFILE CHECKSUM: 1cd747f61401af13b707d533b5d3317f772d7c76
+PODFILE CHECKSUM: 2784a2cf3bc9738078031dce9e0ff3faacd99e32
 
-COCOAPODS: 1.6.0.beta.2
+COCOAPODS: 1.6.0.rc.1