Skip to content

copyright 2025, and bump URLs and such, and add CLA checker #224

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.

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

Merged
merged 2 commits into from
Jan 7, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 11 additions & 0 deletions .github/workflows/cla.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
name: "Check Scala CLA"
on:
pull_request:
jobs:
cla-check:
runs-on: ubuntu-latest
steps:
- name: Verify CLA
uses: scala/cla-checker@v1
with:
author: ${{ github.event.pull_request.user.login }}
6 changes: 3 additions & 3 deletions NOTICE
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
Scala
Copyright (c) 2002-2024 EPFL
Copyright (c) 2011-2024 Lightbend, Inc.
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
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
Expand Down
5 changes: 2 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,7 @@ The specification also used to be in this repo -- it is now a part of the main r

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

The branching structure mimics that of [scala/scala](https://github.com/scala/scala):
branches for 2.11.x, 2.12.x, etc.

branches for 2.12.x and 2.13.x.
2 changes: 1 addition & 1 deletion project/ScalaDist.scala
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ object ScalaDist {
useNativeZip ++ // use native zip to preserve +x permission on scripts
Seq(
name := "scala",
maintainer := "LAMP/EPFL and Lightbend, Inc. <scala-internals@googlegroups.com>",
maintainer := "LAMP/EPFL and Akka",
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)
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.",
crossPaths := false,
Expand Down
6 changes: 3 additions & 3 deletions project/Unix.scala
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,9 @@ object Unix {

// RPM Specific
name in Rpm := "scala",
rpmVendor := "lightbend",
rpmUrl := Some("http://github.com/scala/scala"),
rpmLicense := Some("BSD"),
rpmVendor := "akka",
rpmUrl := Some("https://github.com/scala/scala"),
rpmLicense := Some("Apache 2"),
rpmGroup := Some("Development/Languages"),

// This hack lets us ignore the RPM specific versioning junks.
Expand Down
4 changes: 2 additions & 2 deletions src/linux/copyright
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
Scala
Copyright (c) 2002-2024 EPFL
Copyright (c) 2011-2024 Lightbend, Inc.
Copyright (c) 2011-2024 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
Expand Down