Skip to content

Commit 3892649

Browse files
chadlwilsonchadlwilson
committed
Test against JRuby 10 and Rails 8.0
1 parent a38232c commit 3892649

File tree

7 files changed

+258
-39
lines changed

7 files changed

+258
-39
lines changed

‎.github/workflows/maven.yml‎

Lines changed: 15 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,25 @@ name: Java CI
22

33
on:
44
push:
5-
branches-ignore: [ "internal*" ]
5+
branches: [ "master" ]
66
pull_request:
77
branches: [ "master" ]
88

9+
env:
10+
# Default versions for canonical release build
11+
DEFAULT_JAVA_VERSION: '8'
12+
DEFAULT_JRUBY_VERSION: '9.4.12.1'
13+
914
jobs:
1015
build:
1116
name: JRuby ${{ matrix.jruby_version }} / Java ${{ matrix.java_version }}
1217
runs-on: ubuntu-latest
1318

19+
20+
1421
strategy:
1522
matrix:
16-
jruby_version: [ '9.3.15.0', '9.4.12.1' ] # , '10.0.0.1'
23+
jruby_version: [ '9.3.15.0', '9.4.12.1', '10.0.0.1' ]
1724
java_version: [ '8', '11', '17', '21' ]
1825
exclude:
1926
- jruby_version: '10.0.0.1'
@@ -40,7 +47,7 @@ jobs:
4047
# Uploads the full dependency graph to GitHub to improve the quality of Dependabot alerts this repository can receive
4148
- name: Update dependency graph
4249
uses: advanced-security/maven-dependency-submission-action@aeab9f885293af501bae8bdfe88c589528ea5e25 # v4.1.2
43-
if: github.head_ref == 'refs/heads/master' && matrix.java_version == '8' && startsWith(matrix.jruby_version, '9.4')
50+
if: github.head_ref == 'refs/heads/master' && matrix.java_version == env.DEFAULT_JAVA_VERSION && startsWith(matrix.jruby_version, env.DEFAULT_JRUBY_VERSION)
4451

4552
appraisals:
4653
needs: build
@@ -49,46 +56,20 @@ jobs:
4956

5057
strategy:
5158
matrix:
52-
jruby_version: [ '9.3.15.0', '9.4.12.1' ] # , '10.0.0.1'
59+
jruby_version: [ '9.3.15.0', '9.4.12.1', '10.0.0.1' ]
5360
java_version: [ '8', '11', '17', '21' ]
54-
appraisal: [ 'rails50', 'rails52', 'rails60', 'rails61', 'rails70', 'rails71', 'rails72' ]
61+
appraisal: [ 'rails50', 'rails52', 'rails60', 'rails61', 'rails70', 'rails71', 'rails72', 'rails80' ]
5562
exclude:
5663
- jruby_version: '9.3.15.0'
57-
java_version: '8'
5864
appraisal: 'rails70' # Requires Ruby 2.7 compatibility, which JRuby 9.3 does not support
5965
- jruby_version: '9.3.15.0'
60-
java_version: '8'
6166
appraisal: 'rails71' # Requires Ruby 2.7 compatibility, which JRuby 9.3 does not support
6267
- jruby_version: '9.3.15.0'
63-
java_version: '8'
6468
appraisal: 'rails72' # Requires Ruby 3.1 compatibility, which JRuby 9.3 does not support
6569
- jruby_version: '9.3.15.0'
66-
java_version: '11'
67-
appraisal: 'rails70' # Requires Ruby 2.7 compatibility, which JRuby 9.3 does not support
68-
- jruby_version: '9.3.15.0'
69-
java_version: '11'
70-
appraisal: 'rails71' # Requires Ruby 2.7 compatibility, which JRuby 9.3 does not support
71-
- jruby_version: '9.3.15.0'
72-
java_version: '11'
73-
appraisal: 'rails72' # Requires Ruby 3.1 compatibility, which JRuby 9.3 does not support
74-
- jruby_version: '9.3.15.0'
75-
java_version: '17'
76-
appraisal: 'rails70' # Requires Ruby 2.7 compatibility, which JRuby 9.3 does not support
77-
- jruby_version: '9.3.15.0'
78-
java_version: '17'
79-
appraisal: 'rails71' # Requires Ruby 2.7 compatibility, which JRuby 9.3 does not support
80-
- jruby_version: '9.3.15.0'
81-
java_version: '17'
82-
appraisal: 'rails72' # Requires Ruby 3.1 compatibility, which JRuby 9.3 does not support
83-
- jruby_version: '9.3.15.0'
84-
java_version: '21'
85-
appraisal: 'rails70' # Requires Ruby 2.7 compatibility, which JRuby 9.3 does not support
86-
- jruby_version: '9.3.15.0'
87-
java_version: '21'
88-
appraisal: 'rails71' # Requires Ruby 2.7 compatibility, which JRuby 9.3 does not support
89-
- jruby_version: '9.3.15.0'
90-
java_version: '21'
91-
appraisal: 'rails72' # Requires Ruby 3.1 compatibility, which JRuby 9.3 does not support
70+
appraisal: 'rails80' # Requires Ruby 3.4 compatibility, which JRuby 9.3 does not support
71+
- jruby_version: '9.4.12.1'
72+
appraisal: 'rails80' # Requires Ruby 3.4 compatibility, which JRuby 9.4 does not support
9273
- jruby_version: '10.0.0.1'
9374
java_version: '8' # JRuby 10 requires Java 21
9475
- jruby_version: '10.0.0.1'

‎Appraisals‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,3 +25,7 @@ end
2525
appraise "rails72" do
2626
gem "rails", "~> 7.2.0"
2727
end
28+
29+
appraise "rails80" do
30+
gem "rails", "~> 8.0.0"
31+
end

‎History.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 1.3.0
2+
- Adds basic compatibility with JRuby 10.0
3+
- Drop unnecessary jruby.compat.version and RackConfig.getCompatVersion() API
4+
15
## 1.2.3
26

37
- avoid warnings due usage of `File.exists?`

‎README.md‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ JRuby-Rack supports Rails as well as any Rack-compatible Ruby web framework.
66

77
For more information on Rack, visit http://rack.github.io/.
88

9-
**This README (master) targets JRuby-Rack 1.2. Please use the
9+
**This README (master) targets JRuby-Rack 1.3. Please use the
1010
[1.1-stable](https://github.com/jruby/jruby-rack/tree/1.1-stable) branch for
1111
current stable 1.1.x releases.**
1212

@@ -15,12 +15,16 @@ current stable 1.1.x releases.**
1515

1616
## Compatibility
1717

18+
JRuby-Rack 1.3.x
19+
- aims to be compatible with JRuby 9.3 -> 10.0 and their supported JDK versions
20+
- supports any container compatible with Java Servlet 3.0 API
21+
1822
JRuby-Rack 1.2.x
19-
- aims to be compatible with JRuby >= 9.3 and its supported JDK versions
23+
- compatible with JRuby 9.3 -> 9.4 and their supported JDK versions
2024
- supports any container compatible with Java Servlet 3.0 API
2125

2226
JRuby-Rack 1.1.x
23-
- aims to be compatible with JRuby >= 1.6.4 (used successfully through JRuby 9.4.x)
27+
- aims to be compatible with JRuby >= 1.6.4 (used successfully through JRuby 9.4)
2428
- supports any container compatible with Java Servlet 2.5 API (JEE 5)
2529

2630

‎gemfiles/rails80.gemfile‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
# This file was generated by Appraisal
2+
3+
source "https://rubygems.org"
4+
5+
gem "rake", "~> 13.2", group: :test, require: nil
6+
gem "rspec", group: :test
7+
gem "rails", "~> 8.0.0"
8+
9+
group :default do
10+
gem "rack", "~> 2.2"
11+
end
12+
13+
group :development do
14+
gem "appraisal", require: nil
15+
end

‎gemfiles/rails80.gemfile.lock‎

Lines changed: 211 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,211 @@
1+
GEM
2+
remote: https://rubygems.org/
3+
specs:
4+
actioncable (8.0.2)
5+
actionpack (= 8.0.2)
6+
activesupport (= 8.0.2)
7+
nio4r (~> 2.0)
8+
websocket-driver (>= 0.6.1)
9+
zeitwerk (~> 2.6)
10+
actionmailbox (8.0.2)
11+
actionpack (= 8.0.2)
12+
activejob (= 8.0.2)
13+
activerecord (= 8.0.2)
14+
activestorage (= 8.0.2)
15+
activesupport (= 8.0.2)
16+
mail (>= 2.8.0)
17+
actionmailer (8.0.2)
18+
actionpack (= 8.0.2)
19+
actionview (= 8.0.2)
20+
activejob (= 8.0.2)
21+
activesupport (= 8.0.2)
22+
mail (>= 2.8.0)
23+
rails-dom-testing (~> 2.2)
24+
actionpack (8.0.2)
25+
actionview (= 8.0.2)
26+
activesupport (= 8.0.2)
27+
nokogiri (>= 1.8.5)
28+
rack (>= 2.2.4)
29+
rack-session (>= 1.0.1)
30+
rack-test (>= 0.6.3)
31+
rails-dom-testing (~> 2.2)
32+
rails-html-sanitizer (~> 1.6)
33+
useragent (~> 0.16)
34+
actiontext (8.0.2)
35+
actionpack (= 8.0.2)
36+
activerecord (= 8.0.2)
37+
activestorage (= 8.0.2)
38+
activesupport (= 8.0.2)
39+
globalid (>= 0.6.0)
40+
nokogiri (>= 1.8.5)
41+
actionview (8.0.2)
42+
activesupport (= 8.0.2)
43+
builder (~> 3.1)
44+
erubi (~> 1.11)
45+
rails-dom-testing (~> 2.2)
46+
rails-html-sanitizer (~> 1.6)
47+
activejob (8.0.2)
48+
activesupport (= 8.0.2)
49+
globalid (>= 0.3.6)
50+
activemodel (8.0.2)
51+
activesupport (= 8.0.2)
52+
activerecord (8.0.2)
53+
activemodel (= 8.0.2)
54+
activesupport (= 8.0.2)
55+
timeout (>= 0.4.0)
56+
activestorage (8.0.2)
57+
actionpack (= 8.0.2)
58+
activejob (= 8.0.2)
59+
activerecord (= 8.0.2)
60+
activesupport (= 8.0.2)
61+
marcel (~> 1.0)
62+
activesupport (8.0.2)
63+
base64
64+
benchmark (>= 0.3)
65+
bigdecimal
66+
concurrent-ruby (~> 1.0, >= 1.3.1)
67+
connection_pool (>= 2.2.5)
68+
drb
69+
i18n (>= 1.6, < 2)
70+
logger (>= 1.4.2)
71+
minitest (>= 5.1)
72+
securerandom (>= 0.3)
73+
tzinfo (~> 2.0, >= 2.0.5)
74+
uri (>= 0.13.1)
75+
appraisal (2.5.0)
76+
bundler
77+
rake
78+
thor (>= 0.14.0)
79+
base64 (0.2.0)
80+
benchmark (0.4.0)
81+
bigdecimal (3.1.9-java)
82+
builder (3.3.0)
83+
concurrent-ruby (1.3.5)
84+
connection_pool (2.5.3)
85+
crass (1.0.6)
86+
date (3.4.1-java)
87+
diff-lcs (1.6.2)
88+
drb (2.2.1)
89+
erubi (1.13.1)
90+
globalid (1.2.1)
91+
activesupport (>= 6.1)
92+
i18n (1.14.7)
93+
concurrent-ruby (~> 1.0)
94+
io-console (0.8.0-java)
95+
irb (1.15.2)
96+
pp (>= 0.6.0)
97+
rdoc (>= 4.0.0)
98+
reline (>= 0.4.2)
99+
jar-dependencies (0.5.5)
100+
logger (1.7.0)
101+
loofah (2.24.1)
102+
crass (~> 1.0.2)
103+
nokogiri (>= 1.12.0)
104+
mail (2.8.1)
105+
mini_mime (>= 0.1.1)
106+
net-imap
107+
net-pop
108+
net-smtp
109+
marcel (1.0.4)
110+
mini_mime (1.1.5)
111+
minitest (5.25.5)
112+
net-imap (0.5.8)
113+
date
114+
net-protocol
115+
net-pop (0.1.2)
116+
net-protocol
117+
net-protocol (0.2.2)
118+
timeout
119+
net-smtp (0.5.1)
120+
net-protocol
121+
nio4r (2.7.4-java)
122+
nokogiri (1.18.8-java)
123+
racc (~> 1.4)
124+
pp (0.6.2)
125+
prettyprint
126+
prettyprint (0.2.0)
127+
psych (5.2.6-java)
128+
date
129+
jar-dependencies (>= 0.1.7)
130+
racc (1.8.1-java)
131+
rack (2.2.15)
132+
rack-session (1.0.2)
133+
rack (< 3)
134+
rack-test (2.2.0)
135+
rack (>= 1.3)
136+
rackup (1.0.1)
137+
rack (< 3)
138+
webrick
139+
rails (8.0.2)
140+
actioncable (= 8.0.2)
141+
actionmailbox (= 8.0.2)
142+
actionmailer (= 8.0.2)
143+
actionpack (= 8.0.2)
144+
actiontext (= 8.0.2)
145+
actionview (= 8.0.2)
146+
activejob (= 8.0.2)
147+
activemodel (= 8.0.2)
148+
activerecord (= 8.0.2)
149+
activestorage (= 8.0.2)
150+
activesupport (= 8.0.2)
151+
bundler (>= 1.15.0)
152+
railties (= 8.0.2)
153+
rails-dom-testing (2.2.0)
154+
activesupport (>= 5.0.0)
155+
minitest
156+
nokogiri (>= 1.6)
157+
rails-html-sanitizer (1.6.2)
158+
loofah (~> 2.21)
159+
nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
160+
railties (8.0.2)
161+
actionpack (= 8.0.2)
162+
activesupport (= 8.0.2)
163+
irb (~> 1.13)
164+
rackup (>= 1.0.0)
165+
rake (>= 12.2)
166+
thor (~> 1.0, >= 1.2.2)
167+
zeitwerk (~> 2.6)
168+
rake (13.2.1)
169+
rdoc (6.13.1)
170+
psych (>= 4.0.0)
171+
reline (0.6.1)
172+
io-console (~> 0.5)
173+
rspec (3.13.0)
174+
rspec-core (~> 3.13.0)
175+
rspec-expectations (~> 3.13.0)
176+
rspec-mocks (~> 3.13.0)
177+
rspec-core (3.13.3)
178+
rspec-support (~> 3.13.0)
179+
rspec-expectations (3.13.4)
180+
diff-lcs (>= 1.2.0, < 2.0)
181+
rspec-support (~> 3.13.0)
182+
rspec-mocks (3.13.4)
183+
diff-lcs (>= 1.2.0, < 2.0)
184+
rspec-support (~> 3.13.0)
185+
rspec-support (3.13.3)
186+
securerandom (0.4.1)
187+
thor (1.3.2)
188+
timeout (0.4.3)
189+
tzinfo (2.0.6)
190+
concurrent-ruby (~> 1.0)
191+
uri (1.0.3)
192+
useragent (0.16.11)
193+
webrick (1.9.1)
194+
websocket-driver (0.7.7-java)
195+
base64
196+
websocket-extensions (>= 0.1.0)
197+
websocket-extensions (0.1.5)
198+
zeitwerk (2.7.2)
199+
200+
PLATFORMS
201+
universal-java-21
202+
203+
DEPENDENCIES
204+
appraisal
205+
rack (~> 2.2)
206+
rails (~> 8.0.0)
207+
rake (~> 13.2)
208+
rspec
209+
210+
BUNDLED WITH
211+
2.6.3

‎pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
<groupId>org.jruby.rack</groupId>
1212
<artifactId>jruby-rack</artifactId>
13-
<version>1.2.4-SNAPSHOT</version>
13+
<version>1.3.0-SNAPSHOT</version>
1414
<name>JRuby-Rack</name>
1515
<url>https://github.com/jruby/jruby-rack/</url>
1616
<description>
@@ -19,7 +19,7 @@
1919
</description>
2020

2121
<properties>
22-
<jruby.version>9.4.12.0</jruby.version>
22+
<jruby.version>9.4.12.1</jruby.version>
2323
<jruby.maven.plugins.version>3.0.5</jruby.maven.plugins.version>
2424
<gem.home>${project.build.directory}/rubygems</gem.home>
2525
<slf4j.version>2.0.17</slf4j.version>

0 commit comments

Comments
 (0)