Commit 34e3942
committed
Avoid loading jar-dependencies to install gem hook
By requiring a file from jar-dependencies here, we end up
activating whatever the default jar-dependencies gem is for the
current JRuby runtime. Later on, when the hook is running or gems
that use jars simply try to activate a newer jar-dependencies, we
get the dreaded version conflict described in
jruby/jar-dependencies#86, preventing activation of all
libraries.
The change here moves the body of the hook into the JRuby
defaults.rb for RubyGems rather than loading any files from
jar-dependencies itself. This appears to fix issues like those
seen in the jruby-9.4.9.0 builds at ruby/rdoc#1229 (bundle exec
failing to run due to the version conflict) and may fix other
reports.
This does not fix issues using a newer jar-dependencies on an
older JRuby, unfortunately.1 parent 963f994 commit 34e3942
1 file changed
+9
-3
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
101 | 101 | | |
102 | 102 | | |
103 | 103 | | |
104 | | - | |
105 | | - | |
106 | | - | |
| 104 | + | |
| 105 | + | |
| 106 | + | |
| 107 | + | |
| 108 | + | |
| 109 | + | |
| 110 | + | |
| 111 | + | |
| 112 | + | |
107 | 113 | | |
0 commit comments