Skip to content

Commit a7db13e

Browse files
committed
feat(common): Use java-ecosystem-capabilities for extra metadata
This replaces the missing-metadata-guava plugin, which is now deprecated. Fixes GH-119
1 parent 4abae80 commit a7db13e

3 files changed

Lines changed: 5 additions & 5 deletions

File tree

gradle/libs.versions.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ mammoth = { module = "net.kyori:mammoth", version.ref = "mammoth" }
2929

3030
asm = { module = "org.ow2.asm:asm", version.ref = "asm" }
3131
cadixLicenser = "gradle.plugin.org.cadixdev.gradle:licenser:0.6.1"
32-
# https://github.com/jjohannes/missing-metadata-guava
33-
missingMetadataGuava = "de.jjohannes.gradle:missing-metadata-guava:31.1.1"
32+
# https://github.com/gradlex-org/java-ecosystem-capabilities
33+
javaEcosystemCapabilities = { module = "org.gradlex:java-ecosystem-capabilities", version = "1.1" }
3434
kotlinPlugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
3535

3636
# git

indra-common/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ dependencies {
1919
compileOnlyApi libs.immutables.builder
2020
compileOnlyApi libs.jetbrainsAnnotations
2121
api project(":indra-git")
22-
implementation libs.missingMetadataGuava
22+
implementation libs.javaEcosystemCapabilities
2323
implementation libs.asm
2424
api libs.mammoth
2525
testImplementation project(":indra-testlib")

indra-common/src/main/java/net/kyori/indra/IndraPlugin.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,9 +87,9 @@ public class IndraPlugin implements ProjectPlugin {
8787
public void apply(final @NotNull Project project, final @NotNull PluginContainer plugins, final @NotNull ExtensionContainer extensions, final @NotNull TaskContainer tasks) {
8888
plugins.apply(JavaLibraryPlugin.class);
8989
if (GradleVersion.current().compareTo(GradleVersion.version("7.0")) >= 0) {
90-
// Fix Guava references
90+
// Fix a lot of JVM library artifact inconsistencies
9191
// Gradle <7.0 doesn't provide the necessary attributes for this to work effectively
92-
plugins.apply("de.jjohannes.missing-metadata-guava");
92+
plugins.apply("org.gradlex.java-ecosystem-capabilities");
9393
}
9494

9595
final IndraExtensionImpl indra = (IndraExtensionImpl) Indra.extension(extensions);

0 commit comments

Comments
 (0)