Skip to content

Commit

Permalink
Merge pull request #41 from AVSystem/scala-2.13.15
Browse files Browse the repository at this point in the history
  • Loading branch information
halotukozak authored Oct 3, 2024
2 parents 329bfb5 + be33e33 commit 695df6e
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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")),
Expand All @@ -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"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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") {
Expand Down

0 comments on commit 695df6e

Please sign in to comment.