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

Merge pull request #5517 from eed3si9n/wip/js_workaround 

Revert "Mark scala-js-macro pending"
This commit is contained in:
eugene yokota 2020-05-05 22:26:32 -04:00 committed by GitHub
parent c39ed52112 de098b94d2
commit 77cc7285ae
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
project/Dependencies.scala
View File

@ -11,10 +11,10 @@ object Dependencies {
def nightlyVersion = sys.props.get("sbt.build.version")
// sbt modules
private val ioVersion = nightlyVersion.getOrElse("1.4.0-M2")
private val ioVersion = nightlyVersion.getOrElse("1.4.0-M4")
private val lmVersion =
sys.props.get("sbt.build.lm.version").orElse(nightlyVersion).getOrElse("1.3.0")
val zincVersion = nightlyVersion.getOrElse("1.4.0-M3")
val zincVersion = nightlyVersion.getOrElse("1.4.0-M5")
private val sbtIO = "org.scala-sbt" %% "io" % ioVersion

0
sbt/src/sbt-test/plugins/scala-js-macro/pending → sbt/src/sbt-test/plugins/scala-js-macro/test
View File