Merge pull request #22 from dataswift/update-dependencies

update dependencies

Author: whiteshadow-gr

.gitignore

@@ -6,6 +6,7 @@ tmp
 .history
 dist
 /.idea
+/.bsp
 /*.iml
 /out
 /.idea_modules

build.sbt

@@ -1,11 +1,11 @@
 import Dependencies.Library
 
-val scala212 = "2.12.13"
-val scala213 = "2.13.4"
+//val scala212 = "2.12.13"
+val scala213 = "2.13.6"
 
 inThisBuild(
   List(
-    scalaVersion := scala212
+    scalaVersion := scala213
   )
 )
 
@@ -24,9 +24,8 @@ lazy val driver = project
   .enablePlugins(BasicSettings)
   .settings(
     name := "slick-postgres-driver",
-    commonSettings,
-    crossScalaVersions := Seq(scala212, scala213),
-    scalaVersion := scala212
+    commonSettings
+//    crossScalaVersions := Seq(scala212, scala213),
   )
   .settings(
     libraryDependencies ++= Seq(
@@ -46,40 +45,40 @@ lazy val driver = project
   .configs(IntegrationTest)
   .settings(
     Defaults.itSettings,
-    fork in IntegrationTest := true,
-    envVars in IntegrationTest := Map("TESTCONTAINERS_RYUK_DISABLED" -> "true")
+    IntegrationTest / fork := true,
+    IntegrationTest / envVars := Map("TESTCONTAINERS_RYUK_DISABLED" -> "true")
   )
 
-lazy val plugin = project
-  .in(file("sbt-slick-postgres-generator"))
-  .enablePlugins(BasicSettings)
-  .settings(
-    name := "sbt-slick-postgres-generator",
-    sbtPlugin := true,
-    commonSettings
-  )
-  .settings(
-    libraryDependencies ++= Seq(
-          Library.Db.liquibase,
-          Library.Slick.slickCodegen,
-          Library.Slick.slickHikari,
-          Library.Slick.slickPg,
-          Library.Slick.slickPgCore,
-          Library.Slick.slickPgJoda,
-          Library.Slick.slickPgPlayJson
-        )
-  )
-  .dependsOn(driver)
+//lazy val plugin = project
+//  .in(file("sbt-slick-postgres-generator"))
+//  .enablePlugins(BasicSettings)
+//  .settings(
+//    name := "sbt-slick-postgres-generator",
+//    sbtPlugin := true,
+//    commonSettings
+//  )
+//  .settings(
+//    libraryDependencies ++= Seq(
+//          Library.Db.liquibase,
+//          Library.Slick.slickCodegen,
+//          Library.Slick.slickHikari,
+//          Library.Slick.slickPg,
+//          Library.Slick.slickPgCore,
+//          Library.Slick.slickPgJoda,
+//          Library.Slick.slickPgPlayJson
+//        )
+//  )
+//  .dependsOn(driver)
 
 lazy val genDriver = project
   .in(file("."))
   .settings(
     publishLocal := {},
     publishM2 := {},
     publishArtifact := false,
-    skip in publish := true
+    publish / skip := true
   )
   .settings(
     name := "slick-postgres-generator-driver"
   )
-  .aggregate(driver, plugin)
+  .aggregate(driver)

project/BuildSettings.scala

@@ -17,12 +17,12 @@ object BasicSettings extends AutoPlugin {
   override def trigger = allRequirements
 
   // * Scalac Options
-  val scalacOptions212Only =
-    Seq(
-      "-Ywarn-adapted-args", // Warn if an argument list is modified to match the receiver.
-      "-Ywarn-inaccessible", // Warn about inaccessible types in method signatures.
-      "-Ywarn-nullary-override" // Warn when non-nullary overrides nullary, e.g. def foo() over def foo.
-    )
+//  val scalacOptions212Only =
+//    Seq(
+//      "-Ywarn-adapted-args", // Warn if an argument list is modified to match the receiver.
+//      "-Ywarn-inaccessible", // Warn about inaccessible types in method signatures.
+//      "-Ywarn-nullary-override" // Warn when non-nullary overrides nullary, e.g. def foo() over def foo.
+//    )
 
   val scalacOptionsCommon =
     Seq(
@@ -58,16 +58,13 @@ object BasicSettings extends AutoPlugin {
       )
     ),
     scalacOptions ++= {
-      CrossVersion.partialVersion(scalaVersion.value) match {
-        case Some((2, 12)) => scalacOptions212Only ++ scalacOptionsCommon
-        case Some((2, 13)) => scalacOptionsCommon
-      }
+      scalacOptionsCommon
     },
-    scalacOptions in Test ~= { (options: Seq[String]) =>
+    Test / scalacOptions ~= { (options: Seq[String]) =>
       options filterNot (_ == "-Ywarn-dead-code") // Allow dead code in tests (to support using mockito).
     },
-    parallelExecution in Test := false,
-    fork in Test := true,
+    Test / parallelExecution := false,
+    Test / fork := true,
     // Needed to avoid https://github.com/travis-ci/travis-ci/issues/3775 in forked tests
     // in Travis with `sudo: false`.
     // See https://github.com/sbt/sbt/issues/653

project/Dependencies.scala

@@ -38,17 +38,17 @@ object Dependencies {
     }
 
     object Utils {
-      val jodaTime = "joda-time" % "joda-time" % "2.9.9"
-      val slf4j = "org.slf4j" % "slf4j-api" % "1.7.18"
+      val jodaTime = "joda-time" % "joda-timec" % "2.10.12"
+      val slf4j = "org.slf4j" % "slf4j-api" % "1.7.32"
     }
 
     object ScalaTest {
-      private val version = "3.2.2"
+      private val version = "3.2.10"
       val test = "org.scalatest" %% "scalatest" % version % IntegrationTest
     }
 
     object TestContainers {
-      private val version = "0.38.4"
+      private val version = "0.39.8"
       val scalaTest = "com.dimafeng" %% "testcontainers-scala-scalatest" % version % IntegrationTest
       val postgresql = "com.dimafeng" %% "testcontainers-scala-postgresql" % version % IntegrationTest
     }

project/build.properties

@@ -6,4 +6,4 @@
 # Written by Andrius Aucinas <andrius.aucinas@hatdex.org>, 14/08/17 09:17
 #
 
-sbt.version=1.4.6
+sbt.version=1.5.5