Skip to content

Commit cd3bc07

Browse files
fviernausschuberth
authored andcommitted
chore(model): Use a better name for getVersionRanges()
While at it, also rename a related variable to read less bulky. Signed-off-by: Frank Viernau <[email protected]>
1 parent 8224ea6 commit cd3bc07

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

model/src/main/kotlin/utils/VersionUtils.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@ internal fun Identifier.isApplicableIvyVersion(pkgId: Identifier) =
4242

4343
// `Semver.satisfies(String)` requires a valid version range to work as expected, see:
4444
// https://github.com/semver4j/semver4j/issues/132.
45-
val rangesList = getVersionRange() ?: return false
45+
val ranges = getVersionRanges() ?: return false
4646

47-
return Semver.coerce(pkgId.version)?.satisfies(rangesList) == true
47+
return Semver.coerce(pkgId.version)?.satisfies(ranges) == true
4848
}.onFailure {
4949
logger.warn {
5050
"Failed to check if identifier version '$version' is applicable to package version " +
@@ -55,7 +55,7 @@ internal fun Identifier.isApplicableIvyVersion(pkgId: Identifier) =
5555
}.getOrDefault(false)
5656

5757
internal fun Identifier.isVersionRange(): Boolean {
58-
val ranges = getVersionRange()?.get()?.flatten() ?: return false
58+
val ranges = getVersionRanges()?.get()?.flatten() ?: return false
5959
val rangeVersions = ranges.mapTo(mutableSetOf()) { it.rangeVersion }
6060
val isSingleVersion = rangeVersions.size <= 1 && ranges.all { range ->
6161
// Determine whether the non-accessible `Range.rangeOperator` is `RangeOperator.EQUALS`.
@@ -65,7 +65,7 @@ internal fun Identifier.isVersionRange(): Boolean {
6565
return !isSingleVersion
6666
}
6767

68-
private fun Identifier.getVersionRange(): RangesList? {
68+
private fun Identifier.getVersionRanges(): RangesList? {
6969
if (IVY_VERSION_RANGE_INDICATORS.none { version.contains(it, ignoreCase = true) }) return null
7070

7171
return runCatching {

0 commit comments

Comments
 (0)