Skip to content
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

Gradle 8.5, OWASP plugin update, update some default code styling settings for IntelliJ #641

Merged
merged 9 commits into from
Dec 12, 2023

Conversation

labkey-susanh
Copy link
Contributor

Rationale

  • Gradle 8.5 is the latest
  • OWASP 8.4.3 is the latest 8.x version. Updating to 9.x may also be possible, but locally I ran into problems, so I'll stick with the latest 8.x version for now.
  • In preparation for our conversion to Tomcat 10, it is anticipated there will be fewer merge conflicts if IntelliJ doesn't collapse imports into *-imports, so this updates the style to increase the limit on when *-imports are used.
  • Some other styling changes that seem to be our standard but are not capture are also included here.

Related Pull Requests

Changes

  • Update gradle version
  • Update OWASP dependency check plugin version
  • Update IntelliJ project code style settings.

@@ -7,10 +7,18 @@
<option name="WHILE_ON_NEW_LINE" value="true" />
<option name="CATCH_ON_NEW_LINE" value="true" />
<option name="FINALLY_ON_NEW_LINE" value="true" />
<JSCodeStyleSettings version="0">
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are these changes to settings other than Java imports intended?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I intended them, yes, as I believe they correspond to our expected styling.

@labkey-susanh labkey-susanh merged commit 50db962 into develop Dec 12, 2023
4 checks passed
@labkey-susanh labkey-susanh deleted the fb_gradle8.5 branch December 12, 2023 14:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants