Merge pull request scala#10825 from SethTisue/merge-2.12-to-2.13-20240805

merge 2.12 to 2.13 20240805 [ci: last-only]

Author: lrytz

SECURITY.md

@@ -0,0 +1,5 @@
+# Security Policy
+
+The security policy of the Scala Programming Language organization can be found at [scala-lang.org/security](https://scala-lang.org/security).
+
+To contact us about security issues or the policy, use [[email protected]](mailto:[email protected]).

build.sbt

@@ -37,7 +37,7 @@ import scala.build._, VersionUtil._
 // Non-Scala dependencies:
 val junitDep          = "junit"                          % "junit"                            % "4.13.2"
 val junitInterfaceDep = "com.github.sbt"                 % "junit-interface"                  % "0.13.3"                          % Test
-val scalacheckDep     = "org.scalacheck"                %% "scalacheck"                       % "1.17.0"                          % Test
+val scalacheckDep     = "org.scalacheck"                %% "scalacheck"                       % "1.18.0"                          % Test
 val jolDep            = "org.openjdk.jol"                % "jol-core"                         % "0.16"
 val asmDep            = "org.scala-lang.modules"         % "scala-asm"                        % versionProps("scala-asm.version")
 val jlineDep          = "org.jline"                      % "jline"                            % versionProps("jline.version")

project/plugins.sbt

@@ -6,7 +6,7 @@ scalacOptions ++= Seq(
   "-Werror",
   "-Wconf:msg=IntegrationTest .* is deprecated:s,msg=itSettings .* is deprecated:s")
 
-libraryDependencies += "org.apache.commons" % "commons-lang3" % "3.14.0"
+libraryDependencies += "org.apache.commons" % "commons-lang3" % "3.15.0"
 
 libraryDependencies += "biz.aQute.bnd" % "biz.aQute.bndlib" % "6.1.0"
 

src/compiler/scala/tools/nsc/transform/Erasure.scala

@@ -95,7 +95,7 @@ abstract class Erasure extends InfoTransform
   }
 
   override protected def verifyJavaErasure = settings.Xverify.value || settings.isDebug
-  private def needsJavaSig(sym: Symbol, tp: Type, throwsArgs: List[Type]) = !settings.Ynogenericsig.value && {
+  def needsJavaSig(sym: Symbol, tp: Type, throwsArgs: List[Type]) = !settings.Ynogenericsig.value && {
     def needs(tp: Type) = NeedsSigCollector(sym.isClassConstructor).collect(tp)
     needs(tp) || throwsArgs.exists(needs)
   }