Skip to content

Commit 2c8615e

Browse files
kopporSiedlerchrjjohannes
authored
Switch the Gradle build to org.gradlex.java-module plugins (#13401)
Co-authored-by: Oliver Kopp <[email protected]> Co-authored-by: Siedlerchr <[email protected]> Co-authored-by: Jendrik Johannes <[email protected]>
1 parent 8b13225 commit 2c8615e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+824
-1264
lines changed

‎.github/workflows/binaries-ea.yml‎

Lines changed: 0 additions & 545 deletions
This file was deleted.

‎.github/workflows/binaries.yml‎

Lines changed: 33 additions & 136 deletions
Large diffs are not rendered by default.

‎.github/workflows/tests.yml‎

Lines changed: 126 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,12 @@ jobs:
3434
with:
3535
submodules: 'true'
3636
show-progress: 'false'
37+
- name: Checkout java-module-packaging
38+
uses: actions/checkout@v4
39+
with:
40+
repository: koppor/java-module-packaging
41+
path: build-logic/java-module-packaging
42+
ref: fix-params
3743
- name: Set up JDK
3844
uses: actions/setup-java@v4
3945
with:
@@ -59,6 +65,12 @@ jobs:
5965
with:
6066
submodules: 'true'
6167
show-progress: 'false'
68+
- name: Checkout java-module-packaging
69+
uses: actions/checkout@v4
70+
with:
71+
repository: koppor/java-module-packaging
72+
path: build-logic/java-module-packaging
73+
ref: fix-params
6274
- name: Set up JDK
6375
uses: actions/setup-java@v4
6476
with:
@@ -79,6 +91,12 @@ jobs:
7991
with:
8092
submodules: 'true'
8193
show-progress: 'false'
94+
- name: Checkout java-module-packaging
95+
uses: actions/checkout@v4
96+
with:
97+
repository: koppor/java-module-packaging
98+
path: build-logic/java-module-packaging
99+
ref: fix-params
82100
- name: Set up JDK
83101
uses: actions/setup-java@v4
84102
with:
@@ -101,6 +119,12 @@ jobs:
101119
with:
102120
submodules: 'false'
103121
show-progress: 'false'
122+
- name: Checkout java-module-packaging
123+
uses: actions/checkout@v4
124+
with:
125+
repository: koppor/java-module-packaging
126+
path: build-logic/java-module-packaging
127+
ref: fix-params
104128
- name: markdownlint-cli2-action
105129
uses: DavidAnson/markdownlint-cli2-action@v20
106130
with:
@@ -117,6 +141,12 @@ jobs:
117141
with:
118142
submodules: 'false'
119143
show-progress: 'false'
144+
- name: Checkout java-module-packaging
145+
uses: actions/checkout@v4
146+
with:
147+
repository: koppor/java-module-packaging
148+
path: build-logic/java-module-packaging
149+
ref: fix-params
120150
- name: Generate JBang cache key
121151
id: cache-key
122152
shell: bash
@@ -157,6 +187,12 @@ jobs:
157187
submodules: 'false'
158188
show-progress: 'false'
159189
fetch-depth: 0
190+
- name: Checkout java-module-packaging
191+
uses: actions/checkout@v4
192+
with:
193+
repository: koppor/java-module-packaging
194+
path: build-logic/java-module-packaging
195+
ref: fix-params
160196
- name: Cache clparse jar
161197
id: cache-clparse
162198
uses: actions/cache@v4
@@ -183,6 +219,12 @@ jobs:
183219
steps:
184220
- name: Checkout source
185221
uses: actions/checkout@v4
222+
- name: Checkout java-module-packaging
223+
uses: actions/checkout@v4
224+
with:
225+
repository: koppor/java-module-packaging
226+
path: build-logic/java-module-packaging
227+
ref: fix-params
186228
- name: Set up JDK
187229
uses: actions/setup-java@v4
188230
with:
@@ -204,6 +246,12 @@ jobs:
204246
with:
205247
submodules: 'true'
206248
show-progress: 'false'
249+
- name: Checkout java-module-packaging
250+
uses: actions/checkout@v4
251+
with:
252+
repository: koppor/java-module-packaging
253+
path: build-logic/java-module-packaging
254+
ref: fix-params
207255
- name: Set up JDK
208256
uses: actions/setup-java@v4
209257
with:
@@ -253,6 +301,12 @@ jobs:
253301
with:
254302
submodules: 'true'
255303
show-progress: 'false'
304+
- name: Checkout java-module-packaging
305+
uses: actions/checkout@v4
306+
with:
307+
repository: koppor/java-module-packaging
308+
path: build-logic/java-module-packaging
309+
ref: fix-params
256310
- name: Set up JDK
257311
uses: actions/setup-java@v4
258312
with:
@@ -288,6 +342,12 @@ jobs:
288342
with:
289343
submodules: 'true'
290344
show-progress: 'false'
345+
- name: Checkout java-module-packaging
346+
uses: actions/checkout@v4
347+
with:
348+
repository: koppor/java-module-packaging
349+
path: build-logic/java-module-packaging
350+
ref: fix-params
291351
- name: Set up JDK
292352
uses: actions/setup-java@v4
293353
with:
@@ -310,6 +370,12 @@ jobs:
310370
with:
311371
submodules: 'false'
312372
show-progress: 'false'
373+
- name: Checkout java-module-packaging
374+
uses: actions/checkout@v4
375+
with:
376+
repository: koppor/java-module-packaging
377+
path: build-logic/java-module-packaging
378+
ref: fix-params
313379
- name: Set up JDK
314380
uses: actions/setup-java@v4
315381
with:
@@ -330,6 +396,12 @@ jobs:
330396
jbang-
331397
- name: Setup JBang
332398
uses: jbangdev/setup-jbang@main
399+
- name: Checkout java-module-packaging
400+
uses: actions/checkout@v4
401+
with:
402+
repository: koppor/java-module-packaging
403+
path: build-logic/java-module-packaging
404+
ref: fix-params
333405
- run: jbang build .jbang/CheckoutPR.java
334406
- run: jbang build .jbang/CloneJabRef.java
335407
- run: jbang build .jbang/JabKitLauncher.java
@@ -371,6 +443,12 @@ jobs:
371443
with:
372444
submodules: 'true'
373445
show-progress: 'false'
446+
- name: Checkout java-module-packaging
447+
uses: actions/checkout@v4
448+
with:
449+
repository: koppor/java-module-packaging
450+
path: build-logic/java-module-packaging
451+
ref: fix-params
374452
- name: Set up JDK
375453
if: github.ref == 'refs/heads/main'
376454
uses: actions/setup-java@v4
@@ -403,6 +481,12 @@ jobs:
403481
- uses: actions/checkout@v4
404482
with:
405483
show-progress: 'false'
484+
- name: Checkout java-module-packaging
485+
uses: actions/checkout@v4
486+
with:
487+
repository: koppor/java-module-packaging
488+
path: build-logic/java-module-packaging
489+
ref: fix-params
406490
- name: Set up JDK
407491
uses: actions/setup-java@v4
408492
with:
@@ -423,6 +507,12 @@ jobs:
423507
- uses: actions/checkout@v4
424508
with:
425509
show-progress: 'false'
510+
- name: Checkout java-module-packaging
511+
uses: actions/checkout@v4
512+
with:
513+
repository: koppor/java-module-packaging
514+
path: build-logic/java-module-packaging
515+
ref: fix-params
426516
- uses: gradle/actions/wrapper-validation@v4
427517

428518
mandatory-checks-section-exists:
@@ -444,6 +534,12 @@ jobs:
444534
with:
445535
submodules: 'false'
446536
show-progress: 'false'
537+
- name: Checkout java-module-packaging
538+
uses: actions/checkout@v4
539+
with:
540+
repository: koppor/java-module-packaging
541+
path: build-logic/java-module-packaging
542+
ref: fix-params
447543

448544
- name: Check for existence of Mandatory Checks section
449545
id: check_mandatory_section
@@ -480,6 +576,12 @@ jobs:
480576
with:
481577
submodules: 'false'
482578
show-progress: 'false'
579+
- name: Checkout java-module-packaging
580+
uses: actions/checkout@v4
581+
with:
582+
repository: koppor/java-module-packaging
583+
path: build-logic/java-module-packaging
584+
ref: fix-params
483585
- name: Check for PR checklist
484586
id: check_changelog_modification
485587
run: |
@@ -523,6 +625,12 @@ jobs:
523625
- uses: actions/checkout@v4
524626
with:
525627
show-progress: 'false'
628+
- name: Checkout java-module-packaging
629+
uses: actions/checkout@v4
630+
with:
631+
repository: koppor/java-module-packaging
632+
path: build-logic/java-module-packaging
633+
ref: fix-params
526634
- name: Merge Conflict finder
527635
uses: olivernybroe/[email protected]
528636

@@ -534,6 +642,12 @@ jobs:
534642
uses: actions/checkout@v4
535643
with:
536644
fetch-depth: 0
645+
- name: Checkout java-module-packaging
646+
uses: actions/checkout@v4
647+
with:
648+
repository: koppor/java-module-packaging
649+
path: build-logic/java-module-packaging
650+
ref: fix-params
537651
- name: Check force push
538652
id: force_push_check
539653
run: |
@@ -558,6 +672,12 @@ jobs:
558672
with:
559673
submodules: true
560674
show-progress: 'false'
675+
- name: Checkout java-module-packaging
676+
uses: actions/checkout@v4
677+
with:
678+
repository: koppor/java-module-packaging
679+
path: build-logic/java-module-packaging
680+
ref: fix-params
561681
- name: Check for submodule modifications
562682
id: check_submodule
563683
run: |
@@ -608,6 +728,12 @@ jobs:
608728
- uses: actions/checkout@v4
609729
with:
610730
fetch-depth: 0
731+
- name: Checkout java-module-packaging
732+
uses: actions/checkout@v4
733+
with:
734+
repository: koppor/java-module-packaging
735+
path: build-logic/java-module-packaging
736+
ref: fix-params
611737
- name: Check PR body for changelog note
612738
id: changelog_check
613739
run: |

‎build-logic/.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
java-module-packaging

‎build-logic/build.gradle.kts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,9 @@ dependencies {
1313
implementation("com.autonomousapps:dependency-analysis-gradle-plugin:2.19.0")
1414
implementation("com.github.andygoossens:gradle-modernizer-plugin:1.11.0")
1515
implementation("org.gradlex:extra-java-module-info:1.12")
16+
implementation("org.gradlex:java-module-dependencies:1.9.1")
1617
implementation("org.gradlex:java-module-packaging:1.0.1") // required for platform-specific packaging of JavaFX dependencies
1718
implementation("org.gradlex:java-module-testing:1.7")
1819
implementation("org.gradlex:jvm-dependency-conflict-resolution:2.4")
20+
implementation("org.gradle.toolchains:foojay-resolver:1.0.0")
1921
}

‎build-logic/settings.gradle.kts‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,6 @@
11
rootProject.name = "build-logic"
2+
3+
// If this is not found:
4+
// - clone https://github.com/gradlex-org/java-module-packaging next to this file
5+
// - switch to branch 'preview' and pull
6+
includeBuild("java-module-packaging")

0 commit comments

Comments
 (0)