From 5ca525c7d194f6390777402c1444cb8b086a534b Mon Sep 17 00:00:00 2001 From: Sebastian Haracz Date: Thu, 24 Mar 2022 13:08:59 +0100 Subject: [PATCH] Scala 2.13.8; bump jetty to 9.4.45.v20220203 --- .github/workflows/ci.yml | 10 +++++----- build.sbt | 8 ++++---- project/build.properties | 2 +- project/plugins.sbt | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 99a0abc3a..41746e61a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,7 +24,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - scala: [2.13.7, 2.12.15] + scala: [2.13.8, 2.12.15] java: [graalvm-ce-java11@21.1.0] runs-on: ${{ matrix.os }} steps: @@ -91,7 +91,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - scala: [2.13.7] + scala: [2.13.8] java: [graalvm-ce-java11@21.1.0] runs-on: ${{ matrix.os }} steps: @@ -117,12 +117,12 @@ jobs: ~/Library/Caches/Coursier/v1 key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }} - - name: Download target directories (2.13.7) + - name: Download target directories (2.13.8) uses: actions/download-artifact@v2 with: - name: target-${{ matrix.os }}-2.13.7-${{ matrix.java }} + name: target-${{ matrix.os }}-2.13.8-${{ matrix.java }} - - name: Inflate target directories (2.13.7) + - name: Inflate target directories (2.13.8) run: | tar xf targets.tar rm targets.tar diff --git a/build.sbt b/build.sbt index dd5ef7355..2e15d926a 100644 --- a/build.sbt +++ b/build.sbt @@ -14,10 +14,10 @@ val jsr305Version = "3.0.2" val scalatestVersion = "3.2.9" val scalatestplusScalacheckVersion = "3.2.9.0" val scalacheckVersion = "1.15.4" -val jettyVersion = "9.4.44.v20210927" +val jettyVersion = "9.4.45.v20220203" val mongoVersion = "4.5.0" val springVersion = "4.3.26.RELEASE" -val typesafeConfigVersion = "1.4.1" +val typesafeConfigVersion = "1.4.2" val commonsIoVersion = "1.3.2" // test only val scalaLoggingVersion = "3.9.4" val akkaVersion = "2.6.14" @@ -26,7 +26,7 @@ val mockitoVersion = "3.9.0" val circeVersion = "0.13.0" // benchmark only val upickleVersion = "1.3.11" // benchmark only val scalajsBenchmarkVersion = "0.9.0" -val slf4jVersion = "1.7.30" +val slf4jVersion = "1.7.32" // for binary compatibility checking val previousCompatibleVersions = Set("2.2.4") @@ -52,7 +52,7 @@ inThisBuild(Seq( Developer("ghik", "Roman Janusz", "r.janusz@avsystem.com", url("https://github.com/ghik")), ), - crossScalaVersions := Seq("2.13.7", "2.12.15"), + crossScalaVersions := Seq("2.13.8", "2.12.15"), scalaVersion := crossScalaVersions.value.head, compileOrder := CompileOrder.Mixed, diff --git a/project/build.properties b/project/build.properties index e6e496844..679d19c64 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1,2 +1,2 @@ # suppress inspection "UnusedProperty" -sbt.version=1.5.7 +sbt.version=1.6.2 diff --git a/project/plugins.sbt b/project/plugins.sbt index 9726bdbfa..1beb173f9 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,7 +1,7 @@ logLevel := Level.Warn val scalaJSVersion = - Option(System.getenv("SCALAJS_VERSION")).getOrElse("1.5.1") + Option(System.getenv("SCALAJS_VERSION")).getOrElse("1.7.1") addSbtPlugin("org.scala-js" % "sbt-scalajs" % scalaJSVersion) addSbtPlugin("org.jetbrains.scala" % "sbt-ide-settings" % "1.1.1")