#ESW-516: Update dependencies before the release

tmtsoftware · Jul 6, 2021 · 26fca7b · 26fca7b
1 parent f2fc5ee
commit 26fca7b
Show file tree

Hide file tree

Showing 8 changed files with 38 additions and 25 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -9,7 +9,7 @@ jobs:
   release:
     runs-on: ubuntu-18.04
     env:
-      CSW_VERSION: "3.0.1"
+      CSW_VERSION: "4.0.0-M1"
     steps:
       - uses: actions/checkout@v2
       - uses: laughedelic/coursier-setup@v1

diff --git a/esw-services/src/main/scala/esw/services/Wiring.scala b/esw-services/src/main/scala/esw/services/Wiring.scala
@@ -65,7 +65,7 @@ class Wiring(cmd: Command) {
   private lazy val VersionConf = {
     println(s"${Console.YELLOW}Using versions: ESW=$eswVersion, sequencerScriptsVersion=$scriptVersion${Console.RESET}")
     s"""
-         |scripts = ${scriptVersion}
+         |scripts = $scriptVersion
          |esw = $eswVersion
          |""".stripMargin
   }

diff --git a/notes/0.3.0-M1.markdown b/notes/0.3.0-M1.markdown
@@ -0,0 +1,13 @@
+## ESW - TMT Executive Software v0.3.0-M1
+
+This is the v0.3.0-M1 of the TMT Executive Software.
+
+See [CHANGELOG.md](CHANGELOG.md) for details of all releases.
+
+### Changes
+
+Patch update to resolve latest release on Jitpack
+
+### Documentation
+
+Paradox documentation can be found here: https://tmtsoftware.github.io/esw/0.3.0-M1/
diff --git a/project/Coverage.scala b/project/Coverage.scala
@@ -9,7 +9,7 @@ object Coverage extends AutoPlugin {
   override def projectSettings: Seq[Setting[_]] =
     Seq(
       coverageEnabled := true,
-      coverageMinimum := 80,
+      coverageMinimumStmtTotal := 80,
       coverageFailOnMinimum := true,
       coverageHighlighting := true,
       coverageOutputCobertura := true,

diff --git a/project/EswKeys.scala b/project/EswKeys.scala
@@ -1,7 +1,7 @@
 object EswKeys {
   val homepageValue: String = "https://github.com/tmtsoftware/esw"
   val scalaVersion: String  = "2.13.5"
-  val kotlinVersion: String = "1.5.10"
+  val kotlinVersion: String = "1.5.20"
   val projectName           = "esw"
   val projectVersion        = "0.1.0-SNAPSHOT"
 }
diff --git a/project/Libs.scala b/project/Libs.scala
@@ -7,26 +7,26 @@ import java.util.Properties
 import scala.util.Using
 
 object Libs {
-  private val MSocketVersion = "ca3583448d"
+  private val MSocketVersion = "0.3.0"
 
-  val `case-app`           = "com.github.alexarchambault" %% "case-app" % "2.0.4"
-  val enumeratum           = dep("com.beachape" %%% "enumeratum" % "1.6.1") //MIT License
-  val `mockito-scala`      = "org.mockito"                    %% "mockito-scala"      % "1.16.29" // MIT License
+  val `case-app`           = "com.github.alexarchambault" %% "case-app" % "2.0.6"
+  val enumeratum           = dep("com.beachape" %%% "enumeratum" % "1.7.0") //MIT License
+  val `mockito-scala`      = "org.mockito"                    %% "mockito-scala"      % "1.16.37" // MIT License
   val `scala-async`        = "org.scala-lang.modules" %% "scala-async" % "1.0.0-M1" //BSD 3-clause "New" or "Revised" License
-  val scalatest            = dep("org.scalatest" %%% "scalatest" % "3.1.4") //Apache License 2.0
+  val scalatest            = dep("org.scalatest" %%% "scalatest" % "3.2.9") //Apache License 2.0
   val `scala-java8-compat` = "org.scala-lang.modules"         %% "scala-java8-compat" % "0.9.1"   //BSD 3-clause "New" or "Revised" License
   val `msocket-api`        = dep("com.github.tmtsoftware.msocket" %%% "msocket-api" % MSocketVersion)
   val `msocket-http`       = "com.github.tmtsoftware.msocket" %% "msocket-http"       % MSocketVersion
-  val caffeine             = "com.github.ben-manes.caffeine"   % "caffeine"           % "3.0.0"
+  val caffeine             = "com.github.ben-manes.caffeine"   % "caffeine"           % "3.0.3"
   val `jupiter-interface`  = "net.aichler"                     % "jupiter-interface"  % "0.9.1"
-  val `tmt-test-reporter`  = "com.github.tmtsoftware"         %% "rtm"                % "33b2359b23"
+  val `tmt-test-reporter`  = "com.github.tmtsoftware"         %% "rtm"                % "0.1.0"
 
-  val blockhound          = "io.projectreactor.tools"                   % "blockhound"        % "1.0.4.RELEASE"
-  val `embedded-keycloak` = "com.github.tmtsoftware.embedded-keycloak" %% "embedded-keycloak" % "0.2.0"
+  val blockhound          = "io.projectreactor.tools"                   % "blockhound"        % "1.0.6.RELEASE"
+  val `embedded-keycloak` = "com.github.tmtsoftware.embedded-keycloak" %% "embedded-keycloak" % "0.4.0"
 
-  val `ammonite`      = "com.lihaoyi"      % "ammonite"     % "2.3.8-65-0f0d597f" cross CrossVersion.full
+  val `ammonite`      = "com.lihaoyi"      % "ammonite"     % "2.4.0" cross CrossVersion.full
   val `hdr-histogram` = "org.hdrhistogram" % "HdrHistogram" % "2.1.12"
-  val `slf4j-api`     = "org.slf4j"        % "slf4j-api"    % "1.7.30"
+  val `slf4j-api`     = "org.slf4j"        % "slf4j-api"    % "1.7.31"
 
 }
 
@@ -61,7 +61,7 @@ object Csw {
 }
 
 object Akka {
-  private val Version     = "2.6.14"
+  private val Version     = "2.6.15"
   val `akka-actor-typed`  = "com.typesafe.akka" %% "akka-actor-typed"  % Version
   val `akka-stream-typed` = "com.typesafe.akka" %% "akka-stream-typed" % Version
   val `akka-stream`       = "com.typesafe.akka" %% "akka-stream"       % Version
@@ -83,7 +83,7 @@ object AkkaHttp {
 }
 
 object Borer {
-  private val Version = "1.6.3"
+  private val Version = "1.7.2"
   private val Org     = "io.bullet"
 
   val `borer-core`        = dep(Org %%% "borer-core" % Version)
@@ -106,7 +106,7 @@ object Kotlin {
   val `coroutines-jdk8` = "org.jetbrains.kotlinx" % "kotlinx-coroutines-jdk8" % CoroutinesVersion
 
   val kotlintest = "io.kotest" % "kotest-assertions-core-jvm" % "4.6.0"
-  val mockk      = "io.mockk"  % "mockk"                      % "1.11.0"
+  val mockk      = "io.mockk"  % "mockk"                      % "1.12.0"
 }
 
 object BuildProperties {

diff --git a/project/build.properties b/project/build.properties
@@ -1,2 +1,2 @@
-sbt.version=1.5.0
-csw.version=11edc9503c
+sbt.version=1.5.4
+csw.version=4.0.0-M1
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,18 +1,18 @@
-addSbtPlugin("com.timushev.sbt"                  % "sbt-updates"              % "0.5.2")
+addSbtPlugin("com.timushev.sbt"                  % "sbt-updates"              % "0.5.3")
 addSbtPlugin("io.spray"                          % "sbt-revolver"             % "0.9.1")
-addSbtPlugin("org.scoverage"                     % "sbt-scoverage"            % "1.6.1")
+addSbtPlugin("org.scoverage"                     % "sbt-scoverage"            % "1.8.2")
 addSbtPlugin("com.eed3si9n"                      % "sbt-buildinfo"            % "0.10.0")
 addSbtPlugin("org.scalameta"                     % "sbt-scalafmt"             % "2.4.2")
 addSbtPlugin("com.dwijnand"                      % "sbt-dynver"               % "4.1.1")
-addSbtPlugin("org.portable-scala"                % "sbt-scalajs-crossproject" % "1.0.0")
+addSbtPlugin("org.portable-scala"                % "sbt-scalajs-crossproject" % "1.1.0")
 addSbtPlugin("org.scala-js"                      % "sbt-scalajs"              % "1.5.1")
 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.0")
 
 resolvers += "jitpack" at "https://jitpack.io"
-libraryDependencies += "com.github.tmtsoftware" % "kotlin-plugin" % "872208e"
-libraryDependencies += "com.github.tmtsoftware" % "sbt-docs"      % "9fe4596ff8"
+libraryDependencies += "com.github.tmtsoftware" % "kotlin-plugin" % "3.0.0"
+libraryDependencies += "com.github.tmtsoftware" % "sbt-docs"      % "0.3.0"
 
 resolvers += Resolver.jcenterRepo
 addSbtPlugin("net.aichler" % "sbt-jupiter-interface" % "0.9.1")