fix(common-jvm): fix checkForModule util to match gradle child modu…

…le names w/ arbitrary paths
tinesoft · Dec 15, 2023 · df97dbd · df97dbd
1 parent 37dc370
commit df97dbd
Showing 1 changed file with 3 additions and 3 deletions.
diff --git 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)) ;;
-}
+}