Skip to content

Commit f1c600c

Browse files
authored
Merge pull request #224 from SethTisue/copyright-2025
copyright 2025, and bump URLs and such, and add CLA checker
2 parents b1736d7 + 392f858 commit f1c600c

File tree

6 files changed

+22
-12
lines changed

6 files changed

+22
-12
lines changed

.github/workflows/cla.yml

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
name: "Check Scala CLA"
2+
on:
3+
pull_request:
4+
jobs:
5+
cla-check:
6+
runs-on: ubuntu-latest
7+
steps:
8+
- name: Verify CLA
9+
uses: scala/cla-checker@v1
10+
with:
11+
author: ${{ github.event.pull_request.user.login }}

NOTICE

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
Scala
2-
Copyright (c) 2002-2024 EPFL
3-
Copyright (c) 2011-2024 Lightbend, Inc.
2+
Copyright (c) 2002-2025 EPFL
3+
Copyright (c) 2011-2025 Lightbend, Inc. dba Akka
44

55
Scala includes software developed at
66
LAMP/EPFL (https://lamp.epfl.ch/) and
7-
Lightbend, Inc. (https://www.lightbend.com/).
7+
Akka (https://akka.io/).
88

99
Licensed under the Apache License, Version 2.0 (the "License").
1010
Unless required by applicable law or agreed to in writing, software

README.md

+2-3
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,7 @@ The specification also used to be in this repo -- it is now a part of the main r
4444

4545
## Contributing ##
4646
Please read the [Scala Pull Request Policy](https://github.com/scala/scala/wiki/Pull-Request-Policy)
47-
and sign the [CLA](http://www.lightbend.com/contribute/cla/scala).
47+
and sign the [CLA](http://contribute.akka.io/cla/scala).
4848

4949
The branching structure mimics that of [scala/scala](https://github.com/scala/scala):
50-
branches for 2.11.x, 2.12.x, etc.
51-
50+
branches for 2.12.x and 2.13.x.

project/ScalaDist.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ object ScalaDist {
5252
useNativeZip ++ // use native zip to preserve +x permission on scripts
5353
Seq(
5454
name := "scala",
55-
maintainer := "LAMP/EPFL and Lightbend, Inc. <[email protected]>",
55+
maintainer := "LAMP/EPFL and Akka",
5656
packageSummary := "Scala Programming Language Distribution", // this will be spliced into the middle of a sentence --> no period (it also determines sort order, so, no "The" in front)
5757
packageDescription := "Have the best of both worlds. Construct elegant class hierarchies for maximum code reuse and extensibility, implement their behavior using higher-order functions. Or anything in-between.",
5858
crossPaths := false,

project/Unix.scala

+3-3
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,9 @@ object Unix {
6666

6767
// RPM Specific
6868
name in Rpm := "scala",
69-
rpmVendor := "lightbend",
70-
rpmUrl := Some("http://github.com/scala/scala"),
71-
rpmLicense := Some("BSD"),
69+
rpmVendor := "akka",
70+
rpmUrl := Some("https://github.com/scala/scala"),
71+
rpmLicense := Some("Apache 2"),
7272
rpmGroup := Some("Development/Languages"),
7373

7474
// This hack lets us ignore the RPM specific versioning junks.

src/linux/copyright

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
Scala
22
Copyright (c) 2002-2024 EPFL
3-
Copyright (c) 2011-2024 Lightbend, Inc.
3+
Copyright (c) 2011-2024 Lightbend, Inc. dba Akka
44

55
Scala includes software developed at
66
LAMP/EPFL (https://lamp.epfl.ch/) and
7-
Lightbend, Inc. (https://www.lightbend.com/).
7+
Akka. (https://akka.io/).
88

99
Licensed under the Apache License, Version 2.0 (the "License").
1010
Unless required by applicable law or agreed to in writing, software

0 commit comments

Comments
 (0)