Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
bump to Scala 2.11
  • Loading branch information
jamesward committed Apr 17, 2014
1 parent c66e2e0 commit b2a238c
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions activator.properties
@@ -1,4 +1,4 @@
name=hello-scala
title=Hello Scala!
description=Scala is a general purpose programming language designed to express common programming patterns in a concise, elegant, and type-safe way. This very simple Scala application will get you started building and testing standalone Scala apps. This app uses Scala 2.10 and ScalaTest.
name=hello-scala-2_11
title=Hello Scala 2.11!
description=Scala is a general purpose programming language designed to express common programming patterns in a concise, elegant, and type-safe way. This very simple Scala application will get you started building and testing standalone Scala apps. This app uses Scala 2.11 and ScalaTest.
tags=Basics,scala,starter
4 changes: 2 additions & 2 deletions build.sbt
Expand Up @@ -2,6 +2,6 @@ name := "hello-scala"

version := "1.0"

scalaVersion := "2.10.2"
scalaVersion := "2.11.0"

libraryDependencies += "org.scalatest" %% "scalatest" % "1.9.1" % "test"
libraryDependencies += "org.scalatest" % "scalatest_2.11.0-RC4" % "2.1.3" % "test"
2 changes: 1 addition & 1 deletion project/build.properties
@@ -1 +1 @@
sbt.version=0.13.0
sbt.version=0.13.2

2 comments on commit b2a238c

@retronym
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Here's a PR against my slide deck to merge when this is live.

retronym/welcome-to-scala-211#1

@retronym
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I expect scalatest will be published later today.

Please sign in to comment.