Skip to content

Commit

Permalink
Merge branch 'master' into dependabot/npm_and_yarn/webapp/semver-7.5.4
Browse files Browse the repository at this point in the history
  • Loading branch information
cornerman authored Jan 27, 2024
2 parents 9a8922f + 69026d3 commit 7998db7
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .scalafmt.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version = 3.7.8
version = 3.7.17

runner.dialect = scala213source3
style = defaultWithAlign
Expand Down
6 changes: 3 additions & 3 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ Global / onChangedBuildSource := IgnoreSourceChanges // not working well with we

name := "OutwatchExample"
ThisBuild / version := "0.1.0-SNAPSHOT"
ThisBuild / scalaVersion := "2.13.11"
ThisBuild / scalaVersion := "2.13.12"

val versions = new {
val outwatch = "1.0.0-RC15"
val scalaTest = "3.2.16"
val outwatch = "1.0.0"
val scalaTest = "3.2.17"
}

// do not warn about unused setting key. TODO: why is this needed? scala-js-bundler bug? sbt says this setting is unused, but it is used.
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.9.2
sbt.version=1.9.8
8 changes: 4 additions & 4 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.13.2")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.15.0")
addSbtPlugin("ch.epfl.scala" % "sbt-scalajs-bundler" % "0.21.1")

addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.0")
addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat" % "0.4.4")
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2")
addSbtPlugin("org.typelevel" % "sbt-tpolecat" % "0.5.0")

// for reading npmDependencies from package.json
libraryDependencies ++= Seq("com.lihaoyi" %% "upickle" % "3.1.2")
libraryDependencies ++= Seq("com.lihaoyi" %% "upickle" % "3.1.4")

0 comments on commit 7998db7

Please sign in to comment.