From 364ba9b44b676012ab655c3dae9d894a16bd6a84 Mon Sep 17 00:00:00 2001 From: Alexey Alekhin Date: Sat, 23 Sep 2017 15:20:43 +0200 Subject: [PATCH] Removed extra slash in the localBasePattern When the `scala_[scalaVersion]/` segment is present and the `/[branch]` segment isn't, an extra slash appears before `/[revision]`. --- core/src/main/scala/sbt/librarymanagement/ResolverExtra.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/main/scala/sbt/librarymanagement/ResolverExtra.scala b/core/src/main/scala/sbt/librarymanagement/ResolverExtra.scala index b49b934b5..c8c3064f7 100644 --- a/core/src/main/scala/sbt/librarymanagement/ResolverExtra.scala +++ b/core/src/main/scala/sbt/librarymanagement/ResolverExtra.scala @@ -357,7 +357,7 @@ abstract class ResolverFunctions { def mavenStyleBasePattern = "[organisation]/[module](_[scalaVersion])(_[sbtVersion])/[revision]/[artifact]-[revision](-[classifier]).[ext]" def localBasePattern = - "[organisation]/[module]/" + PluginPattern + "(/[branch])/[revision]/[type]s/[artifact](-[classifier]).[ext]" + "[organisation]/[module]/" + PluginPattern + "([branch]/)[revision]/[type]s/[artifact](-[classifier]).[ext]" def defaultRetrievePattern = "[type]s/[organisation]/[module]/" + PluginPattern + "[artifact](-[revision])(-[classifier]).[ext]" final val PluginPattern = "(scala_[scalaVersion]/)(sbt_[sbtVersion]/)"