diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 541cc47..d5e873b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,7 +23,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - scala: [2.13.14] + scala: [2.13.15] java: [temurin@17, temurin@21] runs-on: ${{ matrix.os }} steps: @@ -73,7 +73,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - scala: [2.13.14] + scala: [2.13.15] java: [temurin@17] runs-on: ${{ matrix.os }} steps: @@ -101,12 +101,12 @@ jobs: - name: Setup sbt uses: sbt/setup-sbt@v1 - - name: Download target directories (2.13.14) + - name: Download target directories (2.13.15) uses: actions/download-artifact@v4 with: - name: target-${{ matrix.os }}-2.13.14-${{ matrix.java }} + name: target-${{ matrix.os }}-2.13.15-${{ matrix.java }} - - name: Inflate target directories (2.13.14) + - name: Inflate target directories (2.13.15) run: | tar xf targets.tar rm targets.tar diff --git a/build.sbt b/build.sbt index f23472c..7adefe6 100644 --- a/build.sbt +++ b/build.sbt @@ -2,7 +2,7 @@ name := "scex" inThisBuild(Seq( organization := "com.avsystem.scex", - scalaVersion := "2.13.14", + scalaVersion := "2.13.15", githubWorkflowTargetTags ++= Seq("v*"), githubWorkflowJavaVersions := Seq(JavaSpec.temurin("17"), JavaSpec.temurin("21")), @@ -22,12 +22,12 @@ inThisBuild(Seq( val CompileAndTest = "compile->compile;test->test" val parserCombinatorsVersion = "2.4.0" -val avsCommonsVersion = "2.18.0" +val avsCommonsVersion = "2.20.0" val slf4jVersion = "2.0.16" val logbackVersion = "1.5.7" // Tests only val commonsLang3Version = "3.17.0" val commonsCodecVersion = "1.17.1" -val guavaVersion = "33.3.0-jre" +val guavaVersion = "33.3.1-jre" val commonsNetVersion = "3.11.1" val scalatestVersion = "3.2.19" diff --git a/scex-util/src/test/scala/com/avsystem/scex/util/QmarkTest.scala b/scex-util/src/test/scala/com/avsystem/scex/util/QmarkTest.scala index 0decbd0..fe29942 100644 --- a/scex-util/src/test/scala/com/avsystem/scex/util/QmarkTest.scala +++ b/scex-util/src/test/scala/com/avsystem/scex/util/QmarkTest.scala @@ -48,7 +48,7 @@ class QmarkTest extends AnyFunSuite { def expression = ju.Arrays.asList[Int]().mean assertThrows[IllegalArgumentException](ju.Arrays.asList[Int]().mean) - assert(0 == expression ? 0) + assert(0.0 == expression ? 0.0) } test("recover from ParseException") {