Rename trait codegen plugin back to package from module (#141)

smithy-lang · Jul 11, 2024 · 562bffb · 562bffb
1 parent a626b97
commit 562bffb
Show file tree

Hide file tree

Showing 18 changed files with 13 additions and 14 deletions.
diff --git a/...dule-plugin/create-simple-trait/README.md → ...kage-plugin/create-simple-trait/README.md b/...dule-plugin/create-simple-trait/README.md → ...kage-plugin/create-simple-trait/README.md
diff --git a/...ugin/create-simple-trait/build.gradle.kts → ...ugin/create-simple-trait/build.gradle.kts b/...ugin/create-simple-trait/build.gradle.kts → ...ugin/create-simple-trait/build.gradle.kts
@@ -1,7 +1,7 @@
 description = "Custom Smithy structure trait with multiple inputs"
 
 plugins {
-    id("software.amazon.smithy.gradle.smithy-trait-module") version "1.0.0"
+    id("software.amazon.smithy.gradle.smithy-trait-package") version "1.0.0"
 }
 
 group = "software.amazon.smithy"

diff --git a/...te-simple-trait/model/custom-trait.smithy → ...te-simple-trait/model/custom-trait.smithy b/...te-simple-trait/model/custom-trait.smithy → ...te-simple-trait/model/custom-trait.smithy
diff --git a/...n/create-simple-trait/settings.gradle.kts → ...n/create-simple-trait/settings.gradle.kts b/...n/create-simple-trait/settings.gradle.kts → ...n/create-simple-trait/settings.gradle.kts
diff --git a/...gin/create-simple-trait/smithy-build.json → ...gin/create-simple-trait/smithy-build.json b/...gin/create-simple-trait/smithy-build.json → ...gin/create-simple-trait/smithy-build.json
diff --git a/...-plugin/use-with-existing-trait/README.md → ...-plugin/use-with-existing-trait/README.md b/...-plugin/use-with-existing-trait/README.md → ...-plugin/use-with-existing-trait/README.md
diff --git a/.../use-with-existing-trait/build.gradle.kts → .../use-with-existing-trait/build.gradle.kts b/.../use-with-existing-trait/build.gradle.kts → .../use-with-existing-trait/build.gradle.kts
@@ -1,7 +1,7 @@
 description = "Use existing"
 
 plugins {
-    id("software.amazon.smithy.gradle.smithy-trait-module") version "1.0.0"
+    id("software.amazon.smithy.gradle.smithy-trait-package") version "1.0.0"
 }
 
 group = "software.amazon.smithy"

diff --git a/...-existing-trait/model/custom-trait.smithy → ...-existing-trait/model/custom-trait.smithy b/...-existing-trait/model/custom-trait.smithy → ...-existing-trait/model/custom-trait.smithy
diff --git a/...e-with-existing-trait/settings.gradle.kts → ...e-with-existing-trait/settings.gradle.kts b/...e-with-existing-trait/settings.gradle.kts → ...e-with-existing-trait/settings.gradle.kts
diff --git a/...use-with-existing-trait/smithy-build.json → ...use-with-existing-trait/smithy-build.json b/...use-with-existing-trait/smithy-build.json → ...use-with-existing-trait/smithy-build.json
diff --git a/...gradle/examples/traits/JsonNameTrait.java → ...gradle/examples/traits/JsonNameTrait.java b/...gradle/examples/traits/JsonNameTrait.java → ...gradle/examples/traits/JsonNameTrait.java
diff --git a/...e.amazon.smithy.model.traits.TraitService → ...e.amazon.smithy.model.traits.TraitService b/...e.amazon.smithy.model.traits.TraitService → ...e.amazon.smithy.model.traits.TraitService
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -2,5 +2,5 @@ rootProject.name = "smithy-gradle"
 
 include("smithy-base")
 include("smithy-jar")
-include("smithy-trait-module")
+include("smithy-trait-package")
 include("integ-test-utils")
diff --git a/smithy-trait-module/build.gradle.kts → smithy-trait-package/build.gradle.kts b/smithy-trait-module/build.gradle.kts → smithy-trait-package/build.gradle.kts
@@ -7,11 +7,11 @@ plugins {
 
 gradlePlugin {
     plugins {
-        create("smithy-trait-module-plugin") {
-            id = "${group}.smithy-trait-module"
+        create("smithy-trait-package-plugin") {
+            id = "${group}.smithy-trait-package"
             displayName = "Smithy Gradle Trait Package plugin."
             description = project.description
-            implementationClass = "software.amazon.smithy.gradle.SmithyTraitModulePlugin"
+            implementationClass = "software.amazon.smithy.gradle.SmithyTraitPackagePlugin"
             tags.addAll("smithy", "api", "building")
         }
     }

diff --git a/...smithy/gradle/CreatesCustomTraitTest.java → ...smithy/gradle/CreatesCustomTraitTest.java b/...smithy/gradle/CreatesCustomTraitTest.java → ...smithy/gradle/CreatesCustomTraitTest.java
@@ -11,7 +11,7 @@ public class CreatesCustomTraitTest {
 
     @Test
     public void createsTraitsAndAddsToJar() {
-        Utils.withCopy("trait-module-plugin/create-simple-trait", buildDir -> {
+        Utils.withCopy("trait-package-plugin/create-simple-trait", buildDir -> {
             BuildResult result = GradleRunner.create()
                     .forwardOutput()
                     .withProjectDir(buildDir)

diff --git a/...mithy/gradle/RespectsManualTraitTest.java → ...mithy/gradle/RespectsManualTraitTest.java b/...mithy/gradle/RespectsManualTraitTest.java → ...mithy/gradle/RespectsManualTraitTest.java
@@ -13,7 +13,7 @@ public class RespectsManualTraitTest {
 
     @Test
     public void respectsExistingTraitAndMergesSpiFiles() {
-        Utils.withCopy("trait-module-plugin/use-with-existing-trait", buildDir -> {
+        Utils.withCopy("trait-package-plugin/use-with-existing-trait", buildDir -> {
             BuildResult result = GradleRunner.create()
                     .forwardOutput()
                     .withProjectDir(buildDir)

diff --git a/...mithy/gradle/SmithyTraitModulePlugin.java → ...ithy/gradle/SmithyTraitPackagePlugin.java b/...mithy/gradle/SmithyTraitModulePlugin.java → ...ithy/gradle/SmithyTraitPackagePlugin.java
@@ -26,7 +26,7 @@
 /**
  * A {@link org.gradle.api.Plugin} that adds sets up a package for a custom trait.
  */
-public class SmithyTraitModulePlugin implements Plugin<Project> {
+public class SmithyTraitPackagePlugin implements Plugin<Project> {
     private static final String SMITHY_TRAIT_CODEGEN_DEP_NAME = "smithy-trait-codegen";
     private static final String TRAIT_CODEGEN_PLUGIN_NAME = "trait-codegen";
     private static final String TRAIT_SPI_FILE_NAME = "software.amazon.smithy.model.traits.TraitService";
@@ -39,7 +39,7 @@ public class SmithyTraitModulePlugin implements Plugin<Project> {
     private final Project project;
 
     @Inject
-    public SmithyTraitModulePlugin(Project project) {
+    public SmithyTraitPackagePlugin(Project project) {
         this.project = project;
     }
 
@@ -89,19 +89,18 @@ private void configureDependencies(SourceSet sourceSet) {
 
         // Prefer explicit dependency
         Optional<Dependency> explicitDepOptional = smithyBuild.getAllDependencies().stream()
-                .filter(d -> SmithyUtils.isMatchingDependency(d,
-                        SmithyTraitModulePlugin.SMITHY_TRAIT_CODEGEN_DEP_NAME))
+                .filter(d -> SmithyUtils.isMatchingDependency(d, SMITHY_TRAIT_CODEGEN_DEP_NAME))
                 .findFirst();
         if (explicitDepOptional.isPresent()) {
             project.getLogger().info(String.format("(using explicitly configured Dependency for %s: %s)",
-                    SmithyTraitModulePlugin.SMITHY_TRAIT_CODEGEN_DEP_NAME, explicitDepOptional.get().getVersion()));
+                    SMITHY_TRAIT_CODEGEN_DEP_NAME, explicitDepOptional.get().getVersion()));
             return;
         }
 
         // If trait codegen does not exist, add the dependency with the same version as the resolved CLI version
         String cliVersion = CliDependencyResolver.resolve(project);
         project.getDependencies().add(smithyBuild.getName(),
-                String.format(DEPENDENCY_NOTATION, SmithyTraitModulePlugin.SMITHY_TRAIT_CODEGEN_DEP_NAME, cliVersion));
+                String.format(DEPENDENCY_NOTATION, SMITHY_TRAIT_CODEGEN_DEP_NAME, cliVersion));
     }
 
     private TaskProvider<MergeSpiFilesTask> addMergeTask(SourceSet sourceSet, Path pluginPath, File existing) {

diff --git a/...mithy/gradle/tasks/MergeSpiFilesTask.java → ...mithy/gradle/tasks/MergeSpiFilesTask.java b/...mithy/gradle/tasks/MergeSpiFilesTask.java → ...mithy/gradle/tasks/MergeSpiFilesTask.java