Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

merge 2.12 to 2.13 20250106 [ci:last-only] #10974

Merged
merged 9 commits into from
Jan 6, 2025
Merged

merge 2.12 to 2.13 20250106 [ci:last-only] #10974

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
e9075e1
do not build the spec during PR validation
SethTisue Dec 19, 2024
9761bae
no more Travis-CI for PR validation, use GitHub Actions
SethTisue Dec 19, 2024
b045381
Merge pull request #10961 from SethTisue/get-travis-ci-out-of-pr-vali…
SethTisue Dec 20, 2024
07d1ed2
Update sbt, scripted-plugin to 1.10.7 in 2.12.x
scala-steward Dec 25, 2024
e8ee7aa
Merge pull request #10969 from scala-steward/update/2.12.x/sbt-1.10.7
SethTisue Dec 28, 2024
786f44a
bump copyright year to 2025
SethTisue Jan 6, 2025
393c05f
Merge pull request #10973 from SethTisue/copyright-2025
SethTisue Jan 6, 2025
b8a0aeb
Merge commit 'b045381055674f3b5bb32b76cb5188116e8356f5' into merge-2.…
SethTisue Jan 6, 2025
63cf7c4
Merge remote-tracking branch 'origin/2.12.x' into merge-2.12-to-2.13-…
SethTisue Jan 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions NOTICE
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Scala
Copyright (c) 2002-2024 EPFL
Copyright (c) 2011-2024 Lightbend, Inc. dba Akka
Copyright (c) 2002-2025 EPFL
Copyright (c) 2011-2025 Lightbend, Inc. dba Akka

Scala includes software developed at
LAMP/EPFL (https://lamp.epfl.ch/) and
Expand Down
4 changes: 2 additions & 2 deletions doc/LICENSE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ Scala is licensed under the [Apache License Version 2.0](https://www.apache.org/

## Scala License

Copyright (c) 2002-2024 EPFL
Copyright (c) 2002-2025 EPFL

Copyright (c) 2011-2024 Lightbend, Inc. dba Akka
Copyright (c) 2011-2025 Lightbend, Inc. dba Akka

All rights reserved.

Expand Down
4 changes: 2 additions & 2 deletions doc/License.rtf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ Scala is licensed under the\'a0{\field{\*\fldinst{HYPERLINK "https://www.apache.
\fs48 \cf2 Scala License\
\pard\pardeftab720\sl360\sa320\partightenfactor0

\f0\b0\fs28 \cf2 Copyright (c) 2002-2024 EPFL\
Copyright (c) 2011-2024 Lightbend, Inc. dba Akka\
\f0\b0\fs28 \cf2 Copyright (c) 2002-2025 EPFL\
Copyright (c) 2011-2025 Lightbend, Inc. dba Akka\
All rights reserved.\
\pard\pardeftab720\sl360\sa320\partightenfactor0
\cf2 \cb4 Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at {\field{\*\fldinst{HYPERLINK "http://www.apache.org/licenses/LICENSE-2.0"}}{\fldrslt http://www.apache.org/licenses/LICENSE-2.0}}.\
Expand Down
2 changes: 1 addition & 1 deletion project/VersionUtil.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ object VersionUtil {
)

lazy val generatePropertiesFileSettings = Seq[Setting[_]](
copyrightString := "Copyright 2002-2024, LAMP/EPFL and Lightbend, Inc. dba Akka",
copyrightString := "Copyright 2002-2025, LAMP/EPFL and Lightbend, Inc. dba Akka",
shellWelcomeString := """
| ________ ___ / / ___
| / __/ __// _ | / / / _ |
Expand Down
2 changes: 1 addition & 1 deletion src/library/scala/util/Properties.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ private[scala] trait PropertiesTrait {
* or "version (unknown)" if it cannot be determined.
*/
val versionString = "version " + scalaPropOrElse("version.number", "(unknown)")
val copyrightString = scalaPropOrElse("copyright.string", "Copyright 2002-2024, LAMP/EPFL and Lightbend, Inc. dba Akka")
val copyrightString = scalaPropOrElse("copyright.string", "Copyright 2002-2025, LAMP/EPFL and Lightbend, Inc. dba Akka")

/** This is the encoding to use reading in source files, overridden with -encoding.
* Note that it uses "prop" i.e. looks in the scala jar, not the system properties.
Expand Down
2 changes: 1 addition & 1 deletion src/scaladoc/scala/tools/nsc/doc/html/page/Entity.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -407,7 +407,7 @@ trait EntityPage extends HtmlPage {

{
if (Set("epfl", "EPFL").contains(tpl.universe.settings.docfooter.value))
<div id="footer">Scala programming documentation. Copyright (c) 2002-2024 <a href="http://www.epfl.ch" target="_top">EPFL</a>, with contributions from <a href="https://akka.io" target="_top">Akka</a>.</div>
<div id="footer">Scala programming documentation. Copyright (c) 2002-2025 <a href="http://www.epfl.ch" target="_top">EPFL</a>, with contributions from <a href="https://akka.io" target="_top">Akka</a>.</div>
else
<div id="footer"> { tpl.universe.settings.docfooter.value } </div>
}
Expand Down
2 changes: 1 addition & 1 deletion src/scalap/decoder.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
version.number=2.0.1
copyright.string=(c) 2002-2024 LAMP/EPFL
copyright.string=(c) 2002-2025 LAMP/EPFL
Loading