Merge pull request scala#9677 from SethTisue/jdk17

Author: SethTisue

.travis.yml

@@ -12,9 +12,9 @@ templates: # this has no effect on travis, it's just a place to put our template
   pr-jdk8: &pr-jdk8
     if: type = pull_request OR repo != scala/scala
 
-  cron-jdk16: &cron-jdk16
+  cron-jdk17: &cron-jdk17
     if: type = cron AND repo = scala/scala
-    env: ADOPTOPENJDK=16
+    env: ADOPTOPENJDK=17
 
   build-for-testing: &build-for-testing
     # pull request validation (w/ bootstrap)
@@ -97,13 +97,13 @@ jobs:
       <<: *pr-jdk8
 
     - <<: *build-for-testing
-      <<: *cron-jdk16
+      <<: *cron-jdk17
 
     - <<: *test1
-      <<: *cron-jdk16
+      <<: *cron-jdk17
 
     - <<: *test2
-      <<: *cron-jdk16
+      <<: *cron-jdk17
 
     - stage: test
       name: build library with Scala 3

build.sbt

@@ -232,6 +232,10 @@ lazy val fatalWarningsSettings = Seq(
     if (fatalWarnings.value) Seq("-Werror")
     else Nil
   },
+  Compile / javacOptions ++= {
+    if (fatalWarnings.value) Seq("-Werror")
+    else Nil
+  },
   Compile / doc / scalacOptions -= "-Werror", // there are too many doc errors to enable this right now
 )
 

src/library/scala/runtime/ModuleSerializationProxy.java

@@ -13,7 +13,6 @@
 package scala.runtime;
 
 import java.io.Serializable;
-import java.security.AccessController;
 import java.security.PrivilegedActionException;
 import java.security.PrivilegedExceptionAction;
 import java.util.HashSet;
@@ -25,9 +24,10 @@ public final class ModuleSerializationProxy implements Serializable {
     private final Class<?> moduleClass;
     private static final ClassValue<Object> instances = new ClassValue<Object>() {
         @Override
+        @SuppressWarnings("removal")  // JDK 17 deprecates AccessController
         protected Object computeValue(Class<?> type) {
             try {
-                return AccessController.doPrivileged((PrivilegedExceptionAction<Object>) () -> type.getField("MODULE$").get(null));
+                return java.security.AccessController.doPrivileged((PrivilegedExceptionAction<Object>) () -> type.getField("MODULE$").get(null));
             } catch (PrivilegedActionException e) {
                 return rethrowRuntime(e.getCause());
             }

src/partest/scala/tools/partest/SecurityTest.scala

@@ -16,6 +16,7 @@ import java.io.FileDescriptor
 import java.net.InetAddress
 import java.security.Permission
 
+@deprecated("JDK 17 deprecates SecurityManager", since="2.13.7")
 class DelegatingSecurityManager(delegate: SecurityManager) extends SecurityManager {
   override def checkExit(status: Int): Unit = if (delegate ne null) delegate.checkExit(status)
   override def checkPermission(perm: Permission): Unit = if (delegate ne null) delegate.checkPermission(perm)

src/partest/scala/tools/partest/nest/DelegatingSecurityManager.scala

@@ -18,6 +18,7 @@ import java.lang.reflect.InvocationTargetException
 import java.nio.charset.Charset
 import java.nio.file.{Files, StandardOpenOption}
 
+import scala.annotation.nowarn
 import scala.collection.mutable.ListBuffer
 import scala.concurrent.duration.Duration
 import scala.reflect.internal.FatalError
@@ -258,7 +259,10 @@ class Runner(val testInfo: TestInfo, val suiteRunner: AbstractRunner) {
 
       pushTranscript(s"<in process execution of $testIdent> > ${logFile.getName}")
 
-      TrapExit(() => run()) match {
+      @nowarn("cat=deprecation")  // JDK 17 deprecates SecurityManager, so TrapExit is deprecated too
+      val trapExit = TrapExit
+
+      trapExit(() => run()) match {
         case Left((status, throwable)) if status != 0 =>
           genFail("non-zero exit code")
         case _ =>

src/partest/scala/tools/partest/nest/Runner.scala

@@ -12,6 +12,7 @@
 
 package scala.tools.partest.nest
 
+@deprecated("JDK 17 deprecates SecurityManager", since="2.13.7")
 object TrapExit {
 
   private class TrapExitThrowable(val status: Int) extends Throwable {

src/partest/scala/tools/partest/nest/TrapExit.scala

@@ -5,9 +5,12 @@ import java.security._
 
 import scala.language.reflectiveCalls
 
+// SecurityManager is deprecated on JDK 17, so we sprinkle `@deprecated` around
+
 object Test {
   trait Bar { def bar: Unit }
 
+  @deprecated
   object Mgr extends SecurityManager {
     def allowedProperty(name: String) =
       name == "sun.net.inetaddr.ttl" ||
@@ -29,6 +32,7 @@ object Test {
     def doDestroy( obj : Destroyable ) : Unit = obj.destroy();
     doDestroy( p );
   }
+  @deprecated
   def t2() = {
     System.setSecurityManager(Mgr)
 
@@ -44,6 +48,6 @@ object Test {
     try t1()
     catch { case _: java.io.IOException => () }
 
-    t2()
+    t2(): @annotation.nowarn("cat=deprecation")
   }
 }