Skip to content

Commit

Permalink
Merge branch 'main' into update/testng-7.10.2
Browse files Browse the repository at this point in the history
  • Loading branch information
sullis authored May 24, 2024
2 parents 451d3d0 + 3a76a9b commit e343cd4
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
strategy:
matrix:
java: [ '8', '11', '17', '21', '22' ]
scala: [ '2.13.13', '2.12.19', '2.11.12', '3.4.1' ]
scala: [ '2.13.14', '2.12.19', '2.11.12', '3.4.2' ]
steps:
- uses: actions/checkout@v4
- name: Set up JDK
Expand Down
4 changes: 2 additions & 2 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ organization := "io.github.sullis"

scalaVersion := "2.12.19"

crossScalaVersions := Seq(scalaVersion.value, "2.11.12", "2.13.13", "3.4.1")
crossScalaVersions := Seq(scalaVersion.value, "2.11.12", "2.13.14", "3.4.2")

scalacOptions += "-target:jvm-1.8"

Expand All @@ -30,7 +30,7 @@ libraryDependencies ++= Seq(
"org.apache.activemq" % "activemq-client" % activeMqVersion,
"org.scalatest" %% "scalatest" % "3.2.18" % Test,
"org.testng" % "testng" % "7.10.2" % Test,
"com.google.guava" % "guava" % "33.1.0-jre" % Test,
"com.google.guava" % "guava" % "33.2.0-jre" % Test,
"ch.qos.logback" % "logback-classic" % "1.5.6" % Test,
"ch.qos.logback" % "logback-core" % "1.5.6" % Test
)
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.9.9
sbt.version=1.10.0
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

addSbtPlugin("org.scoverage" %% "sbt-scoverage" % "2.0.11")
addSbtPlugin("org.scoverage" %% "sbt-scoverage" % "2.0.12")

addSbtPlugin("org.scoverage" %% "sbt-coveralls" % "1.3.11")

Expand Down

0 comments on commit e343cd4

Please sign in to comment.