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.

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

Update deps #46

Merged
merged 4 commits into from
Nov 30, 2024
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
4 changes: 2 additions & 2 deletions .github/workflows/ruby.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ jobs:
strategy:
matrix:
gemfile:
- Gemfile # latest Rails (7.2)
- gemfiles/Gemfile-rails-6-1
- Gemfile # latest Rails (8.0)
- gemfiles/Gemfile-rails-7-0
- gemfiles/Gemfile-rails-7-1
- gemfiles/Gemfile-rails-7-2
ruby:
- "3.1"
- "3.2"
Expand Down
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# Changelog

## 0.7.0

- Minimum Rails version bumped to 7.0
- Marked as Rails 8 compatible

## 0.6.1

- Fixed missing `ConcurrentRails` module definition
Expand Down
5 changes: 3 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,11 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
# Specify your gem's dependencies in concurrent_rails.gemspec.
gemspec

gem "activerecord", "< 8" # needed for app_test test case
gem "minitest-reporters"
gem "activerecord" # needed for app_test test case
gem "sqlite3"

gem "minitest-reporters"

gem "rubocop"
gem "rubocop-minitest"
gem "rubocop-performance"
Expand Down
2 changes: 1 addition & 1 deletion concurrent_rails.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ Gem::Specification.new do |spec|
spec.metadata["changelog_uri"] = "https://github.com/luizkowalski/concurrent_rails/blob/master/CHANGELOG.md"
spec.files = Dir["{app,config,db,lib}/**/*", "MIT-LICENSE", "Rakefile", "README.md"]

spec.add_dependency "railties", ">= 6.1"
spec.add_dependency "railties", ">= 7.0"
spec.add_dependency "zeitwerk"

spec.required_ruby_version = ">= 3.1"
Expand Down
13 changes: 0 additions & 13 deletions gemfiles/Gemfile-rails-6-1

This file was deleted.

11 changes: 6 additions & 5 deletions gemfiles/Gemfile-rails-7-0
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,10 @@ source "https://rubygems.org"
gemspec path: ".."

gem "rails", github: "rails/rails", branch: "7-0-stable"
gem "minitest-reporters", "~> 1.6"
gem "rubocop", "~> 1.55"
gem "rubocop-minitest", "~> 0.31"
gem "rubocop-performance", "~> 1.18"
gem "rubocop-thread_safety", "~> 0.5"

gem "minitest-reporters"
gem "rubocop"
gem "rubocop-minitest"
gem "rubocop-performance"
gem "rubocop-thread_safety"
gem "sqlite3", "~> 1.6"
2 changes: 1 addition & 1 deletion gemfiles/Gemfile-rails-7-1
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ gem "rubocop"
gem "rubocop-minitest"
gem "rubocop-performance"
gem "rubocop-thread_safety"
gem "sqlite3"
gem "sqlite3", "~> 1.6"
14 changes: 14 additions & 0 deletions gemfiles/Gemfile-rails-7-2
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# frozen_string_literal: true

source "https://rubygems.org"

gemspec path: ".."

gem "rails", github: "rails/rails", branch: "7-2-stable"

gem "minitest-reporters"
gem "rubocop"
gem "rubocop-minitest"
gem "rubocop-performance"
gem "rubocop-thread_safety"
gem "sqlite3", "~> 1.6"
2 changes: 1 addition & 1 deletion lib/concurrent_rails/version.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# frozen_string_literal: true

module ConcurrentRails
VERSION = "0.6.1"
VERSION = "0.7.0"
end
2 changes: 1 addition & 1 deletion test/dummy/bin/setup
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ def system!(*args)
system(*args) || abort("\n== Command #{args} failed ==")
end

FileUtils.chdir APP_ROOT do
FileUtils.chdir APP_ROOT do # rubocop:disable ThreadSafety/DirChdir
# This script is a way to set up or update your development environment automatically.
# This script is idempotent, so that you can run it at any time and get an expectable outcome.
# Add necessary setup steps to this file.
Expand Down
6 changes: 3 additions & 3 deletions test/promises_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,20 @@
require "test_helper"

class PromisesTest < ActiveSupport::TestCase
test "should retrun value as expected" do
test "should return value as expected" do
future = ConcurrentRails::Promises.future { 42 }

assert_equal(42, future.value)
end

test "should retrun `resolved?` with successful operation" do
test "should return `resolved?` with successful operation" do
future = ConcurrentRails::Promises.future { 42 }
future.value

assert_predicate(future, :resolved?)
end

test "should retrun `resolved?` with failed operation" do
test "should return `resolved?` with failed operation" do
future = ConcurrentRails::Promises.future { 2 / 0 }
future.value

Expand Down