From 8eda9d3ff14d682bfad7ef162c64f88623f102db Mon Sep 17 00:00:00 2001 From: Dan Fox Date: Fri, 29 Jul 2022 19:22:43 +0100 Subject: [PATCH 1/3] javadoc --- .../plugins/javaversions/BaselineJavaVersion.java | 2 ++ .../BaselineJavaVersionIntegrationTest.groovy | 14 ++++++++++++++ 2 files changed, 16 insertions(+) diff --git a/gradle-baseline-java/src/main/groovy/com/palantir/baseline/plugins/javaversions/BaselineJavaVersion.java b/gradle-baseline-java/src/main/groovy/com/palantir/baseline/plugins/javaversions/BaselineJavaVersion.java index d76eba704..1101485cc 100644 --- a/gradle-baseline-java/src/main/groovy/com/palantir/baseline/plugins/javaversions/BaselineJavaVersion.java +++ b/gradle-baseline-java/src/main/groovy/com/palantir/baseline/plugins/javaversions/BaselineJavaVersion.java @@ -114,6 +114,7 @@ public void execute(Task task) { project.getTasks().withType(Javadoc.class).configureEach(new Action() { @Override public void execute(Javadoc javadocTask) { + javadocTask.getJavadocTool().set(javaToolchain.flatMap(BaselineJavaToolchain::javadocTool)); // javadocTask doesn't allow us to add a CommandLineArgumentProvider, so we do it just in time @@ -124,6 +125,7 @@ public void execute(Task task) { if (target.get().enablePreview()) { // yes, javadoc truly takes a single-dash where everyone else takes a double dash options.addBooleanOption("-enable-preview", true); + // options.setSource(target.get().javaLanguageVersion().toString()); } } }); diff --git a/gradle-baseline-java/src/test/groovy/com/palantir/baseline/BaselineJavaVersionIntegrationTest.groovy b/gradle-baseline-java/src/test/groovy/com/palantir/baseline/BaselineJavaVersionIntegrationTest.groovy index da8ce451f..3972326fe 100644 --- a/gradle-baseline-java/src/test/groovy/com/palantir/baseline/BaselineJavaVersionIntegrationTest.groovy +++ b/gradle-baseline-java/src/test/groovy/com/palantir/baseline/BaselineJavaVersionIntegrationTest.groovy @@ -147,6 +147,20 @@ class BaselineJavaVersionIntegrationTest extends IntegrationSpec { assertBytecodeVersion(compiledClass, JAVA_17_BYTECODE, ENABLE_PREVIEW_BYTECODE) } + def 'java 17 preview javadoc works'() { + when: + buildFile << ''' + javaVersions { + libraryTarget = 11 + distributionTarget = '17_PREVIEW' + } + '''.stripIndent(true) + file('src/main/java/Main.java') << java17PreviewCode + + then: + runTasksSuccessfully('javadoc', '-i') + } + def 'library target is used when no artifacts are published but project is overridden as a library'() { when: buildFile << ''' From 409d4a8d7f150740a66c05c547ae5d9a3912a223 Mon Sep 17 00:00:00 2001 From: svc-changelog Date: Fri, 29 Jul 2022 18:25:15 +0000 Subject: [PATCH 2/3] Add generated changelog entries --- changelog/@unreleased/pr-2338.v2.yml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 changelog/@unreleased/pr-2338.v2.yml diff --git a/changelog/@unreleased/pr-2338.v2.yml b/changelog/@unreleased/pr-2338.v2.yml new file mode 100644 index 000000000..fa12545ff --- /dev/null +++ b/changelog/@unreleased/pr-2338.v2.yml @@ -0,0 +1,6 @@ +type: fix +fix: + description: javadoc tasks are now properly configured when `--enable-preview` is + used + links: + - https://github.com/palantir/gradle-baseline/pull/2338 From da1168be678d56f3d90effd55ae5359ed1b87ba5 Mon Sep 17 00:00:00 2001 From: Dan Fox Date: Fri, 29 Jul 2022 19:27:26 +0100 Subject: [PATCH 3/3] Fix the test --- .../baseline/plugins/javaversions/BaselineJavaVersion.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gradle-baseline-java/src/main/groovy/com/palantir/baseline/plugins/javaversions/BaselineJavaVersion.java b/gradle-baseline-java/src/main/groovy/com/palantir/baseline/plugins/javaversions/BaselineJavaVersion.java index 1101485cc..9492c3fdf 100644 --- a/gradle-baseline-java/src/main/groovy/com/palantir/baseline/plugins/javaversions/BaselineJavaVersion.java +++ b/gradle-baseline-java/src/main/groovy/com/palantir/baseline/plugins/javaversions/BaselineJavaVersion.java @@ -114,7 +114,6 @@ public void execute(Task task) { project.getTasks().withType(Javadoc.class).configureEach(new Action() { @Override public void execute(Javadoc javadocTask) { - javadocTask.getJavadocTool().set(javaToolchain.flatMap(BaselineJavaToolchain::javadocTool)); // javadocTask doesn't allow us to add a CommandLineArgumentProvider, so we do it just in time @@ -125,7 +124,7 @@ public void execute(Task task) { if (target.get().enablePreview()) { // yes, javadoc truly takes a single-dash where everyone else takes a double dash options.addBooleanOption("-enable-preview", true); - // options.setSource(target.get().javaLanguageVersion().toString()); + options.setSource(target.get().javaLanguageVersion().toString()); } } });