From 16adefe6d1df545b2b019ce23627af89aee55a4b Mon Sep 17 00:00:00 2001 From: Kailuo Wang Date: Mon, 24 Apr 2017 16:49:46 -0400 Subject: [PATCH 1/5] upgraded to scala 2.12.2 and 2.11.11 --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index a932b8e4be..d908c4f71e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,14 +9,14 @@ git: scala: - 2.10.6 - - 2.11.8 + - 2.11.11 jdk: - oraclejdk7 matrix: include: - - scala: 2.12.1 + - scala: 2.12.2 jdk: oraclejdk8 before_install: From 73bf469e66965588a2bc8af6f1526a16003700ca Mon Sep 17 00:00:00 2001 From: Kailuo Wang Date: Mon, 24 Apr 2017 17:35:37 -0400 Subject: [PATCH 2/5] upgrade scalajs --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 35d86e7288..728e0c8313 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -7,7 +7,7 @@ addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.2.16") addSbtPlugin("org.scalastyle" % "scalastyle-sbt-plugin" % "0.8.0") addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.5.0") addSbtPlugin("com.typesafe.sbt" % "sbt-git" % "0.8.5") -addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.14") +addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.15") addSbtPlugin("com.github.tkawachi" % "sbt-doctest" % "0.4.1") addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "1.1") addSbtPlugin("com.fortysevendeg" % "sbt-microsites" % "0.3.2") From 92a1989c88fc44d6da145b6e0fee3ec24c099ad5 Mon Sep 17 00:00:00 2001 From: Kailuo Wang Date: Mon, 24 Apr 2017 21:35:28 -0400 Subject: [PATCH 3/5] turn off xlint:unused in scala 2.12 --- build.sbt | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/build.sbt b/build.sbt index 6d09ffeb94..c55031a570 100644 --- a/build.sbt +++ b/build.sbt @@ -25,7 +25,7 @@ lazy val kernelSettings = Seq( Resolver.sonatypeRepo("snapshots")), parallelExecution in Test := false, scalacOptions in (Compile, doc) := (scalacOptions in (Compile, doc)).value.filter(_ != "-Xfatal-warnings") -) ++ warnUnusedImport ++ update2_12 +) ++ warnUnusedImport ++ update2_12 ++ xlint lazy val commonSettings = Seq( incOptions := incOptions.value.withLogRecompileOnMacro(false), @@ -46,7 +46,7 @@ lazy val commonSettings = Seq( scalacOptions in (Compile, doc) := (scalacOptions in (Compile, doc)).value.filter(_ != "-Xfatal-warnings"), // workaround for https://github.com/scalastyle/scalastyle-sbt-plugin/issues/47 scalastyleSources in Compile ++= (unmanagedSourceDirectories in Compile).value -) ++ warnUnusedImport ++ update2_12 +) ++ warnUnusedImport ++ update2_12 ++ xlint lazy val tagName = Def.setting{ s"v${if (releaseUseGlobalVersion.value) (version in ThisBuild).value else version.value}" @@ -470,7 +470,6 @@ lazy val commonScalacOptions = Seq( "-language:experimental.macros", "-unchecked", "-Xfatal-warnings", - "-Xlint", "-Yno-adapted-args", "-Ywarn-dead-code", "-Ywarn-numeric-widen", @@ -571,3 +570,12 @@ lazy val update2_12 = Seq( } } ) + +lazy val xlint = Seq( + scalacOptions += { + CrossVersion.partialVersion(scalaVersion.value) match { + case Some((2, 12)) => "-Xlint:-unused,_" + case _ => "Xlint" + } + } +) From f0e7a99d62ff6542ce4b2fb3a4c8a47feed051ad Mon Sep 17 00:00:00 2001 From: "Kai(luo) Wang" Date: Mon, 24 Apr 2017 23:16:24 -0400 Subject: [PATCH 4/5] Update build.sbt --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index c55031a570..53acbf669b 100644 --- a/build.sbt +++ b/build.sbt @@ -575,7 +575,7 @@ lazy val xlint = Seq( scalacOptions += { CrossVersion.partialVersion(scalaVersion.value) match { case Some((2, 12)) => "-Xlint:-unused,_" - case _ => "Xlint" + case _ => "-Xlint" } } ) From f75cb017e0dd993a09d1b3da52472947350fecc3 Mon Sep 17 00:00:00 2001 From: "Kai(luo) Wang" Date: Tue, 9 May 2017 15:44:28 -0400 Subject: [PATCH 5/5] Update plugins.sbt --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 728e0c8313..3feed6358f 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -7,7 +7,7 @@ addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.2.16") addSbtPlugin("org.scalastyle" % "scalastyle-sbt-plugin" % "0.8.0") addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.5.0") addSbtPlugin("com.typesafe.sbt" % "sbt-git" % "0.8.5") -addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.15") +addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.16") addSbtPlugin("com.github.tkawachi" % "sbt-doctest" % "0.4.1") addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "1.1") addSbtPlugin("com.fortysevendeg" % "sbt-microsites" % "0.3.2")