luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use new helper to get coursier version

This commit is contained in:
Alexandre Archambault 2017-09-20 16:55:15 +02:00
parent 9a35ff416a
commit 1252f2b8d5
4 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
project/Release.scala
View File

@ -193,7 +193,7 @@ object Release {
}
val coursierVersionPattern = s"(?m)^${Pattern.quote("def coursierVersion = \"")}[^${'"'}]*${Pattern.quote("\"")}$$".r
val coursierVersionPattern = s"(?m)^${Pattern.quote("def coursierVersion0 = \"")}[^${'"'}]*${Pattern.quote("\"")}$$".r
val updatePluginsSbt = ReleaseStep { state =>
@ -204,13 +204,9 @@ object Release {
}
val baseDir = Project.extract(state).get(baseDirectory.in(ThisBuild))
val pluginsSbtFile = baseDir / "project" / "plugins.sbt"
val projectPluginsSbtFile = baseDir / "project" / "project" / "plugins.sbt"
val projectProjectPluginsSbtFile = baseDir / "project" / "project" / "project" / "plugins.sbt"
val files = Seq(
pluginsSbtFile,
projectPluginsSbtFile,
projectProjectPluginsSbtFile
)
@ -223,7 +219,7 @@ object Release {
case _ => sys.error(s"Found too many matches in $f")
}
val newContent = coursierVersionPattern.replaceAllIn(content, "def coursierVersion = \"" + releaseVer + "\"")
val newContent = coursierVersionPattern.replaceAllIn(content, "def coursierVersion0 = \"" + releaseVer + "\"")
Files.write(f.toPath, newContent.getBytes(StandardCharsets.UTF_8))
vcs.add(f.getAbsolutePath).!!(state.log)
}

3
project/plugins.sbt
View File

@ -20,9 +20,6 @@ libs ++= Seq(
"com.github.alexarchambault" %% "argonaut-shapeless_6.2" % "1.2.0-M5"
)
// important: this line is matched / substituted during releases (via sbt-release)
def coursierVersion = "1.0.0-RC12"
// required for just released things
resolvers += Resolver.sonatypeRepo("releases")

5
project/project/plugins.sbt
View File

@ -1,8 +1,5 @@
addSbtPlugin("io.get-coursier" % "sbt-coursier" % coursierVersion)
addSbtCoursier
addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.3.0")
// important: this line is matched / substituted during releases (via sbt-release)
def coursierVersion = "1.0.0-RC12"
// required for just released things
resolvers += Resolver.sonatypeRepo("releases")

4
project/project/project/plugins.sbt
View File

@ -1,7 +1,7 @@
addSbtPlugin("io.get-coursier" % "sbt-coursier" % coursierVersion)
addSbtPlugin("io.get-coursier" % "sbt-coursier" % coursierVersion0)
// important: this line is matched / substituted during releases (via sbt-release)
def coursierVersion = "1.0.0-RC12"
def coursierVersion0 = "1.0.0-RC12"
// required for just released things
resolvers += Resolver.sonatypeRepo("releases")