Bump flyway version (#686)

3 files changed, 60 insertions, 3 deletions

diff --git a/build.sc b/build.sc
index 55168fa4..e78d8947 100755
--- a/build.sc
+++ b/build.sc
@@ -28,7 +28,7 @@ object Deps {
   val acyclic = ivy"com.lihaoyi::acyclic:0.1.7"
   val ammonite = ivy"com.lihaoyi:::ammonite:1.6.9"
   val bloopConfig = ivy"ch.epfl.scala::bloop-config:1.2.5"
-  val flywayCore = ivy"org.flywaydb:flyway-core:5.2.4"
+  val flywayCore = ivy"org.flywaydb:flyway-core:6.0.1"
   val graphvizJava = ivy"guru.nidi:graphviz-java:0.8.3"
   val ipcsocket = ivy"org.scala-sbt.ipcsocket:ipcsocket:1.0.0"
   val ipcsocketExcludingJna = ipcsocket.exclude(
diff --git a/contrib/flyway/src/ConsoleLog.scala b/contrib/flyway/src/ConsoleLog.scala
new file mode 100644
index 00000000..7a685539
--- /dev/null
+++ b/contrib/flyway/src/ConsoleLog.scala
@@ -0,0 +1,58 @@
+package mill.contrib.flyway
+
+import org.flywaydb.core.api.logging.Log
+import org.flywaydb.core.api.logging.LogCreator
+
+/**
+  * Adapted from https://github.com/flyway/flyway/blob/25f562283e45d717bf56e44fb9988b4adc98a0ef/flyway-commandline/src/main/java/org/flywaydb/commandline/ConsoleLog.java
+  */
+
+/**
+  * Wrapper around a simple Console output.
+  */
+object ConsoleLog {
+
+  object Level extends Enumeration {
+    type Level = Value
+    val DEBUG, INFO, WARN = Value
+  }
+}
+
+/**
+  * Creates a new Console Log.
+  *
+  * @param level the log level.
+  */
+class ConsoleLog(val level: ConsoleLog.Level.Level) extends Log {
+  override def isDebugEnabled: Boolean = level eq ConsoleLog.Level.DEBUG
+
+  override def debug(message: String): Unit = {
+    if (isDebugEnabled) System.out.println("DEBUG: " + message)
+  }
+
+  override def info(message: String): Unit = {
+    if (level.compareTo(ConsoleLog.Level.INFO) <= 0) System.out.println(message)
+  }
+
+  override def warn(message: String): Unit = {
+    System.out.println("WARNING: " + message)
+  }
+
+  override def error(message: String): Unit = {
+    System.err.println("ERROR: " + message)
+  }
+
+  override def error(message: String, e: Exception): Unit = {
+    System.err.println("ERROR: " + message)
+    e.printStackTrace(System.err)
+  }
+}
+
+
+
+/**
+  * Log Creator for the Command-Line console.
+  */
+class ConsoleLogCreator(val level: ConsoleLog.Level.Level) extends LogCreator {
+  override def createLogger(clazz: Class[_]): Log = new ConsoleLog(level)
+}
\ No newline at end of file
diff --git a/contrib/flyway/src/FlywayModule.scala b/contrib/flyway/src/FlywayModule.scala
index 6ee9ea0b..e10b463f 100644
--- a/contrib/flyway/src/FlywayModule.scala
+++ b/contrib/flyway/src/FlywayModule.scala
@@ -3,6 +3,7 @@ package contrib.flyway
 
 import java.net.URLClassLoader
 
+import mill.contrib.flyway.ConsoleLog.Level
 import mill.scalalib.Lib.resolveDependencies
 import mill.scalalib._
 import org.flywaydb.core.Flyway
@@ -10,8 +11,6 @@ import org.flywaydb.core.api.MigrationVersion
 import org.flywaydb.core.api.logging.LogFactory
 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 scala.collection.JavaConverters._