Update scala-compiler, scala-library, ... to 2.13.6

.github/workflows/scala.yml

@@ -15,10 +15,16 @@ jobs:
         scala:
         - 2.11.12
         - 2.12.11
-        - 2.13.1
+        - 2.13.6
         sbt-args:
         - --addPluginSbtFile=project/plugins.sbt.scalajs06
         - ''
+        exclude:
+        - scala: 2.13.6
+          sbt-args: --addPluginSbtFile=project/plugins.sbt.scalajs06
+        include:
+        - scala: 2.13.4
+          sbt-args: --addPluginSbtFile=project/plugins.sbt.scalajs06
 
     steps:
     - uses: actions/checkout@v2

compilerplugins-ResetEverywhere/src/main/scala/com/thoughtworks/dsl/compilerplugins/ResetEverywhere.scala

@@ -41,22 +41,18 @@ final class ResetEverywhere(override val global: Global) extends Plugin {
 
   private type CpsAttachment = (Tree => Tree) => Tree
 
-  private var nonTypeConstraintResetSymbol: Symbol = _ // = symbolOf[nonTypeConstraintReset]
-
-  override def init(options: List[String], error: String => Unit): Boolean = {
-    super.init(options, error) && {
-      try {
-        nonTypeConstraintResetSymbol = symbolOf[nonTypeConstraintReset]
-        true
-      } catch {
-        case e: ScalaReflectionException =>
-          error("""This compiler plug-in requires the runtime library:
-  libraryDependencies += "com.thoughtworks.dsl" %% "dsl" % "latest.release"
+  private lazy val nonTypeConstraintResetSymbol: Symbol = {
+    try {
+      symbolOf[nonTypeConstraintReset]
+    } catch {
+      case e: ScalaReflectionException =>
+        error("""This compiler plug-in requires the runtime library:
+libraryDependencies += "com.thoughtworks.dsl" %% "dsl" % "latest.release"
 """)
-          false
-      }
+        throw e
     }
   }
+
   val name: String = "ResetEverywhere"
 
   private final class ResetAnnotationCreator extends PluginComponent with Transform {

keywords-NullSafe/src/main/scala/com/thoughtworks/dsl/keywords/NullSafe.scala

@@ -169,7 +169,7 @@ object NullSafe {
   }
 
   /** @template */
-  type ? = reset
+  type `?` = reset
 
   implicit def implicitNullSafe[A <: AnyRef](nullable: A @ ?) = new NullSafe[A](nullable)
 

project/plugins.sbt.scalajs06

@@ -1,6 +1,6 @@
 // An optional sbt file to replace Scala.js 1.0 with 0.6
 dependencyOverrides += Defaults.sbtPluginExtra(
-  "org.scala-js" % "sbt-scalajs" % "0.6.32",
+  "org.scala-js" % "sbt-scalajs" % "0.6.33",
   sbtBinaryVersion.value,
   scalaBinaryVersion.value,
 )