From 363f04fb8d93d1372bebc70c037145b9357aaa9a Mon Sep 17 00:00:00 2001 From: Oliver Kopp Date: Wed, 7 Jul 2021 21:07:22 +0200 Subject: [PATCH 1/3] Update to Java 16 in build.gradle --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index c11147e50d6..bd4c4d61ef7 100644 --- a/build.gradle +++ b/build.gradle @@ -46,8 +46,8 @@ group = "org.jabref" version = project.findProperty('projVersion') ?: '100.0.0' java { - sourceCompatibility = JavaVersion.VERSION_14 - targetCompatibility = JavaVersion.VERSION_14 + sourceCompatibility = JavaVersion.VERSION_16 + targetCompatibility = JavaVersion.VERSION_16 // Workaround needed for Eclipse, probably because of https://github.com/gradle/gradle/issues/16922 // Should be removed as soon as Gradle 7.0.1 is released ( https://github.com/gradle/gradle/issues/16922#issuecomment-828217060 ) From 0600a2be922edb9dad898866d2d9dfa70cbe9b3f Mon Sep 17 00:00:00 2001 From: Oliver Kopp Date: Wed, 7 Jul 2021 21:10:45 +0200 Subject: [PATCH 2/3] Update guidelines-for-setting-up-a-local-workspace.md --- .../guidelines-for-setting-up-a-local-workspace.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace.md b/docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace.md index 029b97b2b8f..309324f8af2 100644 --- a/docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace.md +++ b/docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace.md @@ -18,7 +18,7 @@ This section list the prerequisites you need to get started to develop JabRef. A ### Java Development Kit 16 -A working Java \(Develoment Kit\) 16 installation with Java FX support is required. In the command line \(terminal in Linux, cmd in Windows\) run `javac -version` and make sure that the reported version is Java 16 \(e.g `javac 16`\). If `javac` is not found or a wrong version is reported, check your `PATH` environment variable, your `JAVA_HOME` environment variable or install the most recent JDK. +A working Java \(Develoment Kit\) 16 installation with Java FX support is required. In the command line \(terminal in Linux, cmd in Windows\) run `javac -version` and make sure that the reported version is Java 16 \(e.g., `javac 16`\). If `javac` is not found or a wrong version is reported, check your `PATH` environment variable, your `JAVA_HOME` environment variable or install the most recent JDK. [JavaFX is not part of the default JDK any more](https://www.reddit.com/r/java/comments/82qm9x/javafx_will_be_removed_from_the_java_jdk_in_jdk_11/), it needs to be installed separately if not using a special JDK. @@ -106,7 +106,7 @@ After that, you can open `jabref/build.gradle` as a project. It is crucial that Ensure you have a Java 16 SDK configured by navigating to **File \| Project Structure \| Platform Settings \| SDKs**. If you don't have one, add a new Java JDK and point it to the location of a JDK 16. ![Project Settings](../.gitbook/assets/intellij-choose-jdk-adoptopenjdk-on-windows-project-settings.png) -Navigate to **File \| Project Structure \| Project** and ensure that the projects' SDK is Java 16 ![Use JDK 15 as project SDK](../.gitbook/assets/intellij-choose-jdk15-project-default.png) +Navigate to **File \| Project Structure \| Project** and ensure that the projects' SDK is Java 16 ![Use JDK 16 as project SDK](../.gitbook/assets/intellij-choose-jdk15-project-default.png) Navigate to **File \| Settings \| Build, Execution, Deployment \| Build Tools \| Gradle** and select the "Project SDK" as the Gradle JVM at the bottom. @@ -201,7 +201,7 @@ Finally, ensure that the checkstyle configuration file is in place: 4. Click "Browse" and choose `config/checkstyle/checkstyle.xml` 5. Click "Next" and "Finish" 6. Activate the CheckStyle configuration file by ticking it in the list -7. Ensure that the [latest CheckStyle version](https://checkstyle.org/releasenotes.html) is selected \(8.36 or higher\). 8.36 is required for Java 15. +7. Ensure that the [latest CheckStyle version](https://checkstyle.org/releasenotes.html) is selected \(8.36 or higher\). 8.43 is required for Java 16. 8. Set the "Scan Scope" to "Only Java sources \(including tests\) 9. Save settings by clicking "OK" 10. Your configuration should now look like this: From 46ff3be0d4cea181d902cada94c120f383959099 Mon Sep 17 00:00:00 2001 From: Oliver Kopp Date: Wed, 7 Jul 2021 21:17:28 +0200 Subject: [PATCH 3/3] Update JDK also for fetchter tests and depdency updates --- .github/workflows/check-outdated-dependencies.yml | 2 +- .github/workflows/tests-fetchers.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/check-outdated-dependencies.yml b/.github/workflows/check-outdated-dependencies.yml index 4e9a2f21299..6aa2cf35268 100644 --- a/.github/workflows/check-outdated-dependencies.yml +++ b/.github/workflows/check-outdated-dependencies.yml @@ -14,7 +14,7 @@ jobs: - name: Set up JDK uses: actions/setup-java@v2 with: - java-version: 14 + java-version: 16 distribution: 'adopt' - name: Look for outdated dependencies run: ./gradlew -q checkOutdatedDependencies diff --git a/.github/workflows/tests-fetchers.yml b/.github/workflows/tests-fetchers.yml index 769d1b89fb7..ab390d68d0f 100644 --- a/.github/workflows/tests-fetchers.yml +++ b/.github/workflows/tests-fetchers.yml @@ -36,7 +36,7 @@ jobs: - name: Set up JDK uses: actions/setup-java@v2 with: - java-version: 14 + java-version: 16 distribution: 'adopt' - uses: actions/cache@v2 name: Restore gradle cache