Skip to content

Switch the Gradle build to org.gradlex.java-module plugins #13401

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

Merged
merged 31 commits into from
Jul 1, 2025
Merged
Show file tree
Hide file tree
Changes from 29 commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
d648820
Explore switching the Gradle build to org.gradlex.java-module plugins…
jjohannes Jun 24, 2025
a74df8d
Enable gradle configuration caching
koppor Jun 24, 2025
6d5d992
Update gradle.properties
koppor Jun 24, 2025
7400e80
Also build the portable version for all targets (app-image)
jjohannes Jun 27, 2025
a7c5a1c
Also build 'pkg' ony MacOS
jjohannes Jun 27, 2025
436e2f4
Continue to change 'binaries' job to use 'packages' folder...
jjohannes Jun 27, 2025
c8c76cb
Add newline (checkstyle)
jjohannes Jun 27, 2025
54d3c70
Fix binaries.yml (1)
jjohannes Jun 27, 2025
a5aa239
Fix binaries.yml (2)
jjohannes Jun 27, 2025
a8c7a98
Fix binaries.yml (3)
jjohannes Jun 27, 2025
97741fe
Fix binaries.yml (4)
jjohannes Jun 27, 2025
fe66df1
Fix binaries.yml (5)
jjohannes Jun 27, 2025
7caaf76
Configure signing for Mac targets
jjohannes Jun 27, 2025
91bdb09
Move java options into Gradle build
jjohannes Jun 28, 2025
7f0878d
Remove unnecessary 'assemble' step
jjohannes Jun 28, 2025
141c4c9
macos -> macOS
jjohannes Jun 28, 2025
d2231d5
Fix filename(s) for JabKit
koppor Jun 29, 2025
7e0fdfc
Remove obsolete renaming for portable
koppor Jun 29, 2025
b4f2fb7
Remove jabkit DMG
koppor Jun 29, 2025
399ab22
Fix PIT for removal of jabkit dmg
koppor Jun 30, 2025
f18a281
Fix removal of DMG
koppor Jun 30, 2025
1a73456
Also remove .sha256
koppor Jun 30, 2025
6cce46b
Try NOT to build dmg and pkg
koppor Jun 30, 2025
97dc2bd
Try "--win-console"
koppor Jun 30, 2025
289ce0b
Switch to fix
koppor Jun 30, 2025
4f39601
Adapt to new "appImageOptions"
koppor Jun 30, 2025
4ace5e1
Port changes to jabsrv-cli, too
koppor Jun 30, 2025
d00bd68
Merge branch 'main' into java-module-plugins
koppor Jun 30, 2025
d345e53
Merge branch 'main' into java-module-plugins
koppor Jun 30, 2025
e0b3a49
Merge branch 'main' into java-module-plugins
koppor Jul 1, 2025
6acd2c8
Delete jablib/src/main/java/org/jabref/logic/preferences/PreviewPrefe…
koppor Jul 1, 2025
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
545 changes: 0 additions & 545 deletions .github/workflows/binaries-ea.yml

This file was deleted.

169 changes: 33 additions & 136 deletions .github/workflows/binaries.yml

Large diffs are not rendered by default.

126 changes: 126 additions & 0 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,12 @@ jobs:
with:
submodules: 'true'
show-progress: 'false'
- name: Checkout java-module-packaging
uses: actions/checkout@v4
with:
repository: koppor/java-module-packaging
path: build-logic/java-module-packaging
ref: fix-params
- name: Set up JDK
uses: actions/setup-java@v4
with:
Expand All @@ -59,6 +65,12 @@ jobs:
with:
submodules: 'true'
show-progress: 'false'
- name: Checkout java-module-packaging
uses: actions/checkout@v4
with:
repository: koppor/java-module-packaging
path: build-logic/java-module-packaging
ref: fix-params
- name: Set up JDK
uses: actions/setup-java@v4
with:
Expand All @@ -79,6 +91,12 @@ jobs:
with:
submodules: 'true'
show-progress: 'false'
- name: Checkout java-module-packaging
uses: actions/checkout@v4
with:
repository: koppor/java-module-packaging
path: build-logic/java-module-packaging
ref: fix-params
- name: Set up JDK
uses: actions/setup-java@v4
with:
Expand All @@ -101,6 +119,12 @@ jobs:
with:
submodules: 'false'
show-progress: 'false'
- name: Checkout java-module-packaging
uses: actions/checkout@v4
with:
repository: koppor/java-module-packaging
path: build-logic/java-module-packaging
ref: fix-params
- name: markdownlint-cli2-action
uses: DavidAnson/markdownlint-cli2-action@v20
with:
Expand All @@ -117,6 +141,12 @@ jobs:
with:
submodules: 'false'
show-progress: 'false'
- name: Checkout java-module-packaging
uses: actions/checkout@v4
with:
repository: koppor/java-module-packaging
path: build-logic/java-module-packaging
ref: fix-params
- name: Generate JBang cache key
id: cache-key
shell: bash
Expand Down Expand Up @@ -157,6 +187,12 @@ jobs:
submodules: 'false'
show-progress: 'false'
fetch-depth: 0
- name: Checkout java-module-packaging
uses: actions/checkout@v4
with:
repository: koppor/java-module-packaging
path: build-logic/java-module-packaging
ref: fix-params
- name: Cache clparse jar
id: cache-clparse
uses: actions/cache@v4
Expand All @@ -183,6 +219,12 @@ jobs:
steps:
- name: Checkout source
uses: actions/checkout@v4
- name: Checkout java-module-packaging
uses: actions/checkout@v4
with:
repository: koppor/java-module-packaging
path: build-logic/java-module-packaging
ref: fix-params
- name: Set up JDK
uses: actions/setup-java@v4
with:
Expand All @@ -204,6 +246,12 @@ jobs:
with:
submodules: 'true'
show-progress: 'false'
- name: Checkout java-module-packaging
uses: actions/checkout@v4
with:
repository: koppor/java-module-packaging
path: build-logic/java-module-packaging
ref: fix-params
- name: Set up JDK
uses: actions/setup-java@v4
with:
Expand Down Expand Up @@ -253,6 +301,12 @@ jobs:
with:
submodules: 'true'
show-progress: 'false'
- name: Checkout java-module-packaging
uses: actions/checkout@v4
with:
repository: koppor/java-module-packaging
path: build-logic/java-module-packaging
ref: fix-params
- name: Set up JDK
uses: actions/setup-java@v4
with:
Expand Down Expand Up @@ -288,6 +342,12 @@ jobs:
with:
submodules: 'true'
show-progress: 'false'
- name: Checkout java-module-packaging
uses: actions/checkout@v4
with:
repository: koppor/java-module-packaging
path: build-logic/java-module-packaging
ref: fix-params
- name: Set up JDK
uses: actions/setup-java@v4
with:
Expand All @@ -310,6 +370,12 @@ jobs:
with:
submodules: 'false'
show-progress: 'false'
- name: Checkout java-module-packaging
uses: actions/checkout@v4
with:
repository: koppor/java-module-packaging
path: build-logic/java-module-packaging
ref: fix-params
- name: Set up JDK
uses: actions/setup-java@v4
with:
Expand All @@ -330,6 +396,12 @@ jobs:
jbang-
- name: Setup JBang
uses: jbangdev/setup-jbang@main
- name: Checkout java-module-packaging
uses: actions/checkout@v4
with:
repository: koppor/java-module-packaging
path: build-logic/java-module-packaging
ref: fix-params
- run: jbang build .jbang/CheckoutPR.java
- run: jbang build .jbang/CloneJabRef.java
- run: jbang build .jbang/JabKitLauncher.java
Expand Down Expand Up @@ -371,6 +443,12 @@ jobs:
with:
submodules: 'true'
show-progress: 'false'
- name: Checkout java-module-packaging
uses: actions/checkout@v4
with:
repository: koppor/java-module-packaging
path: build-logic/java-module-packaging
ref: fix-params
- name: Set up JDK
if: github.ref == 'refs/heads/main'
uses: actions/setup-java@v4
Expand Down Expand Up @@ -403,6 +481,12 @@ jobs:
- uses: actions/checkout@v4
with:
show-progress: 'false'
- name: Checkout java-module-packaging
uses: actions/checkout@v4
with:
repository: koppor/java-module-packaging
path: build-logic/java-module-packaging
ref: fix-params
- name: Set up JDK
uses: actions/setup-java@v4
with:
Expand All @@ -423,6 +507,12 @@ jobs:
- uses: actions/checkout@v4
with:
show-progress: 'false'
- name: Checkout java-module-packaging
uses: actions/checkout@v4
with:
repository: koppor/java-module-packaging
path: build-logic/java-module-packaging
ref: fix-params
- uses: gradle/actions/wrapper-validation@v4

mandatory-checks-section-exists:
Expand All @@ -444,6 +534,12 @@ jobs:
with:
submodules: 'false'
show-progress: 'false'
- name: Checkout java-module-packaging
uses: actions/checkout@v4
with:
repository: koppor/java-module-packaging
path: build-logic/java-module-packaging
ref: fix-params

- name: Check for existence of Mandatory Checks section
id: check_mandatory_section
Expand Down Expand Up @@ -480,6 +576,12 @@ jobs:
with:
submodules: 'false'
show-progress: 'false'
- name: Checkout java-module-packaging
uses: actions/checkout@v4
with:
repository: koppor/java-module-packaging
path: build-logic/java-module-packaging
ref: fix-params
- name: Check for PR checklist
id: check_changelog_modification
run: |
Expand Down Expand Up @@ -523,6 +625,12 @@ jobs:
- uses: actions/checkout@v4
with:
show-progress: 'false'
- name: Checkout java-module-packaging
uses: actions/checkout@v4
with:
repository: koppor/java-module-packaging
path: build-logic/java-module-packaging
ref: fix-params
- name: Merge Conflict finder
uses: olivernybroe/action-conflict-finder@v4.1

Expand All @@ -534,6 +642,12 @@ jobs:
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Checkout java-module-packaging
uses: actions/checkout@v4
with:
repository: koppor/java-module-packaging
path: build-logic/java-module-packaging
ref: fix-params
- name: Check force push
id: force_push_check
run: |
Expand All @@ -558,6 +672,12 @@ jobs:
with:
submodules: true
show-progress: 'false'
- name: Checkout java-module-packaging
uses: actions/checkout@v4
with:
repository: koppor/java-module-packaging
path: build-logic/java-module-packaging
ref: fix-params
- name: Check for submodule modifications
id: check_submodule
run: |
Expand Down Expand Up @@ -608,6 +728,12 @@ jobs:
- uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Checkout java-module-packaging
uses: actions/checkout@v4
with:
repository: koppor/java-module-packaging
path: build-logic/java-module-packaging
ref: fix-params
- name: Check PR body for changelog note
id: changelog_check
run: |
Expand Down
1 change: 1 addition & 0 deletions build-logic/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
java-module-packaging
2 changes: 2 additions & 0 deletions build-logic/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,9 @@ dependencies {
implementation("com.autonomousapps:dependency-analysis-gradle-plugin:2.18.0")
implementation("com.github.andygoossens:gradle-modernizer-plugin:1.11.0")
implementation("org.gradlex:extra-java-module-info:1.12")
implementation("org.gradlex:java-module-dependencies:1.9.1")
implementation("org.gradlex:java-module-packaging:1.0.1") // required for platform-specific packaging of JavaFX dependencies
implementation("org.gradlex:java-module-testing:1.7")
implementation("org.gradlex:jvm-dependency-conflict-resolution:2.4")
implementation("org.gradle.toolchains:foojay-resolver:1.0.0")
}
5 changes: 5 additions & 0 deletions build-logic/settings.gradle.kts
Original file line number Diff line number Diff line change
@@ -1 +1,6 @@
rootProject.name = "build-logic"

// If this is not found:
// - clone https://github.com/gradlex-org/java-module-packaging next to this file
// - switch to branch 'preview' and pull
includeBuild("java-module-packaging")
Loading
Loading