Skip to content

Commit b474fba

Browse files
committed
fix tableless and test with rails 8.1
1 parent 2cdb233 commit b474fba

File tree

10 files changed

+493
-15
lines changed

10 files changed

+493
-15
lines changed

.github/workflows/ci.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -91,17 +91,17 @@ jobs:
9191
strategy:
9292
fail-fast: false
9393
matrix:
94-
ruby: [ "3.4", "3.3", "3.2" ] # "jruby-9.4" ]
95-
rails: [ "8.0", "7.2" ]
94+
ruby: [ "3.4", "3.3", "3.2", "jruby-10.0" ]
95+
rails: [ "8.1", "8.0", "7.2" ]
9696
# exclude:
9797
# - ruby: 'jruby-9.4'
9898
# rails: '7.2'
9999
include:
100100
- ruby: '3.4'
101101
rails: '7.2'
102102
coverage: true
103-
- rails: '8.0'
104-
allow_failure: true
103+
# - rails: '8.0'
104+
# allow_failure: true
105105
timeout-minutes: 60
106106
env:
107107
JRUBY_OPTS: "--debug"

CHANGELOG.rdoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
- Add sort_joins to column, defaults to includes value, so it's possible to set sort by SQL without joining the includes, or join with some associations, and preload others.
2222
- Fix when textarea is required and uses tinymce, show the validation error if it's empty and sync the content before submitting.
2323
- Support add_new in collection associations too, only with popup mode (add_new: true will default to popup in such associations)
24-
- Support for rails 8
24+
- Support for rails 8.0 and 8.1
2525
_ Cache action link generation to speed up list rendering
2626

2727
= 4.1.6

gemfiles/Gemfile.rails-8.0.x.lock

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
PATH
22
remote: ..
33
specs:
4-
active_scaffold (4.1.3)
4+
active_scaffold (4.1.5)
55
dartsass-sprockets (~> 3.2.0)
6+
html_attrs (~> 1.1)
67
ice_nine (~> 0.11)
78
rails (>= 7.2.0)
89
request_store (~> 1.3)

gemfiles/Gemfile.rails-8.1.x

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
source 'https://rubygems.org'
2+
3+
gemspec path: '../'
4+
5+
group :development do
6+
# Send and retrieve your ruby i18n localizations to the Locale translation service https://www.localeapp.com
7+
gem 'localeapp'
8+
# RDoc produces HTML and command-line documentation for Ruby projects
9+
gem 'rdoc'
10+
end
11+
12+
group :development, :lint do
13+
# A static analysis security vulnerability scanner for Ruby on Rails applications
14+
gem 'brakeman', require: false
15+
# Patch-level verification for Bundler
16+
gem 'bundler-audit', require: false
17+
# A Ruby static code analyzer. Aims to enforce the community-driven Ruby Style Guide
18+
gem 'rubocop', '0.52.1', require: false
19+
# Manage translation and localization with static analysis, for Ruby i18n
20+
gem 'i18n-tasks', require: false
21+
end
22+
23+
group :development, :lint, :test do
24+
gem 'rake', require: false
25+
end
26+
27+
group :development, :test do
28+
# Rack provides a minimal interface between webservers that support Ruby and Ruby frameworks
29+
gem 'rack'
30+
end
31+
32+
group :test do
33+
# Makes tests easy on the fingers and the eyes
34+
gem 'shoulda'
35+
# Mocking and stubbing library with JMock/SchMock syntax, which allows mocking and stubbing of methods on real (non-mock) classes
36+
gem 'mocha'
37+
# Ruby on Rails is a full-stack web framework optimized for programmer happiness and sustainable productivity.
38+
# It encourages beautiful code by favoring convention over configuration.
39+
gem 'rails', '~> 8.1.0'
40+
# Create customizable MiniTest output formats
41+
gem 'minitest-reporters', require: false
42+
# Code coverage for Ruby 1.9+ with a powerful configuration library and automatic merging of coverage across test suites
43+
gem 'simplecov', require: false
44+
45+
platforms :jruby do
46+
# This module allows Ruby programs to interface with the SQLite3 database engine
47+
gem 'activerecord-jdbcsqlite3-adapter', github: 'jruby/activerecord-jdbc-adapter' #'~> 80.0'
48+
# This module allows Ruby programs to interface with the SQLite3 database engine
49+
gem 'jdbc-sqlite3'
50+
end
51+
52+
platforms :ruby do
53+
# This module allows Ruby programs to interface with the SQLite3 database engine
54+
gem 'sqlite3'
55+
end
56+
end

0 commit comments

Comments
 (0)