From a44baf0f4424979070b7aa0e267a7a2d762e24bb Mon Sep 17 00:00:00 2001 From: Viktor Klang Date: Mon, 24 Sep 2012 11:52:02 +0200 Subject: [PATCH 1/3] #2097 - Adding ls-sbt for all akka projects. --- ls.sbt | 13 ------------- project/AkkaBuild.scala | 14 +++++++++++++- project/plugins.sbt | 8 +++++++- 3 files changed, 20 insertions(+), 15 deletions(-) delete mode 100644 ls.sbt diff --git a/ls.sbt b/ls.sbt deleted file mode 100644 index 87e68ed303..0000000000 --- a/ls.sbt +++ /dev/null @@ -1,13 +0,0 @@ -// seq(lsSettings:_*) - -// (description in LsKeys.lsync) := "Akka is the platform for the next generation of event-driven, scalable and fault-tolerant architectures on the JVM." - -// (homepage in LsKeys.lsync) := Some(url("http://akka.io")) - -// (LsKeys.tags in LsKeys.lsync) := Seq("actors", "stm", "concurrency", "distributed", "fault-tolerance", "scala", "java", "futures", "dataflow", "remoting") - -// (LsKeys.docsUrl in LsKeys.lsync) := Some(url("http://akka.io/docs")) - -// (licenses in LsKeys.lsync) := Seq(("Apache 2", url("http://www.apache.org/licenses/LICENSE-2.0.html"))) - -// (externalResolvers in LsKeys.lsync) := Seq("Typesafe Releases" at "http://repo.typesafe.com/typesafe/releases") diff --git a/project/AkkaBuild.scala b/project/AkkaBuild.scala index b53f681f0e..9b084ceae8 100644 --- a/project/AkkaBuild.scala +++ b/project/AkkaBuild.scala @@ -13,6 +13,7 @@ import com.typesafe.sbtscalariform.ScalariformPlugin.ScalariformKeys import com.typesafe.sbtosgi.OsgiPlugin.{ OsgiKeys, osgiSettings } import com.typesafe.tools.mima.plugin.MimaPlugin.mimaDefaultSettings import com.typesafe.tools.mima.plugin.MimaKeys.previousArtifact +import ls.Plugin.{ lsSettings, LsKeys } import java.lang.Boolean.getBoolean import sbt.Tests import Sphinx.{ sphinxDocs, sphinxHtml, sphinxLatex, sphinxPdf, sphinxPygments, sphinxTags, sphinxVars, sphinxExts } @@ -449,7 +450,7 @@ object AkkaBuild extends Build { (if (useOnlyTestTags.isEmpty) Seq.empty else Seq("-n", if (multiNodeEnabled) useOnlyTestTags.mkString("\"", " ", "\"") else useOnlyTestTags.mkString(" "))) } - lazy val defaultSettings = baseSettings ++ formatSettings ++ mimaSettings ++ Seq( + lazy val defaultSettings = baseSettings ++ formatSettings ++ mimaSettings ++ lsSettings ++ Seq( // compile options scalacOptions in Compile ++= Seq("-encoding", "UTF-8", "-target:jvm-1.6", "-deprecation", "-feature", "-unchecked", "-Xlog-reflective-calls", "-Ywarn-adapted-args"), javacOptions in Compile ++= Seq("-source", "1.6", "-target", "1.6", "-Xlint:unchecked", "-Xlint:deprecation"), @@ -458,6 +459,17 @@ object AkkaBuild extends Build { ivyLoggingLevel in ThisBuild := UpdateLogging.Quiet, + (description in LsKeys.lsync) := "Akka is the platform for the next generation of event-driven, scalable and fault-tolerant architectures on the JVM.", + (homepage in LsKeys.lsync) := Some(url("http://akka.io")), + (LsKeys.tags in LsKeys.lsync) := Seq("actors", "stm", "concurrency", "distributed", "fault-tolerance", "scala", "java", "futures", "dataflow", "remoting"), + (LsKeys.docsUrl in LsKeys.lsync) := Some(url("http://akka.io/docs")), + (licenses in LsKeys.lsync) := Seq(("Apache 2", url("http://www.apache.org/licenses/LICENSE-2.0.html"))), + (externalResolvers in LsKeys.lsync) := Seq("Typesafe Releases" at "http://repo.typesafe.com/typesafe/releases"), + + /** + * Test settings + */ + parallelExecution in Test := System.getProperty("akka.parallelExecution", "false").toBoolean, logBuffered in Test := System.getProperty("akka.logBufferedTests", "false").toBoolean, diff --git a/project/plugins.sbt b/project/plugins.sbt index cbaf707cfe..5cb43706c4 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,6 +1,12 @@ resolvers += Classpaths.typesafeResolver +//ls-sbt resolvers +resolvers ++= Seq( + Classpaths.sbtPluginReleases, + Opts.resolver.sonatypeReleases +) + // these comment markers are for including code into the docs //#sbt-multi-jvm addSbtPlugin("com.typesafe.sbt" % "sbt-multi-jvm" % "0.3.3") @@ -12,4 +18,4 @@ addSbtPlugin("com.typesafe.sbtosgi" % "sbtosgi" % "0.3.0") addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.1.3") -// addSbtPlugin("me.lessis" % "ls-sbt" % "0.1.1") +addSbtPlugin("me.lessis" % "ls-sbt" % "0.1.2") From 76988511b293870dc2de958d85ea223c65de8ca9 Mon Sep 17 00:00:00 2001 From: Viktor Klang Date: Mon, 24 Sep 2012 14:36:20 +0200 Subject: [PATCH 2/3] Minor cleanup of ls-sbt config --- project/AkkaBuild.scala | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/project/AkkaBuild.scala b/project/AkkaBuild.scala index 9b084ceae8..bc6f189dd0 100644 --- a/project/AkkaBuild.scala +++ b/project/AkkaBuild.scala @@ -17,6 +17,7 @@ import ls.Plugin.{ lsSettings, LsKeys } import java.lang.Boolean.getBoolean import sbt.Tests import Sphinx.{ sphinxDocs, sphinxHtml, sphinxLatex, sphinxPdf, sphinxPygments, sphinxTags, sphinxVars, sphinxExts } +import LsKeys.{ lsync, docsUrl => lsDocsUrl, tags => lsTags } object AkkaBuild extends Build { System.setProperty("akka.mode", "test") // Is there better place for this? @@ -459,12 +460,12 @@ object AkkaBuild extends Build { ivyLoggingLevel in ThisBuild := UpdateLogging.Quiet, - (description in LsKeys.lsync) := "Akka is the platform for the next generation of event-driven, scalable and fault-tolerant architectures on the JVM.", - (homepage in LsKeys.lsync) := Some(url("http://akka.io")), - (LsKeys.tags in LsKeys.lsync) := Seq("actors", "stm", "concurrency", "distributed", "fault-tolerance", "scala", "java", "futures", "dataflow", "remoting"), - (LsKeys.docsUrl in LsKeys.lsync) := Some(url("http://akka.io/docs")), - (licenses in LsKeys.lsync) := Seq(("Apache 2", url("http://www.apache.org/licenses/LICENSE-2.0.html"))), - (externalResolvers in LsKeys.lsync) := Seq("Typesafe Releases" at "http://repo.typesafe.com/typesafe/releases"), + description in lsync := "Akka is the platform for the next generation of event-driven, scalable and fault-tolerant architectures on the JVM.", + homepage in lsync := Some(url("http://akka.io")), + lsTags in lsync := Seq("actors", "stm", "concurrency", "distributed", "fault-tolerance", "scala", "java", "futures", "dataflow", "remoting"), + lsDocsUrl in lsync := Some(url("http://akka.io/docs")), + licenses in lsync := Seq(("Apache 2", url("http://www.apache.org/licenses/LICENSE-2.0.html"))), + externalResolvers in lsync := Seq("Typesafe Releases" at "http://repo.typesafe.com/typesafe/releases"), /** * Test settings From fb928975d5bbaf804e378252f54e81b71d8d4260 Mon Sep 17 00:00:00 2001 From: Viktor Klang Date: Mon, 24 Sep 2012 21:09:40 +0200 Subject: [PATCH 3/3] Removing apparently superfluous resolvers --- project/plugins.sbt | 6 ------ 1 file changed, 6 deletions(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 5cb43706c4..c237ff8f02 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,12 +1,6 @@ resolvers += Classpaths.typesafeResolver -//ls-sbt resolvers -resolvers ++= Seq( - Classpaths.sbtPluginReleases, - Opts.resolver.sonatypeReleases -) - // these comment markers are for including code into the docs //#sbt-multi-jvm addSbtPlugin("com.typesafe.sbt" % "sbt-multi-jvm" % "0.3.3")