Skip to content

Update scala3-library to 3.3.7 #1575

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
scala-steward wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Update scala3-library to 3.3.7 #1575

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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'
Expand Down Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(),
Expand Down
2 changes: 1 addition & 1 deletion daffodil-core/src/main/scala/org/apache/daffodil/lib/oolag/OOLAG.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down