diff --git a/lib/manager/gradle-wrapper/artifacts.spec.ts b/lib/manager/gradle-wrapper/artifacts.spec.ts index 4ae79552ca5daea8dbbebdfcd4af9b64d84b12fe..93a89b905ce3a84790b1890799892d787dd1edcc 100644 --- a/lib/manager/gradle-wrapper/artifacts.spec.ts +++ b/lib/manager/gradle-wrapper/artifacts.spec.ts @@ -40,9 +40,7 @@ describe('manager/gradle-wrapper/update', () => { 'gradle/wrapper/gradle-wrapper.jar', 'gradlew', 'gradlew.bat', - ].map(filename => - resolve(__dirname, `./__fixtures__/testFiles/${filename}`) - ), + ], } as Git.StatusResult); const res = await dcUpdate.updateArtifacts({ @@ -64,19 +62,21 @@ describe('manager/gradle-wrapper/update', () => { 'gradle/wrapper/gradle-wrapper.jar', 'gradlew', 'gradlew.bat', - ] - .map(filename => - resolve(__dirname, `./__fixtures__/testFiles/${filename}`) - ) - .map(filePath => { - return { - artifactError: null, - file: { - name: filePath, - contents: readFileSync(filePath, 'utf8'), - }, - }; - }) + ].map(fileProjectPath => { + return { + artifactError: null, + file: { + name: fileProjectPath, + contents: readFileSync( + resolve( + __dirname, + `./__fixtures__/testFiles/${fileProjectPath}` + ), + 'utf8' + ), + }, + }; + }) ); [ diff --git a/lib/manager/gradle-wrapper/artifacts.ts b/lib/manager/gradle-wrapper/artifacts.ts index 663e2d068381e67e65bc70261c4e06a0e38c15cc..322826ec1b65ce4ba33ccfc281540dc4d5ab3ba2 100644 --- a/lib/manager/gradle-wrapper/artifacts.ts +++ b/lib/manager/gradle-wrapper/artifacts.ts @@ -12,13 +12,15 @@ import { gradleWrapperFileName, prepareGradleCommand } from '../gradle/index'; async function addIfUpdated( status: Git.StatusResult, - filePath: string + projectDir: string, + fileProjectPath: string ): Promise<UpdateArtifactsResult | null> { - if (status.modified.includes(filePath)) { + if (status.modified.includes(fileProjectPath)) { + const filePath = resolve(projectDir, `./${fileProjectPath}`); return { artifactError: null, file: { - name: filePath, + name: fileProjectPath, contents: await readLocalFile(filePath), }, }; @@ -66,11 +68,13 @@ export async function updateArtifacts({ const updateArtifactsResult = ( await Promise.all( [ - resolve(projectDir, './gradle/wrapper/gradle-wrapper.properties'), - resolve(projectDir, './gradle/wrapper/gradle-wrapper.jar'), - resolve(projectDir, './gradlew'), - resolve(projectDir, './gradlew.bat'), - ].map(async filePath => addIfUpdated(status, filePath)) + 'gradle/wrapper/gradle-wrapper.properties', + 'gradle/wrapper/gradle-wrapper.jar', + 'gradlew', + 'gradlew.bat', + ].map(async fileProjectPath => + addIfUpdated(status, projectDir, fileProjectPath) + ) ) ).filter(e => e != null); logger.debug(