Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

scala 2.8 cross building

  • Loading branch information...
commit 28b408e0b59946a57975b3f27743d0f5fe860ddb 1 parent 228096e
mmcbride authored
View
6 project/build.properties
@@ -1,8 +1,8 @@
#Project properties
project.organization=net.lag
project.name=naggati
-sbt.version=0.7.3
-project.version=0.7.3
+sbt.version=0.7.4
+project.version=0.7.4-SNAPSHOT
def.scala.version=2.7.7
-build.scala.versions=2.7.7
+build.scala.versions=2.8.0 2.7.7
project.initialize=false
View
18 project/build/NaggatiProject.scala
@@ -3,16 +3,25 @@ import com.twitter.sbt.StandardProject
class NaggatiProject(info: ProjectInfo) extends StandardProject(info) {
- val specs = "org.scala-tools.testing" % "specs" % "1.6.2.1"
- val xrayspecs = "com.twitter" % "xrayspecs" % "1.0.7"
+ val specs = buildScalaVersion match {
+ case "2.7.7" => "org.scala-tools.testing" % "specs" % "1.6.2.1"
+ case _ => "org.scala-tools.testing" %% "specs" % "1.6.5"
+ }
+ val xrayspecs = buildScalaVersion match {
+ case "2.7.7" => "com.twitter" % "xrayspecs" % "1.0.7"
+ case _ => "com.twitter" %% "xrayspecs" % "2.0"
+ }
val vscaladoc = "org.scala-tools" % "vscaladoc" % "1.1-md-3"
- val configgy = "net.lag" % "configgy" % "1.5.3"
+ val configgy = buildScalaVersion match {
+ case "2.7.7" => "net.lag" % "configgy" % "1.5.3"
+ case _ => "net.lag" % "configgy" % "2.0.0"
+ }
val mina = "org.apache.mina" % "mina-core" % "2.0.0-M6"
val slf4j_api = "org.slf4j" % "slf4j-api" % "1.5.2"
val slf4j_jdk14 = "org.slf4j" % "slf4j-jdk14" % "1.5.2"
- val twitter_actors = "com.twitter" % "twitteractors" % "1.0.0"
+ val twitter_actors = "com.twitter" %% "twitteractors" % "2.0.0-SNAPSHOT"
override def pomExtra =
<licenses>
@@ -24,6 +33,7 @@ class NaggatiProject(info: ProjectInfo) extends StandardProject(info) {
</licenses>
override def releaseBuild = true
+ override def disableCrossPaths = false
Credentials(Path.userHome / ".ivy2" / "credentials", log)
val publishTo = "nexus" at "http://nexus.scala-tools.org/content/repositories/releases/"
View
4 project/plugins/Plugins.scala
@@ -1,6 +1,6 @@
import sbt._
class Plugins(info: ProjectInfo) extends PluginDefinition(info) {
- val twitterNest = "com.twitter" at "http://www.lag.net/nest"
- val defaultProject = "com.twitter" % "standard-project" % "0.5.10"
+ val twitterNest = "com.twitter" at "http://maven.twttr.com/"
+ val defaultProject = "com.twitter" % "standard-project" % "0.7.9"
}
View
1  src/main/scala/net/lag/naggati/asn1/Tag.scala
@@ -19,6 +19,7 @@ package net.lag.naggati.asn1
import net.lag.extensions._
import net.lag.naggati.ProtocolError
import net.lag.naggati.Steps._
+import net.lag.naggati.End
object Tag {
View
1  src/test/scala/net/lag/naggati/asn1/TagSpec.scala
@@ -16,6 +16,7 @@
package net.lag.naggati.asn1
+import net.lag.naggati.{Decoder, ProtocolError}
import net.lag.naggati.Steps._
import org.apache.mina.core.buffer.IoBuffer
import org.apache.mina.core.filterchain.IoFilter
Please sign in to comment.
Something went wrong with that request. Please try again.