From 38208df31d3e66658c60e49b72d1fdbe396019d1 Mon Sep 17 00:00:00 2001 From: Caleb Hearth Date: Thu, 2 May 2024 08:56:36 -0600 Subject: [PATCH] Bump default local rails version to 7.0 Also remove ~>0.19 constraint on pg gem, which conflicts with ~>1.1 constraint in Gemfile --- Gemfile | 4 ++-- scenic.gemspec | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 5c270e1f..5fffd0bf 100644 --- a/Gemfile +++ b/Gemfile @@ -3,9 +3,9 @@ source "https://rubygems.org" # Specify your gem's dependencies in scenic.gemspec gemspec -rails_version = ENV.fetch("RAILS_VERSION", "6.1") +rails_version = ENV.fetch("RAILS_VERSION", "7.0") -rails_constraint = if rails_version == "master" +rails_constraint = if rails_version == "main" {github: "rails/rails"} else "~> #{rails_version}.0" diff --git a/scenic.gemspec b/scenic.gemspec index edafe043..9dff25f7 100644 --- a/scenic.gemspec +++ b/scenic.gemspec @@ -22,7 +22,7 @@ Gem::Specification.new do |spec| spec.add_development_dependency "database_cleaner" spec.add_development_dependency "rake" spec.add_development_dependency "rspec", ">= 3.3" - spec.add_development_dependency "pg", "~> 0.19" + spec.add_development_dependency "pg" spec.add_development_dependency "pry" spec.add_development_dependency "ammeter", ">= 1.1.3" spec.add_development_dependency "yard"