Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ name: CI Ruby

on:
push:
branches: [ 'main', 'develop' ]
branches: [ "main", "develop" ]
pull_request:
branches: [ 'main', 'develop' ]
branches: [ "main", "develop" ]

jobs:
test:
Expand All @@ -13,7 +13,7 @@ jobs:
CI: true
strategy:
matrix:
ruby-version: ['3.2', '3.3', '3.4']
ruby-version: [ "3.3", "3.4", "4.0" ]
steps:
- name: Checkout code
uses: actions/checkout@v3
Expand All @@ -35,7 +35,7 @@ jobs:
- name: Install Ruby and gems
uses: ruby/setup-ruby@v1
with:
ruby-version: '3.2'
ruby-version: "4.0"
bundler-cache: true
- name: Lint Ruby files
run: bundle exec rubocop --parallel
Expand All @@ -50,7 +50,7 @@ jobs:
- name: Install Ruby and gems
uses: ruby/setup-ruby@v1
with:
ruby-version: '3.2'
ruby-version: "4.0"
bundler-cache: true
- name: Typecheck Ruby files
run: bundle exec srb tc
8 changes: 7 additions & 1 deletion .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ inherit_gem:
rubocop-espago: sorbet.yml

AllCops:
TargetRubyVersion: 3.1
TargetRubyVersion: 3.2
Exclude:
- lib/tapioca/**/*.rb

Expand Down Expand Up @@ -32,3 +32,9 @@ Sorbet/ForbidTHelpers:

Style/DocumentDynamicEvalDefinition:
Enabled: false

Style/HashLookupMethod:
Enabled: false

Style/OneClassPerFile:
Enabled: false
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.4.5
ruby-4.0.3
16 changes: 8 additions & 8 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,16 @@ source 'https://rubygems.org'
# Specify your gem's dependencies in diggable.gemspec
gemspec

gem 'activemodel', '~> 8.0' # validations
gem 'activemodel', '~> 8.1' # validations
gem 'base64', '~> 0.3' # Base64
gem 'byebug', '~> 11.1' # debugger
gem 'minitest', '~> 5.0' # test framework
gem 'byebug', '~> 13.0' # debugger
gem 'minitest', '~> 6.0' # test framework
gem 'mutex_m', '~> 0.3' # Mutexes
gem 'racc', '~> 1.8' # parser
gem 'rake', '~> 13.0' # automation tasks
gem 'rubocop', '~> 1.81' # ruby linter
gem 'rake', '~> 13.4' # automation tasks
gem 'rubocop', '~> 1.86' # ruby linter
gem 'rubocop-espago', '~> 1.2' # Espago rubocop config
gem 'rubocop-sorbet', '~> 0.11' # sorbet rubocop config
gem 'rubocop-sorbet', '~> 0.12' # sorbet rubocop config
gem 'shoulda-context', '~> 2.0' # more pleasant test syntax
gem 'sorbet', '>= 0.5' # static typechecker
gem 'tapioca', '> 0.13' # RBI generator for sorbet
gem 'sorbet', '>= 0.6' # static typechecker
gem 'tapioca', '> 0.19' # RBI generator for sorbet
133 changes: 74 additions & 59 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -4,140 +4,155 @@ PATH
shale-builder (0.9.3)
booleans (>= 0.1)
shale (< 2.0)
sorbet-runtime (> 0.5)
sorbet-runtime (> 0.6)

GEM
remote: https://rubygems.org/
specs:
activemodel (8.0.3)
activesupport (= 8.0.3)
activesupport (8.0.3)
activemodel (8.1.3)
activesupport (= 8.1.3)
activesupport (8.1.3)
base64
benchmark (>= 0.3)
bigdecimal
concurrent-ruby (~> 1.0, >= 1.3.1)
connection_pool (>= 2.2.5)
drb
i18n (>= 1.6, < 2)
json
logger (>= 1.4.2)
minitest (>= 5.1)
securerandom (>= 0.3)
tzinfo (~> 2.0, >= 2.0.5)
uri (>= 0.13.1)
ast (2.4.3)
base64 (0.3.0)
benchmark (0.4.1)
bigdecimal (3.2.3)
booleans (0.1.1)
byebug (11.1.3)
concurrent-ruby (1.3.5)
connection_pool (2.5.4)
benchmark (0.5.0)
bigdecimal (4.1.2)
booleans (0.1.3)
sorbet-runtime (>= 0.5)
byebug (13.0.0)
reline (>= 0.6.0)
concurrent-ruby (1.3.6)
connection_pool (3.0.2)
drb (2.2.3)
erubi (1.13.1)
i18n (1.14.7)
i18n (1.14.8)
concurrent-ruby (~> 1.0)
json (2.15.1)
io-console (0.8.2)
json (2.19.4)
language_server-protocol (3.17.0.5)
lint_roller (1.1.0)
logger (1.7.0)
minitest (5.17.0)
minitest (6.0.5)
drb (~> 2.0)
prism (~> 1.5)
mutex_m (0.3.0)
netrc (0.11.0)
parallel (1.27.0)
parser (3.3.9.0)
parallel (2.1.0)
parser (3.3.11.1)
ast (~> 2.4.1)
racc
prism (1.5.2)
prism (1.9.0)
racc (1.8.1)
rainbow (3.1.1)
rake (13.0.6)
rbi (0.3.7)
rake (13.4.2)
rbi (0.3.10)
prism (~> 1.0)
rbs (>= 3.4.4)
rbs (3.9.5)
rbs (>= 4.0.1)
rbs (4.0.2)
logger
regexp_parser (2.11.3)
rubocop (1.81.1)
prism (>= 1.6.0)
tsort
regexp_parser (2.12.0)
reline (0.6.3)
io-console (~> 0.5)
require-hooks (0.3.0)
rexml (3.4.4)
rubocop (1.86.1)
json (~> 2.3)
language_server-protocol (~> 3.17.0.2)
lint_roller (~> 1.1.0)
parallel (~> 1.10)
parallel (>= 1.10)
parser (>= 3.3.0.2)
rainbow (>= 2.2.2, < 4.0)
regexp_parser (>= 2.9.3, < 3.0)
rubocop-ast (>= 1.47.1, < 2.0)
rubocop-ast (>= 1.49.0, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 2.4.0, < 4.0)
rubocop-ast (1.47.1)
rubocop-ast (1.49.1)
parser (>= 3.3.7.2)
prism (~> 1.4)
prism (~> 1.7)
rubocop-espago (1.2.0)
rubocop
rubocop-sorbet (0.11.0)
rubocop-sorbet (0.12.0)
lint_roller
rubocop (>= 1.75.2)
ruby-progressbar (1.13.0)
rubydex (0.1.0.beta13-arm64-darwin)
rubydex (0.1.0.beta13-x86_64-linux)
securerandom (0.4.1)
shale (1.2.2)
bigdecimal
shoulda-context (2.0.0)
sorbet (0.6.12642)
sorbet-static (= 0.6.12642)
sorbet-runtime (0.6.12642)
sorbet-static (0.6.12642-universal-darwin)
sorbet-static (0.6.12642-x86_64-linux)
sorbet-static-and-runtime (0.6.12642)
sorbet (= 0.6.12642)
sorbet-runtime (= 0.6.12642)
spoom (1.6.1)
sorbet (0.6.13169)
sorbet-static (= 0.6.13169)
sorbet-runtime (0.6.13169)
sorbet-static (0.6.13169-universal-darwin)
sorbet-static (0.6.13169-x86_64-linux)
sorbet-static-and-runtime (0.6.13169)
sorbet (= 0.6.13169)
sorbet-runtime (= 0.6.13169)
spoom (1.7.13)
erubi (>= 1.10.0)
prism (>= 0.28.0)
rbi (>= 0.2.3)
rbi (>= 0.3.3)
rbs (>= 4.0.0.dev.5)
rexml (>= 3.2.6)
sorbet-static-and-runtime (>= 0.5.10187)
thor (>= 0.19.2)
tapioca (0.16.11)
tapioca (0.19.1)
benchmark
bundler (>= 2.2.25)
netrc (>= 0.11.0)
parallel (>= 1.21.0)
rbi (~> 0.2)
sorbet-static-and-runtime (>= 0.5.11087)
spoom (>= 1.2.0)
rbi (>= 0.3.7)
require-hooks (>= 0.2.2)
rubydex (>= 0.1.0.beta10)
sorbet-static-and-runtime (>= 0.6.12698)
spoom (>= 1.7.9)
thor (>= 1.2.0)
yard-sorbet
thor (1.4.0)
tsort
thor (1.5.0)
tsort (0.2.0)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
unicode-display_width (3.2.0)
unicode-emoji (~> 4.1)
unicode-emoji (4.1.0)
uri (1.0.4)
yard (0.9.37)
yard-sorbet (0.9.0)
sorbet-runtime
yard
unicode-emoji (4.2.0)
uri (1.1.1)

PLATFORMS
arm64-darwin-20
arm64-darwin-22
arm64-darwin-24
arm64-darwin-25
x86_64-linux

DEPENDENCIES
activemodel (~> 8.0)
activemodel (~> 8.1)
base64 (~> 0.3)
byebug (~> 11.1)
minitest (~> 5.0)
byebug (~> 13.0)
minitest (~> 6.0)
mutex_m (~> 0.3)
racc (~> 1.8)
rake (~> 13.0)
rubocop (~> 1.81)
rake (~> 13.4)
rubocop (~> 1.86)
rubocop-espago (~> 1.2)
rubocop-sorbet (~> 0.11)
rubocop-sorbet (~> 0.12)
shale-builder!
shoulda-context (~> 2.0)
sorbet (>= 0.5)
tapioca (> 0.13)
sorbet (>= 0.6)
tapioca (> 0.19)

BUNDLED WITH
2.7.2
4.0.10
2 changes: 1 addition & 1 deletion lib/shale/builder.rb
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ module ClassMethods
extend T::Generic

abstract!
has_attached_class!
has_attached_class!(:out)

#: (Class subclass) -> void
def inherited(subclass)
Expand Down
4 changes: 2 additions & 2 deletions shale-builder.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Gem::Specification.new do |spec|
spec.description = spec.summary
spec.homepage = 'https://github.com/Verseth/ruby-shale-builder'
spec.license = 'MIT'
spec.required_ruby_version = '>= 3.1.0'
spec.required_ruby_version = '>= 3.2.0'

spec.metadata['homepage_uri'] = spec.homepage
spec.metadata['source_code_uri'] = spec.homepage
Expand All @@ -33,6 +33,6 @@ Gem::Specification.new do |spec|
# Uncomment to register a new dependency of your gem
spec.add_dependency 'booleans', '>= 0.1'
spec.add_dependency 'shale', '< 2.0'
spec.add_dependency 'sorbet-runtime', '> 0.5'
spec.add_dependency 'sorbet-runtime', '> 0.6'
spec.metadata['rubygems_mfa_required'] = 'true'
end
1 change: 1 addition & 0 deletions sorbet/config
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,6 @@
.
--enable-experimental-requires-ancestor
--enable-experimental-rbs-comments
--parser=prism
--ignore=tmp/
--ignore=vendor/
4 changes: 0 additions & 4 deletions sorbet/rbi/annotations/minitest.rbi

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading