Skip to content

Commit c64ffad

Browse files
authored
Update workflow to run with Ruby versions mayor to 3.0 (#36)
* Update workflow to run with Ruby versions mayor to 3.0
1 parent dee7aa9 commit c64ffad

File tree

6 files changed

+20
-14
lines changed

6 files changed

+20
-14
lines changed

.github/workflows/ci.yml

+8-4
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ on:
77
push:
88
branches: ["master", "main"]
99

10+
concurrency:
11+
group: ${{ github.ref }}-CI
12+
cancel-in-progress: true
13+
1014
jobs:
1115
linters:
1216
runs-on: ubuntu-latest
@@ -18,7 +22,7 @@ jobs:
1822
- name: Set up Ruby
1923
uses: ruby/setup-ruby@v1
2024
with:
21-
ruby-version: 2.7
25+
ruby-version: 3.0
2226
bundler-cache: true
2327

2428
- name: Run linters
@@ -30,11 +34,11 @@ jobs:
3034
fail-fast: false
3135
matrix:
3236
include:
33-
- ruby: ruby:2.5
34-
- ruby: ruby:2.6
35-
- ruby: ruby:2.7
3637
- ruby: ruby:3.0
3738
coverage: true
39+
- ruby: ruby:3.1
40+
- ruby: ruby:3.2
41+
- ruby: ruby:3.3
3842
name: test/ruby ${{ matrix.ruby }}
3943
steps:
4044
- name: Checkout repository

.reek.yml

-2
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ detectors:
5353
enabled: true
5454
exclude: []
5555
max_allowed_nesting: 2
56-
ignore_iterators: []
5756
NilCheck:
5857
enabled: false
5958
exclude: []
@@ -127,4 +126,3 @@ detectors:
127126
exclude_paths:
128127
- config
129128
- lib/generators/apple_auth/apple_auth_controller/templates
130-

.rubocop.yml

+5-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
AllCops:
2-
TargetRubyVersion: 2.5
2+
TargetRubyVersion: 3.0
3+
SuggestExtensions: false
4+
NewCops: disable
35
Exclude:
46
- lib/generators/apple_auth/apple_auth_controller/templates/**
57

@@ -22,10 +24,10 @@ Metrics/BlockLength:
2224
CountComments: false
2325
Max: 25
2426
Exclude:
25-
- '*.gemspec'
27+
- "*.gemspec"
2628
- config/**/*
2729
- spec/**/*
28-
ExcludedMethods:
30+
AllowedMethods:
2931
- class_methods
3032

3133
Metrics/BlockNesting:

apple_auth.gemspec

+3-3
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@ Gem::Specification.new do |spec|
3535
spec.add_development_dependency 'byebug', '~> 11.1'
3636
spec.add_development_dependency 'railties', '~> 6.0'
3737
spec.add_development_dependency 'rake', '~> 13.0'
38-
spec.add_development_dependency 'reek', '~> 5.6'
38+
spec.add_development_dependency 'reek', '~> 6.0'
3939
spec.add_development_dependency 'rspec', '~> 3.9'
40-
spec.add_development_dependency 'rubocop', '~> 0.80'
41-
spec.add_development_dependency 'parser', '~> 2.7.1.1'
40+
spec.add_development_dependency 'rubocop', '~> 1.66'
41+
spec.add_development_dependency 'parser', '~> 3.3.0'
4242
spec.add_development_dependency 'simplecov', '~> 0.17.1'
4343
spec.add_development_dependency 'webmock', '~> 3.8'
4444
end

lib/apple_auth/token.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ def request_header
6363

6464
def gen_private_key
6565
key = AppleAuth.config.apple_private_key
66-
key = OpenSSL::PKey::EC.new(key) unless key.class == OpenSSL::PKey::EC
66+
key = OpenSSL::PKey::EC.new(key) unless key.instance_of?(OpenSSL::PKey::EC)
6767
key
6868
end
6969

spec/token_spec.rb

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
# frozen_string_literal: true
22

3+
require 'ostruct'
4+
35
RSpec.describe AppleAuth::Token do
46
subject(:token_service) { described_class.new(code) }
57

@@ -9,7 +11,7 @@
911

1012
before do
1113
AppleAuth.config.apple_client_id = 'client_id'
12-
AppleAuth.config.apple_private_key = OpenSSL::PKey::EC.new('prime256v1').generate_key!
14+
AppleAuth.config.apple_private_key = OpenSSL::PKey::EC.generate('prime256v1')
1315
AppleAuth.config.apple_key_id = 'apple_kid'
1416
AppleAuth.config.apple_team_id = 'team_id'
1517
AppleAuth.config.redirect_uri = 'www.example.com'

0 commit comments

Comments
 (0)