From edb9518bf8bb52d6fa8b6d71bd8a5a54b4de0059 Mon Sep 17 00:00:00 2001
From: Johannes Feichtner <343448+Churro@users.noreply.github.com>
Date: Sat, 24 Jun 2023 18:51:04 +0200
Subject: [PATCH] fix(manager/gradle): extend allowed nesting depth for Kotlin
objects from 3 to 4 (#22959)
---
lib/modules/manager/gradle/parser.spec.ts | 12 +++++++-----
lib/modules/manager/gradle/parser/objects.ts | 4 +++-
2 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/lib/modules/manager/gradle/parser.spec.ts b/lib/modules/manager/gradle/parser.spec.ts
index ec46915bf9..4dbcba1e7a 100644
--- a/lib/modules/manager/gradle/parser.spec.ts
+++ b/lib/modules/manager/gradle/parser.spec.ts
@@ -981,8 +981,10 @@ describe('modules/manager/gradle/parser', () => {
const val core = "androidx.test:core:\${Deps.Test.version}"
object Espresso {
- private const val version = "3.3.0-rc01"
- const val espressoCore = "androidx.test.espresso:espresso-core:$version"
+ object Release {
+ private const val version = "3.3.0-rc01"
+ const val espressoCore = "androidx.test.espresso:espresso-core:$version"
+ }
}
object Androidx {
@@ -1003,8 +1005,8 @@ describe('modules/manager/gradle/parser', () => {
key: 'Deps.Test.version',
value: '1.3.0-rc01',
},
- 'Deps.Test.Espresso.version': {
- key: 'Deps.Test.Espresso.version',
+ 'Deps.Test.Espresso.Release.version': {
+ key: 'Deps.Test.Espresso.Release.version',
value: '3.3.0-rc01',
},
},
@@ -1022,7 +1024,7 @@ describe('modules/manager/gradle/parser', () => {
{
depName: 'androidx.test.espresso:espresso-core',
currentValue: '3.3.0-rc01',
- groupName: 'Deps.Test.Espresso.version',
+ groupName: 'Deps.Test.Espresso.Release.version',
},
{
depName: 'androidx.test:core-ktx',
diff --git a/lib/modules/manager/gradle/parser/objects.ts b/lib/modules/manager/gradle/parser/objects.ts
index b1d0f0c862..cde6e8f5cc 100644
--- a/lib/modules/manager/gradle/parser/objects.ts
+++ b/lib/modules/manager/gradle/parser/objects.ts
@@ -49,6 +49,8 @@ const qKotlinMultiObjectExpr = (
export const qKotlinMultiObjectVarAssignment = qKotlinMultiObjectExpr(
qKotlinMultiObjectExpr(
- qKotlinMultiObjectExpr(qKotlinSingleObjectVarAssignment)
+ qKotlinMultiObjectExpr(
+ qKotlinMultiObjectExpr(qKotlinSingleObjectVarAssignment)
+ )
)
).handler(cleanupTempVars);
--
GitLab