This is an automated email from the ASF dual-hosted git repository.
dongjoon pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/spark.git
The following commit(s) were added to refs/heads/master by this push:
new 55764a9ae8e [SPARK-40497][BUILD] Re-upgrade Scala to 2.13.11
55764a9ae8e is described below
commit 55764a9ae8ef92512ef65229deac221c1c6afa95
Author: yangjie01 <yangji...@baidu.com>
AuthorDate: Fri Sep 15 18:54:05 2023 -0700
[SPARK-40497][BUILD] Re-upgrade Scala to 2.13.11
### What changes were proposed in this pull request?
This PR aims to re-upgrade Scala to 2.13.11, after SPARK-45144 was merged,
the build issues mentioned in https://github.com/apache/spark/pull/41943 should
no longer exist.
- https://www.scala-lang.org/news/2.13.11
Additionally, this pr adds a new suppression rule for warning message:
`Implicit definition should have explicit type`, this is a new compile check
introduced by https://github.com/scala/scala/pull/10083, we must fix it when we
upgrading to use Scala 3
### Why are the changes needed?
This release improves collections, adds support for JDK 20 and 21, adds
support for JDK 17 `sealed`:
- https://github.com/scala/scala/pull/10363
- https://github.com/scala/scala/pull/10184
- https://github.com/scala/scala/pull/10397
- https://github.com/scala/scala/pull/10348
- https://github.com/scala/scala/pull/10105
There are 2 known issues in this version:
- https://github.com/scala/bug/issues/12800
- https://github.com/scala/bug/issues/12799
For the first one, there is no compilation warning messages related to
`match may not be exhaustive` in Spark compile log, and for the second one,
there is no case of `method.isAnnotationPresent(Deprecated.class)` in Spark
code, there is just
https://github.com/apache/spark/blob/8c84d2c9349d7b607db949c2e114df781f23e438/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/JavaTypeInference.scala#L130
in Spark Code, and I checked `javax.annotation.Nonnull` no this issue.
So I think These two issues will not affect Spark itself, but this doesn't
mean it won't affect the code written by end users themselves
The full release notes as follows:
- https://github.com/scala/scala/releases/tag/v2.13.11
### Does this PR introduce _any_ user-facing change?
Yes, this is a Scala version change.
### How was this patch tested?
- Existing Test
### Was this patch authored or co-authored using generative AI tooling?
No
Closes #42918 from LuciferYang/SPARK-40497-2.
Authored-by: yangjie01 <yangji...@baidu.com>
Signed-off-by: Dongjoon Hyun <dh...@apple.com>
---
pom.xml | 6 +++++-
project/SparkBuild.scala | 4 +++-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 91d93e8c3cc..779f9e64f1d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3630,7 +3630,7 @@
<profile>
<id>scala-2.13</id>
<properties>
- <scala.version>2.13.8</scala.version>
+ <scala.version>2.13.11</scala.version>
<scala.binary.version>2.13</scala.binary.version>
</properties>
<build>
@@ -3689,6 +3689,10 @@
-->
<arg>-Wconf:cat=unused-imports&src=org\/apache\/spark\/graphx\/impl\/VertexPartitionBase.scala:s</arg>
<arg>-Wconf:cat=unused-imports&src=org\/apache\/spark\/graphx\/impl\/VertexPartitionBaseOps.scala:s</arg>
+ <!--
+ SPARK-40497 Upgrade Scala to 2.13.11 and suppress
`Implicit definition should have explicit type`
+ -->
+ <arg>-Wconf:msg=Implicit definition should have explicit
type:s</arg>
</args>
<compilerPlugins combine.self="override">
</compilerPlugins>
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala
index f67be83561d..dc2e20c644b 100644
--- a/project/SparkBuild.scala
+++ b/project/SparkBuild.scala
@@ -286,7 +286,9 @@ object SparkBuild extends PomBuild {
// TODO(SPARK-43850): Remove the following suppression rules and
remove `import scala.language.higherKinds`
// from the corresponding files when Scala 2.12 is no longer
supported.
"-Wconf:cat=unused-imports&src=org\\/apache\\/spark\\/graphx\\/impl\\/VertexPartitionBase.scala:s",
-
"-Wconf:cat=unused-imports&src=org\\/apache\\/spark\\/graphx\\/impl\\/VertexPartitionBaseOps.scala:s"
+
"-Wconf:cat=unused-imports&src=org\\/apache\\/spark\\/graphx\\/impl\\/VertexPartitionBaseOps.scala:s",
+ // SPARK-40497 Upgrade Scala to 2.13.11 and suppress `Implicit
definition should have explicit type`
+ "-Wconf:msg=Implicit definition should have explicit type:s"
)
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org
For additional commands, e-mail: commits-h...@spark.apache.org
