-
Notifications
You must be signed in to change notification settings - Fork 14
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Additional Scijava conflicts #96
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thank you @elect86. I have a few formatting comments.
Thank you for bringing up the points about organizing the CapabilityDefinitions.java
file. We'll discuss this unrelated to this PR. We already have an issue for this (#70).
If you run a full quickCheck
, there will be a complaint about not having the new entries in the samples/...
. Maybe you can add them there (there should be a message that tells you where). If this does not work out – because the samples suffer from Gradle bug gradle/gradle#14220 – I can have a look at that later.
src/main/java/org/gradlex/javaecosystem/capabilities/rules/CapabilityDefinitions.java
Outdated
Show resolved
Hide resolved
src/main/java/org/gradlex/javaecosystem/capabilities/rules/CapabilityDefinitions.java
Outdated
Show resolved
Hide resolved
I'm hitting other crashes, |
We need a better guide on how to add new rules (#13)... https://github.com/gradlex-org/java-ecosystem-capabilities/blob/main/samples/sample-all/build.out The changes will indicate if the rues behave as expected. I can also do the final adjustments when I try out the changes if you run into trouble there. |
Manually? |
You can either add everything by hand or overwrite the complete file with the output you get from the failing test. And then verify the changes in the Git diff. |
src/main/java/org/gradlex/javaecosystem/capabilities/rules/jakarta/JavaxTransactionApiRule.java
Outdated
Show resolved
Hide resolved
- fixed JavaxTransactionApiRule::FIRST_JAKARTA_VERSION
I have still |
As, I said we need to work on documenting this contribution process better. 🙂 |
thanks dear I'll follow your changes closely, I'm curious to know what I did wrong/missed |
src/main/java/org/gradlex/javaecosystem/capabilities/rules/CapabilityDefinitions.java
Outdated
Show resolved
Hide resolved
src/main/java/org/gradlex/javaecosystem/capabilities/rules/CapabilityDefinitions.java
Outdated
Show resolved
Hide resolved
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I corrected the places that were not really conflicts (no overlapping classes).
The remaining additions seem to be correct.
Thank you @elect86. I will merge this.
Usually, we aim for releasing contributions to this plugin in a timely matter. But since we are in the transition to 2.0 for which we still need to clarify some things, it may take a bit until this gets released (goal for me is middle of April).
Commit I forgot to push to the PR (added on main): c1ce064 |
Wouldn't you even consider a 1.5.3 or a 2.0-alpha? |
I pulled your changes, now I don't have those crashes anymore What was that in the end? I cant figure it out I still have some warnings, though
|
As titled, added additional Scijava conflicts from https://github.com/scijava/pom-scijava/blob/7749f3d2e41f8516d2c0b269e7541763569e5490/pom.xml
Layout is weird, my Idea was indenting with 12 spaces instead of 8, I had to manually fix every string to match your original one.
Also, it might be worth to re-order some entries alphabetically and maybe have
HIGHEST_VERSION
by default unless specified? This will require some work with the constructors, I don't know honestly if it's worth, though, but Java is so verbose..Ps: I noticed Gradle was also warning for the missing default name on
:plugins
, so I added that