diff --git a/Gemfile b/Gemfile index 35435d316..688ee8ebe 100644 --- a/Gemfile +++ b/Gemfile @@ -9,18 +9,25 @@ return unless Plugin.installed?("bundler-multilock") Plugin.send(:load_plugin, "bundler-multilock") -lockfile active: RUBY_VERSION >= "2.7" do +lockfile active: RUBY_VERSION >= "2.7" && (!Object.const_defined?(:JRUBY_VERSION) || JRUBY_VERSION >= "9.4.11.0") do # these gems are not compatible with Ruby 2.6/JRuby 9.3, but we don't need them to actually # run tests gem "debug", "~> 1.9", require: false, platform: :mri gem "irb", "~> 1.6" + gem "jar-dependencies", "~> 0.5.3" gem "nokogiri", "~> 1.15" + gem "psych", "~> 5.2.3" gem "rubocop-inst", "~> 1.0" gem "rubocop-rake", "~> 0.6" gem "rubocop-rspec", "~> 2.11" end +lockfile "pre-jruby-9.4.11", active: RUBY_VERSION >= "2.7" && Object.const_defined?(:JRUBY_VERSION) && JRUBY_VERSION < "9.4.11.0" do + gem "jar-dependencies", "~> 0.4.1" + gem "psych", "~> 5.1.2" +end + lockfile "ruby-2.6", active: RUBY_VERSION < "2.7" do gem "nokogiri", "~> 1.13.0" end diff --git a/Gemfile.lock b/Gemfile.lock index 6c8d588f7..a7c5be020 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -196,10 +196,12 @@ DEPENDENCIES gem-release (~> 2.2) httparty (~> 0.20) irb (~> 1.6) + jar-dependencies (~> 0.5.3) nokogiri (~> 1.15) openhab-scripting! persistent_httparty (~> 0.1) process_exists (~> 0.2) + psych (~> 5.2.3) rake (~> 13.0) rspec (~> 3.11) rubocop-inst (~> 1.0) diff --git a/Gemfile.pre-jruby-9.4.11.lock b/Gemfile.pre-jruby-9.4.11.lock new file mode 100644 index 000000000..c336aa13b --- /dev/null +++ b/Gemfile.pre-jruby-9.4.11.lock @@ -0,0 +1,141 @@ +GIT + remote: https://github.com/ccutrer/yard.git + revision: 4eb15c57c85628d7ef644e9307f4ad2f7d78e948 + branch: integration + specs: + yard (0.9.28) + webrick (~> 1.7.0) + +PATH + remote: . + specs: + openhab-scripting (5.34.0) + bundler (~> 2.2) + marcel (~> 1.0) + method_source (~> 1.0) + ruby2_keywords (~> 0.0) + +GEM + remote: https://rubygems.org/ + specs: + builder (3.2.4) + coderay (1.1.3) + commonmarker (0.23.10) + concurrent-ruby (1.2.2) + cucumber (8.0.0) + builder (~> 3.2, >= 3.2.4) + cucumber-ci-environment (~> 9.0, >= 9.0.4) + cucumber-core (~> 11.0, >= 11.0.0) + cucumber-cucumber-expressions (~> 15.1, >= 15.1.1) + cucumber-gherkin (~> 23.0, >= 23.0.1) + cucumber-html-formatter (~> 19.1, >= 19.1.0) + cucumber-messages (~> 18.0, >= 18.0.0) + diff-lcs (~> 1.5, >= 1.5.0) + mime-types (~> 3.4, >= 3.4.1) + multi_test (~> 1.1, >= 1.1.0) + sys-uname (~> 1.2, >= 1.2.2) + cucumber-ci-environment (9.2.0) + cucumber-core (11.0.0) + cucumber-gherkin (~> 23.0, >= 23.0.1) + cucumber-messages (~> 18.0, >= 18.0.0) + cucumber-tag-expressions (~> 4.1, >= 4.1.0) + cucumber-cucumber-expressions (15.2.0) + cucumber-gherkin (23.0.1) + cucumber-messages (~> 18.0, >= 18.0.0) + cucumber-html-formatter (19.2.0) + cucumber-messages (~> 18.0, >= 18.0.0) + cucumber-messages (18.0.0) + cucumber-tag-expressions (4.1.0) + cuke_linter (1.3.0) + cuke_modeler (>= 1.5, < 4.0) + cuke_modeler (3.20.1) + cucumber-gherkin (< 28.0) + daemons (1.4.1) + diff-lcs (1.5.0) + eventmachine (1.2.7) + eventmachine (1.2.7-java) + ffi (1.16.3) + ffi (1.16.3-java) + gem-release (2.2.2) + gene_pool (1.5.0) + concurrent-ruby (>= 1.0) + httparty (0.21.0) + mini_mime (>= 1.0.0) + multi_xml (>= 0.5.2) + jar-dependencies (0.4.1) + marcel (1.0.2) + method_source (1.0.0) + mime-types (3.5.2) + mime-types-data (~> 3.2015) + mime-types-data (3.2023.1205) + mini_mime (1.1.5) + multi_test (1.1.0) + multi_xml (0.6.0) + pastel (0.8.0) + tty-color (~> 0.5) + persistent_http (1.0.6) + gene_pool (>= 1.3) + persistent_httparty (0.1.2) + httparty (~> 0.9) + persistent_http (< 2) + process_exists (0.2.0) + psych (5.1.2) + stringio + rack (2.2.8) + rake (13.1.0) + rspec (3.12.0) + rspec-core (~> 3.12.0) + rspec-expectations (~> 3.12.0) + rspec-mocks (~> 3.12.0) + rspec-core (3.12.2) + rspec-support (~> 3.12.0) + rspec-expectations (3.12.3) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.12.0) + rspec-mocks (3.12.6) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.12.0) + rspec-support (3.12.1) + ruby2_keywords (0.0.5) + stringio (3.1.2) + sys-uname (1.2.3) + ffi (~> 1.1) + thin (1.8.2) + daemons (~> 1.0, >= 1.0.9) + eventmachine (~> 1.0, >= 1.0.4) + rack (>= 1, < 3) + timecop (0.9.8) + tty-color (0.6.0) + tty-command (0.10.1) + pastel (~> 0.8) + webrick (1.7.0) + yaml-lint (0.1.2) + +PLATFORMS + arm64-darwin + universal-java + x86_64-darwin + x86_64-linux + +DEPENDENCIES + coderay (~> 1.1.3) + commonmarker + cucumber (~> 8.0) + cuke_linter (~> 1.2) + gem-release (~> 2.2) + httparty (~> 0.20) + jar-dependencies (~> 0.4.1) + openhab-scripting! + persistent_httparty (~> 0.1) + process_exists (~> 0.2) + psych (~> 5.1.2) + rake (~> 13.0) + rspec (~> 3.11) + thin (~> 1.8.1) + timecop (~> 0.9) + tty-command (~> 0.10) + yaml-lint (~> 0.0) + yard! + +BUNDLED WITH + 2.4.22