Skip to content

Commit 2990411

Browse files
authored
Bump Scala compiler versions, sbt version to 1.1.1 (#123)
1 parent 6630202 commit 2990411

File tree

5 files changed

+8
-8
lines changed

5 files changed

+8
-8
lines changed

build.sbt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ def scalacOptionsVersion(scalaVersion: String): Seq[String] = {
44
// switch to support our anonymous Bundle definitions:
55
// https://github.com/scala/bug/issues/10047
66
CrossVersion.partialVersion(scalaVersion) match {
7-
case Some((2, scalaMajor: Int)) if scalaMajor < 12 => Seq()
7+
case Some((2, scalaMajor: Long)) if scalaMajor < 12 => Seq()
88
case _ => Seq("-Xsource:2.11")
99
}
1010
}
@@ -16,7 +16,7 @@ def javacOptionsVersion(scalaVersion: String): Seq[String] = {
1616
// Java 7 compatible code for Scala 2.11
1717
// for compatibility with old clients.
1818
CrossVersion.partialVersion(scalaVersion) match {
19-
case Some((2, scalaMajor: Int)) if scalaMajor < 12 =>
19+
case Some((2, scalaMajor: Long)) if scalaMajor < 12 =>
2020
Seq("-source", "1.7", "-target", "1.7")
2121
case _ =>
2222
Seq("-source", "1.8", "-target", "1.8")
@@ -30,9 +30,9 @@ version := "3.2-SNAPSHOT"
3030

3131
name := "chisel-tutorial"
3232

33-
scalaVersion := "2.11.11"
33+
scalaVersion := "2.11.12"
3434

35-
crossScalaVersions := Seq("2.11.11", "2.12.3")
35+
crossScalaVersions := Seq("2.11.12", "2.12.4")
3636

3737
scalacOptions ++= Seq("-deprecation", "-feature", "-unchecked", "-language:reflectiveCalls")
3838

project/build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version = 0.13.16
1+
sbt.version = 1.1.1

run-examples.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
#!/usr/bin/env bash
22
args=$@
3-
sbt -v "test:run-main examples.Launcher $args"
3+
sbt -v "test:runMain examples.Launcher $args"

run-problem.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
#!/usr/bin/env bash
22
args=$@
3-
sbt "test:run-main problems.Launcher $args"
3+
sbt "test:runMain problems.Launcher $args"

run-solution.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
#!/usr/bin/env bash
22
args=$@
3-
sbt "test:run-main solutions.Launcher $args"
3+
sbt "test:runMain solutions.Launcher $args"

0 commit comments

Comments
 (0)