bump dep versions, update for new plugin-meta

Author: zml2008

convention/build.gradle.kts

@@ -11,7 +11,7 @@ tasks.withType(GroovyCompile::class).configureEach {
 dependencies {
     api(project(":spongegradle-plugin-development"))
     implementation(localGroovy())
-    api("net.kyori:indra-common:2.0.0")
+    api("net.kyori:indra-common:2.0.2")
     api("gradle.plugin.org.cadixdev.gradle:licenser:0.6.0")
     api("com.google.code.gson:gson:2.8.6")
 }

plugin-development/build.gradle.kts

@@ -1,5 +1,5 @@
 dependencies {
-    implementation("org.spongepowered:plugin-meta:0.6.2")
+    implementation("org.spongepowered:plugin-meta:0.7.0")
     // implementation("org.spongepowered:vanillagradle:0.2-SNAPSHOT")
     // implementation("gradle.plugin.org.jetbrains.gradle.plugin.idea-ext:gradle-idea-ext:0.10")
 }

plugin-development/src/main/java/org/spongepowered/gradle/plugin/task/WritePluginMetadataTask.java

@@ -71,58 +71,51 @@ public void execute() throws IOException {
             final PluginMetadata.Builder metadataBuilder = PluginMetadata.builder();
 
             metadataBuilder
-                .setId(configuration.getName())
-                .setLoader(configuration.getLoader().get())
-                .setName(configuration.getDisplayName().get())
-                .setVersion(configuration.getVersion().get())
-                .setMainClass(configuration.getMainClass().get())
-                .setDescription(configuration.getDescription().get())
+                .id(configuration.getName())
+                .loader(configuration.getLoader().get())
+                .name(configuration.getDisplayName().get())
+                .version(configuration.getVersion().get())
+                .mainClass(configuration.getMainClass().get())
+                .description(configuration.getDescription().get())
             ;
 
             final PluginLinks.Builder linksBuilder = PluginLinks.builder();
             final PluginLinksConfiguration linksConfiguration = configuration.getLinks();
             if (linksConfiguration.getHomepage().isPresent()) {
-                linksBuilder.setHomepage(linksConfiguration.getHomepage().get());
+                linksBuilder.homepage(linksConfiguration.getHomepage().get());
             }
             if (linksConfiguration.getSource().isPresent()) {
-                linksBuilder.setSource(linksConfiguration.getSource().get());
+                linksBuilder.source(linksConfiguration.getSource().get());
             }
             if (linksConfiguration.getIssues().isPresent()) {
-                linksBuilder.setIssues(linksConfiguration.getIssues().get());
+                linksBuilder.issues(linksConfiguration.getIssues().get());
             }
-            metadataBuilder.setLinks(linksBuilder.build());
-
-            final List<PluginContributor> contributors = new ArrayList<>();
+            metadataBuilder.links(linksBuilder.build());
 
             for (final PluginContributorConfiguration contributor : configuration.getContributors()) {
                 final PluginContributor.Builder contributorBuilder = PluginContributor.builder();
 
-                contributorBuilder.setName(contributor.getName());
+                contributorBuilder.name(contributor.getName());
                 if (contributor.getDescription().isPresent()) {
-                    contributorBuilder.setDescription(contributor.getDescription().get());
+                    contributorBuilder.description(contributor.getDescription().get());
                 }
-                contributors.add(contributorBuilder.build());
+                metadataBuilder.addContributor(contributorBuilder.build());
             }
 
-            metadataBuilder.setContributors(contributors);
-
-            final List<PluginDependency> dependencies = new ArrayList<>();
-
             for (final PluginDependencyConfiguration dependency : configuration.getDependencies()) {
                 final PluginDependency.Builder dependencyBuilder = PluginDependency.builder();
 
-                dependencyBuilder.setId(dependency.getName());
-                dependencyBuilder.setVersion(dependency.getVersion().get());
+                dependencyBuilder.id(dependency.getName());
+                dependencyBuilder.version(dependency.getVersion().get());
                 if (dependency.getLoadOrder().isPresent()) {
-                    dependencyBuilder.setLoadOrder(dependency.getLoadOrder().get());
+                    dependencyBuilder.loadOrder(dependency.getLoadOrder().get());
                 }
                 if (dependency.getOptional().isPresent()) {
-                    dependencyBuilder.setOptional(dependency.getOptional().get());
+                    dependencyBuilder.optional(dependency.getOptional().get());
                 }
-                dependencies.add(dependencyBuilder.build());
-            }
 
-            metadataBuilder.setDependencies(dependencies);
+                metadataBuilder.addDependency(dependencyBuilder.build());
+            }
 
             metadata.add(metadataBuilder.build());
         }

settings.gradle.kts

@@ -6,7 +6,7 @@ pluginManagement {
     }
 
     plugins {
-        val indraVersion = "2.0.1"
+        val indraVersion = "2.0.2"
         id("com.gradle.plugin-publish") version "0.14.0"
         id("net.kyori.indra") version indraVersion
         id("net.kyori.indra.license-header") version indraVersion