Adopt pure ruby DSL implementation for JRuby #9047
Merged
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
JRuby unit and conformance test fixes.
perezd
approved these changes
Oct 4, 2021
ruby/pom.xml
Outdated
| @@ -88,7 +88,7 @@ | |||
| <dependency> | |||
| <groupId>com.google.protobuf</groupId> | |||
| <artifactId>protobuf-java-util</artifactId> | |||
| <version>3.13.0</version> | |||
| <version>3.18.0</version> | |||
There was a problem hiding this comment.
I think you'll need to add an entry to this:
https://github.com/protocolbuffers/protobuf/blob/master/update_version.py
to ensure this stays updated.
There was a problem hiding this comment.
Done - thanks for the pointer.
haberman
reviewed
Oct 4, 2021
| raise ArgumentError, "maven needs to be installed" | ||
| end | ||
| task :clean do | ||
| task :clean => :require_mvn do |
There was a problem hiding this comment.
Do we need to require Maven for this? Could we just run mvn only when it is present?
There was a problem hiding this comment.
The JRuby gem assembly process has a dependency on Maven - they just don't need to be enforced unless you're actually running one of the JRuby tasks; previously it was enforcing the availability of Maven when the tasks were defined.
ruby/lib/google/protobuf.rb
Outdated
| end | ||
|
|
||
| require 'google/protobuf/descriptor_dsl' | ||
|
|
haberman
approved these changes
Oct 5, 2021
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.
JRuby unit and conformance test fixes.
Includes changes originally submitted in #8997 and #8954