From aa47e66c5a9fd17cae9eed94ce87fac28b2409b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20Bon=C3=A9r?= Date: Fri, 26 Nov 2010 17:49:25 +0100 Subject: [PATCH] bumped version to 1.0-RC1 --- .../src/main/scala/akka/config/Config.scala | 2 +- akka-sbt-plugin/project/build.properties | 2 +- .../src/main/scala/AkkaProject.scala | 2 +- config/akka-reference.conf | 2 +- project/build.properties | 2 +- project/build/AkkaProject.scala | 25 ++++--------------- scripts/run_akka.sh | 2 +- 7 files changed, 11 insertions(+), 26 deletions(-) diff --git a/akka-actor/src/main/scala/akka/config/Config.scala b/akka-actor/src/main/scala/akka/config/Config.scala index 419d268012..8dbca225e8 100644 --- a/akka-actor/src/main/scala/akka/config/Config.scala +++ b/akka-actor/src/main/scala/akka/config/Config.scala @@ -20,7 +20,7 @@ class ModuleNotAvailableException(message: String) extends AkkaException(message * @author Jonas Bonér */ object Config extends Logging { - val VERSION = "1.0-SNAPSHOT" + val VERSION = "1.0-RC1" val HOME = { val envHome = System.getenv("AKKA_HOME") match { diff --git a/akka-sbt-plugin/project/build.properties b/akka-sbt-plugin/project/build.properties index fcf840b5f1..57b59e8953 100644 --- a/akka-sbt-plugin/project/build.properties +++ b/akka-sbt-plugin/project/build.properties @@ -2,6 +2,6 @@ project.name=Akka SBT Plugin # need full domain name for publishing to scala-tools project.organization=se.scalablesolutions.akka # mirrors akka version -project.version=1.0-SNAPSHOT +project.version=1.0-RC1 sbt.version=0.7.4 build.scala.versions=2.7.7 diff --git a/akka-sbt-plugin/src/main/scala/AkkaProject.scala b/akka-sbt-plugin/src/main/scala/AkkaProject.scala index 8644311030..d4761d0c91 100644 --- a/akka-sbt-plugin/src/main/scala/AkkaProject.scala +++ b/akka-sbt-plugin/src/main/scala/AkkaProject.scala @@ -56,7 +56,7 @@ trait AkkaBaseProject extends BasicScalaProject { } trait AkkaProject extends AkkaBaseProject { - val akkaVersion = "1.0-SNAPSHOT" + val akkaVersion = "1.0-RC1" // convenience method def akkaModule(module: String) = "se.scalablesolutions.akka" % ("akka-" + module) % akkaVersion diff --git a/config/akka-reference.conf b/config/akka-reference.conf index 496dd6c640..29a93dc6b6 100644 --- a/config/akka-reference.conf +++ b/config/akka-reference.conf @@ -6,7 +6,7 @@ # Modify as needed. akka { - version = "1.0-SNAPSHOT" # Akka version, checked against the runtime version of Akka. + version = "1.0-RC1" # Akka version, checked against the runtime version of Akka. enabled-modules = [] # Comma separated list of the enabled modules. Options: ["remote", "camel", "http"] diff --git a/project/build.properties b/project/build.properties index f4e4af970a..46c6e64d96 100644 --- a/project/build.properties +++ b/project/build.properties @@ -3,6 +3,6 @@ project.organization=se.scalablesolutions.akka project.name=akka sbt.version=0.7.5.RC0 -project.version=1.0-SNAPSHOT +project.version=1.0-RC1 def.scala.version=2.7.7 build.scala.versions=2.8.1 diff --git a/project/build/AkkaProject.scala b/project/build/AkkaProject.scala index 3c69055f66..c340c29a74 100644 --- a/project/build/AkkaProject.scala +++ b/project/build/AkkaProject.scala @@ -21,7 +21,7 @@ class AkkaParentProject(info: ProjectInfo) extends DefaultProject(info) { "-Xmigration", "-Xcheckinit", "-Xstrict-warnings", - // "-optimise", //Uncomment this for release compile + "-optimise", //Uncomment this for release compile "-Xwarninit", "-encoding", "utf8") .map(CompileOption(_)) @@ -34,6 +34,8 @@ class AkkaParentProject(info: ProjectInfo) extends DefaultProject(info) { lazy val deployPath = info.projectPath / "deploy" lazy val distPath = info.projectPath / "dist" + lazy override val `package` = task { None } + //The distribution task, packages Akka into a zipfile and places it into the projectPath/dist directory lazy val dist = task { @@ -230,32 +232,15 @@ class AkkaParentProject(info: ProjectInfo) extends DefaultProject(info) { (IMPLEMENTATION_VENDOR, "Scalable Solutions AB") )).toList - // create a manifest with all akka jars and dependency jars on classpath - override def manifestClassPath = Some(allArtifacts.getFiles - .filter(_.getName.endsWith(".jar")) - .filter(!_.getName.contains("servlet_2.4")) - .filter(!_.getName.contains("scala-library")) - .map("lib_managed/compile/" + _.getName) - .mkString(" ") + - " config/" + - " scala-library.jar" + - " dist/akka-actor-%s.jar".format(version) + - " dist/akka-stm-%s.jar".format(version) + - " dist/akka-typed-actor-%s.jar".format(version) + - " dist/akka-remote-%s.jar".format(version) + - " dist/akka-http-%s.jar".format(version) - ) - //Exclude slf4j1.5.11 from the classpath, it's conflicting... override def fullClasspath(config: Configuration): PathFinder = { super.fullClasspath(config) --- (super.fullClasspath(config) ** "slf4j*1.5.11.jar") } - override def mainResources = super.mainResources +++ - (info.projectPath / "config").descendentsExcept("*", "logback-test.xml") +// override def mainResources = super.mainResources +++ (info.projectPath / "config").descendentsExcept("*", "logback-test.xml") - override def runClasspath = super.runClasspath +++ "config" +// override def runClasspath = super.runClasspath +++ "config" // ------------------------------------------------------------ // publishing diff --git a/scripts/run_akka.sh b/scripts/run_akka.sh index 33036adfe1..eec8953ce9 100755 --- a/scripts/run_akka.sh +++ b/scripts/run_akka.sh @@ -1,6 +1,6 @@ #!/bin/bash cd $AKKA_HOME -VERSION=akka_2.8.0-1.0-SNAPSHOT +VERSION=1.0-RC1 TARGET_DIR=dist/$VERSION/$1 shift 1 VMARGS=$@