Skip to content

Commit

Permalink
Merge pull request #3 from j5ik2o/feature/migrate-to-sbt-1.2
Browse files Browse the repository at this point in the history
Migrate to sbt 1.2
  • Loading branch information
j5ik2o committed Sep 13, 2018
2 parents 8cba1d0 + 5c153df commit e174910
Show file tree
Hide file tree
Showing 4 changed files with 45 additions and 28 deletions.
9 changes: 9 additions & 0 deletions .scalafmt.conf
@@ -0,0 +1,9 @@
style = defaultWithAlign
danglingParentheses = true
indentOperator = spray
includeCurlyBraceInSelectChains = true
maxColumn = 120
rewrite.rules = [RedundantParens, SortImports, PreferCurlyFors]
spaces.inImportCurlyBraces = true
binPack.literalArgumentLists = false
unindentTopLevelOperators = true
4 changes: 2 additions & 2 deletions build.sbt
Expand Up @@ -43,8 +43,6 @@ libraryDependencies ++= Seq(

routesGenerator := InjectedRoutesGenerator

scalariformSettings

flywayUrl := "jdbc:mysql://localhost/spetstore?autoReconnect=true&useSSL=false"

flywayUser := "spetstore"
Expand All @@ -53,4 +51,6 @@ flywayPassword := "phou8Igh"

flywayLocations := Seq("filesystem:conf/db/migration/default")

scalafmtOnCompile in Compile := true

scalafmtTestOnCompile in Compile := true
2 changes: 1 addition & 1 deletion project/build.properties
@@ -1 +1 @@
sbt.version=0.13.13
sbt.version=1.2.1
58 changes: 33 additions & 25 deletions project/plugins.sbt
@@ -1,28 +1,36 @@
// Comment to get more information during initialization
logLevel := Level.Warn

resolvers += Resolver.typesafeRepo("releases")
resolvers += "Flyway" at "https://flywaydb.org/repo"
resolvers ++= Seq(
"Typesafe repository" at "https://repo.typesafe.com/typesafe/releases/",
"Sonatype OSS Snapshot Repository" at "https://oss.sonatype.org/content/repositories/snapshots/",
"Sonatype OSS Release Repository" at "https://oss.sonatype.org/content/repositories/releases/",
"Seasar Repository" at "http://maven.seasar.org/maven2/",
"Flyway" at "https://davidmweber.github.io/flyway-sbt.repo"
)

libraryDependencies ++= Seq(
"com.h2database" % "h2" % "1.4.195",
"commons-io" % "commons-io" % "2.5",
"org.seasar.util" % "s2util" % "0.0.1"
)

// The Play plugin
addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.5.10")

// web plugins
addSbtPlugin("com.typesafe.sbt" % "sbt-coffeescript" % "1.0.0")

addSbtPlugin("com.typesafe.sbt" % "sbt-less" % "1.1.0")

addSbtPlugin("com.typesafe.sbt" % "sbt-jshint" % "1.0.4")

addSbtPlugin("com.typesafe.sbt" % "sbt-rjs" % "1.0.8")

addSbtPlugin("com.typesafe.sbt" % "sbt-digest" % "1.1.1")

addSbtPlugin("com.typesafe.sbt" % "sbt-mocha" % "1.1.0")

addSbtPlugin("org.irundaia.sbt" % "sbt-sassify" % "1.4.6")

addSbtPlugin("org.scalariform" % "sbt-scalariform" % "1.6.0")

addSbtPlugin("org.flywaydb" % "flyway-sbt" % "4.0.3")
addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.6.18")

//// web plugins
//addSbtPlugin("com.typesafe.sbt" % "sbt-coffeescript" % "1.0.0")
//
//addSbtPlugin("com.typesafe.sbt" % "sbt-less" % "1.1.0")
//
//addSbtPlugin("com.typesafe.sbt" % "sbt-jshint" % "1.0.4")
//
//addSbtPlugin("com.typesafe.sbt" % "sbt-rjs" % "1.0.8")
//
//addSbtPlugin("com.typesafe.sbt" % "sbt-digest" % "1.1.1")
//
//addSbtPlugin("com.typesafe.sbt" % "sbt-mocha" % "1.1.0")
//
//addSbtPlugin("org.irundaia.sbt" % "sbt-sassify" % "1.4.6")
//
addSbtPlugin("com.lucidchart" % "sbt-scalafmt" % "1.15")

addSbtPlugin("org.flywaydb" % "flyway-sbt" % "4.2.0")

0 comments on commit e174910

Please sign in to comment.