Skip to content

Simplify .tool-versions conflict handling

Adam Cohen requested to merge simplify-tool-version-conflict-handling into master

What does this MR do?

.tool-versions files won't conflict with spotbugs (!122 - merged) • Daniel Paul Searles • 14.8 added code to rename any .tool-versions files discovered in the project to be scanned so as not to interfere with the way asdf operates. A much simpler approach was suggested at the time, there was a bug in asdf that prevented this simpler approach from being implemented.

However, now that this bug has been fixed, we can upgrade asdf to v0.10.2 and configure the ASDF_DEFAULT_TOOL_VERSIONS_FILENAME environment var to simplify the code.

What are the relevant issue numbers?

Project specific asdf version should not confli... (gitlab-org/gitlab#293900 - closed) • Daniel Paul Searles • 14.8

Testing

A test was added in Add test for .tool-versions conflict handling (!212 - merged) • Adam Cohen • 17.5.

Does this MR meet the acceptance criteria?

Edited by Adam Cohen

Merge request reports

Loading