Skip to content

Commit

Permalink
bump versions
Browse files Browse the repository at this point in the history
  • Loading branch information
oen9 committed Jul 16, 2020
1 parent 1c2a23d commit d6179c4
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 18 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
language: scala
scala:
- 2.13.2
- 2.13.3
jdk:
- openjdk11
26 changes: 12 additions & 14 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
scalaVersion := "2.13.2"
scalaVersion := "2.13.3"

val Ver = new {
val http4s = "0.21.3"
val http4s = "0.21.6"
val slinky = "0.6.5"
val logback = "1.2.3"
val zio = "1.0.0-RC21-1"
val zio = "1.0.0-RC21-2"
val circe = "0.13.0"
val tapir = "0.14.2"
val doobie = "0.9.0"
}

lazy val sharedSettings = Seq(
scalaVersion := "2.13.2",
scalaVersion := "2.13.3",
version := "0.1.0-SNAPSHOT",
organization := "com.github.oen9",
organizationName := "oen9",
Expand All @@ -21,7 +21,7 @@ lazy val sharedSettings = Seq(
"io.circe" %%% "circe-generic-extras" % Ver.circe,
"io.circe" %%% "circe-generic" % Ver.circe,
"io.circe" %%% "circe-literal" % Ver.circe,
"com.softwaremill.quicklens" %%% "quicklens" % "1.5.0",
"com.softwaremill.quicklens" %%% "quicklens" % "1.6.0",
"io.scalaland" %%% "chimney" % "0.5.2"
),
scalacOptions ++= Seq(
Expand All @@ -41,7 +41,7 @@ lazy val jsSettings = Seq(
libraryDependencies ++= Seq(
"me.shadaj" %%% "slinky-web" % Ver.slinky,
"me.shadaj" %%% "slinky-react-router" % Ver.slinky,
"io.suzaku" %%% "diode" % "1.1.8",
"io.suzaku" %%% "diode" % "1.1.11",
"com.github.oen9" %%% "slinky-bridge-react-konva" % "0.1.1"
),
npmDependencies in Compile ++= Seq(
Expand All @@ -50,11 +50,11 @@ lazy val jsSettings = Seq(
"react-popper" -> "1.3.7",
"react-router-dom" -> "5.1.2",
"path-to-regexp" -> "6.1.0",
"bootstrap" -> "4.4.1",
"bootstrap" -> "4.5.0",
"jquery" -> "3.5.1",
"konva" -> "4.2.2",
"react-konva" -> "16.13.0-0",
"use-image" -> "1.0.5"
"react-konva" -> "16.13.0-3",
"use-image" -> "1.0.6"
),
scalaJSUseMainModuleInitializer := true,
version.in(webpack) := "4.43.0",
Expand All @@ -65,10 +65,8 @@ lazy val jsSettings = Seq(
lazy val jvmSettings = Seq(
libraryDependencies ++= Seq(
"dev.zio" %% "zio" % Ver.zio,
"dev.zio" %% "zio-interop-cats" % "2.1.3.0-RC16",
"dev.zio" %% "zio-logging-slf4j" % "0.3.0",

"org.typelevel" %% "cats-effect" % "2.1.3", // needed by zio-interop-cats 2.1.3.0-RC16 (incompatible with 2.1.2)
"dev.zio" %% "zio-interop-cats" % "2.1.4.0-RC17",
"dev.zio" %% "zio-logging-slf4j" % "0.3.2",

"org.http4s" %% "http4s-blaze-server" % Ver.http4s,
"org.http4s" %% "http4s-circe" % Ver.http4s,
Expand All @@ -81,7 +79,7 @@ lazy val jvmSettings = Seq(
"com.softwaremill.sttp.tapir" %% "tapir-openapi-circe-yaml" % Ver.tapir,
"com.softwaremill.sttp.tapir" %% "tapir-json-circe" % Ver.tapir,
"ch.qos.logback" % "logback-classic" % Ver.logback,
"com.github.pureconfig" %% "pureconfig" % "0.12.2",
"com.github.pureconfig" %% "pureconfig" % "0.13.0",

"org.reactivemongo" %% "reactivemongo" % "0.20.3",
"org.flywaydb" % "flyway-core" % "6.3.3",
Expand Down
6 changes: 3 additions & 3 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.0.0")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.0.1")
addSbtPlugin("ch.epfl.scala" % "sbt-scalajs-bundler" % "0.17.0")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.1.1")
addSbtPlugin("ch.epfl.scala" % "sbt-scalajs-bundler" % "0.18.0")

addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.7.1")
addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.7.4")
addSbtPlugin("io.spray" % "sbt-revolver" % "0.9.1")
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.19")
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.0")

0 comments on commit d6179c4

Please sign in to comment.