Updated dependencies, scala version

abrighton · abrighton · commit 5c6e10a9fa8e · 2025-03-14T22:35:22.000+01:00
diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml
@@ -56,7 +56,7 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: Coverage Report
-          path: target/scala-3.6.2/scoverage-report
+          path: target/scala-3.6.4/scoverage-report
 
       - name: Multi-Jvm Tests
         run: sbt -Dsbt.log.noformat=true -DgenerateStoryReport=true esw-integration-test/MultiJvm/test
diff --git a/.github/workflows/masterLinkCheck.yml b/.github/workflows/masterLinkCheck.yml
@@ -16,8 +16,8 @@ jobs:
           jvm: temurin:1.21
       - uses: coursier/cache-action@v6
 
-#      - name: Paradox Validate Links
-#        run: sbtn docs/paradoxValidateLinks
+      - name: Paradox Validate Links
+        run: sbtn docs/paradoxValidateLinks
 
       - name: Notify slack
         if: always()
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -9,8 +9,8 @@ jobs:
   release:
     runs-on: ubuntu-latest
     env:
-      CSW_VERSION: "5726045"
-      ESW_OCS_ENG_UI_VERSION: "0.3.1.TODO"
+      CSW_VERSION: "f3455fc"
+      ESW_OCS_ENG_UI_VERSION: "1cc4bac"
     steps:
       - uses: actions/checkout@v4
       - uses: coursier/setup-action@v1.2.0
@@ -62,7 +62,7 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: Coverage Report
-          path: target/scala-3.6.2/scoverage-report
+          path: target/scala-3.6.4/scoverage-report
 
       - name: Delete js targets
         continue-on-error: true
diff --git a/.scalafmt.conf b/.scalafmt.conf
@@ -1,5 +1,5 @@
-version = 3.7.10
-runner.dialect = scala3
+version = 3.9.4
+runner.dialect = Scala36
 
 project.excludeFilters = ["BuildInfo.scala", "target/"]
 
diff --git a/esw-agent-pekko/esw-agent-pekko-app/src/main/scala/esw/agent/pekko/app/process/ProcessManager.scala b/esw-agent-pekko/esw-agent-pekko-app/src/main/scala/esw/agent/pekko/app/process/ProcessManager.scala
@@ -36,9 +36,8 @@ class ProcessManager(
     verifyComponentIsNotAlreadyRegistered(command.connection)
       .flatMapE(_ => startComponent(command))
       .flatMapE(process =>
-        waitForRegistration(command.connection, AgentTimeouts.DurationToWaitForComponentRegistration).flatMapE(_ =>
-          reconcile(process, command.connection)
-        )
+        waitForRegistration(command.connection, AgentTimeouts.DurationToWaitForComponentRegistration)
+          .flatMapE(_ => reconcile(process, command.connection))
       )
 
   // un-registration is done as a part of process.onComplete callback
@@ -95,9 +94,8 @@ class ProcessManager(
   // in case process is still alive it just returns process as a Future
   private def reconcile(process: Process, connection: Connection): Future[Either[String, Process]] =
     if (!process.isAlive)
-      unregisterComponent(connection).transform(_ =>
-        Try(Left("Process terminated before registration was successful".tap(log.warn(_))))
-      )
+      unregisterComponent(connection)
+        .transform(_ => Try(Left("Process terminated before registration was successful".tap(log.warn(_)))))
     else Future.successful(Right(process))
 
   // it checks if the component of the given connection is registered in the location service within the given timeout
diff --git a/esw-gateway/esw-gateway-impl/src/test/scala/esw/gateway/impl/AdminImplTest.scala b/esw-gateway/esw-gateway-impl/src/test/scala/esw/gateway/impl/AdminImplTest.scala
@@ -260,11 +260,11 @@ class AdminImplTest extends BaseTestSuite {
       val adminService: AdminImpl          = new AdminImpl(locationService)
       val lifecycleState                   = randomFrom(SupervisorLifecycleState.values.toList)
 
-      val probe = actorTestKit.spawn(Behaviors.receiveMessage[GetSupervisorLifecycleState] {
-        case GetSupervisorLifecycleState(replyTo) =>
+      val probe =
+        actorTestKit.spawn(Behaviors.receiveMessage[GetSupervisorLifecycleState] { case GetSupervisorLifecycleState(replyTo) =>
           replyTo ! lifecycleState
           Behaviors.same
-      })
+        })
 
       when(locationService.find(PekkoConnection(componentId))).thenReturn(
         Future.successful(
@@ -296,11 +296,11 @@ class AdminImplTest extends BaseTestSuite {
       val adminService: AdminImpl          = new AdminImpl(locationService)
       val lifecycleState                   = randomFrom(ContainerLifecycleState.values.toList)
 
-      val probe = actorTestKit.spawn(Behaviors.receiveMessage[GetContainerLifecycleState] {
-        case GetContainerLifecycleState(replyTo) =>
+      val probe =
+        actorTestKit.spawn(Behaviors.receiveMessage[GetContainerLifecycleState] { case GetContainerLifecycleState(replyTo) =>
           replyTo ! lifecycleState
           Behaviors.same
-      })
+        })
 
       when(locationService.find(PekkoConnection(componentId))).thenReturn(
         Future.successful(
diff --git a/esw-gateway/esw-gateway-server/src/main/scala/esw/gateway/server/GatewayMain.scala b/esw-gateway/esw-gateway-server/src/main/scala/esw/gateway/server/GatewayMain.scala
@@ -23,7 +23,7 @@ object GatewayMain extends CommandsEntryPoint {
 
   override def commands: Seq[Command[?]] = List(StartCommand)
 
-  class Runner[T <: ServerCommand: Parser: Help] extends EswCommand[T] {
+  class Runner[T <: ServerCommand: {Parser, Help}] extends EswCommand[T] {
     override def run(command: T, args: RemainingArgs): Unit = {
       command match {
         case StartOptions(port, local, commandRoleConfigPath, metricsEnabled) =>
diff --git a/jenkins/stil-nightly b/jenkins/stil-nightly
@@ -49,7 +49,7 @@ pipeline {
                             allowMissing         : true,
                             alwaysLinkToLastBuild: false,
                             keepAll              : true,
-                            reportDir            : './target/scala-3.6.2/scoverage-report',
+                            reportDir            : './target/scala-3.6.4/scoverage-report',
                             reportFiles          : 'index.html',
                             reportName           : "Scoverage Report"
                     ])
diff --git a/project/EswKeys.scala b/project/EswKeys.scala
@@ -1,8 +1,7 @@
 object EswKeys {
   val homepageValue: String = "https://github.com/tmtsoftware/esw"
-  //  val scalaVersion: String  = "3.4.2"
-  val scalaVersion: String  = "3.6.2" // Needs to match ammonite scala version
-  val kotlinVersion: String = "2.1.0"
+  val scalaVersion: String  = "3.6.4" // Needs to match ammonite scala version
+  val kotlinVersion: String = "2.1.10"
   val projectName           = "esw"
   val projectVersion        = "0.1.0-SNAPSHOT"
 }
diff --git a/project/Libs.scala b/project/Libs.scala
@@ -9,29 +9,28 @@ import scala.util.Using
 
 object Libs {
 
-  val `case-app`          = "com.github.alexarchambault"   %% "case-app"          % "2.1.0-M29"
+  val `case-app`          = "com.github.alexarchambault"   %% "case-app"          % "2.1.0-M30"
   val `enumeratum`        = dep("com.beachape" %%% "enumeratum" % "1.7.5") // MIT License
   val `mockito`           = "org.scalatestplus"            %% "mockito-3-4"       % "3.2.10.0"
   val `dotty-cps-async`   = dep("com.github.rssh" %%% "dotty-cps-async" % "0.9.23")
   val `scalatest`         = dep("org.scalatest" %%% "scalatest" % "3.2.19") // Apache License 2.0
   val `caffeine`          = "com.github.ben-manes.caffeine" % "caffeine"          % "3.1.8"
   val `jupiter-interface` = "net.aichler"                   % "jupiter-interface" % "0.11.1"
-  val `tmt-test-reporter` = "com.github.tmtsoftware.rtm"   %% "rtm"               % "b7997a9"
+  val `tmt-test-reporter` = "com.github.tmtsoftware.rtm"   %% "rtm"               % "d45709a"
 
-  val blockhound          = "io.projectreactor.tools"                   % "blockhound"        % "1.0.10.RELEASE"
-  val `embedded-keycloak` = "com.github.tmtsoftware.embedded-keycloak" %% "embedded-keycloak" % "8285bb5" // Apache 2.0
+  val blockhound          = "io.projectreactor.tools"                   % "blockhound"        % "1.0.11.RELEASE"
+  val `embedded-keycloak` = "com.github.tmtsoftware.embedded-keycloak" %% "embedded-keycloak" % "2268e39" // Apache 2.0
 
   // Note: CrossVersion.full: version has to match exact scala version (_3.3.0 instead of _3)
-  val `ammonite` = ("com.lihaoyi" % "ammonite_3.4.3" % "3.0.0-2-6342755f")
+  val `ammonite` = ("com.lihaoyi" % "ammonite_3.6.3" % "3.0.2")
 
   val `hdr-histogram` = "org.hdrhistogram" % "HdrHistogram" % "2.2.2"
 //  val `slf4j-api`     = "org.slf4j"          % "slf4j-api"    % "2.0.7"
   val `play-json`        = "org.playframework" %% "play-json"        % "3.0.3" // Apache 2.0
 }
 
 object MSocket {
-  //  val Version = "0.6.0"
-  val Version = "f35e6ea"
+    val Version = "0.7.0"
 
   val `msocket-api`  = dep("com.github.tmtsoftware.msocket" %%% "msocket-api" % Version)
   val `msocket-http` = "com.github.tmtsoftware.msocket" %% "msocket-http" % Version
@@ -68,7 +67,7 @@ object Csw {
 }
 
 object Pekko {
-  val Version = "1.1.2" // all pekko is Apache License 2.0
+  val Version = "1.1.3" // all pekko is Apache License 2.0
   val Org     = "org.apache.pekko"
 
   val `pekko-actor-typed`  = Org %% "pekko-actor-typed"  % Version
diff --git a/project/build.properties b/project/build.properties
@@ -1,3 +1,3 @@
 sbt.version=1.10.6
-csw.version=2f05249
+csw.version=f3455fc
 #csw.version=6.0.0
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,10 +1,10 @@
 addSbtPlugin("com.timushev.sbt"                  % "sbt-updates"               % "0.6.4")
 addSbtPlugin("io.spray"                          % "sbt-revolver"              % "0.10.0")
-addSbtPlugin("org.scoverage"                     % "sbt-scoverage"             % "2.2.2")
+addSbtPlugin("org.scoverage"                     % "sbt-scoverage"             % "2.3.1")
 addSbtPlugin("com.eed3si9n"                      % "sbt-buildinfo"             % "0.13.1")
-addSbtPlugin("org.scalameta"                     % "sbt-scalafmt"              % "2.5.2")
+addSbtPlugin("org.scalameta"                     % "sbt-scalafmt"              % "2.5.4")
 addSbtPlugin("org.portable-scala"                % "sbt-scalajs-crossproject"  % "1.3.2")
-addSbtPlugin("org.scala-js"                      % "sbt-scalajs"               % "1.17.0")
+addSbtPlugin("org.scala-js"                      % "sbt-scalajs"               % "1.18.2")
 addSbtPlugin("com.typesafe.sbt"                  % "sbt-multi-jvm"             % "0.4.0")
 addSbtPlugin("com.timushev.sbt"                  % "sbt-rewarn"                % "0.1.3")
 addSbtPlugin("com.thoughtworks.sbt-api-mappings" % "sbt-api-mappings"          % "3.0.2")
@@ -18,7 +18,7 @@ resolvers += "jitpack" at "https://jitpack.io"
 //addSbtPlugin("community.flock.sbt" % "sbt-kotlin-plugin" % "3.0.1")
 addSbtPlugin("org.jetbrains.scala" % "sbt-kotlin-plugin" % "3.1.4")
 
-libraryDependencies += "com.github.tmtsoftware" % "sbt-docs" % "2bf7f34"
+libraryDependencies += "com.github.tmtsoftware" % "sbt-docs" % "a3206b6"
 
 resolvers += Resolver.jcenterRepo
 addSbtPlugin("net.aichler" % "sbt-jupiter-interface" % "0.11.1")
