Merge pull request SwiftGen#718 from SwiftGen/release/6.2.0

Release 6.2.0

Author: AliSoftware

.circleci/config.yml

@@ -6,12 +6,19 @@ defaults:
       CIRCLE_TEST_REPORTS: /tmp/circleci-test-results
       BUNDLE_PATH: vendor/bundle
     macos:
-      xcode: "10.0.0"
+      xcode: "11.4.0"
     shell: /bin/bash --login -eo pipefail
   - &prepare-storage
     run:
       name: Create directories for artifacts and reports
       command: mkdir -p $CIRCLE_ARTIFACTS $CIRCLE_TEST_REPORTS
+  - &enable-ruby-auto-switching
+    run:
+      name: Enable Ruby Auto-Switching
+      command: >
+        echo "source /usr/local/share/chruby/chruby.sh" >> ~/.bash_profile;
+        echo "source /usr/local/share/chruby/auto.sh" >> ~/.bash_profile;
+        chruby
   - &restore-gems
     restore_cache:
       keys:
@@ -45,6 +52,7 @@ jobs:
     steps:
       - *prepare-storage
       - checkout
+      - *enable-ruby-auto-switching
       - *restore-gems
       - *install-gems
       - *store-gems
@@ -67,6 +75,7 @@ jobs:
     steps:
       - *prepare-storage
       - checkout
+      - *enable-ruby-auto-switching
       - *restore-gems
       - *install-gems
       - *store-gems
@@ -91,20 +100,10 @@ jobs:
     steps:
       - *prepare-storage
       - checkout
+      - *enable-ruby-auto-switching
       - *restore-gems
       - *install-gems
       - *store-gems
-      - restore_cache:
-          keys:
-            - homebrew-{{ checksum ".circleci/config.yml" }}
-            - homebrew-
-      - run:
-          name: Install libxml2
-          command: brew install libxml2 && brew link --force libxml2
-      -  save_cache:
-          key: homebrew-{{ checksum ".circleci/config.yml" }}
-          paths:
-            - /usr/local/Homebrew
       - run:
           # TODO: This should run the tests once SPM supports testing an executable
           name: Build with SPM
@@ -116,6 +115,7 @@ jobs:
     steps:
       - *prepare-storage
       - checkout
+      - *enable-ruby-auto-switching
       - *restore-gems
       - *install-gems
       - *store-gems
@@ -129,32 +129,35 @@ jobs:
     steps:
       - *prepare-storage
       - checkout
+      - *enable-ruby-auto-switching
       - *restore-gems
       - *install-gems
       - *store-gems
-      - run:
-          name: Download podspec repo
-          command: curl https://cocoapods-specs.circleci.com/fetch-cocoapods-repo-from-s3.sh | bash -s cf
+      - restore_cache:
+          keys:
+            - cocoapods-{{ checksum "Podfile.lock" }}
+            - cocoapods-
       - run:
           name: Lint podspec
           command: bundle exec rake pod:lint
+      -  save_cache:
+          key: cocoapods-{{ checksum "Podfile.lock" }}
+          paths:
+            - ~/.cocoapods
       - *store-artifacts
 
 
 workflows:
   version: 2
   lint-buildandtest-compileoutput-checkdeploy:
     jobs:
+      - check-deploy
       - lint
       - spm-build-and-test
       - xcode-build-and-test
       - compile-output:
           requires:
-            - lint
-            - spm-build-and-test
-            - xcode-build-and-test
-      - check-deploy:
-          requires:
+            - check-deploy
             - lint
             - spm-build-and-test
             - xcode-build-and-test

.ruby-version

@@ -1 +1 @@
-2.3.7
+2.6.6

.swiftlint.yml

@@ -1,4 +1,4 @@
-swiftlint_version: 0.30.1
+swiftlint_version: 0.39.2
 
 opt_in_rules:
  - anyobject_protocol
@@ -9,23 +9,31 @@ opt_in_rules:
  - closure_spacing
  - collection_alignment
  - conditional_returns_on_newline
+ - contains_over_filter_count
+ - contains_over_filter_is_empty
  - contains_over_first_not_nil
+ - contains_over_range_nil_comparison
  - convenience_type
  - discouraged_optional_boolean
  - discouraged_optional_collection
+ - empty_collection_literal
  - empty_count
  - empty_string
  - empty_xctest_method
+ - enum_case_associated_values_count
  - fallthrough
  - fatal_error_message
  - file_header
  - first_where
+ - flatmap_over_map_reduce
  - force_unwrapping
  - identical_operands
  - implicit_return
  - implicitly_unwrapped_optional
+ - indentation_width
  - joined_default_parameter
  - last_where
+ - legacy_multiple
  - legacy_random
  - literal_expression_end_indentation
  - lower_acl_than_parent
@@ -37,13 +45,18 @@ opt_in_rules:
  - multiline_parameters
  - multiline_parameters_brackets
  - nslocalizedstring_key
+ - nslocalizedstring_require_bundle
  - number_separator
  - operator_usage_whitespace
+ - optional_enum_case_matching
  - overridden_super_call
  - override_in_extension
+ - prefer_self_type_over_type_of_self
  - private_action
  - private_outlet
  - prohibited_super_call
+ - raw_value_for_camel_cased_codable_enum
+ - reduce_into
  - redundant_nil_coalescing
  - sorted_first_last
  - sorted_imports
@@ -54,6 +67,7 @@ opt_in_rules:
  - trailing_closure
  - unavailable_function
  - unneeded_parentheses_in_closure_argument
+ - unowned_variable_capture
  - vertical_parameter_alignment_on_call
  - vertical_whitespace_closing_braces
  - vertical_whitespace_opening_braces
@@ -72,6 +86,9 @@ file_header:
                     \/\/ MIT Licence
                     \/\/| Generated using SwiftGen — https:\/\/github.com\/SwiftGen\/SwiftGen)
 
+indentation_width:
+  indentation_width: 2
+
 line_length:
   warning: 120
   error: 200