diff options
| author | Jack Koenig | 2017-12-18 12:01:22 -0800 |
|---|---|---|
| committer | GitHub | 2017-12-18 12:01:22 -0800 |
| commit | 8ab501e7527139a4ee8d0b38f9b4384551387043 (patch) | |
| tree | e02d669e537d81f436072057d22cc62c1322a65d /build.sbt | |
| parent | 9480c0034861bbdae2217dcf91fd8b1fe45806ad (diff) | |
Bump sbt (#703)
Bump SBT to 1.0.4 and update plugins
Update Scala versions and sbt commands in .travis.yml
Replace run-main with runMain
Diffstat (limited to 'build.sbt')
| -rw-r--r-- | build.sbt | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -26,7 +26,7 @@ def scalacOptionsVersion(scalaVersion: String): Seq[String] = { // switch to support our anonymous Bundle definitions: // https://github.com/scala/bug/issues/10047 CrossVersion.partialVersion(scalaVersion) match { - case Some((2, scalaMajor: Int)) if scalaMajor < 12 => Seq() + case Some((2, scalaMajor: Long)) if scalaMajor < 12 => Seq() case _ => Seq("-Xsource:2.11") } } @@ -40,7 +40,7 @@ def javacOptionsVersion(scalaVersion: String): Seq[String] = { // Java 7 compatible code until we need Java 8 features // for compatibility with old clients. CrossVersion.partialVersion(scalaVersion) match { - case Some((2, scalaMajor: Int)) if scalaMajor < 12 => + case Some((2, scalaMajor: Long)) if scalaMajor < 12 => Seq("-source", "1.7", "-target", "1.7") case _ => Seq("-source", "1.8", "-target", "1.8") @@ -74,7 +74,7 @@ assemblyOutputPath in assembly := file("./utils/bin/firrtl.jar") // ANTLRv4 -antlr4Settings +enablePlugins(Antlr4Plugin) antlr4GenVisitor in Antlr4 := true // default = false |