Merge pull request #153 from SwiftGen/feature/update-deps

Update dependencies
SwiftGen · Jul 21, 2022 · c85650b · c85650b
2 parents 49cfe0f + 2470c3e
commit c85650b
Show file tree

Hide file tree

Showing 27 changed files with 340 additions and 231 deletions.
diff --git a/.github/workflows/cocoapods.yml b/.github/workflows/cocoapods.yml
@@ -12,7 +12,7 @@ jobs:
     steps:
       - 
         name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - 
         name: Setup Ruby
         uses: ruby/setup-ruby@v1

diff --git a/.github/workflows/swiftlint.yml b/.github/workflows/swiftlint.yml
@@ -12,7 +12,7 @@ jobs:
     steps:
       - 
         name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - 
         name: Setup Ruby
         uses: ruby/setup-ruby@v1

diff --git a/.github/workflows/test-spm.yml b/.github/workflows/test-spm.yml
@@ -9,27 +9,27 @@ jobs:
   linux:
     name: Test SPM Linux
     runs-on: ubuntu-latest
-    container: swiftgen/swift:5.4
+    container: swiftgen/swift:5.6
     steps:
       - 
         name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - 
         # Note: we can't use `ruby/setup-ruby` on custom docker images, so we
         # have to do our own caching
         name: Cache gems
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: vendor/bundle
-          key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}
+          key: ${{ runner.os }}-gems-${{ hashFiles('Gemfile.lock') }}
           restore-keys: |
             ${{ runner.os }}-gems-
       - 
         name: Cache SPM
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: .build
-          key: ${{ runner.os }}-spm-${{ hashFiles('**/Package.resolved') }}
+          key: ${{ runner.os }}-spm-${{ hashFiles('Package.resolved') }}
           restore-keys: |
             ${{ runner.os }}-spm-
       -
@@ -47,18 +47,18 @@ jobs:
     steps:
       - 
         name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - 
         name: Setup Ruby
         uses: ruby/setup-ruby@v1
         with:
           bundler-cache: true
       - 
         name: Cache SPM
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: .build
-          key: ${{ runner.os }}-spm-${{ hashFiles('**/Package.resolved') }}
+          key: ${{ runner.os }}-spm-${{ hashFiles('Package.resolved') }}
           restore-keys: |
             ${{ runner.os }}-spm-
       -

diff --git a/.ruby-version b/.ruby-version
@@ -1 +1 @@
-2.6.6
+3.0.4
diff --git a/.swiftlint.yml b/.swiftlint.yml
@@ -1,6 +1,8 @@
-swiftlint_version: 0.44.0
+swiftlint_version: 0.47.1
 
 opt_in_rules:
+ - accessibility_label_for_image
+ - anonymous_argument_in_multiline_closure
  - anyobject_protocol
  - array_init
  - attributes
@@ -31,6 +33,7 @@ opt_in_rules:
  - first_where
  - flatmap_over_map_reduce
  - force_unwrapping
+ - ibinspectable_in_extension
  - identical_operands
  - implicit_return
  - implicitly_unwrapped_optional
@@ -43,6 +46,7 @@ opt_in_rules:
  - legacy_random
  - literal_expression_end_indentation
  - lower_acl_than_parent
+ - missing_docs
  - modifier_order
  - multiline_arguments
  - multiline_arguments_brackets
@@ -57,18 +61,26 @@ opt_in_rules:
  - optional_enum_case_matching
  - overridden_super_call
  - override_in_extension
+ - pattern_matching_keywords
+ - prefer_self_in_static_references
  - prefer_self_type_over_type_of_self
  - prefer_zero_over_explicit_init
+ - prefixed_toplevel_constant
  - private_action
  - private_outlet
  - private_subject
  - prohibited_super_call
  - raw_value_for_camel_cased_codable_enum
  - reduce_into
  - redundant_nil_coalescing
+ - redundant_type_annotation
+ - required_enum_case
+ - return_value_from_void_function
+ - single_test_class
  - sorted_first_last
  - sorted_imports
  - static_operator
+ - strict_fileprivate
  - strong_iboutlet
  - switch_case_on_newline
  - test_case_accessibility
@@ -81,6 +93,7 @@ opt_in_rules:
  - vertical_parameter_alignment_on_call
  - vertical_whitespace_closing_braces
  - vertical_whitespace_opening_braces
+ - weak_delegate
  - xct_specific_matcher
  - yoda_condition
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -18,9 +18,10 @@ _None_
 
 ### Internal Changes
 
-* Update to SwiftLint 0.43.1 and enable some extra SwiftLint rules.  
+* Update to SwiftLint 0.47.1 and enable some extra SwiftLint rules.  
   [David Jennes](https://github.com/djbe)
   [#140](https://github.com/SwiftGen/StencilSwiftKit/pull/140)
+  [#153](https://github.com/SwiftGen/StencilSwiftKit/pull/153)
 
 ## 2.8.0
 

diff --git a/Gemfile b/Gemfile
@@ -5,13 +5,13 @@ source 'https://rubygems.org'
 # The bare minimum for building, e.g. in Homebrew
 group :build do
 	gem 'rake', '~> 13.0'
-	gem 'xcpretty'
+	gem 'xcpretty', '~> 0.3'
 end
 
 # In addition to :build, for contributing
 group :development do
 	gem 'cocoapods', '~> 1.11'
-	gem 'rubocop', '~> 1.20'
+	gem 'rubocop', '~> 1.22'
 end
 
 # For releasing to GitHub

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,8 +1,9 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    CFPropertyList (3.0.3)
-    activesupport (6.1.4.1)
+    CFPropertyList (3.0.5)
+      rexml
+    activesupport (6.1.6.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -15,11 +16,11 @@ GEM
       json (>= 1.5.1)
     ast (2.4.2)
     atomos (0.1.3)
-    claide (1.0.3)
-    cocoapods (1.11.0)
+    claide (1.1.0)
+    cocoapods (1.11.3)
       addressable (~> 2.8)
       claide (>= 1.0.2, < 2.0)
-      cocoapods-core (= 1.11.0)
+      cocoapods-core (= 1.11.3)
       cocoapods-deintegrate (>= 1.0.3, < 2.0)
       cocoapods-downloader (>= 1.4.0, < 2.0)
       cocoapods-plugins (>= 1.0.0, < 2.0)
@@ -34,7 +35,7 @@ GEM
       nap (~> 1.0)
       ruby-macho (>= 1.0, < 3.0)
       xcodeproj (>= 1.21.0, < 2.0)
-    cocoapods-core (1.11.0)
+    cocoapods-core (1.11.3)
       activesupport (>= 5.0, < 7)
       addressable (~> 2.8)
       algoliasearch (~> 1.0)
@@ -45,7 +46,7 @@ GEM
       public_suffix (~> 4.0)
       typhoeus (~> 1.0)
     cocoapods-deintegrate (1.0.5)
-    cocoapods-downloader (1.5.1)
+    cocoapods-downloader (1.6.3)
     cocoapods-plugins (1.0.0)
       nap
     cocoapods-search (1.0.1)
@@ -54,78 +55,63 @@ GEM
       netrc (~> 0.11)
     cocoapods-try (1.2.0)
     colored2 (3.1.2)
-    concurrent-ruby (1.1.9)
+    concurrent-ruby (1.1.10)
     escape (0.0.4)
-    ethon (0.14.0)
+    ethon (0.15.0)
       ffi (>= 1.15.0)
-    faraday (1.7.1)
-      faraday-em_http (~> 1.0)
-      faraday-em_synchrony (~> 1.0)
-      faraday-excon (~> 1.1)
-      faraday-httpclient (~> 1.0.1)
-      faraday-net_http (~> 1.0)
-      faraday-net_http_persistent (~> 1.1)
-      faraday-patron (~> 1.0)
-      faraday-rack (~> 1.0)
-      multipart-post (>= 1.2, < 3)
+    faraday (2.3.0)
+      faraday-net_http (~> 2.0)
       ruby2_keywords (>= 0.0.4)
-    faraday-em_http (1.0.0)
-    faraday-em_synchrony (1.0.0)
-    faraday-excon (1.1.0)
-    faraday-httpclient (1.0.1)
-    faraday-net_http (1.0.1)
-    faraday-net_http_persistent (1.2.0)
-    faraday-patron (1.0.0)
-    faraday-rack (1.0.0)
-    ffi (1.15.4)
+    faraday-net_http (2.0.3)
+    ffi (1.15.5)
     fourflusher (2.3.1)
     fuzzy_match (2.0.4)
     gh_inspector (1.1.3)
     httpclient (2.8.3)
-    i18n (1.8.10)
+    i18n (1.12.0)
       concurrent-ruby (~> 1.0)
-    json (2.5.1)
-    minitest (5.14.4)
+    json (2.6.2)
+    minitest (5.16.2)
     molinillo (0.8.0)
-    multipart-post (2.1.1)
     nanaimo (0.3.0)
     nap (1.1.0)
     netrc (0.11.0)
-    octokit (4.21.0)
-      faraday (>= 0.9)
-      sawyer (~> 0.8.0, >= 0.5.3)
-    parallel (1.20.1)
-    parser (3.0.2.0)
+    octokit (4.25.1)
+      faraday (>= 1, < 3)
+      sawyer (~> 0.9)
+    parallel (1.22.1)
+    parser (3.1.2.0)
       ast (~> 2.4.1)
-    public_suffix (4.0.6)
-    rainbow (3.0.0)
+    public_suffix (4.0.7)
+    rainbow (3.1.1)
     rake (13.0.6)
-    regexp_parser (2.1.1)
+    regexp_parser (2.5.0)
     rexml (3.2.5)
     rouge (2.0.7)
-    rubocop (1.20.0)
+    rubocop (1.32.0)
+      json (~> 2.3)
       parallel (~> 1.10)
-      parser (>= 3.0.0.0)
+      parser (>= 3.1.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
-      rexml
-      rubocop-ast (>= 1.9.1, < 2.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.19.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.11.0)
-      parser (>= 3.0.1.1)
+    rubocop-ast (1.19.1)
+      parser (>= 3.1.1.0)
     ruby-macho (2.5.1)
     ruby-progressbar (1.11.0)
     ruby2_keywords (0.0.5)
-    sawyer (0.8.2)
+    sawyer (0.9.2)
       addressable (>= 2.3.5)
-      faraday (> 0.8, < 2.0)
+      faraday (>= 0.17.3, < 3)
     typhoeus (1.4.0)
       ethon (>= 0.9.0)
-    tzinfo (2.0.4)
+    tzinfo (2.0.5)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.0.0)
-    xcodeproj (1.21.0)
+    unicode-display_width (2.2.0)
+    xcodeproj (1.22.0)
       CFPropertyList (>= 2.3.3, < 4.0)
       atomos (~> 0.1.3)
       claide (>= 1.0.2, < 2.0)
@@ -134,7 +120,7 @@ GEM
       rexml (~> 3.2.4)
     xcpretty (0.3.0)
       rouge (~> 2.0.7)
-    zeitwerk (2.4.2)
+    zeitwerk (2.6.0)
 
 PLATFORMS
   ruby
@@ -143,8 +129,8 @@ DEPENDENCIES
   cocoapods (~> 1.11)
   octokit (~> 4.21)
   rake (~> 13.0)
-  rubocop (~> 1.20)
-  xcpretty
+  rubocop (~> 1.22)
+  xcpretty (~> 0.3)
 
 BUNDLED WITH
-   2.2.27
+   2.2.33