Merge pull request #496 from procore-oss/js/fix-failing-build

EOL Ruby 3.0.0 / Update sqlite to 2.1
procore-oss · Jan 9, 2025 · 682df49 · 682df49
2 parents d39aea9 + 4ea612e
commit 682df49
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 8 deletions.
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -11,7 +11,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        ruby: ['3.0', '3.1', '3.2', '3.3']
+        ruby: ['3.1', '3.2', '3.3']
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4

diff --git a/.rubocop.yml b/.rubocop.yml
@@ -1,5 +1,5 @@
 AllCops:
-  TargetRubyVersion: 3.0
+  TargetRubyVersion: 3.1
   NewCops: enable
   Exclude:
     - 'lib/generators/**/*'

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+## Unreleased
+- [BREAKING] Drops support for Ruby 3.0. See [#496](https://github.com/procore-oss/blueprinter/pull/496)
+
 ## 1.1.2 - 2024/10/3
 - 🐛 [BUGFIX] Fixes an issue where a `Blueprinter::BlueprinterError` would be raised on render when providing `view: nil`, instead of falling back on the `:default` view. See
 [#472](https://github.com/procore-oss/blueprinter/pull/472). Thanks to [@lessthanjacob](https://github.com/lessthanjacob).

diff --git a/Gemfile b/Gemfile
@@ -7,7 +7,7 @@ source 'https://rubygems.org'
 # development dependencies will be added by default to the :development group.
 gemspec
 
-# officially supported gems for serialisation
+# Officially supported gems for serialization
 gem 'oj', '~> 3.13'
 gem 'yajl-ruby', '~> 1.4'
 
@@ -24,5 +24,5 @@ gem 'rspec', '~> 3.12'
 gem 'rspec-rails', '~> 7.0'
 gem 'rubocop', '~> 1.44'
 gem 'rubocop-rake'
-gem 'sqlite3', '~> 1.5'
+gem 'sqlite3', '~> 2.1'
 gem 'yard', '>= 0.9.34'
diff --git a/SECURITY.md b/SECURITY.md
@@ -6,8 +6,7 @@ Ruby versions that are currently being supported with security updates.
 
 | Version | Supported          |
 | ------- | ------------------ |
-| <=2.7   | :x:                |
-| 3.0     | :white_check_mark: |
+| <=3.0   | :x:                |
 | 3.1     | :white_check_mark: |
 | 3.2     | :white_check_mark: |
 | 3.3     | :white_check_mark: |

diff --git a/blueprinter.gemspec b/blueprinter.gemspec
@@ -22,6 +22,6 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{app,config,db,lib}/**/*', 'CHANGELOG.md', 'LICENSE.md', 'Rakefile', 'README.md']
 
-  s.required_ruby_version = '>= 3.0'
+  s.required_ruby_version = '>= 3.1'
   s.metadata['rubygems_mfa_required'] = 'true'
 end
diff --git a/lib/generators/blueprinter/blueprint_generator.rb b/lib/generators/blueprinter/blueprint_generator.rb
@@ -36,7 +36,7 @@ def ensure_blueprint_dir
       end
 
       def create_blueprint
-        template 'blueprint.rb', File.join(path, "#{file_path}_blueprint.rb")
+        template 'blueprint.erb', File.join(path, "#{file_path}_blueprint.rb")
       end
 
       private

diff --git a/...rators/blueprinter/templates/blueprint.rb → ...ators/blueprinter/templates/blueprint.erb b/...rators/blueprinter/templates/blueprint.rb → ...ators/blueprinter/templates/blueprint.erb
-Original file line number
+Diff line change
@@ Expand Up / @@ -36,7 +36,7 @@ def ensure_blueprint_dir @@
           end
           def create_blueprint
-            template 'blueprint.rb', File.join(path, "#{file_path}_blueprint.rb")
+            template 'blueprint.erb', File.join(path, "#{file_path}_blueprint.rb")
           end
           private
@@ Expand Down @@