Skip to content

Commit

Permalink
Merge branch 'main' into introduce-junit5-best-practices
Browse files Browse the repository at this point in the history
  • Loading branch information
koppor authored Aug 20, 2024
2 parents 9e903db + 6b8c5a3 commit 8010e78
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/deployment-jdk-ea.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ name: Deployment (JDK early access builds)

on:
schedule:
- cron: "0 5 * * 2"
- cron: "0 18 * * 1"
pull_request:
paths:
- .github/workflows/deployment-jdk-ea.yml
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -340,7 +340,7 @@ dependencies {
exclude group: 'org.jetbrains.kotlin', module: 'kotlin-stdlib-jdk8'
}
// GemxFX also (transitively) depends on kotlin
implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.24'
implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.0.10'

implementation 'commons-io:commons-io:2.16.1'

Expand Down
8 changes: 6 additions & 2 deletions docs/code-howtos/code-quality.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,12 @@ parent: Code Howtos
JabRef has three code style checkers in place:

* [Checkstyle](https://checkstyle.sourceforge.io/) for basic checks, such as wrong import order.
* [Gradle Modernizer Plugin](https://github.com/andygoossens/gradle-modernizer-plugin#gradle-modernizer-plugin) for Java library usage checks. It ensures that "modern" Java concepts are used (e.g., [one should use `Deque` instead of `Stack`](https://stackoverflow.com/a/73021741/873282)).
* [OpenRewrite](https://docs.openrewrite.org/) for advanced rules. OpenRewrite can also automatically fix issues. JabRef's CI toolchain does NOT automatically rewrite the source code, but checks whether OpenRewrite would rewrite something. As developer, one can execute `./gradlew rewriteRun` to fix the issues.
* [Gradle Modernizer Plugin](https://github.com/andygoossens/gradle-modernizer-plugin#gradle-modernizer-plugin) for Java library usage checks.
It ensures that "modern" Java concepts are used (e.g., [one should use `Deque` instead of `Stack`](https://stackoverflow.com/a/73021741/873282)).
* [OpenRewrite](https://docs.openrewrite.org/) for advanced rules. OpenRewrite can also automatically fix issues.
JabRef's CI toolchain does NOT automatically rewrite the source code, but checks whether OpenRewrite would rewrite something.
As developer, one can execute `./gradlew rewriteRun` to fix the issues.
Note that [JabRef is available on the Moderne platform](https://app.moderne.io/organizations/JabRef/jabref?branch=main&origin=github.com), too.

In case a check fails, [the CI](https://github.com/JabRef/jabref/blob/main/.github/workflows/tests.yml#L24C6-L24C6) automatically adds a comment on the pull request.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ public class ManageStudyDefinitionView extends BaseDialog<SlrStudyAndDirectory>
*/
public ManageStudyDefinitionView(Path pathToStudyDataDirectory) {
this.pathToStudyDataDirectory = pathToStudyDataDirectory;
this.setTitle("Define study parameters");
this.setTitle(Localization.lang("Define study parameters"));
this.study = Optional.empty();

ViewLoader.view(this)
Expand Down
3 changes: 2 additions & 1 deletion src/main/resources/l10n/JabRef_en.properties
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,6 @@ Entry\ Title\ (Required\ to\ deliver\ recommendations.)=Entry Title (Required to
Error=Error
Error\ occurred\ when\ parsing\ entry=Error occurred when parsing entry
Error\ during\ persistence\ of\ crawling\ results.=Error during persistence of crawling results.
Error\ during\ reading\ of\ study\ definition\ file.=Error during reading of study definition file.
'%0'\ exists.\ Overwrite\ file?='%0' exists. Overwrite file?
Export=Export
Export\ preferences=Export preferences
Expand Down Expand Up @@ -2443,6 +2442,7 @@ Entry\ types=Entry types
Others=Others
Recommended=Recommended
Define\ study\ parameters=Define study parameters
Authors\ and\ Title=Authors and Title
Catalog=Catalog
Catalogs=Catalogs
Expand All @@ -2455,6 +2455,7 @@ Research\ Questions=Research Questions
Study\ Title\:=Study Title\:
Start\ new\ systematic\ literature\ review=Start new systematic literature review
Manage\ study\ definition=Manage study definition
Error\ during\ reading\ of\ study\ definition\ file.=Error during reading of study definition file.
Update\ study\ search\ results=Update study search results
Study\ repository\ could\ not\ be\ created=Study repository could not be created
Expand Down

0 comments on commit 8010e78

Please sign in to comment.