Merge pull request #266 from gradle/atual/same-version

Set better commit message when wrapper files have not changed (#224)
gradle · Nov 27, 2024 · eb2c46d · eb2c46d
2 parents 13ea0d9 + 648fc96
commit eb2c46d
Showing 1 changed file with 23 additions and 9 deletions.
diff --git a/src/main/java/org/gradle/wrapperupgrade/UpgradeWrapper.java b/src/main/java/org/gradle/wrapperupgrade/UpgradeWrapper.java
@@ -44,7 +44,12 @@ public abstract class UpgradeWrapper extends DefaultTask {
     private final ExecOperations execOperations;
 
     @Inject
-    public UpgradeWrapper(WrapperUpgradeDomainObject upgrade, BuildToolStrategy buildToolStrategy, ProjectLayout layout, ExecOperations execOperations) {
+    public UpgradeWrapper(
+        WrapperUpgradeDomainObject upgrade,
+        BuildToolStrategy buildToolStrategy,
+        ProjectLayout layout,
+        ExecOperations execOperations
+    ) {
         this.upgrade = upgrade;
         this.buildToolStrategy = buildToolStrategy;
         this.layout = layout;
@@ -121,8 +126,12 @@ private String createShortDescription(Params params) {
         String usedBuildToolVersion = params.usedBuildToolVersion.version;
         String relativePath = params.rootProjectDirRelativePath.normalize().toString();
 
+        String title = latestBuildToolVersion.equals(usedBuildToolVersion) ?
+            String.format("Update %s Wrapper version %s files", buildToolName, latestBuildToolVersion) :
+            String.format("Bump %s Wrapper from %s to %s", buildToolName, usedBuildToolVersion, latestBuildToolVersion);
+
         StringBuilder description = new StringBuilder();
-        description.append(String.format("Bump %s Wrapper from %s to %s", buildToolName, usedBuildToolVersion, latestBuildToolVersion));
+        description.append(title);
         if (!relativePath.isEmpty()) {
             String path = relativePath.startsWith("/") ? relativePath : "/" + relativePath;
             description.append(String.format(" in %s", path));
@@ -136,13 +145,18 @@ private String createLongDescription(Params params) {
         String usedBuildToolVersion = params.usedBuildToolVersion.version;
         String releaseNotesLink = buildToolStrategy.releaseNotesLink(latestBuildToolVersion);
 
-        StringBuilder description = new StringBuilder();
-        description.append(String.format("Bump %s Wrapper from %s to %s.", buildToolName, usedBuildToolVersion, latestBuildToolVersion));
-        description.append("\n\n");
-        description.append(String.format("Release notes of %s %s can be found here:", buildToolName, latestBuildToolVersion));
-        description.append("\n");
-        description.append(releaseNotesLink);
-        return description.toString();
+        boolean updatedWrapperFilesOnly = latestBuildToolVersion.equals(usedBuildToolVersion);
+        String title = updatedWrapperFilesOnly ?
+            String.format("Update %s Wrapper version %s files.", buildToolName, latestBuildToolVersion) :
+            String.format("Bump %s Wrapper from %s to %s.", buildToolName, usedBuildToolVersion, latestBuildToolVersion);
+
+        String releaseNotes = updatedWrapperFilesOnly ? "" :
+            "\n\n" +
+                String.format("Release notes of %s %s can be found here:", buildToolName, latestBuildToolVersion) +
+                "\n" +
+                releaseNotesLink;
+
+        return title + releaseNotes;
     }
 
     private void gitCommitAndPush(Params params, String commitMessage) {