From 8dcc25914dc291dc4509c9634179cc4a82877113 Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Wed, 8 Jan 2025 07:57:37 -0800 Subject: [PATCH 1/2] Update sbt-scala-module to 3.2.2 --- project/plugins.sbt | 2 +- src/main/scala/scala/async/Async.scala | 2 +- src/main/scala/scala/async/FutureStateMachine.scala | 2 +- src/test/scala/scala/async/ExceptionalTest.scala | 2 +- src/test/scala/scala/async/FutureSpec.scala | 2 +- src/test/scala/scala/async/SmokeTest.scala | 2 +- src/test/scala/scala/async/TestUtil.scala | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 699b7f7c..4b4ee1f0 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,3 +1,3 @@ -addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "3.2.0") +addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "3.2.2") addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.17.0") addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.2") diff --git a/src/main/scala/scala/async/Async.scala b/src/main/scala/scala/async/Async.scala index b4399e15..b592f0ad 100644 --- a/src/main/scala/scala/async/Async.scala +++ b/src/main/scala/scala/async/Async.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/src/main/scala/scala/async/FutureStateMachine.scala b/src/main/scala/scala/async/FutureStateMachine.scala index 4c651906..8b8c5cfb 100644 --- a/src/main/scala/scala/async/FutureStateMachine.scala +++ b/src/main/scala/scala/async/FutureStateMachine.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/src/test/scala/scala/async/ExceptionalTest.scala b/src/test/scala/scala/async/ExceptionalTest.scala index fcdf5c1a..1caf1341 100644 --- a/src/test/scala/scala/async/ExceptionalTest.scala +++ b/src/test/scala/scala/async/ExceptionalTest.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/src/test/scala/scala/async/FutureSpec.scala b/src/test/scala/scala/async/FutureSpec.scala index 262d748a..9713b816 100644 --- a/src/test/scala/scala/async/FutureSpec.scala +++ b/src/test/scala/scala/async/FutureSpec.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/src/test/scala/scala/async/SmokeTest.scala b/src/test/scala/scala/async/SmokeTest.scala index 4804893a..b04dbdb8 100644 --- a/src/test/scala/scala/async/SmokeTest.scala +++ b/src/test/scala/scala/async/SmokeTest.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/src/test/scala/scala/async/TestUtil.scala b/src/test/scala/scala/async/TestUtil.scala index 11bab02e..57624671 100644 --- a/src/test/scala/scala/async/TestUtil.scala +++ b/src/test/scala/scala/async/TestUtil.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). From 468ba2fedb872e4f1c97e7abb7b237463a3c5d63 Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Wed, 8 Jan 2025 07:57:47 -0800 Subject: [PATCH 2/2] copyright 2025 --- NOTICE | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/NOTICE b/NOTICE index 7d415573..c0e32e62 100644 --- a/NOTICE +++ b/NOTICE @@ -1,10 +1,10 @@ Scala async -Copyright (c) 2012-2023 EPFL -Copyright (c) 2012-2023 Lightbend, Inc. +Copyright (c) 2012-2025 EPFL +Copyright (c) 2012-2025 Lightbend, Inc. dba Akka Scala includes software developed at LAMP/EPFL (https://lamp.epfl.ch/) and -Lightbend, Inc. (https://www.lightbend.com/). +Akka (https://akka.io/). Licensed under the Apache License, Version 2.0 (the "License"). Unless required by applicable law or agreed to in writing, software