Skip to content

Commit 695df6e

Browse files
authored
Merge pull request #41 from AVSystem/scala-2.13.15
2 parents 329bfb5 + be33e33 commit 695df6e

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

.github/workflows/ci.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
strategy:
2424
matrix:
2525
os: [ubuntu-latest]
26-
scala: [2.13.14]
26+
scala: [2.13.15]
2727
java: [temurin@17, temurin@21]
2828
runs-on: ${{ matrix.os }}
2929
steps:
@@ -73,7 +73,7 @@ jobs:
7373
strategy:
7474
matrix:
7575
os: [ubuntu-latest]
76-
scala: [2.13.14]
76+
scala: [2.13.15]
7777
java: [temurin@17]
7878
runs-on: ${{ matrix.os }}
7979
steps:
@@ -101,12 +101,12 @@ jobs:
101101
- name: Setup sbt
102102
uses: sbt/setup-sbt@v1
103103

104-
- name: Download target directories (2.13.14)
104+
- name: Download target directories (2.13.15)
105105
uses: actions/download-artifact@v4
106106
with:
107-
name: target-${{ matrix.os }}-2.13.14-${{ matrix.java }}
107+
name: target-${{ matrix.os }}-2.13.15-${{ matrix.java }}
108108

109-
- name: Inflate target directories (2.13.14)
109+
- name: Inflate target directories (2.13.15)
110110
run: |
111111
tar xf targets.tar
112112
rm targets.tar

build.sbt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name := "scex"
22

33
inThisBuild(Seq(
44
organization := "com.avsystem.scex",
5-
scalaVersion := "2.13.14",
5+
scalaVersion := "2.13.15",
66

77
githubWorkflowTargetTags ++= Seq("v*"),
88
githubWorkflowJavaVersions := Seq(JavaSpec.temurin("17"), JavaSpec.temurin("21")),
@@ -22,12 +22,12 @@ inThisBuild(Seq(
2222
val CompileAndTest = "compile->compile;test->test"
2323

2424
val parserCombinatorsVersion = "2.4.0"
25-
val avsCommonsVersion = "2.18.0"
25+
val avsCommonsVersion = "2.20.0"
2626
val slf4jVersion = "2.0.16"
2727
val logbackVersion = "1.5.7" // Tests only
2828
val commonsLang3Version = "3.17.0"
2929
val commonsCodecVersion = "1.17.1"
30-
val guavaVersion = "33.3.0-jre"
30+
val guavaVersion = "33.3.1-jre"
3131
val commonsNetVersion = "3.11.1"
3232
val scalatestVersion = "3.2.19"
3333

scex-util/src/test/scala/com/avsystem/scex/util/QmarkTest.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ class QmarkTest extends AnyFunSuite {
4848
def expression = ju.Arrays.asList[Int]().mean
4949

5050
assertThrows[IllegalArgumentException](ju.Arrays.asList[Int]().mean)
51-
assert(0 == expression ? 0)
51+
assert(0.0 == expression ? 0.0)
5252
}
5353

5454
test("recover from ParseException") {

0 commit comments

Comments
 (0)