fix(manager/gradle): handle dot as optional when parsing plugins in K…

…otlin DSL (#21362)
renovatebot · Apr 5, 2023 · f0b74b8 · f0b74b8
1 parent b923c87
commit f0b74b8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/lib/modules/manager/gradle/parser.spec.ts b/lib/modules/manager/gradle/parser.spec.ts
@@ -549,6 +549,7 @@ describe('modules/manager/gradle/parser', () => {
         ${''}               | ${'id(["foo.bar"]) version "1.2.3"'}       | ${null}
         ${''}               | ${'id("foo", "bar") version "1.2.3"'}      | ${null}
         ${''}               | ${'id "foo".version("1.2.3")'}             | ${null}
+        ${''}               | ${'id("foo.bar") version("1.2.3")'}        | ${{ depName: 'foo.bar', packageName: 'foo.bar:foo.bar.gradle.plugin', currentValue: '1.2.3' }}
         ${''}               | ${'id("foo.bar") version "1.2.3"'}         | ${{ depName: 'foo.bar', packageName: 'foo.bar:foo.bar.gradle.plugin', currentValue: '1.2.3' }}
         ${''}               | ${'id "foo.bar" version "$baz"'}           | ${{ depName: 'foo.bar', skipReason: 'unknown-version', currentValue: 'baz' }}
         ${'baz = "1.2.3"'}  | ${'id "foo.bar" version "$baz"'}           | ${{ depName: 'foo.bar', packageName: 'foo.bar:foo.bar.gradle.plugin', currentValue: '1.2.3', groupName: 'baz' }}

diff --git a/lib/modules/manager/gradle/parser/plugins.ts b/lib/modules/manager/gradle/parser/plugins.ts
@@ -14,7 +14,6 @@ const qVersion = qValueMatcher.handler((ctx) =>
   storeInTokenMap(ctx, 'version')
 );
 
-// kotlin("jvm") version "1.3.71"
 export const qPlugins = q
   .sym(regEx(/^(?:id|kotlin)$/), storeVarToken)
   .handler((ctx) => storeInTokenMap(ctx, 'methodName'))
@@ -24,6 +23,7 @@ export const qPlugins = q
       .handler((ctx: Ctx) => storeInTokenMap(ctx, 'pluginName'))
       .sym('version')
       .join(qVersion),
+    // kotlin("jvm") version "1.3.71"
     q
       .tree({
         type: 'wrapped-tree',
@@ -37,8 +37,9 @@ export const qPlugins = q
         // id("foo.bar") version "1.2.3"
         q.sym<Ctx>('version').join(qVersion),
         // id("foo.bar").version("1.2.3")
+        // id("foo.bar") version("1.2.3")
         q
-          .op<Ctx>('.')
+          .opt(q.op<Ctx>('.'))
           .sym('version')
           .tree({
             maxDepth: 1,