Skip to content

Commit 7ce8f7a

Browse files
committed
Drop Ruby 2.6 support (EOLed)
1 parent edb5896 commit 7ce8f7a

File tree

5 files changed

+8
-32
lines changed

5 files changed

+8
-32
lines changed

.circleci/config.yml

Lines changed: 2 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,6 @@ gem_cache_key: &gem_cache_key
1919
gem_cache_key: "gem-cache-v2"
2020

2121
executors:
22-
ruby_2_6:
23-
<<: *ruby_env
24-
parameters:
25-
ruby-version:
26-
type: string
27-
default: "2.6"
2822
ruby_2_7:
2923
<<: *ruby_env
3024
parameters:
@@ -68,7 +62,7 @@ commands:
6862
command: |
6963
export GRPC_RUBY_BUILD_PROCS=<<parameters.grpc_ruby_build_procs>>
7064
# due to needing GRPC_RUBY_BUILD_PROCS, we need to explicitly install at least this version
71-
gem install grpc -v '>= 1.44.0.pre2' --verbose --no-document
65+
gem install grpc -v '>= 1.48' --verbose --no-document
7266
bundle config set --local path 'vendor/bundle'
7367
bundle lock --add-platform x86_64-linux
7468
bundle check || bundle install
@@ -169,7 +163,7 @@ jobs:
169163
parameters:
170164
e:
171165
type: executor
172-
default: "ruby_2_7"
166+
default: "ruby_3_0"
173167
steps:
174168
- pre-setup
175169
- bundle-install:
@@ -178,21 +172,6 @@ jobs:
178172

179173
workflows:
180174
version: 2
181-
ruby_2_6:
182-
jobs:
183-
- bundle-audit:
184-
name: "ruby-2_6-bundle_audit"
185-
e: "ruby_2_6"
186-
- rubocop:
187-
name: "ruby-2_6-rubocop"
188-
e: "ruby_2_6"
189-
- rspec-unit:
190-
name: "ruby-2_6-rspec"
191-
e: "ruby_2_6"
192-
code-climate: false
193-
- e2e:
194-
name: "ruby-2_6-e2e"
195-
e: "ruby_2_6"
196175
ruby_2_7:
197176
jobs:
198177
- bundle-audit:

.rubocop.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
AllCops:
2-
TargetRubyVersion: 2.6
2+
TargetRubyVersion: 2.7
3+
SuggestExtensions: false
34
NewCops: enable
45
Exclude:
56
- .bundle/**/*

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ Changelog for the gruf gem. This includes internal history before the gem was ma
44

55
- [#163] Add `context` hash attribute to `Gruf::Controllers::Request` to allow interceptors to pass information down
66
to a gruf controller
7+
- Drop Ruby 2.6 support (EOL'ed on March 31st, 2022)
78

89
### 2.15.1
910

gruf.gemspec

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ Gem::Specification.new do |spec|
3232
spec.executables << 'gruf'
3333
spec.require_paths = ['lib']
3434

35-
spec.required_ruby_version = '>= 2.6', '< 3.2'
35+
spec.required_ruby_version = '>= 2.7', '< 3.2'
3636

3737
spec.metadata = {
3838
'bug_tracker_uri' => 'https://github.com/bigcommerce/gruf/issues',
@@ -44,12 +44,7 @@ Gem::Specification.new do |spec|
4444
}
4545

4646
spec.add_development_dependency 'bundler-audit', '>= 0.6'
47-
# rubocop:disable Gemspec/RubyVersionGlobalsUsage
48-
spec.add_development_dependency(
49-
'factory_bot',
50-
(Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.5') ? '>= 6.1' : '~> 5.2')
51-
)
52-
# rubocop:enable Gemspec/RubyVersionGlobalsUsage
47+
spec.add_development_dependency 'factory_bot', '>= 6.1'
5348
spec.add_development_dependency 'ffaker', '>= 2.15'
5449
spec.add_development_dependency 'pry', '~> 0.12'
5550
spec.add_development_dependency 'pry-byebug', '>= 3.9'

lib/gruf/version.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,5 @@
1616
# OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
1717
#
1818
module Gruf
19-
VERSION = '2.15.2.pre'
19+
VERSION = '2.16.0.pre'
2020
end

0 commit comments

Comments
 (0)