From b8fbb33741cee85fa10ebc23a4d784a690c84da9 Mon Sep 17 00:00:00 2001 From: Diego Date: Sun, 18 Mar 2018 16:57:58 -0300 Subject: * Introduce some scalac params in order to improve the emited bytecode --- build.sbt | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/build.sbt b/build.sbt index 51a5a764..27a13503 100644 --- a/build.sbt +++ b/build.sbt @@ -20,11 +20,23 @@ lazy val kamon = (project in file(".")) .aggregate(core, testkit, coreTests) val commonSettings = Seq( - scalaVersion := "2.11.8", + scalaVersion := "2.12.4", javacOptions += "-XDignore.symbol.file", resolvers += Resolver.mavenLocal, - crossScalaVersions := Seq("2.12.2", "2.11.8", "2.10.6"), - concurrentRestrictions in Global += Tags.limit(Tags.Test, 1) + crossScalaVersions := Seq("2.12.4", "2.11.8", "2.10.6"), + concurrentRestrictions in Global += Tags.limit(Tags.Test, 1), + scalacOptions ++= Seq( + "-deprecation", + "-encoding", "UTF-8", + "-feature", + "-Xfuture", + "-language:implicitConversions", "-language:higherKinds", "-language:existentials", "-language:postfixOps", + "-unchecked" + ) ++ (CrossVersion.partialVersion(scalaVersion.value) match { + case Some((2,10)) => Seq("-Yno-generic-signatures", "-target:jvm-1.7") + case Some((2,11)) => Seq("-Ybackend:GenBCode","-Ydelambdafy:method","-target:jvm-1.8") + case _ => Seq("-opt:l:method") + }) ) lazy val core = (project in file("kamon-core")) -- cgit v1.2.3 From 6fa1bea98093608388fe614fe459ba7e05d42d10 Mon Sep 17 00:00:00 2001 From: Diego Date: Sun, 18 Mar 2018 18:38:33 -0300 Subject: set specific parameters by scala version --- build.sbt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 27a13503..5c2cc104 100644 --- a/build.sbt +++ b/build.sbt @@ -35,7 +35,8 @@ val commonSettings = Seq( ) ++ (CrossVersion.partialVersion(scalaVersion.value) match { case Some((2,10)) => Seq("-Yno-generic-signatures", "-target:jvm-1.7") case Some((2,11)) => Seq("-Ybackend:GenBCode","-Ydelambdafy:method","-target:jvm-1.8") - case _ => Seq("-opt:l:method") + case Some((2,12)) => Seq("-opt:l:method") + case _ => Seq.empty }) ) -- cgit v1.2.3