mirror of
https://github.com/sbt/sbt.git
synced 2026-09-06 09:37:02 +02:00
Factor default Ivy pattern
This commit is contained in:
+1
-3
@@ -746,9 +746,7 @@ object Cache {
|
||||
}
|
||||
|
||||
lazy val ivy2Local = IvyRepository(
|
||||
ivy2HomeUri + "local/" +
|
||||
"[organisation]/[module]/(scala_[scalaVersion]/)(sbt_[sbtVersion]/)[revision]/[type]s/" +
|
||||
"[artifact](-[classifier]).[ext]",
|
||||
ivy2HomeUri + "local/" + coursier.ivy.Pattern.default,
|
||||
dropInfoAttributes = true
|
||||
)
|
||||
|
||||
|
||||
@@ -9,6 +9,10 @@ import java.util.regex.Pattern.quote
|
||||
|
||||
object Pattern {
|
||||
|
||||
val default =
|
||||
"[organisation]/[module]/(scala_[scalaVersion]/)(sbt_[sbtVersion]/)[revision]/[type]s/" +
|
||||
"[artifact](-[classifier]).[ext]"
|
||||
|
||||
val propertyRegex = (quote("${") + "[^" + quote("{[()]}") + "]*" + quote("}")).r
|
||||
val optionalPartRegex = (quote("(") + "[^" + quote("{()}") + "]*" + quote(")")).r
|
||||
val variableRegex = (quote("[") + "[^" + quote("{[()]}") + "]*" + quote("]")).r
|
||||
|
||||
Reference in New Issue
Block a user