Merge branch 'main' into dependabot/bundler/puma-6.4.2

danielpaul · Mar 14, 2024 · 3edaa07 · 3edaa07
2 parents c3619a2 + 4a517ef
commit 3edaa07
Show file tree

Hide file tree

Showing 12 changed files with 238 additions and 191 deletions.
diff --git a/.ruby-version b/.ruby-version
@@ -1 +1 @@
-ruby-3.2.2
+ruby-3.3.0
diff --git a/.tool-versions b/.tool-versions
@@ -1 +1 @@
-ruby 3.2.2
+ruby 3.3.0
diff --git a/Aptfile b/Aptfile
@@ -0,0 +1,3 @@
+libglib2.0-0
+libglib2.0-dev
+libpoppler-glib8
diff --git a/Gemfile b/Gemfile
@@ -1,10 +1,10 @@
 source "https://rubygems.org"
 git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
-ruby "3.2.2"
+ruby "3.3.0"
 
 # Bundle edge Rails instead: gem "rails", github: "rails/rails", branch: "main"
-gem "rails", "~> 7.0.4", ">= 7.0.4.3"
+gem "rails", "~> 7.1", ">= 7.1.3.2"
 
 # The original asset pipeline for Rails [https://github.com/rails/sprockets-rails]
 gem "sprockets-rails"