bumped version to 1.0-RC1

This commit is contained in:
Jonas Bonér 2010-11-26 17:49:25 +01:00
parent ea5cd05c8b
commit aa47e66c5a
7 changed files with 11 additions and 26 deletions

View file

@ -20,7 +20,7 @@ class ModuleNotAvailableException(message: String) extends AkkaException(message
* @author <a href="http://jonasboner.com">Jonas Bon&#233;r</a>
*/
object Config extends Logging {
val VERSION = "1.0-SNAPSHOT"
val VERSION = "1.0-RC1"
val HOME = {
val envHome = System.getenv("AKKA_HOME") match {

View file

@ -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

View file

@ -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

View file

@ -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"]

View file

@ -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

View file

@ -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

View file

@ -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=$@