mirror of https://github.com/sbt/sbt.git
Merge pull request #7802 from Friendseeker/bump-sbt
[1.x] Bump sbt to 1.10.3
This commit is contained in:
commit
be0809c00f
|
|
@ -11,7 +11,7 @@ import scala.util.Try
|
|||
// ThisBuild settings take lower precedence,
|
||||
// but can be shared across the multi projects.
|
||||
ThisBuild / version := {
|
||||
val v = "1.10.2-SNAPSHOT"
|
||||
val v = "1.10.4-SNAPSHOT"
|
||||
nightlyVersion.getOrElse(v)
|
||||
}
|
||||
ThisBuild / version2_13 := "2.0.0-SNAPSHOT"
|
||||
|
|
|
|||
|
|
@ -121,7 +121,7 @@ val root = (project in file(".")).
|
|||
file
|
||||
},
|
||||
// update sbt.sh at root
|
||||
sbtnVersion := "1.10.0",
|
||||
sbtnVersion := "1.10.3",
|
||||
sbtnJarsBaseUrl := "https://github.com/sbt/sbtn-dist/releases/download",
|
||||
sbtnJarsMappings := {
|
||||
val baseUrl = sbtnJarsBaseUrl.value
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
sbt.version=1.10.1
|
||||
sbt.version=1.10.3
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
# This tests that this sbt scripted plugin can launch the previous one
|
||||
|
||||
> ^^1.10.1
|
||||
> ^^1.10.2
|
||||
|
||||
$ copy-file changes/A.scala src/sbt-test/a/b/A.scala
|
||||
> scripted
|
||||
|
|
|
|||
Loading…
Reference in New Issue