From ef1159f27fe07b152238f35d7945df06ebf9de97 Mon Sep 17 00:00:00 2001 From: zml Date: Mon, 28 Aug 2023 12:43:59 -0700 Subject: [PATCH 1/2] chore(testlib): Remove redundant blank line --- .../src/main/java/net/kyori/indra/test/LegacyGradleVersion.java | 1 - 1 file changed, 1 deletion(-) diff --git a/indra-testlib/src/main/java/net/kyori/indra/test/LegacyGradleVersion.java b/indra-testlib/src/main/java/net/kyori/indra/test/LegacyGradleVersion.java index 6f7fab51..1b625c5e 100644 --- a/indra-testlib/src/main/java/net/kyori/indra/test/LegacyGradleVersion.java +++ b/indra-testlib/src/main/java/net/kyori/indra/test/LegacyGradleVersion.java @@ -30,7 +30,6 @@ import java.lang.annotation.Target; import net.kyori.mammoth.test.TestVariant; - /** * An annotation providing Gradle 7.x test variants, so this version can be overridden when running on Java versions * that older Gradle versions do not support. From 648bf896f01c55f463faf275e8a9eb3160527890 Mon Sep 17 00:00:00 2001 From: zml Date: Mon, 28 Aug 2023 13:54:16 -0700 Subject: [PATCH 2/2] fix(crossdoc): Include transitive project dependencies in linking as well --- .../src/main/java/net/kyori/indra/crossdoc/CrossdocPlugin.java | 1 + 1 file changed, 1 insertion(+) diff --git a/indra-crossdoc/src/main/java/net/kyori/indra/crossdoc/CrossdocPlugin.java b/indra-crossdoc/src/main/java/net/kyori/indra/crossdoc/CrossdocPlugin.java index 2da9a957..428fce1f 100644 --- a/indra-crossdoc/src/main/java/net/kyori/indra/crossdoc/CrossdocPlugin.java +++ b/indra-crossdoc/src/main/java/net/kyori/indra/crossdoc/CrossdocPlugin.java @@ -131,6 +131,7 @@ private CrossdocExtension createExtension(final Project project) { private void addUnpackedResultToJavadocConfiguration(final Project project) { // Register unpacked Javadoc as an artifact for cross-linking project.getConfigurations().matching(c -> c.getName().equals(JavaPlugin.JAVADOC_ELEMENTS_CONFIGURATION_NAME)).configureEach(c -> { + c.extendsFrom(project.getConfigurations().getByName(JavaPlugin.API_ELEMENTS_CONFIGURATION_NAME)); // include transitive dependencies c.getOutgoing().getVariants().create("files", v -> { final TaskProvider javadocTask = project.getTasks().named(JavaPlugin.JAVADOC_TASK_NAME, Javadoc.class); v.artifact(javadocTask.map(it -> it.getDestinationDir()), a -> {