Skip to content

Commit 4257176

Browse files
committed
bump copyright year to 2022
in the usual places. based on 906f4cd, and verified with `git grep -w 2021`
1 parent 443c2f9 commit 4257176

File tree

7 files changed

+10
-10
lines changed

7 files changed

+10
-10
lines changed

NOTICE

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Scala
2-
Copyright (c) 2002-2021 EPFL
3-
Copyright (c) 2011-2021 Lightbend, Inc.
2+
Copyright (c) 2002-2022 EPFL
3+
Copyright (c) 2011-2022 Lightbend, Inc.
44

55
Scala includes software developed at
66
LAMP/EPFL (https://lamp.epfl.ch/) and

doc/LICENSE.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ Scala is licensed under the [Apache License Version 2.0](https://www.apache.org/
22

33
## Scala License
44

5-
Copyright (c) 2002-2021 EPFL
5+
Copyright (c) 2002-2022 EPFL
66

7-
Copyright (c) 2011-2021 Lightbend, Inc.
7+
Copyright (c) 2011-2022 Lightbend, Inc.
88

99
All rights reserved.
1010

doc/License.rtf

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ Scala is licensed under the\'a0{\field{\*\fldinst{HYPERLINK "https://www.apache.
2323
\fs48 \cf2 Scala License\
2424
\pard\pardeftab720\sl360\sa320\partightenfactor0
2525
26-
\f0\b0\fs28 \cf2 Copyright (c) 2002-2021 EPFL\
27-
Copyright (c) 2011-2021 Lightbend, Inc.\
26+
\f0\b0\fs28 \cf2 Copyright (c) 2002-2022 EPFL\
27+
Copyright (c) 2011-2022 Lightbend, Inc.\
2828
All rights reserved.\
2929
\pard\pardeftab720\sl360\sa320\partightenfactor0
3030
\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}}.\

project/VersionUtil.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ object VersionUtil {
3030
)
3131

3232
lazy val generatePropertiesFileSettings = Seq[Setting[_]](
33-
copyrightString := "Copyright 2002-2021, LAMP/EPFL and Lightbend, Inc.",
33+
copyrightString := "Copyright 2002-2022, LAMP/EPFL and Lightbend, Inc.",
3434
shellWelcomeString := """
3535
| ________ ___ / / ___
3636
| / __/ __// _ | / / / _ |

src/library/scala/util/Properties.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ private[scala] trait PropertiesTrait {
108108
* or "version (unknown)" if it cannot be determined.
109109
*/
110110
val versionString = "version " + scalaPropOrElse("version.number", "(unknown)")
111-
val copyrightString = scalaPropOrElse("copyright.string", "Copyright 2002-2021, LAMP/EPFL and Lightbend, Inc.")
111+
val copyrightString = scalaPropOrElse("copyright.string", "Copyright 2002-2022, LAMP/EPFL and Lightbend, Inc.")
112112

113113
/** This is the encoding to use reading in source files, overridden with -encoding.
114114
* Note that it uses "prop" i.e. looks in the scala jar, not the system properties.

src/scaladoc/scala/tools/nsc/doc/html/page/Entity.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -407,7 +407,7 @@ trait EntityPage extends HtmlPage {
407407

408408
{
409409
if (Set("epfl", "EPFL").contains(tpl.universe.settings.docfooter.value))
410-
<div id="footer">Scala programming documentation. Copyright (c) 2002-2021 <a href="http://www.epfl.ch" target="_top">EPFL</a>, with contributions from <a href="http://www.lightbend.com" target="_top">Lightbend</a>.</div>
410+
<div id="footer">Scala programming documentation. Copyright (c) 2002-2022 <a href="http://www.epfl.ch" target="_top">EPFL</a>, with contributions from <a href="http://www.lightbend.com" target="_top">Lightbend</a>.</div>
411411
else
412412
<div id="footer"> { tpl.universe.settings.docfooter.value } </div>
413413
}

src/scalap/decoder.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
version.number=2.0.1
2-
copyright.string=(c) 2002-2021 LAMP/EPFL
2+
copyright.string=(c) 2002-2022 LAMP/EPFL

0 commit comments

Comments
 (0)