Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/parameter-after-end' into parame…
Browse files Browse the repository at this point in the history
…ter-after-end
  • Loading branch information
ddsharpe committed Jan 4, 2024
2 parents 64b1470 + 1781c14 commit 3eb7bab
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 11 deletions.
20 changes: 10 additions & 10 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,18 +15,18 @@ jobs:
continue-on-error: ${{ matrix.os == 'macos-latest' || matrix.java-version == '9' || matrix.java-version == '10' || matrix.java-version == '12' || matrix.java-version == '13' || matrix.java-version == '14' || matrix.java-version == '15' || matrix.java-version == '16' || matrix.java-version == '19' }}
steps:
- name: Harden Runner
uses: step-security/harden-runner@eb238b55efaa70779f274895e782ed17c84f2895 # v1
uses: step-security/harden-runner@eb238b55efaa70779f274895e782ed17c84f2895
with:
egress-policy: audit

- name: Checkout
uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v2
uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608

- name: Validate Gradle Wrapper
uses: gradle/wrapper-validation-action@56b90f209b02bf6d1deae490e9ef18b21a389cd4 # v1
uses: gradle/wrapper-validation-action@56b90f209b02bf6d1deae490e9ef18b21a389cd4

- name: Configure JDK ${{ matrix.java-version }}
uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v2
uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93
with:
distribution: 'zulu'
java-version: ${{ matrix.java-version }}
Expand Down Expand Up @@ -130,26 +130,26 @@ jobs:
runs-on: ${{ matrix.os }}
steps:
- name: Harden Runner
uses: step-security/harden-runner@eb238b55efaa70779f274895e782ed17c84f2895 # v1
uses: step-security/harden-runner@eb238b55efaa70779f274895e782ed17c84f2895
with:
egress-policy: audit

- name: Checkout
uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v2
uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608

- name: Validate Gradle Wrapper
uses: gradle/wrapper-validation-action@56b90f209b02bf6d1deae490e9ef18b21a389cd4 # v1
uses: gradle/wrapper-validation-action@56b90f209b02bf6d1deae490e9ef18b21a389cd4

- name: Configure JDK ${{ matrix.java-version }}
uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v2
uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93
with:
distribution: 'zulu'
java-version: ${{ matrix.java-version }}
cache: gradle

- name: Build
uses: gradle/gradle-build-action@8cbcb9948b5892387aed077daf6f90e1f0ba5b27 # v2
uses: gradle/gradle-build-action@v2.11.1 # v2.11.1
with:
gradle-version: 1.12
build-root-directory: picocli-tests-java567/
arguments: -Pgradle-enterprise.injection-enabled=false clean build --no-daemon
arguments: clean build --no-daemon
2 changes: 1 addition & 1 deletion src/main/java/picocli/CommandLine.java
Original file line number Diff line number Diff line change
Expand Up @@ -5637,7 +5637,7 @@ public interface IFactory {
* @since 4.0 */
public static IFactory defaultFactory() { return new DefaultFactory(); }
private static class DefaultFactory implements IFactory {
static Class<?> GROOVY_CLOSURE_CLASS = loadClosureClass();
private static final Class<?> GROOVY_CLOSURE_CLASS = loadClosureClass();
private static Class<?> loadClosureClass() {
if (Boolean.getBoolean("picocli.disable.closures")) {
tracer().info("DefaultFactory: groovy Closures in annotations are disabled and will not be loaded");
Expand Down

0 comments on commit 3eb7bab

Please sign in to comment.