Skip to content

Commit 75b24e3

Browse files
chadlwilsonchadlwilson
authored
Merge pull request #577 from chadlwilson/tests-bump-versions
Run tests on Java 25
2 parents e6d30fd + 0fc34fd commit 75b24e3

File tree

8 files changed

+91
-86
lines changed

8 files changed

+91
-86
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,13 @@ on:
1010

1111
pull_request:
1212

13-
env:
14-
JRUBY_OPTS: -J-Xmx896M
15-
1613
jobs:
1714
ci:
1815
runs-on: ubuntu-22.04
1916

2017
strategy:
2118
matrix:
22-
java-version: [8, 21]
19+
java-version: [8, 21, 25]
2320
ruby-version: [jruby-9.4, jruby-10]
2421
task: ['', integration]
2522
exclude:

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ nbproject
77
target/
88
out/
99
Gemfile.lock
10+
!spec/rails7_stub/Gemfile.lock
1011
.idea
1112
warbler.iml
1213
warbler.iws

‎Mavenfile‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,12 @@ scope :provided do
2828
jar 'org.eclipse.jetty:jetty-webapp', '${jetty.version}'
2929
end
3030

31+
plugin :clean, '3.5.0'
3132
plugin :compiler, '3.14.1', :release => '8'
3233
plugin :resources, '3.3.1'
33-
plugin :jar, '2.6'
34+
plugin :jar, '3.4.2' do
35+
execute_goals(:phase => 'none') # Avoid a duplicate execution with that defined by the :gemspec directive
36+
end
3437
plugin :install, '3.1.4'
3538

3639
gem 'bundler', '${bundler.version}'

‎integration/rails7_test/src/main/ruby/Gemfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
source 'https://rubygems.org'
22

3-
gem 'rails', '~> 7.1.0'
3+
gem 'rails', '~> 7.2.0'
44
gem 'rack', '~> 2.2.19'
55

6-
gem 'activerecord-jdbcsqlite3-adapter', '~> 71.0'
6+
gem 'activerecord-jdbcsqlite3-adapter', '~> 72.1'

‎integration/runnable_w_bundler_test/src/main/ruby/Gemfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
source 'https://rubygems.org'
22

3-
gem 'json', '1.8.3'
3+
gem 'json', '~> 2.15'
44

55
#gem 'warbler', :group => 'development'

‎spec/rails7_stub/Gemfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
source 'https://rubygems.org'
22

3-
gem 'rails', '~> 7.0'
3+
gem 'rails', '~> 7.2.0'
44

5-
gem 'activerecord-jdbcpostgresql-adapter', '~> 70.0'
5+
gem 'activerecord-jdbcpostgresql-adapter', '~> 72.1'

‎spec/rails7_stub/Gemfile.lock‎

Lines changed: 78 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
actioncable (7.2.2.1)
5-
actionpack (= 7.2.2.1)
6-
activesupport (= 7.2.2.1)
4+
actioncable (7.2.2.2)
5+
actionpack (= 7.2.2.2)
6+
activesupport (= 7.2.2.2)
77
nio4r (~> 2.0)
88
websocket-driver (>= 0.6.1)
99
zeitwerk (~> 2.6)
10-
actionmailbox (7.2.2.1)
11-
actionpack (= 7.2.2.1)
12-
activejob (= 7.2.2.1)
13-
activerecord (= 7.2.2.1)
14-
activestorage (= 7.2.2.1)
15-
activesupport (= 7.2.2.1)
10+
actionmailbox (7.2.2.2)
11+
actionpack (= 7.2.2.2)
12+
activejob (= 7.2.2.2)
13+
activerecord (= 7.2.2.2)
14+
activestorage (= 7.2.2.2)
15+
activesupport (= 7.2.2.2)
1616
mail (>= 2.8.0)
17-
actionmailer (7.2.2.1)
18-
actionpack (= 7.2.2.1)
19-
actionview (= 7.2.2.1)
20-
activejob (= 7.2.2.1)
21-
activesupport (= 7.2.2.1)
17+
actionmailer (7.2.2.2)
18+
actionpack (= 7.2.2.2)
19+
actionview (= 7.2.2.2)
20+
activejob (= 7.2.2.2)
21+
activesupport (= 7.2.2.2)
2222
mail (>= 2.8.0)
2323
rails-dom-testing (~> 2.2)
24-
actionpack (7.2.2.1)
25-
actionview (= 7.2.2.1)
26-
activesupport (= 7.2.2.1)
24+
actionpack (7.2.2.2)
25+
actionview (= 7.2.2.2)
26+
activesupport (= 7.2.2.2)
2727
nokogiri (>= 1.8.5)
2828
racc
2929
rack (>= 2.2.4, < 3.2)
@@ -32,40 +32,40 @@ GEM
3232
rails-dom-testing (~> 2.2)
3333
rails-html-sanitizer (~> 1.6)
3434
useragent (~> 0.16)
35-
actiontext (7.2.2.1)
36-
actionpack (= 7.2.2.1)
37-
activerecord (= 7.2.2.1)
38-
activestorage (= 7.2.2.1)
39-
activesupport (= 7.2.2.1)
35+
actiontext (7.2.2.2)
36+
actionpack (= 7.2.2.2)
37+
activerecord (= 7.2.2.2)
38+
activestorage (= 7.2.2.2)
39+
activesupport (= 7.2.2.2)
4040
globalid (>= 0.6.0)
4141
nokogiri (>= 1.8.5)
42-
actionview (7.2.2.1)
43-
activesupport (= 7.2.2.1)
42+
actionview (7.2.2.2)
43+
activesupport (= 7.2.2.2)
4444
builder (~> 3.1)
4545
erubi (~> 1.11)
4646
rails-dom-testing (~> 2.2)
4747
rails-html-sanitizer (~> 1.6)
48-
activejob (7.2.2.1)
49-
activesupport (= 7.2.2.1)
48+
activejob (7.2.2.2)
49+
activesupport (= 7.2.2.2)
5050
globalid (>= 0.3.6)
51-
activemodel (7.2.2.1)
52-
activesupport (= 7.2.2.1)
53-
activerecord (7.2.2.1)
54-
activemodel (= 7.2.2.1)
55-
activesupport (= 7.2.2.1)
51+
activemodel (7.2.2.2)
52+
activesupport (= 7.2.2.2)
53+
activerecord (7.2.2.2)
54+
activemodel (= 7.2.2.2)
55+
activesupport (= 7.2.2.2)
5656
timeout (>= 0.4.0)
57-
activerecord-jdbc-adapter (70.2-java)
58-
activerecord (~> 7.0)
59-
activerecord-jdbcpostgresql-adapter (70.2-java)
60-
activerecord-jdbc-adapter (= 70.2)
57+
activerecord-jdbc-adapter (72.1-java)
58+
activerecord (~> 7.2.2)
59+
activerecord-jdbcpostgresql-adapter (72.1-java)
60+
activerecord-jdbc-adapter (= 72.1)
6161
jdbc-postgres (>= 9.4, < 43)
62-
activestorage (7.2.2.1)
63-
actionpack (= 7.2.2.1)
64-
activejob (= 7.2.2.1)
65-
activerecord (= 7.2.2.1)
66-
activesupport (= 7.2.2.1)
62+
activestorage (7.2.2.2)
63+
actionpack (= 7.2.2.2)
64+
activejob (= 7.2.2.2)
65+
activerecord (= 7.2.2.2)
66+
activesupport (= 7.2.2.2)
6767
marcel (~> 1.0)
68-
activesupport (7.2.2.1)
68+
activesupport (7.2.2.2)
6969
base64
7070
benchmark (>= 0.3)
7171
bigdecimal
@@ -79,28 +79,28 @@ GEM
7979
tzinfo (~> 2.0, >= 2.0.5)
8080
base64 (0.3.0)
8181
benchmark (0.4.1)
82-
bigdecimal (3.2.2-java)
82+
bigdecimal (3.3.1-java)
8383
builder (3.3.0)
8484
cgi (0.5.0-java)
8585
concurrent-ruby (1.3.5)
86-
connection_pool (2.5.3)
86+
connection_pool (2.5.4)
8787
crass (1.0.6)
8888
date (3.4.1-java)
8989
drb (2.2.3)
9090
erb (4.0.4-java)
9191
cgi (>= 0.3.3)
9292
erubi (1.13.1)
93-
globalid (1.2.1)
93+
globalid (1.3.0)
9494
activesupport (>= 6.1)
9595
i18n (1.14.7)
9696
concurrent-ruby (~> 1.0)
97-
io-console (0.8.0-java)
97+
io-console (0.8.1-java)
9898
irb (1.15.2)
9999
pp (>= 0.6.0)
100100
rdoc (>= 4.0.0)
101101
reline (>= 0.4.2)
102102
jar-dependencies (0.5.5)
103-
jdbc-postgres (42.6.0)
103+
jdbc-postgres (42.7.8)
104104
logger (1.7.0)
105105
loofah (2.24.1)
106106
crass (~> 1.0.2)
@@ -110,10 +110,10 @@ GEM
110110
net-imap
111111
net-pop
112112
net-smtp
113-
marcel (1.0.4)
113+
marcel (1.1.0)
114114
mini_mime (1.1.5)
115-
minitest (5.25.5)
116-
net-imap (0.5.9)
115+
minitest (5.26.0)
116+
net-imap (0.5.12)
117117
date
118118
net-protocol
119119
net-pop (0.1.2)
@@ -123,61 +123,63 @@ GEM
123123
net-smtp (0.5.1)
124124
net-protocol
125125
nio4r (2.7.4-java)
126-
nokogiri (1.18.8-java)
126+
nokogiri (1.18.10-java)
127127
racc (~> 1.4)
128-
pp (0.6.2)
128+
pp (0.6.3)
129129
prettyprint
130130
prettyprint (0.2.0)
131131
psych (5.2.6-java)
132132
date
133133
jar-dependencies (>= 0.1.7)
134134
racc (1.8.1-java)
135-
rack (3.1.16)
135+
rack (3.1.18)
136136
rack-session (2.1.1)
137137
base64 (>= 0.1.0)
138138
rack (>= 3.0.0)
139139
rack-test (2.2.0)
140140
rack (>= 1.3)
141141
rackup (2.2.1)
142142
rack (>= 3)
143-
rails (7.2.2.1)
144-
actioncable (= 7.2.2.1)
145-
actionmailbox (= 7.2.2.1)
146-
actionmailer (= 7.2.2.1)
147-
actionpack (= 7.2.2.1)
148-
actiontext (= 7.2.2.1)
149-
actionview (= 7.2.2.1)
150-
activejob (= 7.2.2.1)
151-
activemodel (= 7.2.2.1)
152-
activerecord (= 7.2.2.1)
153-
activestorage (= 7.2.2.1)
154-
activesupport (= 7.2.2.1)
143+
rails (7.2.2.2)
144+
actioncable (= 7.2.2.2)
145+
actionmailbox (= 7.2.2.2)
146+
actionmailer (= 7.2.2.2)
147+
actionpack (= 7.2.2.2)
148+
actiontext (= 7.2.2.2)
149+
actionview (= 7.2.2.2)
150+
activejob (= 7.2.2.2)
151+
activemodel (= 7.2.2.2)
152+
activerecord (= 7.2.2.2)
153+
activestorage (= 7.2.2.2)
154+
activesupport (= 7.2.2.2)
155155
bundler (>= 1.15.0)
156-
railties (= 7.2.2.1)
156+
railties (= 7.2.2.2)
157157
rails-dom-testing (2.3.0)
158158
activesupport (>= 5.0.0)
159159
minitest
160160
nokogiri (>= 1.6)
161161
rails-html-sanitizer (1.6.2)
162162
loofah (~> 2.21)
163163
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)
164-
railties (7.2.2.1)
165-
actionpack (= 7.2.2.1)
166-
activesupport (= 7.2.2.1)
164+
railties (7.2.2.2)
165+
actionpack (= 7.2.2.2)
166+
activesupport (= 7.2.2.2)
167167
irb (~> 1.13)
168168
rackup (>= 1.0.0)
169169
rake (>= 12.2)
170170
thor (~> 1.0, >= 1.2.2)
171171
zeitwerk (~> 2.6)
172172
rake (13.3.0)
173-
rdoc (6.14.1)
173+
rdoc (6.15.0)
174174
erb
175175
psych (>= 4.0.0)
176-
reline (0.6.1)
176+
tsort
177+
reline (0.6.2)
177178
io-console (~> 0.5)
178179
securerandom (0.4.1)
179-
thor (1.3.2)
180+
thor (1.4.0)
180181
timeout (0.4.3)
182+
tsort (0.2.0)
181183
tzinfo (2.0.6)
182184
concurrent-ruby (~> 1.0)
183185
useragent (0.16.11)
@@ -189,14 +191,15 @@ GEM
189191

190192
PLATFORMS
191193
universal-java-1.8
194+
universal-java-8
192195
universal-java-11
193196
universal-java-17
194197
universal-java-21
195-
universal-java-8
198+
universal-java-25
196199

197200
DEPENDENCIES
198-
activerecord-jdbcpostgresql-adapter (~> 70.0)
199-
rails (~> 7.0)
201+
activerecord-jdbcpostgresql-adapter (~> 72.1)
202+
rails (~> 7.2.0)
200203

201204
BUNDLED WITH
202-
2.6.3
205+
2.6.9

‎spec/sample_bundler/Gemfile.lock‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,11 @@ GEM
55

66
PLATFORMS
77
universal-java-1.8
8+
universal-java-8
89
universal-java-11
910
universal-java-17
1011
universal-java-21
11-
universal-java-8
12+
universal-java-25
1213

1314
DEPENDENCIES
1415
rake (= 13.3.0)

0 commit comments

Comments
 (0)