Skip to content

Commit

Permalink
merged changes from 4.4
Browse files Browse the repository at this point in the history
  • Loading branch information
klobuczek committed May 3, 2024
2 parents e57121b + a577e67 commit 83841e6
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 6 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/specs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
fail-fast: false
matrix:
ruby: [ jruby, ruby ]
neo4j: [ 4.4.32, 5.19.0 ]
neo4j: [ 4.4.33, 5.19.0 ]
include:
- ruby: jruby
java-version: 17
Expand All @@ -28,15 +28,15 @@ jobs:
- name: Start neo4j
run: docker run --name neo4j --env NEO4J_AUTH=neo4j/password --env NEO4J_ACCEPT_LICENSE_AGREEMENT=yes -p7687:7687 -p7474:7474 -v `pwd`/tmp:/var/lib/neo4j/import --rm neo4j:${{ matrix.neo4j }}-enterprise &

- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Set up Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: ${{ matrix.ruby }}

- name: Set up Java
uses: actions/setup-java@v3
uses: actions/setup-java@v4
if: matrix.java-version
with:
distribution: 'temurin'
Expand Down
1 change: 1 addition & 0 deletions History.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
=== 5.13.0.alpha.3 / 2023-10-15
=== 5.13.0.alpha.2 / 2023-10-15
=== 5.13.0.alpha.1 / 2023-10-08
=== 4.4.6 / 2023-10-12
=== 4.4.5 / 2023-02-09
=== 4.4.4 / 2023-02-06
=== 4.4.3 / 2023-02-06
Expand Down
5 changes: 3 additions & 2 deletions Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ HOE = Class.new(Hoe) do
end.spec 'neo4j-ruby-driver' do
developer 'Heinrich Klobuczek', '[email protected]'

dependency 'activesupport', '>= 0'
active_support_version = ENV['ACTIVE_SUPPORT_VERSION']
dependency 'activesupport', active_support_version&.length&.positive? ? "~> #{active_support_version}" : '>= 7.1'
# dependency 'async-rspec', '>= 0', :dev
dependency 'ffaker', '>= 0', :dev
dependency 'hoe', '>= 0', :dev
Expand All @@ -41,7 +42,7 @@ end.spec 'neo4j-ruby-driver' do
dependency 'jar-dependencies', '>= 0.4.1'
dependency 'ruby-maven', '>= 0', :dev

spec_extras[:requirements] = ->(requirements) { requirements << 'jar org.neo4j.driver, neo4j-java-driver-all, 5.19.0' }
spec_extras[:requirements] = ->(requirements) { requirements << 'jar org.neo4j.driver, neo4j-java-driver-all, 5.20.0' }
spec_extras[:platform] = 'java'
else
require_ruby_version '>= 3.1'
Expand Down
2 changes: 1 addition & 1 deletion jruby/neo4j/driver/version.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@

module Neo4j
module Driver
VERSION = '5.19.0.alpha.0'
VERSION = '5.20.0.alpha.0'
end
end

0 comments on commit 83841e6

Please sign in to comment.