feat(gradle): Support for gradle consistent versions plugin #19182

janhoy · 2022-11-30T01:09:27Z

Changes

Support for plugin gradle-consistent-versions by Palantir

Context

See #8017

Documentation (please check one with an [x])

I have updated the documentation, or
No documentation update is required

May also need website update

How I've tested my work (please tick one)

I have verified these changes via:

Code inspection only, or
Newly added/modified unit tests, or
No unit tests but ran on a real repository, or
Both unit tests + ran on a real repository

Small test repo: https://github.com/janhoy/gradle-consistent

Much larger, realistic test repo: https://github.com/cominvent/solr-playground

Signed-off-by: Jan Høydahl janhoy@users.noreply.github.com

Closes #8017

Fixes renovatebot#8017 Signed-off-by: Jan Høydahl <janhoy@users.noreply.github.com>

Signed-off-by: Jan Høydahl <janhoy@users.noreply.github.com>

janhoy · 2022-11-30T08:08:47Z

A question - it is fairly easy to parse what lines in versions.props are test dependencies (below a certain header at the bottom). Would it make sense to tag those as depType = devDependencies for some reason?

rarkins · 2022-11-30T08:21:41Z

A question - it is fairly easy to parse what lines in versions.props are test dependencies (below a certain header at the bottom). Would it make sense to tag those as depType = devDependencies for some reason?

devDependencies is a term from npm, which you don't need to use. Instead, using depType=test would be fine and we could adjust any presets we have to include that term if we need

lib/modules/manager/gradle/extract/consistent-versions-plugin.ts

lib/modules/manager/gradle/artifacts.ts

lib/modules/manager/gradle/extract.spec.ts

lib/modules/manager/gradle/extract/consistent-versions-plugin.ts

Co-authored-by: Johannes Feichtner <Churro@users.noreply.github.com>

Signed-off-by: Jan Høydahl <janhoy@users.noreply.github.com>

…po top-level Signed-off-by: Jan Høydahl <janhoy@users.noreply.github.com>

Signed-off-by: Jan Høydahl <janhoy@users.noreply.github.com>

This reverts commit b923c34.

- support projects in sub folders (monorepo) - don't check for existence until you see versions.props - explicitly skip versions.lock - more compact tests, uses fsMock dict trick and shorter example buildfiles Signed-off-by: Jan Høydahl <janhoy@users.noreply.github.com>

Signed-off-by: Jan Høydahl <janhoy@users.noreply.github.com>

- Use literal glob string as group name - Use same logic as palantir for * -> .*? - Resolve lock deps in order 1. first exact match from prop 2. then longest glob string (most specific group) 3. all the way to shortest/least specific - We construct the regex once per glob, hoping to gain some speed Signed-off-by: Jan Høydahl <janhoy@users.noreply.github.com>

Also fix bug in glob test Signed-off-by: Jan Høydahl <janhoy@users.noreply.github.com>

Signed-off-by: Jan Høydahl <janhoy@users.noreply.github.com>

lib/modules/manager/gradle/extract/consistent-versions-plugin.ts

Signed-off-by: Jan Høydahl <janhoy@users.noreply.github.com>

janhoy · 2022-12-02T01:04:18Z

I think this is getting somewhere. Remaining is the plugin detection issue at #19182 (comment)

…on in all build files Signed-off-by: Jan Høydahl <janhoy@users.noreply.github.com>

Signed-off-by: Jan Høydahl <janhoy@users.noreply.github.com>

janhoy · 2022-12-06T07:39:55Z

I have seen that output, which suggests that no deps are extracted. But locally they all pass, i.e. they are non-null. There must be some difference in local and CI environment..

Found it after realizing it was the Node14 tests failing and I ran Node16 locally. Debugggin in Node14 locally unveiled that it does not support String.replaceAll().

Signed-off-by: Jan Høydahl <janhoy@users.noreply.github.com>

Churro · 2022-12-06T23:26:27Z

Could you please undo your changes to yarn.lock? Otherwise LGTM

This reverts commit dcdac86.

…to palantir-consistent-versions

renovate-release · 2022-12-08T12:49:58Z

🎉 This PR is included in version 34.52.0 🎉

The release is available on:

GitHub release
34.52.0

Your semantic-release bot 📦🚀

janhoy added 4 commits November 30, 2022 00:54

Support for plugin gradle-consistent-versions by Palantir

33b0ca9

Fixes renovatebot#8017 Signed-off-by: Jan Høydahl <janhoy@users.noreply.github.com>

Convert const function to proper function

02ff915

Signed-off-by: Jan Høydahl <janhoy@users.noreply.github.com>

Add test for missing lock file and not activated plugin

dc5d84c

Signed-off-by: Jan Høydahl <janhoy@users.noreply.github.com>

Fix kebab rules, more robust glob-to-regex

86c7b3b

Signed-off-by: Jan Høydahl <janhoy@users.noreply.github.com>

janhoy changed the title ~~Support for consistent versions plugin by Palantir~~ feat(gradle): Support for gradle consistent versions plugin Nov 30, 2022

rarkins requested a review from Churro November 30, 2022 06:37

janhoy commented Nov 30, 2022

View reviewed changes

lib/modules/manager/gradle/extract/consistent-versions-plugin.ts Outdated Show resolved Hide resolved

Churro suggested changes Nov 30, 2022

View reviewed changes

janhoy and others added 16 commits December 1, 2022 19:10

Update lib/modules/manager/gradle/extract.spec.ts

b923c34

Co-authored-by: Johannes Feichtner <Churro@users.noreply.github.com>

Review comment isLockFile

9733032

Signed-off-by: Jan Høydahl <janhoy@users.noreply.github.com>

Review feedback - use 'codeBlock' in tests

090f068

Signed-off-by: Jan Høydahl <janhoy@users.noreply.github.com>

Review feedback - Match the props and lock on sub folder, not only re…

6842549

…po top-level Signed-off-by: Jan Høydahl <janhoy@users.noreply.github.com>

Move GCV check above for-loop

2a4db1c

Signed-off-by: Jan Høydahl <janhoy@users.noreply.github.com>

Revert "Update lib/modules/manager/gradle/extract.spec.ts"

3dfdc48

This reverts commit b923c34.

Fix logick in isLockFile to also support both root and sub folders

1758cc7

Signed-off-by: Jan Høydahl <janhoy@users.noreply.github.com>

Fix name of build.gradle.kts support

e73b384

Signed-off-by: Jan Høydahl <janhoy@users.noreply.github.com>

Support both top level and sub folder in index.ts

49cef0a

Signed-off-by: Jan Høydahl <janhoy@users.noreply.github.com>

Remove comment block

75d410f

Signed-off-by: Jan Høydahl <janhoy@users.noreply.github.com>

VersionWithPositions fields cannot be null

6275b48

Signed-off-by: Jan Høydahl <janhoy@users.noreply.github.com>

Parsing of props file positions in CRLF and LF

b51b71b

Also fix bug in glob test Signed-off-by: Jan Høydahl <janhoy@users.noreply.github.com>

More validation of parsing regex, including a test

8b9df5f

Signed-off-by: Jan Høydahl <janhoy@users.noreply.github.com>

Support for depType=test

f4ecf56

Signed-off-by: Jan Høydahl <janhoy@users.noreply.github.com>

janhoy commented Dec 2, 2022

View reviewed changes

lib/modules/manager/gradle/extract/consistent-versions-plugin.ts Show resolved Hide resolved

Added test for Test Dependencies parsing

d871f79

Signed-off-by: Jan Høydahl <janhoy@users.noreply.github.com>

Check header line of lockfile instead of loooking for plugin activati…

4a0e81b

…on in all build files Signed-off-by: Jan Høydahl <janhoy@users.noreply.github.com>

janhoy added 8 commits December 6, 2022 00:05

Merge branch 'main' into palantir-consistent-versions

451afe3

Add debug printing to PR

7b2f3b8

Signed-off-by: Jan Høydahl <janhoy@users.noreply.github.com>

More debug print to PR

f509a28

Signed-off-by: Jan Høydahl <janhoy@users.noreply.github.com>

More debugging for CI

abaffc1

Signed-off-by: Jan Høydahl <janhoy@users.noreply.github.com>

Yet more logging

d9a7f7a

Signed-off-by: Jan Høydahl <janhoy@users.noreply.github.com>

Log parsed objects

3138d8e

Signed-off-by: Jan Høydahl <janhoy@users.noreply.github.com>

Log also lockfile map

19a3db5

Signed-off-by: Jan Høydahl <janhoy@users.noreply.github.com>

Do not use replaceAll()

f6dbe8a

Signed-off-by: Jan Høydahl <janhoy@users.noreply.github.com>

janhoy added 4 commits December 6, 2022 08:42

Remove debug logging

1cf989b

Signed-off-by: Jan Høydahl <janhoy@users.noreply.github.com>

Remove misplaced comment

1edb143

Signed-off-by: Jan Høydahl <janhoy@users.noreply.github.com>

Merge branch 'main' into palantir-consistent-versions

1782d75

Merge branch 'main' into palantir-consistent-versions

b38b48e

Churro previously approved these changes Dec 6, 2022

View reviewed changes

Churro requested a review from viceice December 6, 2022 23:27

janhoy added 3 commits December 7, 2022 09:03

Revert "Update yarn.lock"

a7af9d7

This reverts commit dcdac86.

Merge branch 'main' into palantir-consistent-versions

226ac43

Merge remote-tracking branch 'origin/palantir-consistent-versions' in…

35529c3

…to palantir-consistent-versions

janhoy dismissed Churro’s stale review via 35529c3 December 7, 2022 08:07

rarkins requested a review from Churro December 7, 2022 14:49

Churro approved these changes Dec 7, 2022

View reviewed changes

rarkins enabled auto-merge (squash) December 8, 2022 08:40

rarkins added 2 commits December 8, 2022 09:40

Merge branch 'main' into palantir-consistent-versions

054a756

Merge branch 'main' into palantir-consistent-versions

bc767d8

rarkins approved these changes Dec 8, 2022

View reviewed changes

rarkins merged commit 0d9aaed into renovatebot:main Dec 8, 2022

Churro mentioned this pull request Dec 8, 2022

fix(regex): don’t escape forward slash in fileMatch #19314

Merged

6 tasks

github-actions bot locked as resolved and limited conversation to collaborators Jan 8, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat(gradle): Support for gradle consistent versions plugin #19182

feat(gradle): Support for gradle consistent versions plugin #19182

janhoy commented Nov 30, 2022 •

edited

Loading

janhoy commented Nov 30, 2022

rarkins commented Nov 30, 2022

janhoy commented Dec 2, 2022

janhoy commented Dec 6, 2022

Churro commented Dec 6, 2022

renovate-release commented Dec 8, 2022

feat(gradle): Support for gradle consistent versions plugin #19182

feat(gradle): Support for gradle consistent versions plugin #19182

Conversation

janhoy commented Nov 30, 2022 • edited Loading

Changes

Context

Documentation (please check one with an [x])

How I've tested my work (please tick one)

janhoy commented Nov 30, 2022

rarkins commented Nov 30, 2022

janhoy commented Dec 2, 2022

janhoy commented Dec 6, 2022

Churro commented Dec 6, 2022

renovate-release commented Dec 8, 2022

janhoy commented Nov 30, 2022 •

edited

Loading