From 54f6184ec4095cb762525a851e63cc1750e77971 Mon Sep 17 00:00:00 2001 From: Viktor Klang Date: Thu, 26 Jul 2012 14:48:36 +0200 Subject: [PATCH] Scoping scalac and javac options to Compile --- project/AkkaBuild.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/project/AkkaBuild.scala b/project/AkkaBuild.scala index e0e61589ae..ae858b323a 100644 --- a/project/AkkaBuild.scala +++ b/project/AkkaBuild.scala @@ -403,9 +403,9 @@ object AkkaBuild extends Build { resolvers += "Typesafe Repo" at "http://repo.typesafe.com/typesafe/releases/", // compile options - scalacOptions ++= Seq("-encoding", "UTF-8", "-target:jvm-1.6", "-deprecation", "-feature", "-unchecked", "-Xlog-reflective-calls", "-Ywarn-adapted-args") ++ ( + scalacOptions in Compile ++= Seq("-encoding", "UTF-8", "-target:jvm-1.6", "-deprecation", "-feature", "-unchecked", "-Xlog-reflective-calls", "-Ywarn-adapted-args") ++ ( if (true || (System getProperty "java.runtime.version" startsWith "1.7")) Seq() else Seq("-optimize")), // -optimize fails with jdk7 - javacOptions ++= Seq("-Xlint:unchecked", "-Xlint:deprecation"), + javacOptions in Compile ++= Seq("-Xlint:unchecked", "-Xlint:deprecation"), ivyLoggingLevel in ThisBuild := UpdateLogging.Quiet,