Skip to content

Commit fbc1225

Browse files
kopporkoppor
authored
Update java-module-packaging (#13438)
1 parent ebce0e6 commit fbc1225

File tree

6 files changed

+1
-148
lines changed

6 files changed

+1
-148
lines changed

‎.github/workflows/binaries.yml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -179,12 +179,6 @@ jobs:
179179
fetch-depth: 0
180180
submodules: 'true'
181181
show-progress: 'false'
182-
- name: Fetch preview of java-module-packaging
183-
uses: actions/checkout@v4
184-
with:
185-
repository: koppor/java-module-packaging
186-
path: build-logic/java-module-packaging
187-
ref: fix-params
188182
- name: Install pigz and cache (linux)
189183
if: (startsWith(matrix.os, 'ubuntu'))
190184
uses: awalsh128/cache-apt-pkgs-action@latest

‎.github/workflows/publish.yml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,6 @@ jobs:
3939
fetch-depth: 0
4040
submodules: 'true'
4141
show-progress: 'false'
42-
- name: Checkout java-module-packaging
43-
uses: actions/checkout@v4
44-
with:
45-
repository: koppor/java-module-packaging
46-
path: build-logic/java-module-packaging
47-
ref: fix-params
4842
- name: Install GitVersion
4943
uses: gittools/actions/gitversion/[email protected]
5044
with:

‎.github/workflows/tests.yml‎

Lines changed: 0 additions & 126 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,6 @@ 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
4337
- name: Set up JDK
4438
uses: actions/setup-java@v4
4539
with:
@@ -65,12 +59,6 @@ jobs:
6559
with:
6660
submodules: 'true'
6761
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
7462
- name: Set up JDK
7563
uses: actions/setup-java@v4
7664
with:
@@ -91,12 +79,6 @@ jobs:
9179
with:
9280
submodules: 'true'
9381
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
10082
- name: Set up JDK
10183
uses: actions/setup-java@v4
10284
with:
@@ -119,12 +101,6 @@ jobs:
119101
with:
120102
submodules: 'false'
121103
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
128104
- name: markdownlint-cli2-action
129105
uses: DavidAnson/markdownlint-cli2-action@v20
130106
with:
@@ -141,12 +117,6 @@ jobs:
141117
with:
142118
submodules: 'false'
143119
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
150120
- name: Generate JBang cache key
151121
id: cache-key
152122
shell: bash
@@ -187,12 +157,6 @@ jobs:
187157
submodules: 'false'
188158
show-progress: 'false'
189159
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
196160
- name: Cache clparse jar
197161
id: cache-clparse
198162
uses: actions/cache@v4
@@ -219,12 +183,6 @@ jobs:
219183
steps:
220184
- name: Checkout source
221185
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
228186
- name: Set up JDK
229187
uses: actions/setup-java@v4
230188
with:
@@ -246,12 +204,6 @@ jobs:
246204
with:
247205
submodules: 'true'
248206
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
255207
- name: Set up JDK
256208
uses: actions/setup-java@v4
257209
with:
@@ -301,12 +253,6 @@ jobs:
301253
with:
302254
submodules: 'true'
303255
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
310256
- name: Set up JDK
311257
uses: actions/setup-java@v4
312258
with:
@@ -342,12 +288,6 @@ jobs:
342288
with:
343289
submodules: 'true'
344290
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
351291
- name: Set up JDK
352292
uses: actions/setup-java@v4
353293
with:
@@ -372,12 +312,6 @@ jobs:
372312
with:
373313
submodules: 'false'
374314
show-progress: 'false'
375-
- name: Checkout java-module-packaging
376-
uses: actions/checkout@v4
377-
with:
378-
repository: koppor/java-module-packaging
379-
path: build-logic/java-module-packaging
380-
ref: fix-params
381315
- name: Set up JDK
382316
uses: actions/setup-java@v4
383317
with:
@@ -398,12 +332,6 @@ jobs:
398332
jbang-
399333
- name: Setup JBang
400334
uses: jbangdev/setup-jbang@main
401-
- name: Checkout java-module-packaging
402-
uses: actions/checkout@v4
403-
with:
404-
repository: koppor/java-module-packaging
405-
path: build-logic/java-module-packaging
406-
ref: fix-params
407335
- run: jbang build .jbang/CheckoutPR.java
408336
- run: jbang build .jbang/CloneJabRef.java
409337
- run: jbang build --fresh .jbang/JabKitLauncher.java
@@ -445,12 +373,6 @@ jobs:
445373
with:
446374
submodules: 'true'
447375
show-progress: 'false'
448-
- name: Checkout java-module-packaging
449-
uses: actions/checkout@v4
450-
with:
451-
repository: koppor/java-module-packaging
452-
path: build-logic/java-module-packaging
453-
ref: fix-params
454376
- name: Set up JDK
455377
if: github.ref == 'refs/heads/main'
456378
uses: actions/setup-java@v4
@@ -483,12 +405,6 @@ jobs:
483405
- uses: actions/checkout@v4
484406
with:
485407
show-progress: 'false'
486-
- name: Checkout java-module-packaging
487-
uses: actions/checkout@v4
488-
with:
489-
repository: koppor/java-module-packaging
490-
path: build-logic/java-module-packaging
491-
ref: fix-params
492408
- name: Set up JDK
493409
uses: actions/setup-java@v4
494410
with:
@@ -509,12 +425,6 @@ jobs:
509425
- uses: actions/checkout@v4
510426
with:
511427
show-progress: 'false'
512-
- name: Checkout java-module-packaging
513-
uses: actions/checkout@v4
514-
with:
515-
repository: koppor/java-module-packaging
516-
path: build-logic/java-module-packaging
517-
ref: fix-params
518428
- uses: gradle/actions/wrapper-validation@v4
519429

520430
mandatory-checks-section-exists:
@@ -536,12 +446,6 @@ jobs:
536446
with:
537447
submodules: 'false'
538448
show-progress: 'false'
539-
- name: Checkout java-module-packaging
540-
uses: actions/checkout@v4
541-
with:
542-
repository: koppor/java-module-packaging
543-
path: build-logic/java-module-packaging
544-
ref: fix-params
545449

546450
- name: Check for existence of Mandatory Checks section
547451
id: check_mandatory_section
@@ -578,12 +482,6 @@ jobs:
578482
with:
579483
submodules: 'false'
580484
show-progress: 'false'
581-
- name: Checkout java-module-packaging
582-
uses: actions/checkout@v4
583-
with:
584-
repository: koppor/java-module-packaging
585-
path: build-logic/java-module-packaging
586-
ref: fix-params
587485
- name: Check for PR checklist
588486
id: check_changelog_modification
589487
run: |
@@ -627,12 +525,6 @@ jobs:
627525
- uses: actions/checkout@v4
628526
with:
629527
show-progress: 'false'
630-
- name: Checkout java-module-packaging
631-
uses: actions/checkout@v4
632-
with:
633-
repository: koppor/java-module-packaging
634-
path: build-logic/java-module-packaging
635-
ref: fix-params
636528
- name: Merge Conflict finder
637529
uses: olivernybroe/[email protected]
638530

@@ -644,12 +536,6 @@ jobs:
644536
uses: actions/checkout@v4
645537
with:
646538
fetch-depth: 0
647-
- name: Checkout java-module-packaging
648-
uses: actions/checkout@v4
649-
with:
650-
repository: koppor/java-module-packaging
651-
path: build-logic/java-module-packaging
652-
ref: fix-params
653539
- name: Check force push
654540
id: force_push_check
655541
run: |
@@ -674,12 +560,6 @@ jobs:
674560
with:
675561
submodules: true
676562
show-progress: 'false'
677-
- name: Checkout java-module-packaging
678-
uses: actions/checkout@v4
679-
with:
680-
repository: koppor/java-module-packaging
681-
path: build-logic/java-module-packaging
682-
ref: fix-params
683563
- name: Check for submodule modifications
684564
id: check_submodule
685565
run: |
@@ -730,12 +610,6 @@ jobs:
730610
- uses: actions/checkout@v4
731611
with:
732612
fetch-depth: 0
733-
- name: Checkout java-module-packaging
734-
uses: actions/checkout@v4
735-
with:
736-
repository: koppor/java-module-packaging
737-
path: build-logic/java-module-packaging
738-
ref: fix-params
739613
- name: Check PR body for changelog note
740614
id: changelog_check
741615
run: |

‎build-logic/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ dependencies {
1414
implementation("com.github.andygoossens:gradle-modernizer-plugin:1.11.0")
1515
implementation("org.gradlex:extra-java-module-info:1.12")
1616
implementation("org.gradlex:java-module-dependencies:1.9.1")
17-
implementation("org.gradlex:java-module-packaging:1.0.1") // required for platform-specific packaging of JavaFX dependencies
17+
implementation("org.gradlex:java-module-packaging:1.1") // required for platform-specific packaging of JavaFX dependencies
1818
implementation("org.gradlex:java-module-testing:1.7")
1919
implementation("org.gradlex:jvm-dependency-conflict-resolution:2.4")
2020
implementation("org.gradle.toolchains:foojay-resolver:1.0.0")

‎build-logic/settings.gradle.kts‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1 @@
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")

‎jitpack.yml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
jdk:
22
- openjdk24
3-
before_install:
4-
- cd build-logic
5-
- git clone https://github.com/koppor/java-module-packaging.git
6-
- cd ..
73
install:
84
- ./gradlew :versions:publishToMavenLocal
95
- ./gradlew :jablib:publishToMavenLocal

0 commit comments

Comments
 (0)