From 228cf6df8225658449ab3b1b769c0e8e54cd3af6 Mon Sep 17 00:00:00 2001 From: Eric Pugh Date: Tue, 5 Nov 2024 10:30:44 -0500 Subject: [PATCH 1/6] Try out rc2 of Rails 8 --- gemfiles/rails_8.0.0rc2.gemfile | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 gemfiles/rails_8.0.0rc2.gemfile diff --git a/gemfiles/rails_8.0.0rc2.gemfile b/gemfiles/rails_8.0.0rc2.gemfile new file mode 100644 index 0000000..7379fc8 --- /dev/null +++ b/gemfiles/rails_8.0.0rc2.gemfile @@ -0,0 +1,10 @@ +source "https://rubygems.org" + +gem "rails", "~> 8.0.0rc2" +gem "slim-rails" +gem "haml" +gem "kramdown" + +gem 'coveralls', require: false + +gemspec :path => ".././" From c45588bec096089e51d84ee3461736f000dff87a Mon Sep 17 00:00:00 2001 From: Eric Pugh Date: Tue, 5 Nov 2024 10:52:44 -0500 Subject: [PATCH 2/6] Move to Rails 8 --- .github/workflows/build.yml | 1 + CHANGELOG.md | 4 ++++ angular-rails-templates.gemspec | 2 +- lib/angular-rails-templates/version.rb | 2 +- 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7c3c5d2..5f38882 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -25,6 +25,7 @@ jobs: - rails_7.0 - rails_7.1 - rails_7.2 + - rails_8.0.0rc2 include: - gemfile: rails_5.0 ruby: '2.6' diff --git a/CHANGELOG.md b/CHANGELOG.md index d120e21..1d783c1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ ### [Unreleased] +### 1.3.0 + +- Support Rails 8 + ### 1.2.2 - Support Rails 7.2 diff --git a/angular-rails-templates.gemspec b/angular-rails-templates.gemspec index affea6a..cd8de3e 100644 --- a/angular-rails-templates.gemspec +++ b/angular-rails-templates.gemspec @@ -16,7 +16,7 @@ Gem::Specification.new do |s| s.require_paths = ["lib"] - s.add_dependency "railties", ">= 5.0", "< 7.3" + s.add_dependency "railties", ">= 5.0", "< 8.1" s.add_dependency "sprockets", ">= 3.0", '< 5' s.add_dependency "sprockets-rails" s.add_dependency "tilt" diff --git a/lib/angular-rails-templates/version.rb b/lib/angular-rails-templates/version.rb index 4eb8de4..5b534b6 100644 --- a/lib/angular-rails-templates/version.rb +++ b/lib/angular-rails-templates/version.rb @@ -1,3 +1,3 @@ module AngularRailsTemplates - VERSION = '1.2.2' + VERSION = '1.3.0' end From c34454f5c4fd049ac6ba92c886686e4dc17771ed Mon Sep 17 00:00:00 2001 From: Eric Pugh Date: Fri, 29 Nov 2024 08:32:47 -0500 Subject: [PATCH 3/6] use released version --- gemfiles/{rails_8.0.0rc2.gemfile => rails_8.0.0.gemfile} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename gemfiles/{rails_8.0.0rc2.gemfile => rails_8.0.0.gemfile} (100%) diff --git a/gemfiles/rails_8.0.0rc2.gemfile b/gemfiles/rails_8.0.0.gemfile similarity index 100% rename from gemfiles/rails_8.0.0rc2.gemfile rename to gemfiles/rails_8.0.0.gemfile From fec6d55a9d9d112acd5e4f592d831a6153a1b494 Mon Sep 17 00:00:00 2001 From: Eric Pugh Date: Fri, 29 Nov 2024 08:34:11 -0500 Subject: [PATCH 4/6] use two digits --- .github/workflows/build.yml | 2 +- gemfiles/rails_8.0.gemfile | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 gemfiles/rails_8.0.gemfile diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5f38882..66273c9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -25,7 +25,7 @@ jobs: - rails_7.0 - rails_7.1 - rails_7.2 - - rails_8.0.0rc2 + - rails_8.0 include: - gemfile: rails_5.0 ruby: '2.6' diff --git a/gemfiles/rails_8.0.gemfile b/gemfiles/rails_8.0.gemfile new file mode 100644 index 0000000..92062f5 --- /dev/null +++ b/gemfiles/rails_8.0.gemfile @@ -0,0 +1,10 @@ +source "https://rubygems.org" + +gem "rails", "~> 8.0.0" +gem "slim-rails" +gem "haml" +gem "kramdown" + +gem 'coveralls', require: false + +gemspec :path => ".././" From 9f06a127dddbec9279674fa4fa3bd31718422f42 Mon Sep 17 00:00:00 2001 From: Eric Pugh Date: Fri, 29 Nov 2024 08:34:53 -0500 Subject: [PATCH 5/6] remove third digit style --- gemfiles/rails_8.0.0.gemfile | 10 ---------- 1 file changed, 10 deletions(-) delete mode 100644 gemfiles/rails_8.0.0.gemfile diff --git a/gemfiles/rails_8.0.0.gemfile b/gemfiles/rails_8.0.0.gemfile deleted file mode 100644 index 7379fc8..0000000 --- a/gemfiles/rails_8.0.0.gemfile +++ /dev/null @@ -1,10 +0,0 @@ -source "https://rubygems.org" - -gem "rails", "~> 8.0.0rc2" -gem "slim-rails" -gem "haml" -gem "kramdown" - -gem 'coveralls', require: false - -gemspec :path => ".././" From a5e008d7993c30e72281e6c5246f2d75b2762fee Mon Sep 17 00:00:00 2001 From: Mathieu Jobin <99191+mathieujobin@users.noreply.github.com> Date: Sun, 1 Dec 2024 18:59:06 +0900 Subject: [PATCH 6/6] Exclude Ruby 3.1 for Rails 8, unsupported. --- .github/workflows/build.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 66273c9..d74b435 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -26,6 +26,9 @@ jobs: - rails_7.1 - rails_7.2 - rails_8.0 + exclude: + - gemfile: rails_8.0 + ruby: '3.1' include: - gemfile: rails_5.0 ruby: '2.6'