Skip to content

Instantly share code, notes, and snippets.

@derekjw
Created February 20, 2011 18:33
Show Gist options
  • Save derekjw/836181 to your computer and use it in GitHub Desktop.
Save derekjw/836181 to your computer and use it in GitHub Desktop.
Patch for building akka 1.1 with scala 2.9.0
diff --git a/project/build.properties b/project/build.properties
index c5b83d7..be1c7fa 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -5,4 +5,4 @@ project.name=akka
sbt.version=0.7.5.RC0
project.version=1.1-SNAPSHOT
def.scala.version=2.7.7
-build.scala.versions=2.8.1
+build.scala.versions=2.9.0-SNAPSHOT
diff --git a/project/build/AkkaProject.scala b/project/build/AkkaProject.scala
index edbd131..cff686a 100644
--- a/project/build/AkkaProject.scala
+++ b/project/build/AkkaProject.scala
@@ -101,11 +101,13 @@ class AkkaParentProject(info: ProjectInfo) extends DefaultProject(info) {
lazy val jerseyModuleConfig = ModuleConfiguration("com.sun.jersey", JavaNetRepo)
lazy val multiverseModuleConfig = ModuleConfiguration("org.multiverse", CodehausRepo)
lazy val nettyModuleConfig = ModuleConfiguration("org.jboss.netty", JBossRepo)
- lazy val scalaTestModuleConfig = ModuleConfiguration("org.scalatest", ScalaToolsRelRepo)
+ lazy val scalaTestModuleConfig = ModuleConfiguration("org.scalatest", ScalaToolsSnapshots)
lazy val logbackModuleConfig = ModuleConfiguration("ch.qos.logback", sbt.DefaultMavenRepository)
lazy val spdeModuleConfig = ModuleConfiguration("us.technically.spde", DatabinderRepo)
lazy val processingModuleConfig = ModuleConfiguration("org.processing", DatabinderRepo)
+ lazy val scalaToolsSnapshotRepo = ScalaToolsSnapshots
+
// -------------------------------------------------------------------------------------------------------------------
// Versions
// -------------------------------------------------------------------------------------------------------------------
@@ -115,7 +117,7 @@ class AkkaParentProject(info: ProjectInfo) extends DefaultProject(info) {
lazy val JACKSON_VERSION = "1.4.3"
lazy val JERSEY_VERSION = "1.3"
lazy val MULTIVERSE_VERSION = "0.6.2"
- lazy val SCALATEST_VERSION = "1.3"
+ lazy val SCALATEST_VERSION = "1.4-SNAPSHOT"
lazy val LOGBACK_VERSION = "0.9.24"
lazy val SLF4J_VERSION = "1.6.0"
lazy val JETTY_VERSION = "7.1.6.v20100715"
@@ -216,7 +218,7 @@ class AkkaParentProject(info: ProjectInfo) extends DefaultProject(info) {
lazy val akka_typed_actor = project("akka-typed-actor", "akka-typed-actor", new AkkaTypedActorProject(_), akka_stm)
lazy val akka_remote = project("akka-remote", "akka-remote", new AkkaRemoteProject(_), akka_typed_actor)
lazy val akka_http = project("akka-http", "akka-http", new AkkaHttpProject(_), akka_remote)
- lazy val akka_samples = project("akka-samples", "akka-samples", new AkkaSamplesParentProject(_))
+ //lazy val akka_samples = project("akka-samples", "akka-samples", new AkkaSamplesParentProject(_))
lazy val akka_sbt_plugin = project("akka-sbt-plugin", "akka-sbt-plugin", new AkkaSbtPluginProject(_))
// -------------------------------------------------------------------------------------------------------------------
@@ -252,7 +254,7 @@ class AkkaParentProject(info: ProjectInfo) extends DefaultProject(info) {
override def artifacts = Set(Artifact(artifactID, "pom", "pom"))
override def deliverProjectDependencies =
- super.deliverProjectDependencies.toList - akka_samples.projectID - akka_sbt_plugin.projectID
+ super.deliverProjectDependencies.toList - akka_sbt_plugin.projectID
// val sourceArtifact = Artifact(artifactID, "src", "jar", Some("sources"), Nil, None)
// val docsArtifact = Artifact(artifactID, "doc", "jar", Some("docs"), Nil, None)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment