Skip to content

Bump Scala compiler versions, sbt version to 1.1.1 #123

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 18, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,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")
}
}
Expand All @@ -16,7 +16,7 @@ def javacOptionsVersion(scalaVersion: String): Seq[String] = {
// Java 7 compatible code for Scala 2.11
// 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")
Expand All @@ -30,9 +30,9 @@ version := "3.2-SNAPSHOT"

name := "chisel-tutorial"

scalaVersion := "2.11.11"
scalaVersion := "2.11.12"

crossScalaVersions := Seq("2.11.11", "2.12.3")
crossScalaVersions := Seq("2.11.12", "2.12.4")

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

Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version = 0.13.16
sbt.version = 1.1.1
2 changes: 1 addition & 1 deletion run-examples.sh
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#!/usr/bin/env bash
args=$@
sbt -v "test:run-main examples.Launcher $args"
sbt -v "test:runMain examples.Launcher $args"
2 changes: 1 addition & 1 deletion run-problem.sh
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#!/usr/bin/env bash
args=$@
sbt "test:run-main problems.Launcher $args"
sbt "test:runMain problems.Launcher $args"
2 changes: 1 addition & 1 deletion run-solution.sh
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#!/usr/bin/env bash
args=$@
sbt "test:run-main solutions.Launcher $args"
sbt "test:runMain solutions.Launcher $args"