fix(gradle): fix UpgradeAction for gradle 8.11 (#586)

bancolombia · Nov 20, 2024 · 0f5073d · 0f5073d
1 parent d6715a7
commit 0f5073d
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 0 deletions.
diff --git a/src/main/java/co/com/bancolombia/factory/upgrades/actions/UpgradeY2024M11D16Gradle.java b/src/main/java/co/com/bancolombia/factory/upgrades/actions/UpgradeY2024M11D16Gradle.java
@@ -17,6 +17,10 @@ public boolean up(ModuleBuilder builder) {
     return builder.updateFile(
         MAIN_GRADLE,
         content -> {
+          if (!builder.findExpressions(MAIN_GRADLE, "java\\s*\\{").isEmpty()) {
+            return content;
+          }
+
           String sourceCompatibilityLoaded =
               builder
                   .findExpressions(

diff --git a/src/test/java/co/com/bancolombia/factory/upgrades/actions/UpgradeY2024M11D16GradleTest.java b/src/test/java/co/com/bancolombia/factory/upgrades/actions/UpgradeY2024M11D16GradleTest.java
@@ -1,6 +1,7 @@
 package co.com.bancolombia.factory.upgrades.actions;
 
 import static co.com.bancolombia.Constants.MainFiles.MAIN_GRADLE;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.Mockito.spy;
@@ -58,4 +59,20 @@ void shouldApplyUpdate() throws IOException {
             MAIN_GRADLE,
             FileUtils.getResourceAsString(resolver, "gradle-8.11-sample/main-after.txt"));
   }
+
+  @Test
+  void shouldNotApplyUpdateIfJavaBlockExists() throws IOException {
+    DefaultResolver resolver = new DefaultResolver();
+    // Arrange
+    builder.addFile(
+        MAIN_GRADLE, FileUtils.getResourceAsString(resolver, "gradle-8.11-sample/main-after.txt"));
+    // Act
+    boolean applied = updater.up(builder);
+    // Assert
+    assertFalse(applied);
+    verify(builder)
+        .addFile(
+            MAIN_GRADLE,
+            FileUtils.getResourceAsString(resolver, "gradle-8.11-sample/main-after.txt"));
+  }
 }