Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(managers/gradle): allow dot annotation in version.ref #21820

Merged
merged 6 commits into from May 4, 2023
Merged

fix(managers/gradle): allow dot annotation in version.ref #21820

merged 6 commits into from May 4, 2023
+11 −6

Conversation

cjtim
Copy link
Contributor

@cjtim cjtim commented Apr 26, 2023 •
edited

Changes

. - _ in version.ref can be a reference to the version variable

Context

Documentation (please check one with an [x])

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

How I've tested my work (please select 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

@cjtim cjtim marked this pull request as ready for review April 26, 2023 14:28
@rarkins rarkins requested a review from Churro April 26, 2023 15:42
Churro
Churro suggested changes Apr 26, 2023
View reviewed changes
Copy link
Collaborator

@Churro Churro left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  • Documentation update needed? Please tick accordingly
  • When proposing such changes, please provide evidence like a reference to Gradle docs / code or a minimum reproduction repo that demonstrates practical viability
  • I think the change should also be done here:

    renovate/lib/modules/manager/gradle/extract/catalog.ts

    Line 287 in dc1d1e8

    dependency.groupName = version.ref;

lib/modules/manager/gradle/extract/catalog.ts Outdated Show resolved Hide resolved
lib/modules/manager/gradle/extract/catalog.ts Outdated Show resolved Hide resolved
lib/modules/manager/gradle/extract/catalog.ts Outdated Show resolved Hide resolved
@cjtim cjtim force-pushed the feat/gradle-dot-annotaion-var branch from 89d8800 to e33d735 Compare April 27, 2023 02:52
viceice
viceice reviewed Apr 27, 2023
View reviewed changes
Copy link
Member

@viceice viceice left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

failed code coverage

@cjtim
Copy link
Contributor Author

cjtim commented May 3, 2023

  • Documentation update needed? Please tick accordingly
  • When proposing such changes, please provide evidence like a reference to Gradle docs / code or a minimum reproduction repo that demonstrates practical viability
  • I think the change should also be done here:

    renovate/lib/modules/manager/gradle/extract/catalog.ts

    Line 287 in dc1d1e8

    dependency.groupName = version.ref;

@Churro
I got example repo and ran with this PR's code https://github.com/cjtim/gradle-example

@viceice CodeCov not highlight lines that missing test case not sure what to do

viceice
viceice reviewed May 3, 2023
View reviewed changes
Copy link
Member

@viceice viceice left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Strange indirect coverage change:
https://app.codecov.io/gh/renovatebot/renovate/pull/21820/indirect-changes

@cjtim cjtim force-pushed the feat/gradle-dot-annotaion-var branch from e88187b to cfadd1a Compare May 3, 2023 14:12
cjtim and others added 5 commits May 4, 2023 19:00
@cjtim
fix(managers/gradle): allow dot annotation in version.ref
f58b71a 
Signed-off-by: Jinna C <jinnatim@gmail.com>
@cjtim
fix: test case
1d88e3d 
Signed-off-by: Jinna C <jinnatim@gmail.com>
@cjtim
use regular expression
2120105 
Signed-off-by: Jinna C <jinnatim@gmail.com>
@cjtim @Churro
Update lib/modules/manager/gradle/extract/catalog.ts
92970d8 
Co-authored-by: Johannes Feichtner <343448+Churro@users.noreply.github.com>
@cjtim
create function normalizeVersionPointer
01975f1 
Signed-off-by: Jinna C <jinnatim@gmail.com>
@cjtim cjtim force-pushed the feat/gradle-dot-annotaion-var branch from 7ca0ccb to 01975f1 Compare May 4, 2023 12:00
@cjtim
Copy link
Contributor Author

cjtim commented May 4, 2023

@Churro I update as you suggested. Please review it again thanks! :)

@cjtim
remove optional string version.ref
98a7cfd 
Signed-off-by: Jinna C <jinnatim@gmail.com>
@rarkins rarkins enabled auto-merge May 4, 2023 18:21
@rarkins rarkins requested a review from viceice May 4, 2023 18:22
@rarkins rarkins added this pull request to the merge queue May 4, 2023
Merged via the queue into renovatebot:main with commit e3e6de9 May 4, 2023
11 checks passed
@renovate-release
Copy link
Collaborator

🎉 This PR is included in version 35.71.3 🎉

The release is available on:

Your semantic-release bot 📦🚀

mjunker pushed a commit to mjunker/renovate that referenced this pull request May 17, 2023
@cjtim @Churro @mjunker
fix(managers/gradle): allow dot annotation in version.ref (renovatebo…
902e46b 
…t#21820)

Signed-off-by: Jinna C <jinnatim@gmail.com>
Co-authored-by: Johannes Feichtner <343448+Churro@users.noreply.github.com>
@viceice viceice added the regression Issue about a regression bug, or the PR caused it label May 23, 2023
@Churro Churro mentioned this pull request May 28, 2023
Merged
6 tasks
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jun 23, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@Churro Churro Churro approved these changes

@viceice viceice viceice approved these changes

Assignees
No one assigned
Labels
regression Issue about a regression bug, or the PR caused it
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@cjtim @renovate-release @Churro @viceice @rarkins