Support both single and double quotes in plugin defs (#39)

markelliot · Mar 30, 2022 · 2f8179e · 2f8179e
1 parent 04018e4
commit 2f8179e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/gradle-versions/src/main/java/com/markelliot/gradle/versions/UpdatePluginsTask.java b/gradle-versions/src/main/java/com/markelliot/gradle/versions/UpdatePluginsTask.java
@@ -52,14 +52,14 @@ private void setNewPluginVersions(File sourceFile, Map<String, String> pluginUpd
     static String applyUpdate(String content, String pluginName, String pluginVersion) {
         Pattern pattern =
                 Pattern.compile(
-                        "id(\\s+|\\s*\\()\""
+                        "id(\\s+|\\s*\\()(\"|')"
                                 + Pattern.quote(pluginName)
-                                + "\"(\\s+|\\)\\s+)version\\s+\"([^\"]+)\"");
+                                + "(\"|')(\\s+|\\)\\s+)version\\s+(\"|')([^\"]+)(\"|')");
         Matcher matcher = pattern.matcher(content);
         if (matcher.find()) {
             content =
                     matcher.replaceFirst(
-                            "id$1\"" + pluginName + "\"$2version \"" + pluginVersion + "\"");
+                            "id$1$2" + pluginName + "$3$4version $5" + pluginVersion + "$7");
         }
         return content;
     }

diff --git a/gradle-versions/src/test/java/com/markelliot/gradle/versions/UpdatePluginsTaskTests.java b/gradle-versions/src/test/java/com/markelliot/gradle/versions/UpdatePluginsTaskTests.java
@@ -11,11 +11,19 @@ public void testApplyUpdate() {
         // gradle/groovy
         assertThat(applyUpdate("id \"com.foo.bar\" version \"0.1.0\"", "com.foo.bar", "0.2.0"))
                 .isEqualTo("id \"com.foo.bar\" version \"0.2.0\"");
+        assertThat(applyUpdate("id 'com.foo.bar' version '0.1.0'", "com.foo.bar", "0.2.0"))
+                .isEqualTo("id 'com.foo.bar' version '0.2.0'");
+        assertThat(applyUpdate("id 'com.foo.bar' version \"0.1.0\"", "com.foo.bar", "0.2.0"))
+                .isEqualTo("id 'com.foo.bar' version \"0.2.0\"");
+        assertThat(applyUpdate("id \"com.foo.bar\" version '0.1.0'", "com.foo.bar", "0.2.0"))
+                .isEqualTo("id \"com.foo.bar\" version '0.2.0'");
         // gradle/kotlin
         assertThat(applyUpdate("id(\"com.foo.bar\") version \"0.1.0\"", "com.foo.bar", "0.2.0"))
                 .isEqualTo("id(\"com.foo.bar\") version \"0.2.0\"");
         // no match
         assertThat(applyUpdate("id \"com.foo.baz\" version \"0.1.0\"", "com.foo.bar", "0.2.0"))
                 .isEqualTo("id \"com.foo.baz\" version \"0.1.0\"");
+        assertThat(applyUpdate("id 'com.foo.baz' version '0.1.0'", "com.foo.bar", "0.2.0"))
+                .isEqualTo("id 'com.foo.baz' version '0.1.0'");
     }
 }