diff --git a/.travis.yml b/.travis.yml index 810c408..9e8f897 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,4 @@ language: scala -script: sbt test +script: sbt +test after_success: -- "sbt publish" +- "sbt +publish" diff --git a/build.sbt b/build.sbt index 97e34a3..cec293a 100644 --- a/build.sbt +++ b/build.sbt @@ -1,12 +1,16 @@ scalaVersion := "2.11.8" +crossScalaVersions := Seq("2.11.8", "2.12.1") + organization := "com.1on1development" name := "slick-migration-api-flyway" -version := "0.3" +version := "0.4" + +scalacOptions += "-deprecation" -libraryDependencies += "io.github.nafg" %% "slick-migration-api" % "0.3.0" +libraryDependencies += "io.github.nafg" %% "slick-migration-api" % "0.4.0" libraryDependencies += "org.flywaydb" % "flyway-core" % "4.1.2" diff --git a/src/main/scala/slick/migration/api/flyway/UnmanagedDatabase.scala b/src/main/scala/slick/migration/api/flyway/UnmanagedDatabase.scala index 2b26aca..187591f 100644 --- a/src/main/scala/slick/migration/api/flyway/UnmanagedDatabase.scala +++ b/src/main/scala/slick/migration/api/flyway/UnmanagedDatabase.scala @@ -8,9 +8,9 @@ import slick.util.AsyncExecutor class UnmanagedJdbcDataSource(conn: Connection) extends JdbcDataSource { - def createConnection() = conn - - def close() = () + override def createConnection() = conn + override def close() = () + override val maxConnections = None } class UnmanagedSession(database: DatabaseDef) extends BaseSession(database) { diff --git a/src/test/scala/slick/migration/api/flyway/FlywayAdapterSpecs.scala b/src/test/scala/slick/migration/api/flyway/FlywayAdapterSpecs.scala index b1b20c1..8d2d017 100644 --- a/src/test/scala/slick/migration/api/flyway/FlywayAdapterSpecs.scala +++ b/src/test/scala/slick/migration/api/flyway/FlywayAdapterSpecs.scala @@ -2,7 +2,7 @@ package slick.migration.api.flyway import scala.concurrent.ExecutionContext -import slick.driver.H2Driver.api._ +import slick.jdbc.H2Profile.api._ import slick.jdbc.meta.MTable import slick.migration.api.{H2Dialect, SqlMigration, TableMigration}