From f317458b9566939e1d19fbcbc41342e6c7172301 Mon Sep 17 00:00:00 2001
From: Sergei Zharinov <zharinov@users.noreply.github.com>
Date: Fri, 8 Apr 2022 18:25:48 +0300
Subject: [PATCH] fix(gradle): Don't skip files matched via custom pattern
(#15027)
---
lib/modules/manager/gradle/extract.ts | 3 +--
lib/modules/manager/gradle/utils.ts | 6 ------
2 files changed, 1 insertion(+), 8 deletions(-)
diff --git a/lib/modules/manager/gradle/extract.ts b/lib/modules/manager/gradle/extract.ts
index 8e7bf0d24e..d7587357fb 100644
--- a/lib/modules/manager/gradle/extract.ts
+++ b/lib/modules/manager/gradle/extract.ts
@@ -12,7 +12,6 @@ import type {
} from './types';
import {
getVars,
- isGradleFile,
isPropsFile,
isTOMLFile,
reorderFiles,
@@ -68,7 +67,7 @@ export async function extractAllPackageFiles(
} else if (isTOMLFile(packageFile)) {
const updatesFromCatalog = parseCatalog(packageFile, content);
extractedDeps.push(...updatesFromCatalog);
- } else if (isGradleFile(packageFile)) {
+ } else {
const vars = getVars(registry, dir);
const {
deps,
diff --git a/lib/modules/manager/gradle/utils.ts b/lib/modules/manager/gradle/utils.ts
index 076646b6dd..b5f491429c 100644
--- a/lib/modules/manager/gradle/utils.ts
+++ b/lib/modules/manager/gradle/utils.ts
@@ -101,7 +101,6 @@ export function interpolateString(
const gradleVersionsFileRegex = regEx('^versions\\.gradle(?:\\.kts)?$', 'i');
const gradleBuildFileRegex = regEx('^build\\.gradle(?:\\.kts)?$', 'i');
-const gradleFileRegex = regEx('\\.gradle(?:\\.kts)?$', 'i');
export function isGradleVersionsFile(path: string): boolean {
const filename = upath.basename(path);
@@ -113,11 +112,6 @@ export function isGradleBuildFile(path: string): boolean {
return gradleBuildFileRegex.test(filename);
}
-export function isGradleFile(path: string): boolean {
- const filename = upath.basename(path);
- return gradleFileRegex.test(filename);
-}
-
export function isPropsFile(path: string): boolean {
const filename = upath.basename(path).toLowerCase();
return filename === 'gradle.properties';
--
GitLab