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

Closes #5201 Relicense under the Apache 2.0 and add header to source files #5783

Closed
wants to merge 9 commits into from
Closed

Closes #5201 Relicense under the Apache 2.0 and add header to source files #5783

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
9ed7191
Closes #5201 Relicense under the Apache 2.0 and add header to source …
Fnux Jan 23, 2019
b9f2d7e
Update license header to include Lightbend, Inc. ; Add NOTICE file
Fnux Jan 26, 2019
4caf681
Rename LICENSE.txt into LICENSE
Fnux Jan 26, 2019
81dfac9
Relicense vscode-dotty under the Apache 2.0 license
Fnux Jan 26, 2019
7c47d92
AUTHORS.md: Mention CSS and JS libraries shipped by Dottydoc
Fnux Jan 26, 2019
e43f38c
Update copyright year in NOTICE and LICENSE to match AUTHORS.md
Fnux Jan 26, 2019
68450b6
Merge AUTHORS.md into NOTICE
Fnux Feb 1, 2019
110a095
Update license link in README.md to apache.org's page for ASL-2.0
Fnux Feb 1, 2019
eafff3e
Remove explicit mention to EPFL/Lightbend from APPENDIX section of LI…
Fnux Feb 3, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
7 changes: 7 additions & 0 deletions AUTHORS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,3 +75,10 @@ The majority of the dotty codebase is new code, with the exception of the compon
`dotty.tools.dotc.plugins`

> Adapted from [scala/scala](https://github.com/scala/scala) with some modifications. They were originally authored by Lex Spoon, Som Snytt, Adriaan Moors, Paul Phillips and others.

`dotty.tools.dottydoc`

> The Dottydoc documentation utility ships some third-party Javascript and CSS
> libraries which are located under `dotty-doc/resources/css/`,
> `dotty-doc/resources/js/`, `docs/css/` and `docs/js/`. Please refer to the
> license header of the concerned files for details.
3 changes: 2 additions & 1 deletion LICENSE.txt → LICENSE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,8 @@
same "printed page" as the copyright notice for easier
identification within third-party archives.

Copyright 2014-2019 EPFL
Copyright 2012-2019 EPFL
Copyright 2012-2019 Lightbend, Inc.
Fnux marked this conversation as resolved.
Show resolved Hide resolved

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
14 changes: 14 additions & 0 deletions NOTICE
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
Dotty (https://dotty.epfl.ch)
Copyright 2012-2019 EPFL
Copyright 2012-2019 Lightbend, Inc.

Licensed under the Apache License, Version 2.0 (the "License"):
http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.

This software includes projects with other licenses -- see `doc/AUTHORS.md`.
Fnux marked this conversation as resolved.
Show resolved Hide resolved
5 changes: 4 additions & 1 deletion compiler/src/dotty/tools/FatalError.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
/*
* Dotty (https://dotty.epfl.ch/)
*
* Copyright EPFL.
* Copyright EPFL and Lightbend, Inc.
*
* Licensed under Apache License 2.0
* (https://www.apache.org/licenses/LICENSE-2.0).
*
* See the NOTICE file distributed with this work for
* additional information regarding copyright ownership.
*/

package dotty.tools
Expand Down
5 changes: 4 additions & 1 deletion compiler/src/dotty/tools/backend/jvm/CollectEntryPoints.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
/*
* Dotty (https://dotty.epfl.ch/)
*
* Copyright EPFL.
* Copyright EPFL and Lightbend, Inc.
*
* Licensed under Apache License 2.0
* (https://www.apache.org/licenses/LICENSE-2.0).
*
* See the NOTICE file distributed with this work for
* additional information regarding copyright ownership.
*/

package dotty.tools.backend.jvm
Expand Down
5 changes: 4 additions & 1 deletion compiler/src/dotty/tools/backend/jvm/CollectSuperCalls.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
/*
* Dotty (https://dotty.epfl.ch/)
*
* Copyright EPFL.
* Copyright EPFL and Lightbend, Inc.
*
* Licensed under Apache License 2.0
* (https://www.apache.org/licenses/LICENSE-2.0).
*
* See the NOTICE file distributed with this work for
* additional information regarding copyright ownership.
*/

package dotty.tools.backend.jvm
Expand Down
5 changes: 4 additions & 1 deletion compiler/src/dotty/tools/backend/jvm/DottyBackendInterface.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
/*
* Dotty (https://dotty.epfl.ch/)
*
* Copyright EPFL.
* Copyright EPFL and Lightbend, Inc.
*
* Licensed under Apache License 2.0
* (https://www.apache.org/licenses/LICENSE-2.0).
*
* See the NOTICE file distributed with this work for
* additional information regarding copyright ownership.
*/

package dotty.tools.backend.jvm
Expand Down
5 changes: 4 additions & 1 deletion compiler/src/dotty/tools/backend/jvm/GenBCode.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
/*
* Dotty (https://dotty.epfl.ch/)
*
* Copyright EPFL.
* Copyright EPFL and Lightbend, Inc.
*
* Licensed under Apache License 2.0
* (https://www.apache.org/licenses/LICENSE-2.0).
*
* See the NOTICE file distributed with this work for
* additional information regarding copyright ownership.
*/

package dotty.tools.backend.jvm
Expand Down
5 changes: 4 additions & 1 deletion compiler/src/dotty/tools/backend/jvm/scalaPrimitives.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
/*
* Dotty (https://dotty.epfl.ch/)
*
* Copyright EPFL.
* Copyright EPFL and Lightbend, Inc.
*
* Licensed under Apache License 2.0
* (https://www.apache.org/licenses/LICENSE-2.0).
*
* See the NOTICE file distributed with this work for
* additional information regarding copyright ownership.
*/

package dotty.tools
Expand Down
5 changes: 4 additions & 1 deletion compiler/src/dotty/tools/backend/sjs/GenSJSIR.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
/*
* Dotty (https://dotty.epfl.ch/)
*
* Copyright EPFL.
* Copyright EPFL and Lightbend, Inc.
*
* Licensed under Apache License 2.0
* (https://www.apache.org/licenses/LICENSE-2.0).
*
* See the NOTICE file distributed with this work for
* additional information regarding copyright ownership.
*/

package dotty.tools.backend.sjs
Expand Down
5 changes: 4 additions & 1 deletion compiler/src/dotty/tools/backend/sjs/JSCodeGen.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
/*
* Dotty (https://dotty.epfl.ch/)
*
* Copyright EPFL.
* Copyright EPFL and Lightbend, Inc.
*
* Licensed under Apache License 2.0
* (https://www.apache.org/licenses/LICENSE-2.0).
*
* See the NOTICE file distributed with this work for
* additional information regarding copyright ownership.
*/

package dotty.tools.backend.sjs
Expand Down
5 changes: 4 additions & 1 deletion compiler/src/dotty/tools/backend/sjs/JSDefinitions.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
/*
* Dotty (https://dotty.epfl.ch/)
*
* Copyright EPFL.
* Copyright EPFL and Lightbend, Inc.
*
* Licensed under Apache License 2.0
* (https://www.apache.org/licenses/LICENSE-2.0).
*
* See the NOTICE file distributed with this work for
* additional information regarding copyright ownership.
*/

package dotty.tools.backend.sjs
Expand Down
5 changes: 4 additions & 1 deletion compiler/src/dotty/tools/backend/sjs/JSEncoding.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
/*
* Dotty (https://dotty.epfl.ch/)
*
* Copyright EPFL.
* Copyright EPFL and Lightbend, Inc.
*
* Licensed under Apache License 2.0
* (https://www.apache.org/licenses/LICENSE-2.0).
*
* See the NOTICE file distributed with this work for
* additional information regarding copyright ownership.
*/

package dotty.tools.backend.sjs
Expand Down
5 changes: 4 additions & 1 deletion compiler/src/dotty/tools/backend/sjs/JSInterop.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
/*
* Dotty (https://dotty.epfl.ch/)
*
* Copyright EPFL.
* Copyright EPFL and Lightbend, Inc.
*
* Licensed under Apache License 2.0
* (https://www.apache.org/licenses/LICENSE-2.0).
*
* See the NOTICE file distributed with this work for
* additional information regarding copyright ownership.
*/

package dotty.tools.backend.sjs
Expand Down
5 changes: 4 additions & 1 deletion compiler/src/dotty/tools/backend/sjs/JSPositions.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
/*
* Dotty (https://dotty.epfl.ch/)
*
* Copyright EPFL.
* Copyright EPFL and Lightbend, Inc.
*
* Licensed under Apache License 2.0
* (https://www.apache.org/licenses/LICENSE-2.0).
*
* See the NOTICE file distributed with this work for
* additional information regarding copyright ownership.
*/

package dotty.tools.backend.sjs
Expand Down
5 changes: 4 additions & 1 deletion compiler/src/dotty/tools/backend/sjs/JSPrimitives.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
/*
* Dotty (https://dotty.epfl.ch/)
*
* Copyright EPFL.
* Copyright EPFL and Lightbend, Inc.
*
* Licensed under Apache License 2.0
* (https://www.apache.org/licenses/LICENSE-2.0).
*
* See the NOTICE file distributed with this work for
* additional information regarding copyright ownership.
*/

package dotty.tools.backend.sjs
Expand Down
5 changes: 4 additions & 1 deletion compiler/src/dotty/tools/backend/sjs/ScopedVar.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
/*
* Dotty (https://dotty.epfl.ch/)
*
* Copyright EPFL.
* Copyright EPFL and Lightbend, Inc.
*
* Licensed under Apache License 2.0
* (https://www.apache.org/licenses/LICENSE-2.0).
*
* See the NOTICE file distributed with this work for
* additional information regarding copyright ownership.
*/

package dotty.tools.backend.sjs
Expand Down
5 changes: 4 additions & 1 deletion compiler/src/dotty/tools/dotc/Bench.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
/*
* Dotty (https://dotty.epfl.ch/)
*
* Copyright EPFL.
* Copyright EPFL and Lightbend, Inc.
*
* Licensed under Apache License 2.0
* (https://www.apache.org/licenses/LICENSE-2.0).
*
* See the NOTICE file distributed with this work for
* additional information regarding copyright ownership.
*/

package dotty.tools
Expand Down
5 changes: 4 additions & 1 deletion compiler/src/dotty/tools/dotc/CompilationUnit.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
/*
* Dotty (https://dotty.epfl.ch/)
*
* Copyright EPFL.
* Copyright EPFL and Lightbend, Inc.
*
* Licensed under Apache License 2.0
* (https://www.apache.org/licenses/LICENSE-2.0).
*
* See the NOTICE file distributed with this work for
* additional information regarding copyright ownership.
*/

package dotty.tools
Expand Down
5 changes: 4 additions & 1 deletion compiler/src/dotty/tools/dotc/Compiler.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
/*
* Dotty (https://dotty.epfl.ch/)
*
* Copyright EPFL.
* Copyright EPFL and Lightbend, Inc.
*
* Licensed under Apache License 2.0
* (https://www.apache.org/licenses/LICENSE-2.0).
*
* See the NOTICE file distributed with this work for
* additional information regarding copyright ownership.
*/

package dotty.tools
Expand Down
5 changes: 4 additions & 1 deletion compiler/src/dotty/tools/dotc/Driver.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
/*
* Dotty (https://dotty.epfl.ch/)
*
* Copyright EPFL.
* Copyright EPFL and Lightbend, Inc.
*
* Licensed under Apache License 2.0
* (https://www.apache.org/licenses/LICENSE-2.0).
*
* See the NOTICE file distributed with this work for
* additional information regarding copyright ownership.
*/

package dotty.tools.dotc
Expand Down
5 changes: 4 additions & 1 deletion compiler/src/dotty/tools/dotc/Main.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
/*
* Dotty (https://dotty.epfl.ch/)
*
* Copyright EPFL.
* Copyright EPFL and Lightbend, Inc.
*
* Licensed under Apache License 2.0
* (https://www.apache.org/licenses/LICENSE-2.0).
*
* See the NOTICE file distributed with this work for
* additional information regarding copyright ownership.
*/

package dotty.tools
Expand Down
5 changes: 4 additions & 1 deletion compiler/src/dotty/tools/dotc/MissingCoreLibraryException.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
/*
* Dotty (https://dotty.epfl.ch/)
*
* Copyright EPFL.
* Copyright EPFL and Lightbend, Inc.
*
* Licensed under Apache License 2.0
* (https://www.apache.org/licenses/LICENSE-2.0).
*
* See the NOTICE file distributed with this work for
* additional information regarding copyright ownership.
*/

package dotty.tools.dotc
Expand Down
5 changes: 4 additions & 1 deletion compiler/src/dotty/tools/dotc/Resident.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
/*
* Dotty (https://dotty.epfl.ch/)
*
* Copyright EPFL.
* Copyright EPFL and Lightbend, Inc.
*
* Licensed under Apache License 2.0
* (https://www.apache.org/licenses/LICENSE-2.0).
*
* See the NOTICE file distributed with this work for
* additional information regarding copyright ownership.
*/

package dotty.tools
Expand Down
5 changes: 4 additions & 1 deletion compiler/src/dotty/tools/dotc/Run.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
/*
* Dotty (https://dotty.epfl.ch/)
*
* Copyright EPFL.
* Copyright EPFL and Lightbend, Inc.
*
* Licensed under Apache License 2.0
* (https://www.apache.org/licenses/LICENSE-2.0).
*
* See the NOTICE file distributed with this work for
* additional information regarding copyright ownership.
*/

package dotty.tools
Expand Down
5 changes: 4 additions & 1 deletion compiler/src/dotty/tools/dotc/ast/Desugar.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
/*
* Dotty (https://dotty.epfl.ch/)
*
* Copyright EPFL.
* Copyright EPFL and Lightbend, Inc.
*
* Licensed under Apache License 2.0
* (https://www.apache.org/licenses/LICENSE-2.0).
*
* See the NOTICE file distributed with this work for
* additional information regarding copyright ownership.
*/

package dotty.tools
Expand Down
5 changes: 4 additions & 1 deletion compiler/src/dotty/tools/dotc/ast/DesugarEnums.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
/*
* Dotty (https://dotty.epfl.ch/)
*
* Copyright EPFL.
* Copyright EPFL and Lightbend, Inc.
*
* Licensed under Apache License 2.0
* (https://www.apache.org/licenses/LICENSE-2.0).
*
* See the NOTICE file distributed with this work for
* additional information regarding copyright ownership.
*/

package dotty.tools
Expand Down
Loading