From df97dbdeea58a09cab5c978602f4cd3fba781c20 Mon Sep 17 00:00:00 2001 From: Jacob Quinn Date: Thu, 14 Dec 2023 06:33:50 -0700 Subject: [PATCH] fix(common-jvm): fix `checkForModule` util to match gradle child module names w/ arbitrary paths --- packages/common-jvm/src/lib/utils/gradle-utils.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/common-jvm/src/lib/utils/gradle-utils.ts b/packages/common-jvm/src/lib/utils/gradle-utils.ts index d20cd7a8..7ff09b42 100644 --- a/packages/common-jvm/src/lib/utils/gradle-utils.ts +++ b/packages/common-jvm/src/lib/utils/gradle-utils.ts @@ -380,12 +380,12 @@ export function hasGradleModule(cwd:string, moduleName: string){ function checkForModule(settings:string, moduleName:string){ const opts = { - fragments: [new RegExp(`rootProject\\.name\\s*=\\s*'`), new RegExp(`include\\s+':?${moduleName}'`)], + fragments: [new RegExp(`rootProject\\.name\\s*=\\s*'`), new RegExp(`include\\s+':?(?:[^:]*:)*${moduleName}'`)], logicalOp: 'and' as 'and' | 'or' }; const optsKts = { - fragments: [new RegExp(`rootProject\\.name\\s*=\\s*"`), new RegExp(`include\\(":?${moduleName}"\\)`)], + fragments: [new RegExp(`rootProject\\.name\\s*=\\s*"`), new RegExp(`include\\(":?(?:[^:]*:)*${moduleName}"\\)`)], logicalOp: 'and' as 'and' | 'or' }; @@ -473,4 +473,4 @@ function hasGradleWrapperWithPredicate(predicate: (file: string) => boolean) { 'gradlew.bat', 'gradlew.cmd', ].some(file => predicate(file)) ;; -} \ No newline at end of file +}