diff options
| author | Nathan Fischer <nfischer921@gmail.com> | 2019-04-10 16:05:34 -0700 |
|---|---|---|
| committer | Tobias Roeser <le.petit.fou@web.de> | 2019-04-17 08:06:46 +0200 |
| commit | cbb067690b31a69d6ba6c543057ed75f2dd55414 (patch) | |
| tree | 9d6df663e93055ec6c90081ac31b72f66bf41b3d | |
| parent | e9bf4bc1867750d73346aa558ebcf885b8a5cdc5 (diff) | |
| download | mill-cbb067690b31a69d6ba6c543057ed75f2dd55414.tar.gz mill-cbb067690b31a69d6ba6c543057ed75f2dd55414.tar.bz2 mill-cbb067690b31a69d6ba6c543057ed75f2dd55414.zip | |
tidy up
| -rwxr-xr-x | build.sc | 1 | ||||
| -rw-r--r-- | contrib/flyway/src/FlywayModule.scala | 8 | ||||
| -rw-r--r-- | docs/pages/9 - Contrib Modules.md | 4 |
3 files changed, 3 insertions, 10 deletions
@@ -304,7 +304,6 @@ object contrib extends MillModule { object flyway extends MillModule { def moduleDeps = Seq(scalalib) - def ivyDeps = Agg(ivy"org.flywaydb:flyway-core:5.2.4") } } diff --git a/contrib/flyway/src/FlywayModule.scala b/contrib/flyway/src/FlywayModule.scala index 0d4c3462..6ee9ea0b 100644 --- a/contrib/flyway/src/FlywayModule.scala +++ b/contrib/flyway/src/FlywayModule.scala @@ -12,7 +12,6 @@ import org.flywaydb.core.internal.configuration.{ConfigUtils => flyway} import org.flywaydb.core.internal.info.MigrationInfoDumper import org.flywaydb.core.internal.logging.console.ConsoleLog.Level import org.flywaydb.core.internal.logging.console.ConsoleLogCreator -import upickle.default.writer import scala.collection.JavaConverters._ @@ -22,8 +21,6 @@ trait FlywayModule extends JavaModule { def flywayUrl: T[String] def flywayUser: T[String] = T("") def flywayPassword: T[String] = T("") - //def flywayClassLocationDeps: T[Agg[Dep]] = Agg.empty[Dep] - //def flywayClassLocations: T[Seq[String]] = T(Nil) def flywayFileLocations: T[Seq[PathRef]] = T(resources().map(pr => PathRef(pr.path / "db" / "migration", pr.quick))) def flywayDriverDeps: T[Agg[Dep]] def jdbcClasspath = T ( resolveDependencies( @@ -34,10 +31,7 @@ trait FlywayModule extends JavaModule { private def strToOptPair[A](key: String, v: String) = Option(v) - .filter { - case a: String => a.nonEmpty - case _ => true - } + .filter(_.nonEmpty) .map(key -> _) def flywayInstance = T.worker { diff --git a/docs/pages/9 - Contrib Modules.md b/docs/pages/9 - Contrib Modules.md index b979c677..7fc6b655 100644 --- a/docs/pages/9 - Contrib Modules.md +++ b/docs/pages/9 - Contrib Modules.md @@ -71,8 +71,8 @@ mill foo.flywayMigrate ``` > REMINDER: -> You should never check credentials into any code or source control. -> You should write some code to populate the settings for flyway. +> You should never hard-code credentials or check them into a version control system. +> You should write some code to populate the settings for flyway instead. > For example `def flywayPassword = T.input(T.ctx().env("FLYWAY_PASSWORD"))` ### Play Framework |