From 2851f13ce0bb8a7b3ad970708c327afaeae645e2 Mon Sep 17 00:00:00 2001
From: Florian Wininger <fw.centrale@gmail.com>
Date: Mon, 11 Apr 2022 14:12:05 +0200
Subject: Add support of ruby 3.1 and drop 2.5

---
 .github/workflows/ci.yml |  9 ++-------
 .rubocop.yml             |  2 +-
 .rubocop_todo.yml        | 41 ++++++++++++++++++++++++++++++-----------
 3 files changed, 33 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 363814f..d92c39e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -3,14 +3,9 @@ on: [push, pull_request]
 jobs:
   test:
     runs-on: ubuntu-18.04
-    continue-on-error: ${{ matrix.flaky }}
     strategy:
       matrix:
-        ruby-version: [2.7.2, 2.6.6, 3.0.1]
-        flaky: [false]
-        include:
-          - ruby-version: 2.5.8
-            flaky: true
+        ruby-version: [2.7.2, 2.6.6, 3.0.1, 3.1.1]
     steps:
       - uses: actions/checkout@v1
 
@@ -89,5 +84,5 @@ jobs:
       - name: Run test helper test
         run: bundle exec rake test_test
       - name: Rubocop
-        if: matrix.ruby-version == '3.0.1'
+        if: matrix.ruby-version == '3.1.1'
         run: bundle exec rubocop --fail-level C -f s
diff --git a/.rubocop.yml b/.rubocop.yml
index aa0c0cb..9b25b09 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -4,7 +4,7 @@ AllCops:
     - "vendor/**/.*"
     - "vendor/**/*"
   NewCops: enable
-  TargetRubyVersion: 2.5
+  TargetRubyVersion: 2.6
 
 inherit_from: .rubocop_todo.yml
 
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 0cec116..6be520e 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -1,11 +1,18 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2021-10-25 13:17:23 UTC using RuboCop version 1.22.2.
+# on 2022-04-11 12:21:32 UTC using RuboCop version 1.22.3.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
+# Offense count: 1
+# Configuration parameters: Include.
+# Include: **/*.gemspec
+Gemspec/RequiredRubyVersion:
+  Exclude:
+    - 'net-ssh.gemspec'
+
 # Offense count: 1
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, IndentationWidth.
@@ -79,7 +86,7 @@ Lint/DeprecatedClassMethods:
   Exclude:
     - 'lib/net/ssh/transport/packet_stream.rb'
 
-# Offense count: 10
+# Offense count: 12
 # Cop supports --auto-correct.
 Lint/DeprecatedOpenSSLConstant:
   Exclude:
@@ -193,7 +200,7 @@ Lint/UnusedBlockArgument:
     - 'lib/net/ssh/connection/session.rb'
     - 'lib/net/ssh/service/forward.rb'
 
-# Offense count: 71
+# Offense count: 74
 # Cop supports --auto-correct.
 # Configuration parameters: AllowUnusedKeywordArguments, IgnoreEmptyMethods, IgnoreNotImplementedMethods.
 Lint/UnusedMethodArgument:
@@ -222,7 +229,7 @@ Lint/UselessTimes:
   Exclude:
     - 'test/integration/test_forward.rb'
 
-# Offense count: 202
+# Offense count: 205
 # Configuration parameters: IgnoredMethods, CountRepeatedAttributes.
 Metrics/AbcSize:
   Max: 74
@@ -243,12 +250,12 @@ Metrics/BlockNesting:
 Metrics/ClassLength:
   Max: 488
 
-# Offense count: 37
+# Offense count: 38
 # Configuration parameters: IgnoredMethods.
 Metrics/CyclomaticComplexity:
   Max: 32
 
-# Offense count: 229
+# Offense count: 232
 # Configuration parameters: CountComments, CountAsOne, ExcludedMethods, IgnoredMethods.
 Metrics/MethodLength:
   Max: 72
@@ -263,7 +270,7 @@ Metrics/ModuleLength:
 Metrics/ParameterLists:
   MaxOptionalParameters: 4
 
-# Offense count: 32
+# Offense count: 34
 # Configuration parameters: IgnoredMethods.
 Metrics/PerceivedComplexity:
   Max: 32
@@ -439,7 +446,7 @@ Style/CaseEquality:
     - 'lib/net/ssh/buffer.rb'
     - 'lib/net/ssh/connection/session.rb'
 
-# Offense count: 2
+# Offense count: 3
 # Cop supports --auto-correct.
 Style/CaseLikeIf:
   Exclude:
@@ -776,7 +783,7 @@ Style/PerlBackrefs:
     - 'lib/net/ssh/proxy/socks5.rb'
     - 'test/integration/common.rb'
 
-# Offense count: 14
+# Offense count: 15
 # Cop supports --auto-correct.
 Style/Proc:
   Exclude:
@@ -848,7 +855,7 @@ Style/RedundantRegexpEscape:
     - 'lib/net/ssh/config.rb'
     - 'lib/net/ssh/transport/cipher_factory.rb'
 
-# Offense count: 86
+# Offense count: 87
 # Cop supports --auto-correct.
 # Configuration parameters: AllowMultipleReturnValues.
 Style/RedundantReturn:
@@ -925,6 +932,18 @@ Style/SingleLineMethods:
   Exclude:
     - 'lib/net/ssh/buffered_io.rb'
 
+# Offense count: 11
+# Cop supports --auto-correct.
+Style/SlicingWithRange:
+  Exclude:
+    - 'lib/net/ssh/authentication/ed25519.rb'
+    - 'lib/net/ssh/buffer.rb'
+    - 'lib/net/ssh/config.rb'
+    - 'lib/net/ssh/transport/algorithms.rb'
+    - 'lib/net/ssh/transport/packet_stream.rb'
+    - 'lib/net/ssh/transport/state.rb'
+    - 'test/transport/test_packet_stream.rb'
+
 # Offense count: 3
 # Cop supports --auto-correct.
 # Configuration parameters: AllowModifier.
@@ -971,7 +990,7 @@ Style/StringConcatenation:
     - 'test/test_buffer.rb'
     - 'test/test_key_factory.rb'
 
-# Offense count: 1816
+# Offense count: 1846
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, ConsistentQuotesInMultiline.
 # SupportedStyles: single_quotes, double_quotes
-- 
cgit v1.2.1