From 454aa41ab525c21d71d323ae352982a50af49424 Mon Sep 17 00:00:00 2001
From: Rodrigo Toledo <rodrigo@rtoledo.inf.br>
Date: Mon, 11 Nov 2024 10:22:43 -0300
Subject: [PATCH] Update Ruby version to 3.3.4 and gem dependencies
---
.tool-versions | 2 +-
Gemfile | 7 +++----
annotate.gemspec | 8 ++++----
3 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/.tool-versions b/.tool-versions
index 9e83a384..05668b72 100644
--- a/.tool-versions
+++ b/.tool-versions
@@ -1 +1 @@
-ruby 2.7.3
+ruby 3.3.4
diff --git a/Gemfile b/Gemfile
index 0998ee0d..fd7d3699 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,8 +1,8 @@
source 'https://rubygems.org'
-ruby '>= 2.4.0'
+ruby '>= 2.4.0', '<= 3.3.5'
-gem 'activerecord', '>= 4.2.5', '< 6', require: false
+gem 'activerecord', '>= 4.2.5', '<= 8.0.0', require: false
gem 'rake', require: false
group :development do
@@ -29,7 +29,6 @@ group :development, :test do
gem 'coveralls'
gem 'overcommit'
- gem 'ruby_dep', '1.5.0'
platforms :mri, :mingw do
gem 'pry', require: false
@@ -38,6 +37,6 @@ group :development, :test do
end
group :test do
- gem 'files', require: false
+ gem "files", git: "https://github.com/rodrigotoledo/files"
gem 'git', require: false
end
diff --git a/annotate.gemspec b/annotate.gemspec
index 43b2ac99..d42edd32 100644
--- a/annotate.gemspec
+++ b/annotate.gemspec
@@ -7,11 +7,11 @@ Gem::Specification.new do |s|
s.name = 'annotate'
s.version = Annotate.version
- s.required_ruby_version = '>= 2.4.0'
+ s.required_ruby_version = '>= 2.4.0', '<= 3.3.5'
s.required_rubygems_version = Gem::Requirement.new('>= 0') if s.respond_to? :required_rubygems_version=
- s.authors = ['Alex Chaffee', 'Cuong Tran', 'Marcos Piccinini', 'Turadg Aleahmad', 'Jon Frisby']
+ s.authors = ['Alex Chaffee', 'Cuong Tran', 'Marcos Piccinini', 'Turadg Aleahmad', 'Jon Frisby', 'RToledo Dev']
s.description = 'Annotates Rails/ActiveRecord Models, routes, fixtures, and others based on the database schema.'
- s.email = ['alex@stinky.com', 'cuong.tran@gmail.com', 'x@nofxx.com', 'turadg@aleahmad.net', 'jon@cloudability.com']
+ s.email = ['alex@stinky.com', 'cuong.tran@gmail.com', 'x@nofxx.com', 'turadg@aleahmad.net', 'jon@cloudability.com', 'rodrigo@rtoledo.inf.br']
s.executables = ['annotate']
s.extra_rdoc_files = ['README.md', 'CHANGELOG.md']
s.files = `git ls-files -z LICENSE.txt *.md *.gemspec bin lib`.split("\x0")
@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
s.specification_version = 4 if s.respond_to? :specification_version
s.add_runtime_dependency(%q<rake>, '>= 10.4', '< 14.0')
- s.add_runtime_dependency(%q<activerecord>, ['>= 3.2', '< 8.0'])
+ s.add_runtime_dependency(%q<activerecord>, ['>= 3.2', '<= 8.0.0'])
s.metadata = {
"bug_tracker_uri" => "https://github.com/ctran/annotate_models/issues/",