Skip to content

Commit

Permalink
bump copyright year to 2024
Browse files Browse the repository at this point in the history
in the usual places. based on 258a171, and verified with
`git grep -w 2023`
  • Loading branch information
SethTisue committed Jan 8, 2024
1 parent 81adeb5 commit 567412d
Show file tree
Hide file tree
Showing 7 changed files with 10 additions and 10 deletions.
4 changes: 2 additions & 2 deletions NOTICE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Scala
Copyright (c) 2002-2023 EPFL
Copyright (c) 2011-2023 Lightbend, Inc.
Copyright (c) 2002-2024 EPFL
Copyright (c) 2011-2024 Lightbend, Inc.

Scala includes software developed at
LAMP/EPFL (https://lamp.epfl.ch/) and
Expand Down
4 changes: 2 additions & 2 deletions doc/LICENSE.md
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-2023 EPFL
Copyright (c) 2002-2024 EPFL

Copyright (c) 2011-2023 Lightbend, Inc.
Copyright (c) 2011-2024 Lightbend, Inc.

All rights reserved.

Expand Down
4 changes: 2 additions & 2 deletions doc/License.rtf
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-2023 EPFL\
Copyright (c) 2011-2023 Lightbend, Inc.\
\f0\b0\fs28 \cf2 Copyright (c) 2002-2024 EPFL\
Copyright (c) 2011-2024 Lightbend, Inc.\
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
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-2023, LAMP/EPFL and Lightbend, Inc.",
copyrightString := "Copyright 2002-2024, LAMP/EPFL and Lightbend, Inc.",
shellWelcomeString := """
| ________ ___ / / ___
| / __/ __// _ | / / / _ |
Expand Down
2 changes: 1 addition & 1 deletion src/library/scala/util/Properties.scala
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-2023, LAMP/EPFL and Lightbend, Inc.")
val copyrightString = scalaPropOrElse("copyright.string", "Copyright 2002-2024, LAMP/EPFL and Lightbend, Inc.")

/** 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
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-2023 <a href="http://www.epfl.ch" target="_top">EPFL</a>, with contributions from <a href="http://www.lightbend.com" target="_top">Lightbend</a>.</div>
<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="http://www.lightbend.com" target="_top">Lightbend</a>.</div>
else
<div id="footer"> { tpl.universe.settings.docfooter.value } </div>
}
Expand Down
2 changes: 1 addition & 1 deletion src/scalap/decoder.properties
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
version.number=2.0.1
copyright.string=(c) 2002-2023 LAMP/EPFL
copyright.string=(c) 2002-2024 LAMP/EPFL

0 comments on commit 567412d

Please sign in to comment.