Fix SemVersionRangeRequirementBuilder

This commit is contained in:
Karlatemp 2020-09-21 12:47:53 +08:00
parent 209bc97b32
commit dc0ba1d8ff
No known key found for this signature in database
GPG Key ID: 21FBDDF664FF06F8

View File

@ -26,7 +26,7 @@ public object SemVersionRangeRequirementBuilder {
} }
override fun toString(): String { override fun toString(): String {
return "(${this@or}) or ($other)" return "{${this@or}} || {$other}"
} }
} }
} }
@ -48,7 +48,7 @@ public object SemVersionRangeRequirementBuilder {
} }
override fun toString(): String { override fun toString(): String {
return "(${this@and}) or ($other)" return "{${this@and}} && {$other}"
} }
} }
} }
@ -64,7 +64,12 @@ public object SemVersionRangeRequirementBuilder {
@Suppress("NOTHING_TO_INLINE") @Suppress("NOTHING_TO_INLINE")
@ILoveHim188moeForever @ILoveHim188moeForever
public inline fun custom(rule: SemVersion.Requirement): SemVersion.Requirement = rule public fun custom(rule: (SemVersion) -> Boolean): SemVersion.Requirement = object : SemVersion.Requirement {
override fun test(version: SemVersion): Boolean = rule(version)
override fun toString(): String {
return "Custom{$rule}"
}
}
/** /**
* 标注一个 [SemVersionRangeRequirementBuilder] DSL * 标注一个 [SemVersionRangeRequirementBuilder] DSL