Skip to content

Commit 7a1f8f2

Browse files
authored
Merge pull request #744 from dry-rb/bundle-fixes-for-jruby
Bundle fixes for jruby
2 parents ec11e61 + 93028b0 commit 7a1f8f2

File tree

6 files changed

+12
-11
lines changed

6 files changed

+12
-11
lines changed

Gemfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ group :benchmarks do
1717
gem "activerecord"
1818
gem "benchmark-ips"
1919
# gem "hotch", platform: :mri
20-
gem "sqlite3"
20+
gem "sqlite3", platform: :mri
21+
gem "jdbc-sqlite3", platform: :jruby
22+
gem "activerecord-jdbc-adapter", platform: :jruby
2123
gem "virtus"
2224
end

benchmarks/active_record_setup.rb

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,15 @@
22

33
require "active_record"
44

5-
ActiveRecord::Base.establish_connection(adapter: "sqlite3", database: ":memory:")
5+
if RUBY_PLATFORM == "java"
6+
require "activerecord-jdbc-adapter"
7+
ActiveRecord::Base.establish_connection(
8+
adapter: "sqlite3",
9+
database: ":memory:"
10+
)
11+
else
12+
ActiveRecord::Base.establish_connection(adapter: "sqlite3", database: ":memory:")
13+
end
614

715
ActiveRecord::Schema.define do
816
create_table :users do |table|

benchmarks/benchmark_form_invalid.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55

66
require "i18n"
77
require "dry-validation"
8-
require "byebug"
98

109
require_relative "active_record_setup"
1110

benchmarks/benchmark_form_invalid_huge.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55

66
require "i18n"
77
require "dry-validation"
8-
require "byebug"
98

109
COUNT = (ENV["COUNT"] || 100).to_i
1110
FIELDS = COUNT.times.map { |i| :"field_#{i}" }

examples/each.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
# frozen_string_literal: true
22

3-
require "byebug"
43
require "dry-validation"
54

65
contract = Class.new(Dry::Validation::Contract) do

spec/spec_helper.rb

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,6 @@
33
require_relative "support/coverage"
44
require_relative "support/warnings"
55

6-
begin
7-
require "pry"
8-
require "pry-byebug"
9-
rescue LoadError
10-
end
11-
126
Warning.process { |w| raise w }
137

148
require "yaml"

0 commit comments

Comments
 (0)