Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Unpin zeitwerk version from 2.6.5 #1169

Merged
merged 2 commits into from
Jun 7, 2023
Merged

Unpin zeitwerk version from 2.6.5 #1169

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
93fdef8
Unpin zeitwerk version from 2.6.5 - Fixes #1058
sterrym Jun 7, 2023
6f62667
Update CHANGELOG
sterrym Jun 7, 2023
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ Note: For changes to the API, see https://shopify.dev/changelog?filter=api
## Unreleased

- [#1157](https://github.com/Shopify/shopify-api-ruby/pull/1157) Fix an issue where read-only attributes are included when saving REST resources
- [#1169](https://github.com/Shopify/shopify-api-ruby/pull/1169) Unpin zeitwerk version from 2.6.5

## 13.0.0

Expand Down
4 changes: 2 additions & 2 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ PATH
openssl
securerandom
sorbet-runtime
zeitwerk (~> 2.5, < 2.6.5)
zeitwerk (~> 2.5)

GEM
remote: https://rubygems.org/
Expand Down Expand Up @@ -133,7 +133,7 @@ GEM
yard-sorbet (0.7.0)
sorbet-runtime (>= 0.5)
yard (>= 0.9)
zeitwerk (2.6.4)
zeitwerk (2.6.8)

PLATFORMS
arm64-darwin-21
Expand Down
1 change: 1 addition & 0 deletions lib/shopify_api/context.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ def setup(
sig { params(api_version: String).void }
def load_rest_resources(api_version:)
# Unload any previous instances - mostly useful for tests where we need to reset the version
@rest_resource_loader&.setup
@rest_resource_loader&.unload

# No resources for the unstable version
Expand Down
2 changes: 1 addition & 1 deletion shopify_api.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ Gem::Specification.new do |s|
s.add_runtime_dependency("openssl")
s.add_runtime_dependency("securerandom")
s.add_runtime_dependency("sorbet-runtime")
s.add_runtime_dependency("zeitwerk", "~> 2.5", "< 2.6.5") # https://github.com/Shopify/shopify-api-ruby/issues/1058
s.add_runtime_dependency("zeitwerk", "~> 2.5")

s.add_development_dependency("pry-byebug")
s.add_development_dependency("rake")
Expand Down