Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/actions/setup-gradle/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ inputs:
javaVersion:
description: Java version
required: false
default: '25'
default: '26'

runs:
using: composite
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/binaries.yml
Original file line number Diff line number Diff line change
Expand Up @@ -550,7 +550,7 @@ jobs:
SED_I=(-i)
[[ '${{ startsWith(matrix.os, 'macos') }}' == 'true' ]] && SED_I=(-i '')

sed "${SED_I[@]}" "s/JavaLanguageVersion.of(25)/JavaLanguageVersion.of(${{ needs.conditions.outputs.jdkVersion }})/" build-logic/src/main/kotlin/org.jabref.gradle.feature.compile.gradle.kts
sed "${SED_I[@]}" "s/JavaLanguageVersion.of(26)/JavaLanguageVersion.of(${{ needs.conditions.outputs.jdkVersion }})/" build-logic/src/main/kotlin/org.jabref.gradle.feature.compile.gradle.kts
sed "${SED_I[@]}" "s/AMAZON/ORACLE/" build-logic/src/main/kotlin/org.jabref.gradle.feature.compile.gradle.kts
sed "${SED_I[@]}" "s|val javafx = .*|val javafx = \"${{ needs.conditions.outputs.javafxVersion }}\"|" versions/build.gradle.kts

Expand Down
11 changes: 8 additions & 3 deletions .github/workflows/tests-code.yml
Original file line number Diff line number Diff line change
Expand Up @@ -258,6 +258,11 @@ jobs:
submodules: 'true'
show-progress: 'false'
- uses: ./.github/actions/setup-gradle
- name: Install at-spi2-core
uses: awalsh128/cache-apt-pkgs-action@latest
with:
packages: at-spi2-core
version: 1.0
- name: Run ${{ matrix.module }} tests
run: xvfb-run --auto-servernum gradle :${{ matrix.module }}:check -x checkstyleJmh -x checkstyleMain -x checkstyleTest -x modernizer
env:
Expand Down Expand Up @@ -405,7 +410,7 @@ jobs:
if: steps.changed-jablib-files.outputs.any_changed != 'true'
uses: actions/setup-java@v5
with:
java-version: '25'
java-version: '26'
distribution: 'corretto'
check-latest: true

Expand Down Expand Up @@ -461,7 +466,7 @@ jobs:
- name: Setup JDK
uses: actions/setup-java@v5
with:
java-version: '25'
java-version: '26'
distribution: 'corretto'
check-latest: true
- name: Modify ${{ matrix.script }} to include changed classes
Expand Down Expand Up @@ -517,7 +522,7 @@ jobs:
- name: Set up JDK
uses: actions/setup-java@v5
with:
java-version: 25
java-version: 26
distribution: 'corretto'
cache: maven
check-latest: true
Expand Down
3 changes: 2 additions & 1 deletion .jbang/JabKitLauncher.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@

//DESCRIPTION jabkit - mange BibTeX files using JabRef

//JAVA 25+
//JAVA 26+
//DEPS org.openjfx:jdk-jsobject:26
//RUNTIME_OPTIONS --enable-native-access=ALL-UNNAMED

// raw is for https://github.com/unicode-org/icu/pull/2127
Expand Down
2 changes: 1 addition & 1 deletion .jbang/JabLsLauncher.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

//DESCRIPTION jabls - start a bibtex languageserver

//JAVA 25+
//JAVA 26+
//RUNTIME_OPTIONS --enable-native-access=ALL-UNNAMED

// raw is for https://github.com/unicode-org/icu/pull/2127
Expand Down
2 changes: 1 addition & 1 deletion .jbang/JabSrvLauncher.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

//DESCRIPTION jabsrv - serve BibTeX files using JabRef

//JAVA 25+
//JAVA 26+
//RUNTIME_OPTIONS --enable-native-access=ALL-UNNAMED

// raw is for https://github.com/unicode-org/icu/pull/2127
Expand Down
2 changes: 1 addition & 1 deletion .moderne/moderne.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
specs: specs.moderne.ai/v1/cli
java:
selectedJdk: '25'
selectedJdk: '26'
2 changes: 1 addition & 1 deletion .sdkmanrc
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
java=25.0.2-amzn
java=26-amzn
#visualvm=2.1.10
Original file line number Diff line number Diff line change
Expand Up @@ -38,19 +38,8 @@ listOf("javafx-base", "javafx-controls", "javafx-fxml", "javafx-graphics", "java
}

fun addJfxTarget(jfxModule: String, name: String, os: String, arch: String) {
if (jfxModule == "javafx-web" && name.isNotEmpty()) {
// Special treatment of 'javafx-web' for the time being due to https://bugs.openjdk.org/browse/JDK-8342623.
// Can be remove once Java 26 is the minimum version JabRef is built with.
dependencies.components.withModule<JDKjsobjectDependencyMetadataRule>("org.openjfx:$jfxModule") {
params(name, os, arch, 11)
}
dependencies.components.withModule<JDKjsobjectDependencyMetadataRule>("org.openjfx:$jfxModule") {
params(name, os, arch, 26)
}
} else {
jvmDependencyConflicts.patch.module("org.openjfx:$jfxModule") {
addTargetPlatformVariant(name, os, arch)
}
jvmDependencyConflicts.patch.module("org.openjfx:$jfxModule") {
addTargetPlatformVariant(name, os, arch)
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ java {
// - jablib-examples/jbang/*.java
// - jablib-examples/maven3/*/pom.xml
// - Dockerfile.* (first line)
languageVersion = JavaLanguageVersion.of(25)
languageVersion = JavaLanguageVersion.of(26)
// See https://docs.gradle.org/current/javadoc/org/gradle/jvm/toolchain/JvmVendorSpec.html for a full list
// Temurin does not ship jmods, thus we need to use another JDK -- see https://github.com/actions/setup-java/issues/804
// We also need a JDK without JavaFX, because we patch JavaFX due to modularity issues
Expand All @@ -28,7 +28,7 @@ java {
}

tasks.withType<JavaCompile>().configureEach {
options.release = 25
options.release = 26
// See https://docs.gradle.org/current/userguide/performance.html#a_run_the_compiler_as_a_separate_process
options.isFork = true
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//JAVA 25+
//JAVA 26+
//RUNTIME_OPTIONS --enable-native-access=ALL-UNNAMED

//DEPS org.jspecify:jspecify:1.0.0
Expand Down
2 changes: 1 addition & 1 deletion build-support/src/main/java/JournalListMvGenerator.java
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//JAVA 25+
//JAVA 26+
//RUNTIME_OPTIONS --enable-native-access=ALL-UNNAMED

//DEPS com.h2database:h2:2.4.240
Expand Down
2 changes: 1 addition & 1 deletion build-support/src/main/java/LtwaListMvGenerator.java
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//JAVA 25+
//JAVA 26+
//RUNTIME_OPTIONS --enable-native-access=ALL-UNNAMED

//DEPS com.h2database:h2:2.4.240
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,13 @@ Go to "File > Project Structure" or press <kbd>Ctrl</kbd>+<kbd>Shift</kbd>+<kbd>
![Open Project Structure](12-02-open-project-settings.png)
{% endfigure %}

Click on "Project" on the left side. Then, select **temurin-25** as the project SDK (continue reading if this option is not available).
Click on "Project" on the left side. Then, select **temurin-26** as the project SDK (continue reading if this option is not available).

{% figure caption:"Project Structure - Project SDK" %}
![Project Structure - Project SDK](12-03-project-sdk.png)
{% endfigure %}

If you do not have access to this JDK, download it by clicking on "Download JDK..." In the dialog that opens, select version 25, vendor "Eclipse Temurin (AdoptOpenJDK HotSpot)", and click "Download".
If you do not have access to this JDK, download it by clicking on "Download JDK..." In the dialog that opens, select version 26, vendor "Eclipse Temurin (AdoptOpenJDK HotSpot)", and click "Download".

{% figure caption: "Dropdown to select Download JDK" %}
![Dropdown to select Download JDK](12-04-download-jdk.png)
Expand Down
2 changes: 1 addition & 1 deletion jablib-examples/jbang/doi_to_bibtex.java
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

//DESCRIPTION Converts a DOI to BibTeX

//JAVA 25+
//JAVA 26+
//RUNTIME_OPTIONS --enable-native-access=ALL-UNNAMED
//FILES tinylog.properties=tinylog.properties
// see https://github.com/gradlex-org/extra-java-module-info/issues/237 why we include e-adr here
Expand Down
2 changes: 1 addition & 1 deletion jablib-examples/jbang/ieee_pdf_references_to_bibtex.java
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

//DESCRIPTION Opens the given PDF file, parses the references and outputs BibTeX

//JAVA 25+
//JAVA 26+
//RUNTIME_OPTIONS --enable-native-access=ALL-UNNAMED
//FILES tinylog.properties=tinylog.properties

Expand Down
2 changes: 1 addition & 1 deletion jablib-examples/maven3/doi-to-bibtex/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.release>24</maven.compiler.release>
<maven.compiler.release>26</maven.compiler.release>
</properties>

<repositories>
Expand Down
2 changes: 1 addition & 1 deletion jitpack.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
jdk:
- openjdk25
- openjdk26
install:
- ./gradlew :versions:publishToMavenLocal
- ./gradlew :jablib:publishToMavenLocal
Loading