diff --git a/project/AkkaBuild.scala b/project/AkkaBuild.scala index ae858b323a..b295224dfb 100644 --- a/project/AkkaBuild.scala +++ b/project/AkkaBuild.scala @@ -15,22 +15,16 @@ import com.typesafe.tools.mima.plugin.MimaPlugin.mimaDefaultSettings import com.typesafe.tools.mima.plugin.MimaKeys.previousArtifact import java.lang.Boolean.getBoolean import sbt.Tests -import Sphinx.{ sphinxDocs, sphinxHtml, sphinxLatex, sphinxPdf, sphinxPygments, sphinxTags } +import Sphinx.{ sphinxDocs, sphinxHtml, sphinxLatex, sphinxPdf, sphinxPygments, sphinxTags, sphinx } object AkkaBuild extends Build { System.setProperty("akka.mode", "test") // Is there better place for this? - - lazy val desiredScalaVersion = "2.10.0-M5" + val enableMiMa = false lazy val buildSettings = Seq( organization := "com.typesafe.akka", version := "2.1-SNAPSHOT", - //scalaVersion := desiredScalaVersion - scalaVersion := "2.10.0-SNAPSHOT", - scalaVersion in update <<= (scalaVersion) apply { - case "2.10.0-SNAPSHOT" => desiredScalaVersion - case x => x - } + scalaVersion := "2.10.0-M6" ) lazy val akka = Project( @@ -333,8 +327,8 @@ object AkkaBuild extends Build { override lazy val settings = super.settings ++ buildSettings ++ Seq( resolvers += "Sonatype Snapshot Repo" at "https://oss.sonatype.org/content/repositories/snapshots/", - //resolvers += "Sonatype Releases Repo" at "https://oss.sonatype.org/content/repositories/releases/", - resolvers += "Typesafe 2.10 Freshness" at "http://typesafe.artifactoryonline.com/typesafe/scala-fresh-2.10.x/", + resolvers += "Sonatype Releases Repo" at "https://oss.sonatype.org/content/repositories/releases/", + resolvers += "Typesafe 2.10 Freshness" at "http://typesafe.artifactoryonline.com/typesafe/scala-fresh-2.10.x/", //FIXME REMOVE shellPrompt := { s => Project.extract(s).currentProject.id + " > " } ) @@ -403,8 +397,7 @@ object AkkaBuild extends Build { resolvers += "Typesafe Repo" at "http://repo.typesafe.com/typesafe/releases/", // compile options - 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 + scalacOptions in Compile ++= Seq("-encoding", "UTF-8", "-target:jvm-1.6", "-deprecation", "-feature", "-unchecked", "-Xlog-reflective-calls", "-Ywarn-adapted-args"), javacOptions in Compile ++= Seq("-Xlint:unchecked", "-Xlint:deprecation"), ivyLoggingLevel in ThisBuild := UpdateLogging.Quiet, @@ -472,10 +465,9 @@ object AkkaBuild extends Build { previousArtifact := None ) - def akkaPreviousArtifact(id: String, organization: String = "com.typesafe.akka", version: String = "2.0"): Option[sbt.ModuleID] = { - // the artifact to compare binary compatibility with - Some(organization % id % version) - } + def akkaPreviousArtifact(id: String, organization: String = "com.typesafe.akka", version: String = "2.0"): Option[sbt.ModuleID] = + if (enableMiMa) Some(organization % id % version) // the artifact to compare binary compatibility with + else None } // Dependencies @@ -515,23 +507,20 @@ object Dependencies { val docs = Seq(Test.scalatest, Test.junit, Test.junitIntf) - val zeroMQ = Seq(protobuf, Dependency.zeroMQ, Test.scalatest, Test.junit) + val zeroMQ = Seq(protobuf, zeroMQClient, Test.scalatest, Test.junit) } object Dependency { - - def v(a: String): String = a+"_"+AkkaBuild.desiredScalaVersion - // Compile val config = "com.typesafe" % "config" % "0.4.1" // ApacheV2 val camelCore = "org.apache.camel" % "camel-core" % "2.8.0" // ApacheV2 val netty = "io.netty" % "netty" % "3.5.1.Final" // ApacheV2 val protobuf = "com.google.protobuf" % "protobuf-java" % "2.4.1" // New BSD - //val scalaStm = "org.scala-tools" % "scala-stm" % "0.5" // Modified BSD (Scala) - val scalaStm = "scala-stm" % "scala-stm" % "0.6-SNAPSHOT" //"0.5" // Modified BSD (Scala) - val scalaActors = "org.scala-lang" % "scala-actors" % "2.10.0-SNAPSHOT" + val scalaStm = "scala-stm" % "scala-stm" % "0.6-SNAPSHOT" // FIXME REPLACE WITH BELOW + val scalaActors = "org.scala-lang" % "scala-actors" % "2.10.0-M6" // FIXME REMOVE + //val scalaStm = "org.scala-tools" %% "scala-stm" % "0.6" // Modified BSD (Scala) val slf4jApi = "org.slf4j" % "slf4j-api" % "1.6.4" // MIT - val zeroMQ = "org.zeromq" % v("zeromq-scala-binding") % "0.0.6" // ApacheV2 + val zeroMQClient = "org.zeromq" %% "zeromq-scala-binding" % "0.0.6" // ApacheV2 val uncommonsMath = "org.uncommons.maths" % "uncommons-maths" % "1.2.2a" // ApacheV2 val ariesBlueprint = "org.apache.aries.blueprint" % "org.apache.aries.blueprint" % "0.3.2" // ApacheV2 val osgiCore = "org.osgi" % "org.osgi.core" % "4.2.0" // ApacheV2 @@ -544,9 +533,9 @@ object Dependency { val junit = "junit" % "junit" % "4.10" % "test" // Common Public License 1.0 val logback = "ch.qos.logback" % "logback-classic" % "1.0.4" % "test" // EPL 1.0 / LGPL 2.1 val mockito = "org.mockito" % "mockito-all" % "1.8.1" % "test" // MIT - val scalatest = "org.scalatest" % v("scalatest") % "1.9-2.10.0-M5-B2" % "test" // ApacheV2 - val scalacheck = "org.scalacheck" % v("scalacheck") % "1.10.0" % "test" // New BSD - val ariesProxy = "org.apache.aries.proxy" % "org.apache.aries.proxy.impl" % "0.3" % "test" // ApacheV2 + val scalatest = "org.scalatest" %% "scalatest" % "1.9-2.10.0-M6-B2" % "test" // ApacheV2 + val scalacheck = "org.scalacheck" %% "scalacheck" % "1.10.0" % "test" // New BSD + val ariesProxy = "org.apache.aries.proxy" % "org.apache.aries.proxy.impl" % "0.3" % "test" // ApacheV2 val pojosr = "com.googlecode.pojosr" % "de.kalpatec.pojosr.framework" % "0.1.4" % "test" // ApacheV2 val tinybundles = "org.ops4j.pax.tinybundles" % "tinybundles" % "1.0.0" % "test" // ApacheV2 val log4j = "log4j" % "log4j" % "1.2.14" % "test" // ApacheV2 diff --git a/project/Sphinx.scala b/project/Sphinx.scala index 4707215875..685c30b08b 100644 --- a/project/Sphinx.scala +++ b/project/Sphinx.scala @@ -33,7 +33,7 @@ object Sphinx { ) def pygmentsTask = (sphinxPygmentsDir, sphinxTarget, streams) map { - (pygments, baseTarget, s) => { + (pygments, baseTarget, s) => Sphinx.synchronized { val target = baseTarget / "site-packages" val empty = (target * "*.egg").get.isEmpty if (empty) { @@ -54,7 +54,7 @@ object Sphinx { def buildTask(builder: String, tagsKey: SettingKey[Seq[String]]) = { (cacheDirectory, sphinxDocs, sphinxTarget, sphinxPygments, tagsKey, streams) map { - (cacheDir, docs, baseTarget, pygments, tags, s) => { + (cacheDir, docs, baseTarget, pygments, tags, s) => Sphinx.synchronized { val target = baseTarget / builder val doctrees = baseTarget / "doctrees" val cache = cacheDir / "sphinx" / builder @@ -86,7 +86,7 @@ object Sphinx { } def pdfTask = (sphinxLatex, streams) map { - (latex, s) => { + (latex, s) => Sphinx.synchronized { val pdf = latex / "Akka.pdf" def failed = sys.error("Failed to build Sphinx pdf documentation.") if (!pdf.exists) { @@ -109,7 +109,7 @@ object Sphinx { } def sphinxTask = (sphinxHtml, sphinxPdf, sphinxTarget, streams) map { - (html, pdf, baseTarget, s) => { + (html, pdf, baseTarget, s) => Sphinx.synchronized { val target = baseTarget / "docs" IO.delete(target) IO.copyDirectory(html, target) diff --git a/project/scripts/release b/project/scripts/release index 9e418317bd..a6e14a227e 100755 --- a/project/scripts/release +++ b/project/scripts/release @@ -216,7 +216,7 @@ fi # build the release echolog "Building the release..." try sbt build-release -try cp akka-spring/src/main/resources/akka/spring/akka-*.xsd ${release_dir} +#try cp akka-spring/src/main/resources/akka/spring/akka-*.xsd ${release_dir} echolog "Creating gzipped tar download..." try tar -cz -C ${unzipped_dir} -f ${release_dir}/downloads/akka-${version}.tgz akka-${version} echolog "Successfully created local release"