You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pekko.apache.org by md...@apache.org on 2023/03/21 20:56:56 UTC
[incubator-pekko] branch main updated: Update Scala versions
This is an automated email from the ASF dual-hosted git repository.
mdedetrich pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-pekko.git
The following commit(s) were added to refs/heads/main by this push:
new 85c2a46909 Update Scala versions
85c2a46909 is described below
commit 85c2a469098abd064738dbf9bb50f3cc271dc73b
Author: Matthew de Detrich <ma...@aiven.io>
AuthorDate: Tue Mar 21 13:52:14 2023 +0100
Update Scala versions
---
.../main/scala/org/apache/pekko/actor/dungeon/Children.scala | 2 +-
.../src/main/scala/org/apache/pekko/pattern/AskSupport.scala | 4 ++--
.../main/scala/org/apache/pekko/pattern/CircuitBreaker.scala | 2 ++
project/Dependencies.scala | 4 ++--
project/JdkOptions.scala | 12 +++---------
project/PekkoDisciplinePlugin.scala | 2 +-
scripts/link-validator.conf | 8 ++++----
7 files changed, 15 insertions(+), 19 deletions(-)
diff --git a/actor/src/main/scala/org/apache/pekko/actor/dungeon/Children.scala b/actor/src/main/scala/org/apache/pekko/actor/dungeon/Children.scala
index 36feaf8e81..b690ea9456 100644
--- a/actor/src/main/scala/org/apache/pekko/actor/dungeon/Children.scala
+++ b/actor/src/main/scala/org/apache/pekko/actor/dungeon/Children.scala
@@ -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
diff --git a/actor/src/main/scala/org/apache/pekko/pattern/AskSupport.scala b/actor/src/main/scala/org/apache/pekko/pattern/AskSupport.scala
index e5a12abca1..db13aecd7a 100644
--- a/actor/src/main/scala/org/apache/pekko/pattern/AskSupport.scala
+++ b/actor/src/main/scala/org/apache/pekko/pattern/AskSupport.scala
@@ -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 = {
diff --git a/actor/src/main/scala/org/apache/pekko/pattern/CircuitBreaker.scala b/actor/src/main/scala/org/apache/pekko/pattern/CircuitBreaker.scala
index f848b068e0..00ae9a6566 100644
--- a/actor/src/main/scala/org/apache/pekko/pattern/CircuitBreaker.scala
+++ b/actor/src/main/scala/org/apache/pekko/pattern/CircuitBreaker.scala
@@ -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
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index 03c02c4ee8..ecf1b1d40c 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -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"
diff --git a/project/JdkOptions.scala b/project/JdkOptions.scala
index 25d4076552..701065bfc6 100644
--- a/project/JdkOptions.scala
+++ b/project/JdkOptions.scala
@@ -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(
diff --git a/project/PekkoDisciplinePlugin.scala b/project/PekkoDisciplinePlugin.scala
index d0656ef101..38cd14b0aa 100644
--- a/project/PekkoDisciplinePlugin.scala
+++ b/project/PekkoDisciplinePlugin.scala
@@ -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",
diff --git a/scripts/link-validator.conf b/scripts/link-validator.conf
index e19b92125a..65dc4aa9fe 100644
--- a/scripts/link-validator.conf
+++ b/scripts/link-validator.conf
@@ -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 = [
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pekko.apache.org
For additional commands, e-mail: commits-help@pekko.apache.org