Fix JRuby detection on JRuby 9.2 in cpu_counter.rb #265
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Java::Java is no longer defined by default, it's not defined until it is accessed: $ jruby -e 'p defined?(Java::Java)' nil $ jruby -e 'p Java::Java' Java::Java In earlier JRuby versions, defined?(Java::Java) returned "constant".
hsbt
reviewed
May 25, 2018
lib/rake/cpu_counter.rb
Outdated
| @@ -32,7 +32,7 @@ def count | |||
| require 'rbconfig' | |||
|
|
|||
| def count | |||
| if defined?(Java::Java) | |||
| if defined?(JRUBY_VERSION) && (Java::Java rescue nil) | |||
There was a problem hiding this comment.
How about to use RUBY_PLATFORM == 'java' instead of current imprementation?
There was a problem hiding this comment.
Sure, let me send another diff.
|
@hsbt is this waiting on anything more to merge? |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Java::Javais no longer defined by default, it's not defined until it is accessed:In earlier JRuby versions,
defined?(Java::Java)returned"constant".While this doesn't cause an test failures, it does result in the following warning when run on non-Windows systems:
!!!! Missing jruby-win32ole gem: jruby -S gem install jruby-win32ole, because the first fallback code is to try to loadwin32ole, and on JRuby that prints the warning.