Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,12 @@ import sbtrelease.ReleasePlugin._

name := "scala-storm"

// If you comment this out, SBT 0.10 will default to Scala 2.8.1
scalaVersion := "2.9.1"
scalaVersion := "2.9.2"

organization := "com.github.velvia"

crossScalaVersions := Seq("2.9.2", "2.10.3")

// sbt defaults to <project>/src/test/{scala,java} unless we put this in
unmanagedSourceDirectories in Test <<= Seq( baseDirectory( _ / "test" ) ).join

Expand All @@ -16,7 +17,7 @@ unmanagedSourceDirectories in Compile <<= Seq( baseDirectory( _ / "src" ) ).join
resolvers ++= Seq("clojars" at "http://clojars.org/repo/",
"clojure-releases" at "http://build.clojure.org/releases")

libraryDependencies += "storm" % "storm" % "0.8.1" % "provided" exclude("junit", "junit")
libraryDependencies += "storm" % "storm" % "0.8.1" % "provided" exclude("junit", "junit")

// This is to prevent error [java.lang.OutOfMemoryError: PermGen space]
javaOptions += "-XX:MaxPermSize=1g"
Expand All @@ -25,6 +26,14 @@ javaOptions += "-Xmx2g"

scalacOptions += "-Yresolve-term-conflict:package"

scalacOptions ++= {
if (scalaVersion.value.startsWith("2.10")) {
Seq("-feature", "-language:implicitConversions")
} else {
Seq()
}
}

// When doing sbt run, fork a separate process. This is apparently needed by storm.
fork := true

Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=0.12.1
sbt.version=0.13.1
6 changes: 1 addition & 5 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@

resolvers += Resolver.url("sbt-plugin-releases",
new URL("http://scalasbt.artifactoryonline.com/scalasbt/sbt-plugin-releases/"))(Resolver.ivyStylePatterns)

addSbtPlugin("com.jsuereth" % "xsbt-gpg-plugin" % "0.6")
addSbtPlugin("com.typesafe.sbt" % "sbt-pgp" % "0.8")

addSbtPlugin("com.github.gseitz" % "sbt-release" % "0.8")