Skip to content

Commit

Permalink
chore: update sorbet version and fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
jacobobq committed Nov 27, 2024
1 parent 5257b58 commit 61b71b8
Show file tree
Hide file tree
Showing 15 changed files with 2,848 additions and 142 deletions.
4 changes: 2 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ gem "activesupport"
gem "rspec"
gem "rspec-json_expectations"
gem "rspec-sorbet", "~> 1.9.2"
gem "sorbet-coerce", ">= 0.2.6"
gem "sorbet-static-and-runtime", ">= 0.5.11609"
gem "sorbet-coerce", "~> 0.7"
gem "sorbet-static-and-runtime", "0.5.11670"
gem "tapioca", "~> 0.15.1", require: false
gem "syntax_tree", "~> 6.2", require: false

Expand Down
28 changes: 15 additions & 13 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,9 @@ GEM
minitest (>= 5.1)
securerandom (>= 0.3)
tzinfo (~> 2.0, >= 2.0.5)
uri (>= 0.13.1)
base64 (0.2.0)
benchmark (0.3.0)
benchmark (0.4.0)
bigdecimal (3.1.8)
coderay (1.1.3)
concurrent-ruby (1.3.4)
Expand Down Expand Up @@ -47,7 +48,7 @@ GEM
logger (1.6.1)
lumberjack (1.2.10)
method_source (1.1.0)
minitest (5.25.1)
minitest (5.25.2)
nenv (0.3.0)
netrc (0.11.0)
notiffany (0.1.3)
Expand Down Expand Up @@ -83,20 +84,20 @@ GEM
sorbet-runtime
rspec-support (3.13.1)
safe_type (1.1.1)
securerandom (0.3.1)
securerandom (0.3.2)
shellany (0.0.1)
sorbet (0.5.11609)
sorbet-static (= 0.5.11609)
sorbet (0.5.11670)
sorbet-static (= 0.5.11670)
sorbet-coerce (0.7.0)
polyfill (~> 1.8)
safe_type (~> 1.1, >= 1.1.1)
sorbet-runtime (>= 0.4.4704)
sorbet-runtime (0.5.11609)
sorbet-static (0.5.11609-universal-darwin)
sorbet-static (0.5.11609-x86_64-linux)
sorbet-static-and-runtime (0.5.11609)
sorbet (= 0.5.11609)
sorbet-runtime (= 0.5.11609)
sorbet-runtime (0.5.11670)
sorbet-static (0.5.11670-universal-darwin)
sorbet-static (0.5.11670-x86_64-linux)
sorbet-static-and-runtime (0.5.11670)
sorbet (= 0.5.11670)
sorbet-runtime (= 0.5.11670)
spoom (1.4.2)
erubi (>= 1.10.0)
prism (>= 0.28.0)
Expand All @@ -116,6 +117,7 @@ GEM
thor (1.3.0)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
uri (1.0.2)
yard (0.9.36)
yard-sorbet (0.9.0)
sorbet-runtime
Expand All @@ -132,8 +134,8 @@ DEPENDENCIES
rspec
rspec-json_expectations
rspec-sorbet (~> 1.9.2)
sorbet-coerce (>= 0.2.6)
sorbet-static-and-runtime (>= 0.5.11609)
sorbet-coerce (~> 0.7)
sorbet-static-and-runtime (= 0.5.11670)
syntax_tree (~> 6.2)
tapioca (~> 0.15.1)

Expand Down
2 changes: 1 addition & 1 deletion examples/sinatra-pet-shelter/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ source "https://rubygems.org"
gem "json"
gem "resource_registry",
github: "factorialco/resource-registry",
branch: "adding-example-app"
branch: "chore/update-sorbet-version-and-fixes"
gem "sinatra"
gem "sinatra-contrib"
gem "tapioca", "~> 0.15.1", require: false
Expand Down
7 changes: 5 additions & 2 deletions lib/resource_registry.rb
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,15 @@
require "public/versions"
require "public/versions/version"
require "public/entity_finder"
require "public/resource_struct_builder"
require "public/registry"
require "public/serializer"
require "public/repositories/base"
require "schema_registry/registry"
require "schema_registry/json_schema_mapper"
require "schema_registry/maybe"
require "schema_registry/generate_from_struct"
require "runtime_generic"
require "public/resource_struct_builder"
require "public/registry"

# Entry point for ResourceRegistry
module ResourceRegistry
Expand Down
34 changes: 0 additions & 34 deletions lib/schema_generator.rb

This file was deleted.

36 changes: 19 additions & 17 deletions resource_registry.gemspec
Original file line number Diff line number Diff line change
@@ -1,19 +1,21 @@
Gem::Specification.new do |s|
s.name = 'resource_registry'
s.version = '0.0.0'
s.summary = 'Resource Registry'
s.description = 'A declarative approach to define resources and their relationships'
s.authors = ['Genar Trias Ortiz']
s.email = '[email protected]'
s.files = ['lib/resource_registry.rb', 'lib/public/repositories/base.rb', 'rbi/resource_registry.rbi']
s.homepage =
'https://rubygems.org/gems/resource_registry'
s.license = 'MIT'
s.add_dependency 'sorbet-coerce', '>= 0.2.6'
# s.add_runtime_dependency 'sorbet-runtime-stub', '0.2.0'
s.add_development_dependency 'sorbet', '0.5.11609'
s.add_runtime_dependency 'activesupport', '>= 7.1.3'
s.add_runtime_dependency 'dry-inflector', '>= 0.1.2'
s.add_runtime_dependency 'sorbet-runtime', '0.5.11609'
# s.add_development_dependency 'tapioca'
s.name = "resource_registry"
s.version = "0.0.0"
s.summary = "Resource Registry"
s.description =
"A declarative approach to define resources and their relationships"
s.authors = ["Genar Trias Ortiz"]
s.email = "[email protected]"
s.files = %w[
lib/resource_registry.rb
lib/public/repositories/base.rb
rbi/resource_registry.rbi
]
s.homepage = "https://rubygems.org/gems/resource_registry"
s.license = "MIT"
s.required_ruby_version = ">= 3.0"
s.add_development_dependency "sorbet", "0.5.11670"
s.add_runtime_dependency "sorbet-runtime", "0.5.11670"
s.add_dependency "sorbet-coerce", "~> 0.7"
s.add_runtime_dependency "activesupport", ">= 7.1.3"
end
3 changes: 3 additions & 0 deletions sorbet/rbi/annotations/activesupport.rbi

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

1 change: 1 addition & 0 deletions sorbet/rbi/dsl/.gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
**/*.rbi linguist-generated=true
21 changes: 21 additions & 0 deletions sorbet/rbi/dsl/active_support/callbacks.rbi

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

File renamed without changes.
File renamed without changes.
9 changes: 9 additions & 0 deletions sorbet/rbi/gems/[email protected]

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

73 changes: 0 additions & 73 deletions sorbet/rbi/gems/[email protected]

This file was deleted.

Loading

0 comments on commit 61b71b8

Please sign in to comment.