This is an automated email from the ASF dual-hosted git repository.
jinterrante pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/daffodil.git
The following commit(s) were added to refs/heads/main by this push:
new c3dc26516 Update scala-library, scala-reflect to 2.12.17
c3dc26516 is described below
commit c3dc26516e9b034605643016c3e18e73c3d4d473
Author: Scala Steward <[email protected]>
AuthorDate: Thu Oct 20 10:17:16 2022 -0400
Update scala-library, scala-reflect to 2.12.17
Also update sbt-native-packager to 1.9.11 and sbt-scoverage to 2.0.6.
These all have transitive dependencies so must be updated at once.
Also removes the pluginDependency overrides. This no longer seems to be
neede.
---
.github/workflows/main.yml | 4 ++--
build.sbt | 4 ++--
project/plugins.sbt | 16 ++--------------
3 files changed, 6 insertions(+), 18 deletions(-)
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 8b43cb129..608f8e8a3 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -35,7 +35,7 @@ jobs:
matrix:
distribution: [ temurin ]
java_version: [ 8, 11, 17 ]
- scala_version: [ 2.12.15 ]
+ scala_version: [ 2.12.17 ]
os: [ ubuntu-20.04, windows-2019 ]
include:
- os: ubuntu-20.04
@@ -58,7 +58,7 @@ jobs:
SONARSCAN: ${{
matrix.os == 'ubuntu-20.04' &&
matrix.java_version == '11' &&
- matrix.scala_version == '2.12.15' &&
+ matrix.scala_version == '2.12.17' &&
github.event_name == 'push' &&
github.repository == 'apache/daffodil' &&
github.ref == 'refs/heads/main'
diff --git a/build.sbt b/build.sbt
index 53610bff1..2da01e789 100644
--- a/build.sbt
+++ b/build.sbt
@@ -153,8 +153,8 @@ lazy val testStdLayout =
Project("daffodil-test-stdLayout", file("test-stdLay
lazy val commonSettings = Seq(
organization := "org.apache.daffodil",
version := "3.4.0-SNAPSHOT",
- scalaVersion := "2.12.15",
- crossScalaVersions := Seq("2.12.15"),
+ scalaVersion := "2.12.17",
+ crossScalaVersions := Seq("2.12.17"),
scalacOptions ++= buildScalacOptions(scalaVersion.value),
Compile / compile / javacOptions ++= buildJavacOptions(),
logBuffered := true,
diff --git a/project/plugins.sbt b/project/plugins.sbt
index c71d0c5e6..b76742b5c 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -17,24 +17,12 @@
addSbtPlugin("com.github.tnakamot" % "sbt-cc" % "0.0.3")
-addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.9.9")
+addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.9.11")
addSbtPlugin("org.musigma" % "sbt-rat" % "0.7.0")
-addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.9.3")
+addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.6")
addSbtPlugin("com.github.sbt" % "sbt-unidoc" % "0.5.0")
addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % "5.2.4")
-
-// Both sbt and the sbt-native-pacakger plugin have transitive dependencies to
-// different versions of plexus-utils and guava, but with different major
-// version numbers. SBT interprets this major version number difference as
-// having dependencies that are potentially not binary compatible, resulting in
-// a warning message when starting SBT. It appears the binary incompatibilities
-// (if they exist) do not affect building Daffodil, so this overrides the
-// dependencies to the latest versions and removes the warning.
-dependencyOverrides ++= Seq(
- "org.codehaus.plexus" % "plexus-utils" % "3.0.17",
- "com.google.guava" % "guava" % "20.0"
-)
