Skip to content

Commit

Permalink
bump versions
Browse files Browse the repository at this point in the history
  • Loading branch information
@oen9
oen9 committed Jun 6, 2021
1 parent 199d83a commit 0dfb3ed
Show file tree
Hide file tree
Showing 5 changed files with 33 additions and 34 deletions.
55 changes: 27 additions & 28 deletions build.sbt
View file
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
scalaVersion := "2.13.4"
scalaVersion := "2.13.6"

val Ver = new {
val http4s = "0.21.11"
val slinky = "0.6.6"
val http4s = "0.21.24"
val slinky = "0.6.7"
val logback = "1.2.3"
val zio = "1.0.3"
val circe = "0.13.0"
val tapir = "0.16.10"
val doobie = "0.9.2"
val caliban = "0.9.3"
val zio = "1.0.9"
val circe = "0.14.1"
val tapir = "0.16.16"
val doobie = "0.13.4"
val caliban = "0.10.1"
}

lazy val sharedSettings = Seq(
scalaVersion := "2.13.4",
scalaVersion := "2.13.6",
version := "0.1.0-SNAPSHOT",
organization := "com.github.oen9",
organizationName := "oen9",
libraryDependencies ++= Seq(
"org.typelevel" %% "cats-core" % "2.2.0",
"org.typelevel" %% "cats-core" % "2.6.1",
"io.circe" %%% "circe-parser" % Ver.circe,
"io.circe" %%% "circe-generic-extras" % Ver.circe,
"io.circe" %%% "circe-generic" % Ver.circe,
"io.circe" %%% "circe-literal" % Ver.circe,
"com.softwaremill.quicklens" %%% "quicklens" % "1.6.1",
"com.softwaremill.quicklens" %%% "quicklens" % "1.7.4",
"io.scalaland" %%% "chimney" % "0.6.1"
),
scalacOptions ++= Seq(
Expand All @@ -34,19 +34,18 @@ lazy val sharedSettings = Seq(
"-Ymacro-annotations",
"-Ywarn-unused:imports",
"-Xlint:-byname-implicit" // github.com/scala/bug/issues/12072 TODO
),
semanticdbEnabled := true
)
)

lazy val jsSettings = Seq(
libraryDependencies ++= Seq(
"me.shadaj" %%% "slinky-web" % Ver.slinky,
"me.shadaj" %%% "slinky-react-router" % Ver.slinky,
"io.suzaku" %%% "diode" % "1.1.13",
"io.suzaku" %%% "diode" % "1.1.14",
"com.github.oen9" %%% "slinky-bridge-react-konva" % "0.1.1",
"com.github.ghostdogpr" %%% "caliban-client" % Ver.caliban
),
npmDependencies in Compile ++= Seq(
Compile / npmDependencies ++= Seq(
"react" -> "16.13.1",
"react-dom" -> "16.13.1",
"react-popper" -> "1.3.7",
Expand All @@ -59,16 +58,16 @@ lazy val jsSettings = Seq(
"use-image" -> "1.0.6"
),
scalaJSUseMainModuleInitializer := true,
version.in(webpack) := "4.44.2",
webpack / version := "4.44.2",
webpackBundlingMode := BundlingMode.Application,
webpackBundlingMode.in(fastOptJS) := BundlingMode.LibraryOnly()
fastOptJS / webpackBundlingMode := BundlingMode.LibraryOnly()
)

lazy val jvmSettings = Seq(
libraryDependencies ++= Seq(
"dev.zio" %% "zio" % Ver.zio,
"dev.zio" %% "zio-interop-cats" % "2.2.0.1",
"dev.zio" %% "zio-logging-slf4j" % "0.5.3",
"dev.zio" %% "zio-interop-cats" % "2.5.1.0",
"dev.zio" %% "zio-logging-slf4j" % "0.5.10",

"org.http4s" %% "http4s-blaze-server" % Ver.http4s,
"org.http4s" %% "http4s-circe" % Ver.http4s,
Expand All @@ -83,11 +82,11 @@ 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.14.0",
"com.github.pureconfig" %% "pureconfig" % "0.15.0",

"org.reactivemongo" %% "reactivemongo" % "1.0.1",
"org.flywaydb" % "flyway-core" % "7.2.1",
"org.postgresql" % "postgresql" % "42.2.12",
"org.reactivemongo" %% "reactivemongo" % "1.0.4",
"org.flywaydb" % "flyway-core" % "7.9.2",
"org.postgresql" % "postgresql" % "42.2.20",
"org.tpolecat" %% "doobie-core" % Ver.doobie,
"org.tpolecat" %% "doobie-h2" % Ver.doobie,
"org.tpolecat" %% "doobie-hikari" % Ver.doobie,
Expand All @@ -100,7 +99,7 @@ lazy val jvmSettings = Seq(
),
testFrameworks += new TestFramework("zio.test.sbt.ZTestFramework"),
target := baseDirectory.value / ".." / "target",
addCompilerPlugin(("org.typelevel" %% "kind-projector" % "0.11.2").cross(CrossVersion.full))
addCompilerPlugin(("org.typelevel" %% "kind-projector" % "0.13.0").cross(CrossVersion.full))
)

lazy val app =
Expand All @@ -120,12 +119,12 @@ lazy val appJVM = app.jvm
.settings(
dockerExposedPorts := Seq(8080),
dockerBaseImage := "oracle/graalvm-ce:20.2.0-java11",
(unmanagedResourceDirectories in Compile) += (resourceDirectory in (appJS, Compile)).value,
mappings.in(Universal) ++= webpack.in(Compile, fullOptJS).in(appJS, Compile).value.map { f =>
Compile / unmanagedResourceDirectories += (appJS / Compile / resourceDirectory).value,
Universal / mappings ++= (appJS / Compile / fullOptJS / webpack).value.map { f =>
f.data -> s"assets/${f.data.getName()}"
},
mappings.in(Universal) ++= Seq(
(target in (appJS, Compile)).value / ("scala-" + scalaBinaryVersion.value) / "scalajs-bundler" / "main" / "node_modules" / "bootstrap" / "dist" / "css" / "bootstrap.min.css" -> "assets/bootstrap.min.css"
Universal / mappings ++= Seq(
(appJS / Compile / target).value / ("scala-" + scalaBinaryVersion.value) / "scalajs-bundler" / "main" / "node_modules" / "bootstrap" / "dist" / "css" / "bootstrap.min.css" -> "assets/bootstrap.min.css"
),
bashScriptExtraDefines += """addJava "-Dassets=${app_home}/../assets""""
)
Expand Down
2 changes: 1 addition & 1 deletion js/src/main/scala/example/services/GraphQLClient.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import org.scalajs.dom
import scala.concurrent.ExecutionContext.Implicits.global
import scala.concurrent.Future
import scala.scalajs.LinkingInfo
import sttp.client._
import sttp.client3._

object GraphQLClient {
lazy val sttpBackend = FetchBackend()
Expand Down
2 changes: 1 addition & 1 deletion jvm/src/main/scala/example/Hello.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ object Hello extends App {
case e: Throwable =>
val sw = new StringWriter
e.printStackTrace(new PrintWriter(sw))
zio.console.putStrLn(sw.toString())
zio.console.putStrLnErr(sw.toString()).orElse(ZIO.unit)
}.fold(_ => ExitCode.failure, _ => ExitCode.success)

def app(): ZIO[AppEnv, Throwable, Unit] =
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.4.4
sbt.version=1.5.3
6 changes: 3 additions & 3 deletions project/plugins.sbt
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.0.0")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.3.0")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.5.1")
addSbtPlugin("ch.epfl.scala" % "sbt-scalajs-bundler" % "0.20.0")

addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.7.5")
addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.8.1")
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")
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.2")
addSbtPlugin("com.github.ghostdogpr" % "caliban-codegen-sbt" % "0.9.2")

0 comments on commit 0dfb3ed

Please sign in to comment.