Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 30 additions & 0 deletions .github/workflows/ruby.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,11 @@ jobs:

steps:
- uses: actions/checkout@v4
- name: Set up Java 21
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: '21'
- name: Set up Ruby
uses: ruby/setup-ruby@v1
with:
Expand Down Expand Up @@ -103,6 +108,11 @@ jobs:

steps:
- uses: actions/checkout@v4
- name: Set up Java 21
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: '21'
- name: Set up Ruby
uses: ruby/setup-ruby@v1
with:
Expand Down Expand Up @@ -138,6 +148,11 @@ jobs:

steps:
- uses: actions/checkout@v4
- name: Set up Java 21
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: '21'
- name: Set up Ruby
uses: ruby/setup-ruby@v1
with:
Expand Down Expand Up @@ -180,6 +195,11 @@ jobs:

steps:
- uses: actions/checkout@v4
- name: Set up Java 21
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: '21'
- name: Set up Ruby
uses: ruby/setup-ruby@v1
with:
Expand Down Expand Up @@ -231,6 +251,11 @@ jobs:

steps:
- uses: actions/checkout@v4
- name: Set up Java 21
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: '21'
- name: Set up Ruby
uses: ruby/setup-ruby@v1
with:
Expand Down Expand Up @@ -260,6 +285,11 @@ jobs:

steps:
- uses: actions/checkout@v4
- name: Set up Java 21
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: '21'
- name: Set up Ruby
uses: ruby/setup-ruby@v1
with:
Expand Down
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,10 @@ Versions are targeted at certain versions of Rails and live on their own branche
| 61.x | 6.1.x | 61-stable | 9.2.7 | 8 |
| 70.x | 7.0.x | 70-stable | 9.3.0 | 8 |
| 71.x | 7.1.x | 71-stable | 9.4.3 | 8 |
| 72.x | 7.2.x | master | 9.4.3 | 8 |
| 72.x | 7.2.x | 72-stable | 9.4.3 | 8 |
| 80.x | 8.0.x | master | 10.0.0 | 8 |

Note: 72.x is still under development and not supported yet.
Note: 80.x is still under development and not supported yet.

Note that JRuby 9.1.x and JRuby 9.2.x are at end-of-life. We recommend Java 8
at a minimum for all versions.
Expand Down
2 changes: 1 addition & 1 deletion activerecord-jdbc-adapter.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ Gem::Specification.new do |gem|
gem.executables = gem.files.grep(%r{^bin/}).map { |f| File.basename(f) }
gem.test_files = gem.files.grep(%r{^test/})

gem.add_dependency "activerecord", "~> 7.2.2"
gem.add_dependency "activerecord", "~> 8.0.0"

#gem.add_development_dependency 'test-unit', '2.5.4'
#gem.add_development_dependency 'test-unit-context', '>= 0.3.0'
Expand Down
2 changes: 1 addition & 1 deletion lib/arjdbc/version.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module ArJdbc
VERSION = '71.0'
VERSION = '80.0'
end
2 changes: 1 addition & 1 deletion rakelib/02-test.rake
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ def test_task_for(adapter, options = {})
test_task.libs = []
if defined?(JRUBY_VERSION)
test_task.libs << 'lib'
test_task.libs << "jdbc-#{driver}/lib" if driver && File.exists?("jdbc-#{driver}/lib")
test_task.libs << "jdbc-#{driver}/lib" if driver && File.exist?("jdbc-#{driver}/lib")
test_task.libs.push *FileList["activerecord-jdbc#{adapter}*/lib"]
end
test_task.libs << 'test'
Expand Down
Loading