Skip to content

Commit

Permalink
dependency updates
Browse files Browse the repository at this point in the history
  • Loading branch information
rmgk committed Jan 14, 2024
1 parent e9de6b5 commit f876586
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 13 deletions.
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package replication.fbdc

import de.rmgk.script.syntax
import de.rmgk.script.{process, runOutput}
import kofre.datatypes.LastWriterWins

object Fortunes {

def enableConditional(exampleData: FbdcExampleData) = {
if process"which fortune".scriptStart().waitFor() == 0
if process"which fortune".inheritIO().start().waitFor() == 0
then
println(s"enabling fortunes")
enableFortuneProcessing(exampleData)
Expand All @@ -33,6 +33,6 @@ object Fortunes {
}

def processFortune(r: Req.Fortune) =
Res.Fortune(r, process"fortune".run())
Res.Fortune(r, process"fortune".runOutput())

}
12 changes: 6 additions & 6 deletions project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -9,26 +9,26 @@ object Dependencies {

def directories = libraryDependencies += "dev.dirs" % "directories" % "26"
def jol = libraryDependencies += "org.openjdk.jol" % "jol-core" % "0.17"
def jsoup = libraryDependencies += "org.jsoup" % "jsoup" % "1.16.2"
def jsoup = libraryDependencies += "org.jsoup" % "jsoup" % "1.17.2"
def munit = libraryDependencies += "org.scalameta" %%% "munit" % "1.0.0-M10" % Test
def munitCheck = libraryDependencies += "org.scalameta" %%% "munit-scalacheck" % "1.0.0-M10" % Test
def okHttp = libraryDependencies += "com.squareup.okhttp3" % "okhttp" % "4.10.0"
def pprint = libraryDependencies += "com.lihaoyi" %%% "pprint" % "0.8.1"
def quicklens = libraryDependencies += "com.softwaremill.quicklens" %%% "quicklens" % "1.9.0"
def scalacheck = libraryDependencies += "org.scalacheck" %%% "scalacheck" % "1.17.0" % Test
def scalaJavaTime = libraryDependencies += "io.github.cquiroz" %%% "scala-java-time" % "2.3.0"
def scalajsDom = libraryDependencies += "org.scala-js" %%% "scalajs-dom" % "2.6.0"
def scalajsDom = libraryDependencies += "org.scala-js" %%% "scalajs-dom" % "2.8.0"
def scalatags = libraryDependencies += "com.lihaoyi" %%% "scalatags" % "0.12.0"
def scribe = libraryDependencies += "com.outr" %%% "scribe" % "3.10.7"
def scribeSlf4j = libraryDependencies += "com.outr" %% "scribe-slf4j" % "3.10.7"
def scribeSlf4j2 = libraryDependencies += "com.outr" %% "scribe-slf4j2" % "3.10.7"
def sourcecode = libraryDependencies += "com.lihaoyi" %%% "sourcecode" % "0.3.1"
def sqliteJdbc = libraryDependencies += "org.xerial" % "sqlite-jdbc" % "3.44.1.0"
def upickle = libraryDependencies += "com.lihaoyi" %%% "upickle" % "3.1.3"
def upickle = libraryDependencies += "com.lihaoyi" %%% "upickle" % "3.1.4"
def jsoniterScala =
libraryDependencies ++= Seq(
"com.github.plokhotnyuk.jsoniter-scala" %%% "jsoniter-scala-core" % "2.25.0",
"com.github.plokhotnyuk.jsoniter-scala" %%% "jsoniter-scala-macros" % "2.25.0" % "provided"
"com.github.plokhotnyuk.jsoniter-scala" %%% "jsoniter-scala-core" % "2.27.3",
"com.github.plokhotnyuk.jsoniter-scala" %%% "jsoniter-scala-macros" % "2.27.3" % "provided"
)

object slips {
Expand All @@ -37,7 +37,7 @@ object Dependencies {
def logging = libraryDependencies += "de.rmgk.slips" %%% "logging" % "0.5.0"
def options = libraryDependencies += "de.rmgk.slips" %%% "options" % "0.7.0"
def scip = libraryDependencies += "de.rmgk.slips" %%% "scip" % "0.5.0"
def script = libraryDependencies += "de.rmgk.slips" %%% "script" % "0.7.0"
def script = libraryDependencies += "de.rmgk.slips" %%% "script" % "0.8.0"
}

object loci {
Expand Down
2 changes: 1 addition & 1 deletion project/Settings.scala
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ object Settings {
}

val commonScalacOptions =
fatalWarnings ++ featureOptions ++ valueDiscard(Compile / compile) ++ unusedWarnings(Compile / compile)
fatalWarnings ++ featureOptions ++ valueDiscard(Compile / compile)

// see https://www.scala-js.org/news/2021/12/10/announcing-scalajs-1.8.0/#the-default-executioncontextglobal-is-now-deprecated
val jsAcceptUnfairGlobalTasks =
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.7
sbt.version=1.9.8
4 changes: 2 additions & 2 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* and may contain unused dependencies */

// scalajs 1.0
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.14.0")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.15.0")
libraryDependencies += "org.scala-js" %% "scalajs-env-jsdom-nodejs" % "1.1.0"

// scalanative
Expand All @@ -20,5 +20,5 @@ addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.11.0")
addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.2.1")

// tooling
addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.6")
addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.7")
addSbtPlugin("org.scalablytyped.converter" % "sbt-converter" % "1.0.0-beta43")

0 comments on commit f876586

Please sign in to comment.