diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 6ff9fe01a7..cbf302bfa1 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -40,7 +40,7 @@ jobs: matrix: java_distribution: [ temurin ] java_version: [ 17, 21, 25 ] - scala_version: [ 3.3.6 ] + scala_version: [ 3.3.7 ] os: [ ubuntu-22.04, windows-2022, macos-14 ] exclude: # only run macos on java 17 @@ -88,7 +88,7 @@ jobs: SONARSCAN: ${{ matrix.os == 'ubuntu-22.04' && matrix.java_version == '17' && - matrix.scala_version == '3.3.6' && + matrix.scala_version == '3.3.7' && github.event_name == 'push' && github.repository == 'apache/daffodil' && github.ref == 'refs/heads/main' @@ -239,7 +239,7 @@ jobs: matrix: java_distribution: [ temurin ] java_version: [ 17 ] - scala_version: [ 3.3.6 ] + scala_version: [ 3.3.7 ] os: [ ubuntu-22.04 ] runs-on: ${{ matrix.os }} env: diff --git a/build.sbt b/build.sbt index 3a30ac67c8..d135751f7c 100644 --- a/build.sbt +++ b/build.sbt @@ -181,8 +181,8 @@ val minSupportedJavaVersion: String = "17" lazy val commonSettings = Seq( organization := "org.apache.daffodil", version := IO.read((ThisBuild / baseDirectory).value / "VERSION").trim, - scalaVersion := "3.3.6", - crossScalaVersions := Seq("3.3.6"), + scalaVersion := "3.3.7", + crossScalaVersions := Seq("3.3.7"), scalacOptions ++= buildScalacOptions(scalaVersion.value), Test / scalacOptions ++= buildTestScalacOptions(scalaVersion.value), Compile / compile / javacOptions ++= buildJavacOptions(), diff --git a/daffodil-core/src/main/scala/org/apache/daffodil/lib/oolag/OOLAG.scala b/daffodil-core/src/main/scala/org/apache/daffodil/lib/oolag/OOLAG.scala index 4c11006ded..5b69d4b7f3 100644 --- a/daffodil-core/src/main/scala/org/apache/daffodil/lib/oolag/OOLAG.scala +++ b/daffodil-core/src/main/scala/org/apache/daffodil/lib/oolag/OOLAG.scala @@ -350,7 +350,7 @@ object OOLAG { } } - // scala 3.3.6 complains about this being private (MissingType error). So as a + // scala 3.3.7 complains about this being private (MissingType error). So as a // workaround to that, we make it protected instead protected sealed trait ActivityStatus private case object Active extends ActivityStatus