Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

re-enable test forking by default while upgrading to sbt 0.12.2-RC2 #654

Merged
merged 1 commit into from Jan 9, 2013
Merged

re-enable test forking by default while upgrading to sbt 0.12.2-RC2 #654

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion framework/project/Build.scala
View file
Open in desktop
Expand Up @@ -354,7 +354,7 @@ object PlayBuild extends Build {
val previousScalaVersion = "2.9.1"
val buildScalaVersion = "2.10.0"
val buildScalaVersionForSbt = "2.9.2"
val buildSbtVersion = "0.12.1"
val buildSbtVersion = "0.12.2-RC2"
val buildSbtVersionBinaryCompatible = "0.12"

val buildSettings = Defaults.defaultSettings ++ Seq (
Expand Down
2 changes: 1 addition & 1 deletion framework/project/build.properties
View file
Open in desktop
@@ -1 +1 @@
sbt.version=0.12.1
sbt.version=0.12.2-RC2
Binary file modified framework/sbt/sbt-launch.jar
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion framework/skeletons/java-skel/project/build.properties
View file
Open in desktop
@@ -1 +1 @@
sbt.version=0.12.1
sbt.version=0.12.2-RC2
2 changes: 1 addition & 1 deletion framework/skeletons/scala-skel/project/build.properties
View file
Open in desktop
@@ -1 +1 @@
sbt.version=0.12.1
sbt.version=0.12.2-RC2
2 changes: 1 addition & 1 deletion framework/src/sbt-plugin/src/main/scala/PlaySettings.scala
View file
Open in desktop
Expand Up @@ -107,7 +107,7 @@ trait PlaySettings {

parallelExecution in Test := false,

fork in Test := false,
fork in Test := true,

testOptions in Test += Tests.Argument(TestFrameworks.Specs2, "sequential", "true"),

Expand Down
2 changes: 1 addition & 1 deletion framework/test/csrftest-scala/project/build.properties
View file
Open in desktop
@@ -1 +1 @@
sbt.version=0.12.1
sbt.version=0.12.2-RC2
2 changes: 1 addition & 1 deletion framework/test/integrationtest-java/project/build.properties
View file
Open in desktop
@@ -1 +1 @@
sbt.version=0.12.1
sbt.version=0.12.2-RC2
2 changes: 1 addition & 1 deletion framework/test/integrationtest-scala/project/build.properties
View file
Open in desktop
@@ -1 +1 @@
sbt.version=0.12.1
sbt.version=0.12.2-RC2
2 changes: 1 addition & 1 deletion framework/test/integrationtest/project/build.properties
View file
Open in desktop
@@ -1 +1 @@
sbt.version=0.12.1
sbt.version=0.12.2-RC2
2 changes: 1 addition & 1 deletion samples/java/comet-clock/project/build.properties
View file
Open in desktop
@@ -1 +1 @@
sbt.version=0.12.1
sbt.version=0.12.2-RC2
2 changes: 1 addition & 1 deletion samples/java/computer-database-jpa/project/build.properties
View file
Open in desktop
@@ -1 +1 @@
sbt.version=0.12.1
sbt.version=0.12.2-RC2
2 changes: 1 addition & 1 deletion samples/java/computer-database/project/build.properties
View file
Open in desktop
@@ -1 +1 @@
sbt.version=0.12.1
sbt.version=0.12.2-RC2
2 changes: 1 addition & 1 deletion samples/java/forms/project/build.properties
View file
Open in desktop
@@ -1 +1 @@
sbt.version=0.12.1
sbt.version=0.12.2-RC2
2 changes: 1 addition & 1 deletion samples/java/helloworld/project/build.properties
View file
Open in desktop
@@ -1 +1 @@
sbt.version=0.12.1
sbt.version=0.12.2-RC2
2 changes: 1 addition & 1 deletion samples/java/websocket-chat/project/build.properties
View file
Open in desktop
@@ -1 +1 @@
sbt.version=0.12.1
sbt.version=0.12.2-RC2
2 changes: 1 addition & 1 deletion samples/java/zentasks/project/build.properties
View file
Open in desktop
@@ -1 +1 @@
sbt.version=0.12.1
sbt.version=0.12.2-RC2
2 changes: 1 addition & 1 deletion samples/scala/comet-clock/project/build.properties
View file
Open in desktop
@@ -1 +1 @@
sbt.version=0.12.1
sbt.version=0.12.2-RC2
2 changes: 1 addition & 1 deletion samples/scala/comet-live-monitoring/project/build.properties
View file
Open in desktop
@@ -1 +1 @@
sbt.version=0.12.1
sbt.version=0.12.2-RC2
2 changes: 1 addition & 1 deletion samples/scala/computer-database/project/build.properties
View file
Open in desktop
@@ -1 +1 @@
sbt.version=0.12.1
sbt.version=0.12.2-RC2
2 changes: 1 addition & 1 deletion samples/scala/forms/project/build.properties
View file
Open in desktop
@@ -1 +1 @@
sbt.version=0.12.1
sbt.version=0.12.2-RC2
2 changes: 1 addition & 1 deletion samples/scala/helloworld/project/build.properties
View file
Open in desktop
@@ -1 +1 @@
sbt.version=0.12.1
sbt.version=0.12.2-RC2
2 changes: 1 addition & 1 deletion samples/scala/websocket-chat/project/build.properties
View file
Open in desktop
@@ -1 +1 @@
sbt.version=0.12.1
sbt.version=0.12.2-RC2
2 changes: 1 addition & 1 deletion samples/scala/zentasks/project/build.properties
View file
Open in desktop
@@ -1 +1 @@
sbt.version=0.12.1
sbt.version=0.12.2-RC2
2 changes: 1 addition & 1 deletion samples/workinprogress/akka-chat/project/build.properties
View file
Open in desktop
@@ -1 +1 @@
sbt.version=0.12.1
sbt.version=0.12.2-RC2
2 changes: 1 addition & 1 deletion samples/workinprogress/pi-calculator/project/build.properties
View file
Open in desktop
@@ -1 +1 @@
sbt.version=0.12.1
sbt.version=0.12.2-RC2
2 changes: 1 addition & 1 deletion samples/workinprogress/twitterstream/project/build.properties
View file
Open in desktop
@@ -1 +1 @@
sbt.version=0.12.1
sbt.version=0.12.2-RC2