Update Scala versions
This commit is contained in:
parent
c4e33c3972
commit
85c2a46909
7 changed files with 15 additions and 19 deletions
|
|
@ -33,7 +33,7 @@ private[pekko] trait Children { this: ActorCell =>
|
|||
|
||||
import ChildrenContainer._
|
||||
|
||||
@nowarn("msg=never used")
|
||||
@nowarn("msg=never used|is never updated")
|
||||
@volatile
|
||||
private var _childrenRefsDoNotCallMeDirectly: ChildrenContainer = EmptyChildrenContainer
|
||||
|
||||
|
|
|
|||
|
|
@ -537,11 +537,11 @@ private[pekko] final class PromiseActorRef(
|
|||
* Stopped => stopped, path not yet created
|
||||
*/
|
||||
@volatile
|
||||
@nowarn("msg=never used")
|
||||
@nowarn("msg=is never updated")
|
||||
private[this] var _stateDoNotCallMeDirectly: AnyRef = _
|
||||
|
||||
@volatile
|
||||
@nowarn("msg=never used")
|
||||
@nowarn("msg=is never updated")
|
||||
private[this] var _watchedByDoNotCallMeDirectly: Set[ActorRef] = ActorCell.emptyActorRefSet
|
||||
|
||||
@nowarn private def _preventPrivateUnusedErasure = {
|
||||
|
|
|
|||
|
|
@ -294,12 +294,14 @@ class CircuitBreaker(
|
|||
/**
|
||||
* Holds reference to current state of CircuitBreaker - *access only via helper methods*
|
||||
*/
|
||||
@nowarn("msg=is never updated")
|
||||
@volatile
|
||||
private[this] var _currentStateDoNotCallMeDirectly: State = Closed
|
||||
|
||||
/**
|
||||
* Holds reference to current resetTimeout of CircuitBreaker - *access only via helper methods*
|
||||
*/
|
||||
@nowarn("msg=is never updated")
|
||||
@volatile
|
||||
private[this] var _currentResetTimeoutDoNotCallMeDirectly: FiniteDuration = resetTimeout
|
||||
|
||||
|
|
|
|||
|
|
@ -50,8 +50,8 @@ object Dependencies {
|
|||
}
|
||||
}
|
||||
|
||||
val scala212Version = "2.12.16"
|
||||
val scala213Version = "2.13.8"
|
||||
val scala212Version = "2.12.17"
|
||||
val scala213Version = "2.13.10"
|
||||
// To get the fix for https://github.com/lampepfl/dotty/issues/13106
|
||||
// and restored static forwarders
|
||||
val scala3Version = "3.1.2"
|
||||
|
|
|
|||
|
|
@ -57,14 +57,8 @@ object JdkOptions extends AutoPlugin {
|
|||
targetSystemJdk,
|
||||
jdk8home,
|
||||
fullJavaHomes,
|
||||
Seq(if (scalaVersion.startsWith("3.")) "-Xtarget:8" else "-target:jvm-1.8"),
|
||||
// '-release 8' is not enough, for some reason we need the 8 rt.jar
|
||||
// explicitly. To test whether this has the desired effect, compile
|
||||
// pekko-remote and check the invocation of 'ByteBuffer.clear()' in
|
||||
// EnvelopeBuffer.class with 'javap -c': it should refer to
|
||||
// ""java/nio/ByteBuffer.clear:()Ljava/nio/Buffer" and not
|
||||
// "java/nio/ByteBuffer.clear:()Ljava/nio/ByteBuffer". Issue #27079
|
||||
(java8home: File) => Seq("-release", "8", "-javabootclasspath", java8home + "/jre/lib/rt.jar"))
|
||||
Seq(if (scalaVersion.startsWith("3.")) "-Xtarget:8" else "release:8"),
|
||||
(java8home: File) => Seq("-release", "8"))
|
||||
def targetJdkJavacOptions(
|
||||
targetSystemJdk: Boolean,
|
||||
jdk8home: Option[File],
|
||||
|
|
@ -75,7 +69,7 @@ object JdkOptions extends AutoPlugin {
|
|||
fullJavaHomes,
|
||||
Nil,
|
||||
// '-release 8' would be a neater option here, but is currently not an
|
||||
// option because it doesn't provide access to `sun.misc.Unsafe` #27079
|
||||
// option because it doesn't provide access to `sun.misc.Unsafe` https://github.com/akka/akka/issues/27079
|
||||
(java8home: File) => Seq("-source", "8", "-target", "8", "-bootclasspath", java8home + "/jre/lib/rt.jar"))
|
||||
|
||||
private def selectOptions(
|
||||
|
|
|
|||
|
|
@ -164,7 +164,7 @@ object PekkoDisciplinePlugin extends AutoPlugin {
|
|||
"-Ywarn-numeric-widen",
|
||||
"-Yno-adapted-args",
|
||||
"-deprecation",
|
||||
"-Xlint",
|
||||
"-Xlint:-infer-any",
|
||||
"-Ywarn-dead-code",
|
||||
"-Ywarn-inaccessible",
|
||||
"-Ywarn-infer-any",
|
||||
|
|
|
|||
|
|
@ -46,10 +46,10 @@ site-link-validator {
|
|||
"https://javadoc.io/static/"
|
||||
# GitHub will block with "429 Too Many Requests"
|
||||
"https://github.com/"
|
||||
"https://www.scala-lang.org/api/2.13.8/scala/runtime/AbstractFunction1.html"
|
||||
"https://www.scala-lang.org/api/2.13.8/scala/runtime/AbstractFunction2.html"
|
||||
"https://www.scala-lang.org/api/2.13.8/scala/runtime/AbstractFunction3.html"
|
||||
"https://www.scala-lang.org/api/2.13.8/scala/runtime/AbstractPartialFunction.html"
|
||||
"https://www.scala-lang.org/api/2.13.10/scala/runtime/AbstractFunction1.html"
|
||||
"https://www.scala-lang.org/api/2.13.10/scala/runtime/AbstractFunction2.html"
|
||||
"https://www.scala-lang.org/api/2.13.10/scala/runtime/AbstractFunction3.html"
|
||||
"https://www.scala-lang.org/api/2.13.10/scala/runtime/AbstractPartialFunction.html"
|
||||
]
|
||||
|
||||
non-https-whitelist = [
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue