Skip to content

Commit 39a51b7

Browse files
authored
Merge pull request #1150 from tildeio/drop-ruby-27
end support for ruby 2.7
2 parents 3624d3a + 13303e7 commit 39a51b7

File tree

26 files changed

+290
-596
lines changed

26 files changed

+290
-596
lines changed

.github/workflows/build.yml

Lines changed: 143 additions & 351 deletions
Large diffs are not rendered by default.

.rubocop_todo.yml

Lines changed: 56 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,35 @@
11
# This configuration was generated by
22
# `rubocop --auto-gen-config`
3-
# on 2024-10-29 17:01:45 UTC using RuboCop version 1.66.1.
3+
# on 2025-08-12 16:11:14 UTC using RuboCop version 1.70.0.
44
# The point is for the user to remove these configuration records
55
# one by one as the offenses are removed from the code base.
66
# Note that changes in the inspected code, or installation of new
77
# versions of RuboCop, may require this file to be generated again.
88

9-
# Offense count: 2
9+
# Offense count: 1
10+
# This cop supports safe autocorrection (--autocorrect).
11+
# Configuration parameters: TreatCommentsAsGroupSeparators, ConsiderPunctuation, Include.
12+
# Include: **/*.gemfile, **/Gemfile, **/gems.rb
13+
Bundler/OrderedGems:
14+
Exclude:
15+
- 'dummy/Gemfile'
16+
17+
# Offense count: 1
18+
# Configuration parameters: Severity, Include.
19+
# Include: **/*.gemspec
20+
Gemspec/RequiredRubyVersion:
21+
Exclude:
22+
- 'skylight.gemspec'
23+
24+
# Offense count: 5
1025
# This cop supports safe autocorrection (--autocorrect).
11-
# Configuration parameters: Max, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns.
26+
# Configuration parameters: Max, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns, SplitStrings.
1227
# URISchemes: http, https
1328
Layout/LineLength:
1429
Exclude:
15-
- 'spec/integration/graphql_spec.rb'
30+
- 'lib/skylight/probes/lambda.rb'
31+
- 'spec/integration/delayed_job_spec.rb'
32+
- 'spec/integration/initialization_spec.rb'
1633
- 'spec/unit/custom_instrumentation_spec.rb'
1734

1835
# Offense count: 1
@@ -29,14 +46,6 @@ Lint/RedundantCopDisableDirective:
2946
- 'lib/skylight/util/clock.rb'
3047
- 'spec/integration/rails_spec.rb'
3148

32-
# Offense count: 1
33-
# This cop supports unsafe autocorrection (--autocorrect-all).
34-
# Configuration parameters: AllowedMethods.
35-
# AllowedMethods: instance_of?, kind_of?, is_a?, eql?, respond_to?, equal?
36-
Lint/RedundantSafeNavigation:
37-
Exclude:
38-
- 'lib/skylight/normalizers/render.rb'
39-
4049
# Offense count: 1
4150
# This cop supports safe autocorrection (--autocorrect).
4251
Lint/RedundantStringCoercion:
@@ -45,11 +54,10 @@ Lint/RedundantStringCoercion:
4554

4655
# Offense count: 1
4756
# This cop supports safe autocorrection (--autocorrect).
48-
# Configuration parameters: EnforcedStyle.
49-
# SupportedStyles: strict, consistent
50-
Lint/SymbolConversion:
57+
# Configuration parameters: AutoCorrect.
58+
Lint/UselessAssignment:
5159
Exclude:
52-
- 'spec/spec_helper.rb'
60+
- 'spec/unit/instrumenter_spec.rb'
5361

5462
# Offense count: 2
5563
# This cop supports safe autocorrection (--autocorrect).
@@ -77,7 +85,13 @@ Style/ExplicitBlockArgument:
7785
- 'lib/skylight/test.rb'
7886
- 'spec/support/messages/trace.rb'
7987

80-
# Offense count: 242
88+
# Offense count: 1
89+
# This cop supports unsafe autocorrection (--autocorrect-all).
90+
Style/FileNull:
91+
Exclude:
92+
- 'lib/skylight/cli/doctor.rb'
93+
94+
# Offense count: 264
8195
# This cop supports unsafe autocorrection (--autocorrect-all).
8296
# Configuration parameters: EnforcedStyle.
8397
# SupportedStyles: always, always_true, never
@@ -94,27 +108,22 @@ Style/HashEachMethods:
94108
- 'lib/skylight/probes/mongo.rb'
95109
- 'lib/tasks/workflow.rake'
96110

97-
# Offense count: 3
111+
# Offense count: 4
98112
# This cop supports unsafe autocorrection (--autocorrect-all).
99113
Style/MapIntoArray:
100114
Exclude:
101115
- 'spec/integration/graphql_spec.rb'
102116
- 'spec/integration/rails_spec.rb'
103117
- 'spec/integration/sinatra_spec.rb'
118+
- 'spec/support/matchers.rb'
104119

105-
# Offense count: 7
106-
Style/OpenStructUse:
107-
Exclude:
108-
- 'lib/skylight/cli/merger.rb'
109-
- 'spec/unit/cli/merger_spec.rb'
110-
- 'spec/unit/extensions/collection_spec.rb'
111-
- 'spec/unit/extensions/source_location_spec.rb'
112-
113-
# Offense count: 1
120+
# Offense count: 2
114121
# This cop supports safe autocorrection (--autocorrect).
115-
Style/OperatorMethodCall:
122+
# Configuration parameters: AllowMethodComparison, ComparisonsThreshold.
123+
Style/MultipleComparison:
116124
Exclude:
117-
- 'lib/skylight/util/logging.rb'
125+
- 'lib/skylight/instrumenter.rb'
126+
- 'lib/skylight/normalizers/sql.rb'
118127

119128
# Offense count: 2
120129
# This cop supports safe autocorrection (--autocorrect).
@@ -123,6 +132,13 @@ Style/RedundantRegexpArgument:
123132
- 'lib/skylight/native_ext_fetcher.rb'
124133
- 'lib/skylight/util/http.rb'
125134

135+
# Offense count: 8
136+
# This cop supports safe autocorrection (--autocorrect).
137+
Style/RedundantRegexpEscape:
138+
Exclude:
139+
- 'spec/integration/cli_spec.rb'
140+
- 'spec/unit/cli/setup_spec.rb'
141+
126142
# Offense count: 1
127143
# This cop supports safe autocorrection (--autocorrect).
128144
Style/RedundantStringEscape:
@@ -147,7 +163,17 @@ Style/SafeNavigation:
147163
- 'lib/skylight/probes/net_http.rb'
148164
- 'lib/skylight/util/logging.rb'
149165

150-
# Offense count: 2
166+
# Offense count: 4
167+
# This cop supports safe autocorrection (--autocorrect).
168+
# Configuration parameters: EnforcedStyle, ConsistentQuotesInMultiline.
169+
# SupportedStyles: single_quotes, double_quotes
170+
Style/StringLiterals:
171+
Exclude:
172+
- 'dummy/Gemfile'
173+
- 'dummy/config/environment.rb'
174+
- 'dummy/lib/validate_skylight.rb'
175+
176+
# Offense count: 3
151177
# This cop supports safe autocorrection (--autocorrect).
152178
Style/SuperArguments:
153179
Exclude:

CHANGELOG.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1-
## 6.2.0.alpha (October 10, 2024)
1+
## 7.0.0.beta (July 31, 2025)
22

33
- IMPROVEMENT Initial support for AWS Lambda
4+
- BREAKING end support for Ruby 2.7 and 3.0
5+
- BREAKING end support for Rails < 7.1
46

57
## 6.1.0.beta (June 11, 2024)
68

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ gemspec
55
ruby ">= 2.7"
66

77
gem "grape", "~> 2.2.0"
8-
gem "rails", "~> 7.1.0"
8+
gem "rails", "~> 8.0.0"
99
gem "sinatra", "~> 3.0.0"
1010

1111
eval_gemfile "./gemfiles/Gemfile.additional"

gemfiles/Gemfile.additional

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ gem "graphql", "~> 2.0.18"
88
gem "httpclient"
99
gem "rexml"
1010
gem "sequel", "> 0"
11-
gem "sidekiq"
12-
gem "sqlite3", "~> 1.4.1"
11+
gem "sidekiq", "< 8"
12+
gem "sqlite3", "~> 2.1.0"
1313
gem "tilt"
1414
gem "haml"
1515
gem "redis"

gemfiles/ams-0.8.x/Gemfile

Lines changed: 0 additions & 9 deletions
This file was deleted.

gemfiles/ams-0.9.x/Gemfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ source "https://rubygems.org"
33
gemspec path: "../.."
44

55
# TODO: Check if we need Rails
6-
gem "rails", "~> 5.2.0"
7-
gem "sqlite3", "~> 1.4"
6+
gem "rails", "~> 7.2.0"
7+
gem "sqlite3", "~> 2"
88

99
gem "active_model_serializers", "~> 0.9.5"

gemfiles/elasticsearch/Gemfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ source "https://rubygems.org"
33
gemspec path: "../.."
44

55
# TODO: Check if we need Rails
6-
gem "rails", "~> 6.1.0"
7-
gem "sqlite3", "~> 1.4"
6+
gem "rails", "~> 7.1.0"
7+
gem "sqlite3", "~> 2"
88

99
gem "elasticsearch"
1010

gemfiles/grape-1.2.x/Gemfile

Lines changed: 0 additions & 8 deletions
This file was deleted.

gemfiles/graphql-1.9.x/Gemfile

Lines changed: 0 additions & 9 deletions
This file was deleted.

0 commit comments

Comments
 (0)