Skip to content

Bumped scala version #18

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

Merged
merged 1 commit into from
May 28, 2015
Merged

Bumped scala version #18

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions project/Build.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@ object StackableControllerProjects extends Build {
organization := _organization,
name := "stackable-controller",
version := _version,
scalaVersion := "2.10.4",
crossScalaVersions := scalaVersion.value :: "2.11.1" :: Nil,
scalaVersion := "2.11.6",
crossScalaVersions := scalaVersion.value :: "2.10.5" :: Nil,
publishTo <<= version { (v: String) => _publishTo(v) },
publishMavenStyle := true,
resolvers ++= _resolvers,
Expand All @@ -67,20 +67,21 @@ object StackableControllerProjects extends Build {

lazy val sample = Project("sample", file("sample")).enablePlugins(play.sbt.PlayScala).settings(
version := _version,
scalaVersion := "2.10.4",
scalaVersion := "2.11.6",
resolvers ++= _resolvers,
libraryDependencies ++= Seq(
play.sbt.Play.autoImport.jdbc,
play.sbt.Play.autoImport.specs2 % "test",
"com.typesafe.play" %% "play" % play.core.PlayVersion.current,
"org.scalikejdbc" %% "scalikejdbc" % "2.0.0",
"org.scalikejdbc" %% "scalikejdbc-config" % "2.0.0",
"org.scalikejdbc" %% "scalikejdbc-play-plugin" % "2.3.0", // TODO scalikejdbc-play-plugin for play2.4
"org.slf4j" % "slf4j-simple" % "[1.7,)"
)
) dependsOn(core)

lazy val root = Project(id = "root", base = file(".")).settings(
scalaVersion := "2.10.4"
scalaVersion := "2.11.6"
).aggregate(core, sample)

}
2 changes: 1 addition & 1 deletion project/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=0.13.5
sbt.version=0.13.8