diff --git a/akka-sbt-plugin/project/build.properties b/akka-sbt-plugin/project/build.properties index 27b9049bf2..24af37f708 100644 --- a/akka-sbt-plugin/project/build.properties +++ b/akka-sbt-plugin/project/build.properties @@ -1,6 +1,6 @@ -project.name=Akka Plugin +project.name=Akka SBT Plugin project.organization=se.scalablesolutions.akka # mirrors akka version -project.version=0.9.1 +project.version=0.10 sbt.version=0.7.4 build.scala.versions=2.7.7 diff --git a/akka-sbt-plugin/project/build/AkkaPluginProject.scala b/akka-sbt-plugin/project/build/AkkaPluginProject.scala index 4c63e9d14f..976915aaf3 100644 --- a/akka-sbt-plugin/project/build/AkkaPluginProject.scala +++ b/akka-sbt-plugin/project/build/AkkaPluginProject.scala @@ -1,3 +1,7 @@ import sbt._ -class AkkaPluginProject(info: ProjectInfo) extends PluginProject(info) +class AkkaPluginProject(info: ProjectInfo) extends PluginProject(info) { + override def managedStyle = ManagedStyle.Maven + val publishTo = "Scala Tools Nexus" at "http://nexus.scala-tools.org/content/repositories/releases/" + Credentials(Path.userHome / ".ivy2" / ".scala-tools-credentials", log) +} diff --git a/akka-sbt-plugin/src/main/scala/AkkaProject.scala b/akka-sbt-plugin/src/main/scala/AkkaProject.scala index 5ec83204a2..bc0fe51f97 100644 --- a/akka-sbt-plugin/src/main/scala/AkkaProject.scala +++ b/akka-sbt-plugin/src/main/scala/AkkaProject.scala @@ -1,11 +1,12 @@ import sbt._ object AkkaRepositories { - val AkkaRepo = MavenRepository("Akka Repository", "http://scalablesolutions.se/akka/repository") - val GuiceyFruitRepo = MavenRepository("GuiceyFruit Repo", "http://guiceyfruit.googlecode.com/svn/repo/releases/") - val JBossRepo = MavenRepository("JBoss Repo", "https://repository.jboss.org/nexus/content/groups/public/") - val SunJDMKRepo = MavenRepository("Sun JDMK Repo", "http://wp5.e-taxonomy.eu/cdmlib/mavenrepo") - val JavaNetRepo = MavenRepository("java.net Repo", "http://download.java.net/maven/2") + val AkkaRepo = MavenRepository("Akka Repository", "http://scalablesolutions.se/akka/repository") + val GuiceyFruitRepo = MavenRepository("GuiceyFruit Repo", "http://guiceyfruit.googlecode.com/svn/repo/releases/") + val JBossRepo = MavenRepository("JBoss Repo", "https://repository.jboss.org/nexus/content/groups/public/") + val SunJDMKRepo = MavenRepository("Sun JDMK Repo", "http://wp5.e-taxonomy.eu/cdmlib/mavenrepo") + val JavaNetRepo = MavenRepository("java.net Repo", "http://download.java.net/maven/2") + val CodehausSnapshotRepo = MavenRepository("Codehaus Snapshots", "http://snapshots.repository.codehaus.org") } trait AkkaBaseProject extends BasicScalaProject { @@ -14,7 +15,8 @@ trait AkkaBaseProject extends BasicScalaProject { // Every dependency that cannot be resolved from the built-in repositories (Maven Central and Scala Tools Releases) // is resolved from a ModuleConfiguration. This will result in a significant acceleration of the update action. - val akkaModuleConfig = ModuleConfiguration("se.scalablesolutions.akka", AkkaRepo) + // for development version resolve to .ivy2/local + // val akkaModuleConfig = ModuleConfiguration("se.scalablesolutions.akka", AkkaRepo) val netLagModuleConfig = ModuleConfiguration("net.lag", AkkaRepo) val sbinaryModuleConfig = ModuleConfiguration("sbinary", AkkaRepo) val redisModuleConfig = ModuleConfiguration("com.redis", AkkaRepo) @@ -34,11 +36,12 @@ trait AkkaBaseProject extends BasicScalaProject { val jerseyModuleConfig = ModuleConfiguration("com.sun.jersey", JavaNetRepo) val jerseyContrModuleConfig = ModuleConfiguration("com.sun.jersey.contribs", JavaNetRepo) val grizzlyModuleConfig = ModuleConfiguration("com.sun.grizzly", JavaNetRepo) + val multiverseModuleConfig = ModuleConfiguration("org.multiverse", CodehausSnapshotRepo) // only while snapshot version val liftModuleConfig = ModuleConfiguration("net.liftweb", ScalaToolsSnapshots) } trait AkkaProject extends AkkaBaseProject { - val akkaVersion = "0.9.1" + val akkaVersion = "0.10" // convenience method def akkaModule(module: String) = "se.scalablesolutions.akka" %% ("akka-" + module) % akkaVersion