diff --git a/.travis.yml b/.travis.yml
index ce50f73..b321a14 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,6 +6,6 @@ jdk:
- oraclejdk8
scala:
- - 2.10.5
- - 2.11.6
+ - 2.10.6
+ - 2.11.11
diff --git a/build.sbt b/build.sbt
new file mode 100644
index 0000000..17b441c
--- /dev/null
+++ b/build.sbt
@@ -0,0 +1,158 @@
+val appName = "play2-auth"
+
+val playVersion = play.core.PlayVersion.current
+
+lazy val baseSettings = Seq(
+ version := "0.14.2",
+ scalaVersion := "2.11.11",
+ crossScalaVersions := Seq("2.10.6", "2.11.11"),
+ organization := "jp.t2v",
+ resolvers ++=
+ Resolver.typesafeRepo("releases") ::
+ Resolver.sonatypeRepo("releases") ::
+ Nil,
+ scalacOptions ++= Seq("-language:_", "-deprecation")
+)
+
+lazy val appPublishMavenStyle = true
+lazy val appPublishArtifactInTest = false
+lazy val appPomIncludeRepository = { _: MavenRepository => false }
+lazy val appPublishTo = { (v: String) =>
+ val nexus = "https://oss.sonatype.org/"
+ if (v.trim.endsWith("SNAPSHOT"))
+ Some("snapshots" at nexus + "content/repositories/snapshots")
+ else
+ Some("releases" at nexus + "service/local/staging/deploy/maven2")
+}
+lazy val appPomExtra = {
+ https://github.com/t2v/play2-auth
+
+
+ Apache License, Version 2.0
+ http://www.apache.org/licenses/LICENSE-2.0.html
+ repo
+
+
+
+ git@github.com:t2v/play2-auth.git
+ scm:git:git@github.com:t2v/play2-auth.git
+
+
+
+ gakuzzzz
+ gakuzzzz
+ https://github.com/gakuzzzz
+
+
+}
+
+
+lazy val core = project.in(file("module"))
+ .settings(
+ baseSettings,
+ libraryDependencies += "com.typesafe.play" %% "play" % playVersion % "provided",
+ libraryDependencies += "com.typesafe.play" %% "play-cache" % playVersion % "provided",
+ libraryDependencies += "jp.t2v" %% "stackable-controller" % "0.5.1",
+ name := appName,
+ publishMavenStyle := appPublishMavenStyle,
+ publishArtifact in Test := appPublishArtifactInTest,
+ pomIncludeRepository := appPomIncludeRepository,
+ publishTo := version(appPublishTo).value,
+ pomExtra := appPomExtra
+ )
+
+lazy val test = project.in(file("test"))
+ .settings(
+ baseSettings,
+ libraryDependencies += "com.typesafe.play" %% "play-test" % playVersion,
+ name := appName + "-test",
+ publishMavenStyle := appPublishMavenStyle,
+ publishArtifact in Test := appPublishArtifactInTest,
+ pomIncludeRepository := appPomIncludeRepository,
+ publishTo := version(appPublishTo).value,
+ pomExtra := appPomExtra
+ ).dependsOn(core)
+
+lazy val sample = project.in(file("sample"))
+ .enablePlugins(play.sbt.PlayScala)
+ .settings(
+ baseSettings,
+ resolvers += "scalaz-bintray" at "https://dl.bintray.com/scalaz/releases",
+ libraryDependencies += play.sbt.Play.autoImport.cache,
+ libraryDependencies += play.sbt.Play.autoImport.specs2 % Test,
+ libraryDependencies += play.sbt.Play.autoImport.jdbc,
+ libraryDependencies += "org.mindrot" % "jbcrypt" % "0.3m",
+ libraryDependencies += "org.scalikejdbc" %% "scalikejdbc" % "2.2.7",
+ libraryDependencies += "org.scalikejdbc" %% "scalikejdbc-config" % "2.2.7",
+ libraryDependencies += "org.scalikejdbc" %% "scalikejdbc-syntax-support-macro" % "2.2.7",
+ libraryDependencies += "org.scalikejdbc" %% "scalikejdbc-test" % "2.2.7" % "test",
+ libraryDependencies += "org.scalikejdbc" %% "scalikejdbc-play-initializer" % "2.4.0",
+ libraryDependencies += "org.scalikejdbc" %% "scalikejdbc-play-dbapi-adapter" % "2.4.0",
+ libraryDependencies += "org.scalikejdbc" %% "scalikejdbc-play-fixture" % "2.4.0",
+ libraryDependencies += "org.flywaydb" %% "flyway-play" % "2.0.1",
+ TwirlKeys.templateImports in Compile ++= Seq(
+ "jp.t2v.lab.play2.auth.sample._",
+ "play.api.data.Form",
+ "play.api.mvc.Flash",
+ "views._",
+ "views.html.helper",
+ "controllers._"
+ ),
+ publish := { },
+ publishArtifact := false,
+ packagedArtifacts := Map.empty,
+ publishTo := version(appPublishTo).value,
+ pomExtra := appPomExtra
+ )
+ .dependsOn(core, test % "test")
+
+lazy val social = Project (id = "social", base = file ("social"))
+ .settings(
+ baseSettings,
+ name := appName + "-social",
+ libraryDependencies += "com.typesafe.play" %% "play" % playVersion % "provided",
+ libraryDependencies += "com.typesafe.play" %% "play-ws" % playVersion % "provided",
+ libraryDependencies += "com.typesafe.play" %% "play-cache" % playVersion % "provided",
+ publishMavenStyle := appPublishMavenStyle,
+ publishArtifact in Test := appPublishArtifactInTest,
+ pomIncludeRepository := appPomIncludeRepository,
+ publishTo := version(appPublishTo).value,
+ pomExtra := appPomExtra
+ ).dependsOn(core)
+
+lazy val socialSample = project.in(file("social-sample"))
+ .enablePlugins(play.sbt.PlayScala)
+ .settings(
+ baseSettings,
+ name := appName + "-social-sample",
+ resourceDirectories in Test += baseDirectory.value / "conf",
+ resolvers += "Sonatype OSS Snapshots" at "https://oss.sonatype.org/content/repositories/snapshots",
+ libraryDependencies ++= Seq(
+ "com.typesafe.play" %% "play-ws" % playVersion,
+ "com.typesafe.play" %% "play-cache" % playVersion,
+ "org.flywaydb" %% "flyway-play" % "2.0.1",
+ "org.scalikejdbc" %% "scalikejdbc" % "2.2.7",
+ "org.scalikejdbc" %% "scalikejdbc-config" % "2.2.7",
+ "org.scalikejdbc" %% "scalikejdbc-syntax-support-macro" % "2.2.7",
+ "org.scalikejdbc" %% "scalikejdbc-test" % "2.2.7" % "test",
+ "org.scalikejdbc" %% "scalikejdbc-play-initializer" % "2.4.0",
+ "org.scalikejdbc" %% "scalikejdbc-play-dbapi-adapter" % "2.4.0",
+ "org.scalikejdbc" %% "scalikejdbc-play-fixture" % "2.4.0"
+ ),
+ publish := { },
+ publishArtifact := false,
+ packagedArtifacts := Map.empty,
+ publishTo := version(appPublishTo).value,
+ pomExtra := appPomExtra
+ )
+ .dependsOn(core, social)
+
+lazy val root = project.in(file("."))
+ .settings(baseSettings)
+ .settings(
+ publish := { },
+ publishArtifact := false,
+ packagedArtifacts := Map.empty,
+ publishTo := version(appPublishTo).value,
+ pomExtra := appPomExtra
+ ).aggregate(core, test, sample, social, socialSample)
\ No newline at end of file
diff --git a/project/Build.scala b/project/Build.scala
deleted file mode 100644
index 30109d6..0000000
--- a/project/Build.scala
+++ /dev/null
@@ -1,166 +0,0 @@
-import sbt._
-import Keys._
-import play.twirl.sbt.Import.TwirlKeys
-
-object ApplicationBuild extends Build {
-
- val appName = "play2-auth"
-
- val playVersion = play.core.PlayVersion.current
-
- lazy val baseSettings = Seq(
- version := "0.14.2",
- scalaVersion := "2.11.8",
- crossScalaVersions := Seq("2.10.5", "2.11.8"),
- organization := "jp.t2v",
- resolvers ++=
- Resolver.typesafeRepo("releases") ::
- Resolver.sonatypeRepo("releases") ::
- Nil,
- scalacOptions ++= Seq("-language:_", "-deprecation")
- )
-
- lazy val appPublishMavenStyle = true
- lazy val appPublishArtifactInTest = false
- lazy val appPomIncludeRepository = { _: MavenRepository => false }
- lazy val appPublishTo = { (v: String) =>
- val nexus = "https://oss.sonatype.org/"
- if (v.trim.endsWith("SNAPSHOT"))
- Some("snapshots" at nexus + "content/repositories/snapshots")
- else
- Some("releases" at nexus + "service/local/staging/deploy/maven2")
- }
- lazy val appPomExtra = {
- https://github.com/t2v/play2-auth
-
-
- Apache License, Version 2.0
- http://www.apache.org/licenses/LICENSE-2.0.html
- repo
-
-
-
- git@github.com:t2v/play2-auth.git
- scm:git:git@github.com:t2v/play2-auth.git
-
-
-
- gakuzzzz
- gakuzzzz
- https://github.com/gakuzzzz
-
-
- }
-
-
- lazy val core = Project("core", base = file("module"))
- .settings(
- baseSettings,
- libraryDependencies += "com.typesafe.play" %% "play" % playVersion % "provided",
- libraryDependencies += "com.typesafe.play" %% "play-cache" % playVersion % "provided",
- libraryDependencies += "jp.t2v" %% "stackable-controller" % "0.5.1",
- name := appName,
- publishMavenStyle := appPublishMavenStyle,
- publishArtifact in Test := appPublishArtifactInTest,
- pomIncludeRepository := appPomIncludeRepository,
- publishTo <<=(version)(appPublishTo),
- pomExtra := appPomExtra
- )
-
- lazy val test = Project("test", base = file("test"))
- .settings(
- baseSettings,
- libraryDependencies += "com.typesafe.play" %% "play-test" % playVersion,
- name := appName + "-test",
- publishMavenStyle := appPublishMavenStyle,
- publishArtifact in Test := appPublishArtifactInTest,
- pomIncludeRepository := appPomIncludeRepository,
- publishTo <<=(version)(appPublishTo),
- pomExtra := appPomExtra
- ).dependsOn(core)
-
- lazy val sample = Project("sample", file("sample"))
- .enablePlugins(play.sbt.PlayScala)
- .settings(
- baseSettings,
- resolvers += "scalaz-bintray" at "https://dl.bintray.com/scalaz/releases",
- libraryDependencies += play.sbt.Play.autoImport.cache,
- libraryDependencies += play.sbt.Play.autoImport.specs2 % Test,
- libraryDependencies += play.sbt.Play.autoImport.jdbc,
- libraryDependencies += "org.mindrot" % "jbcrypt" % "0.3m",
- libraryDependencies += "org.scalikejdbc" %% "scalikejdbc" % "2.2.7",
- libraryDependencies += "org.scalikejdbc" %% "scalikejdbc-config" % "2.2.7",
- libraryDependencies += "org.scalikejdbc" %% "scalikejdbc-syntax-support-macro" % "2.2.7",
- libraryDependencies += "org.scalikejdbc" %% "scalikejdbc-test" % "2.2.7" % "test",
- libraryDependencies += "org.scalikejdbc" %% "scalikejdbc-play-initializer" % "2.4.0",
- libraryDependencies += "org.scalikejdbc" %% "scalikejdbc-play-dbapi-adapter" % "2.4.0",
- libraryDependencies += "org.scalikejdbc" %% "scalikejdbc-play-fixture" % "2.4.0",
- libraryDependencies += "org.flywaydb" %% "flyway-play" % "2.0.1",
- TwirlKeys.templateImports in Compile ++= Seq(
- "jp.t2v.lab.play2.auth.sample._",
- "play.api.data.Form",
- "play.api.mvc.Flash",
- "views._",
- "views.html.helper",
- "controllers._"
- ),
- publish := { },
- publishArtifact := false,
- packagedArtifacts := Map.empty,
- publishTo <<=(version)(appPublishTo),
- pomExtra := appPomExtra
- )
- .dependsOn(core, test % "test")
-
- lazy val social = Project (id = "social", base = file ("social"))
- .settings(
- baseSettings,
- name := appName + "-social",
- libraryDependencies += "com.typesafe.play" %% "play" % playVersion % "provided",
- libraryDependencies += "com.typesafe.play" %% "play-ws" % playVersion % "provided",
- libraryDependencies += "com.typesafe.play" %% "play-cache" % playVersion % "provided",
- publishMavenStyle := appPublishMavenStyle,
- publishArtifact in Test := appPublishArtifactInTest,
- pomIncludeRepository := appPomIncludeRepository,
- publishTo <<=(version)(appPublishTo),
- pomExtra := appPomExtra
- ).dependsOn(core)
-
- lazy val socialSample = Project("social-sample", file("social-sample"))
- .enablePlugins(play.sbt.PlayScala)
- .settings(
- baseSettings,
- name := appName + "-social-sample",
- resourceDirectories in Test += baseDirectory.value / "conf",
- resolvers += "Sonatype OSS Snapshots" at "https://oss.sonatype.org/content/repositories/snapshots",
- libraryDependencies ++= Seq(
- "com.typesafe.play" %% "play-ws" % playVersion,
- "com.typesafe.play" %% "play-cache" % playVersion,
- "org.flywaydb" %% "flyway-play" % "2.0.1",
- "org.scalikejdbc" %% "scalikejdbc" % "2.2.7",
- "org.scalikejdbc" %% "scalikejdbc-config" % "2.2.7",
- "org.scalikejdbc" %% "scalikejdbc-syntax-support-macro" % "2.2.7",
- "org.scalikejdbc" %% "scalikejdbc-test" % "2.2.7" % "test",
- "org.scalikejdbc" %% "scalikejdbc-play-initializer" % "2.4.0",
- "org.scalikejdbc" %% "scalikejdbc-play-dbapi-adapter" % "2.4.0",
- "org.scalikejdbc" %% "scalikejdbc-play-fixture" % "2.4.0"
- ),
- publish := { },
- publishArtifact := false,
- packagedArtifacts := Map.empty,
- publishTo <<=(version)(appPublishTo),
- pomExtra := appPomExtra
- )
- .dependsOn(core, social)
-
- lazy val root = Project("root", base = file("."))
- .settings(baseSettings)
- .settings(
- publish := { },
- publishArtifact := false,
- packagedArtifacts := Map.empty,
- publishTo <<=(version)(appPublishTo),
- pomExtra := appPomExtra
- ).aggregate(core, test, sample, social, socialSample)
-
-}