Skip to content

Commit

Permalink
Moved buildsettings for scalikejdbc-play-plugin/test/zentasks to buil…
Browse files Browse the repository at this point in the history
…d/Build.scala.

scalikejdbc-play-plugin/test/zentasks was intended to be a sample application of scalikejdbc-play-plugin
but it is convenience for scalikejdbc-play-plugin's test to use this project.
This fix makes scalikejdbc-play-plugin depend on and aggregate other sub projects.
I don't need to do 'publish-local' every time I change the code in play-plugin for manual test.

Two points in my mind (may be trivial).
 - Works only with > Scala 2.10 because it depends on scalikejdbc-interpolation.
 - Play 2.1 depends on Scala 2.10.0 but some parts of interpolation is based on macro's features that seem to be incompatible between 2.10.0 and 2.10.1.
  • Loading branch information
tototoshi authored and seratch committed Mar 31, 2013
1 parent 55907ec commit 7dc66e2
Show file tree
Hide file tree
Showing 4 changed files with 34 additions and 34 deletions.
27 changes: 27 additions & 0 deletions project/Build.scala
@@ -1,6 +1,8 @@
import sbt._
import Keys._

import play.Project._

object ScalikeJDBCProjects extends Build {

lazy val _organization = "com.github.seratch"
Expand Down Expand Up @@ -213,6 +215,31 @@ object ScalikeJDBCProjects extends Build {
)
) dependsOn(scalikejdbc)

lazy val scalikejdbcPlayPluginTestZentasks = {
val appName = "play-plugin-test-zentask"
val appVersion = "1.0"

val appDependencies = Seq(
"com.h2database" % "h2" % "[1.3,)",
"postgresql" % "postgresql" % "9.1-901.jdbc4"
)

play.Project(appName, appVersion, appDependencies,
path = file("scalikejdbc-play-plugin/test/zentasks")).settings(
scalaVersion in ThisBuild := "2.10.0",
resolvers ++= Seq(
"Sonatype OSS Releases" at "http://oss.sonatype.org/content/repositories/releases",
"Sonatype OSS Snapshots" at "http://oss.sonatype.org/content/repositories/snapshots"
)
).dependsOn(
scalikejdbcPlayPlugin,
scalikejdbcInterpolation
).aggregate(
scalikejdbcPlayPlugin,
scalikejdbcInterpolation
)
}

lazy val scalikejdbcTest = Project(
id = "test",
base = file("scalikejdbc-test"),
Expand Down
7 changes: 7 additions & 0 deletions project/plugins.sbt
Expand Up @@ -20,3 +20,10 @@ libraryDependencies <+= (sbtVersion){ sv =>
}
}

logLevel := Level.Warn

resolvers += "Typesafe repository" at "http://repo.typesafe.com/typesafe/releases/"

addSbtPlugin("play" % "sbt-plugin" % "2.1.0")


28 changes: 0 additions & 28 deletions scalikejdbc-play-plugin/test/zentasks/project/Build.scala

This file was deleted.

6 changes: 0 additions & 6 deletions scalikejdbc-play-plugin/test/zentasks/project/plugins.sbt

This file was deleted.

0 comments on commit 7dc66e2

Please sign in to comment.