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

Merge remote-tracking branch 'origin/1.3.x' into 1.3.x-merge

This commit is contained in:
Ethan Atkins 2019-09-05 11:44:24 -07:00
parent a0dc3fc06a 7cd29cda7b
commit 58b3d970d0
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.sbt
View File

@ -8,7 +8,7 @@ import scala.xml.transform.{ RewriteRule, RuleTransformer }
import scala.util.Try
ThisBuild / version := {
val v = "1.3.0-SNAPSHOT"
val v = "1.3.1-SNAPSHOT"
nightlyVersion.getOrElse(v)
}
ThisBuild / scalafmtOnCompile := !(Global / insideCI).value

2
src/main/conscript/scalas/launchconfig
View File

@ -4,7 +4,7 @@
[app]
org: ${sbt.organization-org.scala-sbt}
name: sbt
version: ${sbt.version-read(sbt.version)[1.2.0]}
version: ${sbt.version-read(sbt.version)[1.3.0]}
class: sbt.ScriptMain
components: xsbti,extra
cross-versioned: ${sbt.cross.versioned-false}

2
src/main/conscript/screpl/launchconfig
View File

@ -4,7 +4,7 @@
[app]
org: ${sbt.organization-org.scala-sbt}
name: sbt
version: ${sbt.version-read(sbt.version)[1.2.0]}
version: ${sbt.version-read(sbt.version)[1.3.0]}
class: sbt.ConsoleMain
components: xsbti,extra
cross-versioned: ${sbt.cross.versioned-false}

2
src/main/conscript/xsbt/launchconfig
View File

@ -4,7 +4,7 @@
[app]
org: ${sbt.organization-org.scala-sbt}
name: sbt
version: ${sbt.version-read(sbt.version)[1.2.0]}
version: ${sbt.version-read(sbt.version)[1.3.0]}
class: sbt.xMain
components: xsbti,extra
cross-versioned: ${sbt.cross.versioned-false}