diff --git a/.travis.yml b/.travis.yml index f56b55fb..1e10ce2b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,6 +6,7 @@ scala: - 2.13.0-M5 jdk: - oraclejdk8 + - openjdk11 env: global: diff --git a/LICENSE b/LICENSE index 57f166ce..261eeb9e 100644 --- a/LICENSE +++ b/LICENSE @@ -1,28 +1,201 @@ -Copyright (c) 2002-2018 EPFL -Copyright (c) 2011-2018 Lightbend, Inc. - -All rights reserved. - -Redistribution and use in source and binary forms, with or without modification, -are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of the EPFL nor the names of its contributors - may be used to endorse or promote products derived from this software - without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR -CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, -EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR -PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + 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 + + 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. diff --git a/NOTICE b/NOTICE new file mode 100644 index 00000000..6b6a05b0 --- /dev/null +++ b/NOTICE @@ -0,0 +1,14 @@ +scala-collection-compat +Copyright (c) 2002-2019 EPFL +Copyright (c) 2011-2019 Lightbend, Inc. + +Scala includes software developed at +LAMP/EPFL (https://lamp.epfl.ch/) and +Lightbend, Inc. (https://www.lightbend.com/). + +Licensed under the Apache License, Version 2.0 (the "License"). +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. diff --git a/binary-compat/new/src/main/scala/org.example/Lib.scala b/binary-compat/new/src/main/scala/org.example/Lib.scala index 68c91ef7..f353d9d4 100644 --- a/binary-compat/new/src/main/scala/org.example/Lib.scala +++ b/binary-compat/new/src/main/scala/org.example/Lib.scala @@ -1,3 +1,15 @@ +/* + * Scala (https://www.scala-lang.org) + * + * Copyright EPFL and Lightbend, Inc. + * + * Licensed under Apache License 2.0 + * (http://www.apache.org/licenses/LICENSE-2.0). + * + * See the NOTICE file distributed with this work for + * additional information regarding copyright ownership. + */ + package org.example import scala.collection.generic._ diff --git a/binary-compat/old/src/main/scala/org.example/Lib.scala b/binary-compat/old/src/main/scala/org.example/Lib.scala index fa51e475..25857a6c 100644 --- a/binary-compat/old/src/main/scala/org.example/Lib.scala +++ b/binary-compat/old/src/main/scala/org.example/Lib.scala @@ -1,3 +1,15 @@ +/* + * Scala (https://www.scala-lang.org) + * + * Copyright EPFL and Lightbend, Inc. + * + * Licensed under Apache License 2.0 + * (http://www.apache.org/licenses/LICENSE-2.0). + * + * See the NOTICE file distributed with this work for + * additional information regarding copyright ownership. + */ + package org.example import scala.collection.generic._ diff --git a/binary-compat/test/src/test/scala/BinaryCompaTest.scala b/binary-compat/test/src/test/scala/BinaryCompaTest.scala index dba6a50f..e15ff9b3 100644 --- a/binary-compat/test/src/test/scala/BinaryCompaTest.scala +++ b/binary-compat/test/src/test/scala/BinaryCompaTest.scala @@ -1,3 +1,15 @@ +/* + * Scala (https://www.scala-lang.org) + * + * Copyright EPFL and Lightbend, Inc. + * + * Licensed under Apache License 2.0 + * (http://www.apache.org/licenses/LICENSE-2.0). + * + * See the NOTICE file distributed with this work for + * additional information regarding copyright ownership. + */ + import org.junit.{Assert, Test} import build.BuildInfo._ diff --git a/build.sbt b/build.sbt index 976ca419..d594c7d1 100644 --- a/build.sbt +++ b/build.sbt @@ -2,8 +2,24 @@ import ScalaModulePlugin._ import sbtcrossproject.{crossProject, CrossType} import _root_.scalafix.sbt.BuildInfo.{scalafixVersion, scala212 => scalafixScala212} +lazy val commonSettings = Seq( + // this line could be removed after https://github.com/scala/sbt-scala-module/issues/48 is fixed + licenses := Seq(("Apache-2.0", url("https://www.apache.org/licenses/LICENSE-2.0"))), + headerLicense := Some(HeaderLicense.Custom( + s"""|Scala (https://www.scala-lang.org) + | + |Copyright EPFL and Lightbend, Inc. + | + |Licensed under Apache License 2.0 + |(http://www.apache.org/licenses/LICENSE-2.0). + | + |See the NOTICE file distributed with this work for + |additional information regarding copyright ownership. + |""".stripMargin))) + lazy val root = project .in(file(".")) + .settings(commonSettings) .settings(dontPublish) .aggregate( compat211JVM, @@ -36,6 +52,7 @@ lazy val scala213 = "2.13.0-M5" lazy val compat = MultiScalaCrossProject(JSPlatform, JVMPlatform)( "compat", _.settings(scalaModuleSettings) + .settings(commonSettings) .jvmSettings(scalaModuleSettingsJVM) .settings( name := "scala-collection-compat", @@ -79,17 +96,20 @@ lazy val compat213JS = compat213.js lazy val `binary-compat-old` = project .in(file("binary-compat/old")) + .settings(commonSettings) .settings(scalaVersion := scala212) .disablePlugins(ScalafixPlugin) lazy val `binary-compat-new` = project .in(file("binary-compat/new")) + .settings(commonSettings) .settings(scalaVersion := scala212) .dependsOn(compat212JVM) .disablePlugins(ScalafixPlugin) lazy val `binary-compat` = project .in(file("binary-compat/test")) + .settings(commonSettings) .settings( scalaVersion := scala212, libraryDependencies += "com.typesafe" %% "mima-reporter" % "0.3.0" % Test, @@ -111,6 +131,7 @@ lazy val `binary-compat` = project lazy val `scalafix-rules` = project .in(file("scalafix/rules")) + .settings(commonSettings) .settings(scalaModuleSettings) .settings( organization := (organization in compat212JVM).value, @@ -136,6 +157,7 @@ lazy val `scalafix-data` = MultiScalaProject( "scalafix-data", "scalafix/data", _.settings(sharedScalafixSettings) + .settings(commonSettings) .settings(dontPublish) ) @@ -145,6 +167,7 @@ val `scalafix-data213` = `scalafix-data`(scala213, _.dependsOn(compat213JVM)) lazy val `scalafix-input` = project .in(file("scalafix/input")) + .settings(commonSettings) .settings(sharedScalafixSettings) .settings(dontPublish) .settings( @@ -160,6 +183,7 @@ lazy val `scalafix-input` = project val `scalafix-output` = MultiScalaProject("scalafix-output", "scalafix/output", _.settings(sharedScalafixSettings) + .settings(commonSettings) .settings(dontPublish) .disablePlugins(ScalafixPlugin)) @@ -199,11 +223,13 @@ lazy val `scalafix-output213` = `scalafix-output`( lazy val `scalafix-output213-failure` = project .in(file("scalafix/output213-failure")) + .settings(commonSettings) .settings(sharedScalafixSettings) .settings(dontPublish) lazy val `scalafix-tests` = project .in(file("scalafix/tests")) + .settings(commonSettings) .settings(sharedScalafixSettings) .settings(dontPublish) .settings( diff --git a/compat/src/main/scala-2.11/scala/collection/compat/package.scala b/compat/src/main/scala-2.11/scala/collection/compat/package.scala index 479401e5..c60b579f 100644 --- a/compat/src/main/scala-2.11/scala/collection/compat/package.scala +++ b/compat/src/main/scala-2.11/scala/collection/compat/package.scala @@ -1,3 +1,15 @@ +/* + * Scala (https://www.scala-lang.org) + * + * Copyright EPFL and Lightbend, Inc. + * + * Licensed under Apache License 2.0 + * (http://www.apache.org/licenses/LICENSE-2.0). + * + * See the NOTICE file distributed with this work for + * additional information regarding copyright ownership. + */ + package scala.collection package object compat extends compat.PackageShared diff --git a/compat/src/main/scala-2.11_2.12/scala/collection/compat/BuildFrom.scala b/compat/src/main/scala-2.11_2.12/scala/collection/compat/BuildFrom.scala index c7bf65ce..c03033bd 100644 --- a/compat/src/main/scala-2.11_2.12/scala/collection/compat/BuildFrom.scala +++ b/compat/src/main/scala-2.11_2.12/scala/collection/compat/BuildFrom.scala @@ -1,3 +1,15 @@ +/* + * Scala (https://www.scala-lang.org) + * + * Copyright EPFL and Lightbend, Inc. + * + * Licensed under Apache License 2.0 + * (http://www.apache.org/licenses/LICENSE-2.0). + * + * See the NOTICE file distributed with this work for + * additional information regarding copyright ownership. + */ + package scala.collection.compat import scala.collection.generic.CanBuildFrom diff --git a/compat/src/main/scala-2.11_2.12/scala/collection/compat/CompatImpl.scala b/compat/src/main/scala-2.11_2.12/scala/collection/compat/CompatImpl.scala index 90af472d..f6f43961 100644 --- a/compat/src/main/scala-2.11_2.12/scala/collection/compat/CompatImpl.scala +++ b/compat/src/main/scala-2.11_2.12/scala/collection/compat/CompatImpl.scala @@ -1,3 +1,15 @@ +/* + * Scala (https://www.scala-lang.org) + * + * Copyright EPFL and Lightbend, Inc. + * + * Licensed under Apache License 2.0 + * (http://www.apache.org/licenses/LICENSE-2.0). + * + * See the NOTICE file distributed with this work for + * additional information regarding copyright ownership. + */ + package scala.collection.compat import scala.collection.generic.CanBuildFrom diff --git a/compat/src/main/scala-2.11_2.12/scala/collection/compat/PackageShared.scala b/compat/src/main/scala-2.11_2.12/scala/collection/compat/PackageShared.scala index 9f82ded7..e01cd648 100644 --- a/compat/src/main/scala-2.11_2.12/scala/collection/compat/PackageShared.scala +++ b/compat/src/main/scala-2.11_2.12/scala/collection/compat/PackageShared.scala @@ -1,3 +1,15 @@ +/* + * Scala (https://www.scala-lang.org) + * + * Copyright EPFL and Lightbend, Inc. + * + * Licensed under Apache License 2.0 + * (http://www.apache.org/licenses/LICENSE-2.0). + * + * See the NOTICE file distributed with this work for + * additional information regarding copyright ownership. + */ + package scala.collection.compat import scala.collection.generic._ diff --git a/compat/src/main/scala-2.11_2.12/scala/collection/compat/immutable/ArraySeq.scala b/compat/src/main/scala-2.11_2.12/scala/collection/compat/immutable/ArraySeq.scala index b89327a7..670dc33d 100644 --- a/compat/src/main/scala-2.11_2.12/scala/collection/compat/immutable/ArraySeq.scala +++ b/compat/src/main/scala-2.11_2.12/scala/collection/compat/immutable/ArraySeq.scala @@ -1,3 +1,15 @@ +/* + * Scala (https://www.scala-lang.org) + * + * Copyright EPFL and Lightbend, Inc. + * + * Licensed under Apache License 2.0 + * (http://www.apache.org/licenses/LICENSE-2.0). + * + * See the NOTICE file distributed with this work for + * additional information regarding copyright ownership. + */ + package scala.collection.compat.immutable import java.util.Arrays diff --git a/compat/src/main/scala-2.12/scala/collection/compat/package.scala b/compat/src/main/scala-2.12/scala/collection/compat/package.scala index 0ebf09a1..987e35b4 100644 --- a/compat/src/main/scala-2.12/scala/collection/compat/package.scala +++ b/compat/src/main/scala-2.12/scala/collection/compat/package.scala @@ -1,3 +1,15 @@ +/* + * Scala (https://www.scala-lang.org) + * + * Copyright EPFL and Lightbend, Inc. + * + * Licensed under Apache License 2.0 + * (http://www.apache.org/licenses/LICENSE-2.0). + * + * See the NOTICE file distributed with this work for + * additional information regarding copyright ownership. + */ + package scala.collection import scala.collection.{mutable => m} diff --git a/compat/src/main/scala-2.13/scala/collection/compat/immutable/package.scala b/compat/src/main/scala-2.13/scala/collection/compat/immutable/package.scala index fbe4025f..316bdc0c 100644 --- a/compat/src/main/scala-2.13/scala/collection/compat/immutable/package.scala +++ b/compat/src/main/scala-2.13/scala/collection/compat/immutable/package.scala @@ -1,3 +1,15 @@ +/* + * Scala (https://www.scala-lang.org) + * + * Copyright EPFL and Lightbend, Inc. + * + * Licensed under Apache License 2.0 + * (http://www.apache.org/licenses/LICENSE-2.0). + * + * See the NOTICE file distributed with this work for + * additional information regarding copyright ownership. + */ + package scala.collection.compat package object immutable { diff --git a/compat/src/main/scala-2.13/scala/collection/compat/package.scala b/compat/src/main/scala-2.13/scala/collection/compat/package.scala index c324fc37..3a575d21 100644 --- a/compat/src/main/scala-2.13/scala/collection/compat/package.scala +++ b/compat/src/main/scala-2.13/scala/collection/compat/package.scala @@ -1,3 +1,15 @@ +/* + * Scala (https://www.scala-lang.org) + * + * Copyright EPFL and Lightbend, Inc. + * + * Licensed under Apache License 2.0 + * (http://www.apache.org/licenses/LICENSE-2.0). + * + * See the NOTICE file distributed with this work for + * additional information regarding copyright ownership. + */ + package scala.collection package object compat { diff --git a/compat/src/test/scala/test/scala/collection/ArraySeqTest.scala b/compat/src/test/scala/test/scala/collection/ArraySeqTest.scala index d34f5f2a..12eae4ce 100644 --- a/compat/src/test/scala/test/scala/collection/ArraySeqTest.scala +++ b/compat/src/test/scala/test/scala/collection/ArraySeqTest.scala @@ -1,3 +1,15 @@ +/* + * Scala (https://www.scala-lang.org) + * + * Copyright EPFL and Lightbend, Inc. + * + * Licensed under Apache License 2.0 + * (http://www.apache.org/licenses/LICENSE-2.0). + * + * See the NOTICE file distributed with this work for + * additional information regarding copyright ownership. + */ + package test.scala.collection import org.junit.{Assert, Test} diff --git a/compat/src/test/scala/test/scala/collection/BuildFromTest.scala b/compat/src/test/scala/test/scala/collection/BuildFromTest.scala index 32d86dab..0081eb05 100644 --- a/compat/src/test/scala/test/scala/collection/BuildFromTest.scala +++ b/compat/src/test/scala/test/scala/collection/BuildFromTest.scala @@ -1,3 +1,15 @@ +/* + * Scala (https://www.scala-lang.org) + * + * Copyright EPFL and Lightbend, Inc. + * + * Licensed under Apache License 2.0 + * (http://www.apache.org/licenses/LICENSE-2.0). + * + * See the NOTICE file distributed with this work for + * additional information regarding copyright ownership. + */ + package test.scala.collection import org.junit.Test diff --git a/compat/src/test/scala/test/scala/collection/CollectionTest.scala b/compat/src/test/scala/test/scala/collection/CollectionTest.scala index c5548792..f9b7ac89 100644 --- a/compat/src/test/scala/test/scala/collection/CollectionTest.scala +++ b/compat/src/test/scala/test/scala/collection/CollectionTest.scala @@ -1,3 +1,15 @@ +/* + * Scala (https://www.scala-lang.org) + * + * Copyright EPFL and Lightbend, Inc. + * + * Licensed under Apache License 2.0 + * (http://www.apache.org/licenses/LICENSE-2.0). + * + * See the NOTICE file distributed with this work for + * additional information regarding copyright ownership. + */ + package test.scala.collection import org.junit.Assert._ diff --git a/compat/src/test/scala/test/scala/collection/FactoryTest.scala b/compat/src/test/scala/test/scala/collection/FactoryTest.scala index e55074d7..c004e76b 100644 --- a/compat/src/test/scala/test/scala/collection/FactoryTest.scala +++ b/compat/src/test/scala/test/scala/collection/FactoryTest.scala @@ -1,3 +1,15 @@ +/* + * Scala (https://www.scala-lang.org) + * + * Copyright EPFL and Lightbend, Inc. + * + * Licensed under Apache License 2.0 + * (http://www.apache.org/licenses/LICENSE-2.0). + * + * See the NOTICE file distributed with this work for + * additional information regarding copyright ownership. + */ + package test.scala.collection import org.junit.{Assert, Test} diff --git a/compat/src/test/scala/test/scala/collection/NoImportTest.scala b/compat/src/test/scala/test/scala/collection/NoImportTest.scala index 0275627c..d52de72c 100644 --- a/compat/src/test/scala/test/scala/collection/NoImportTest.scala +++ b/compat/src/test/scala/test/scala/collection/NoImportTest.scala @@ -1,3 +1,15 @@ +/* + * Scala (https://www.scala-lang.org) + * + * Copyright EPFL and Lightbend, Inc. + * + * Licensed under Apache License 2.0 + * (http://www.apache.org/licenses/LICENSE-2.0). + * + * See the NOTICE file distributed with this work for + * additional information regarding copyright ownership. + */ + package test.scala.collection // Don't import scala.collection.compat._ diff --git a/compat/src/test/scala/test/scala/collection/StreamTest.scala b/compat/src/test/scala/test/scala/collection/StreamTest.scala index f31e38d5..74c11610 100644 --- a/compat/src/test/scala/test/scala/collection/StreamTest.scala +++ b/compat/src/test/scala/test/scala/collection/StreamTest.scala @@ -1,3 +1,15 @@ +/* + * Scala (https://www.scala-lang.org) + * + * Copyright EPFL and Lightbend, Inc. + * + * Licensed under Apache License 2.0 + * (http://www.apache.org/licenses/LICENSE-2.0). + * + * See the NOTICE file distributed with this work for + * additional information regarding copyright ownership. + */ + package test.scala.collection import org.junit.Test diff --git a/compat/src/test/scala/test/scala/collection/generic/SortedTest.scala b/compat/src/test/scala/test/scala/collection/generic/SortedTest.scala index 173ec9e1..fde31750 100644 --- a/compat/src/test/scala/test/scala/collection/generic/SortedTest.scala +++ b/compat/src/test/scala/test/scala/collection/generic/SortedTest.scala @@ -1,3 +1,15 @@ +/* + * Scala (https://www.scala-lang.org) + * + * Copyright EPFL and Lightbend, Inc. + * + * Licensed under Apache License 2.0 + * (http://www.apache.org/licenses/LICENSE-2.0). + * + * See the NOTICE file distributed with this work for + * additional information regarding copyright ownership. + */ + package test.scala.collection.generic import org.junit.Assert._ diff --git a/project/plugins.sbt b/project/plugins.sbt index 977b033f..fed3154a 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,7 +1,7 @@ if (System.getProperty("java.version").startsWith("1.")) Seq() else - // override to version that works on Java 9, + // override to version that works on Java 11, // see https://github.com/scala/sbt-scala-module/issues/35 Seq(addSbtPlugin("com.typesafe.sbt" % "sbt-osgi" % "0.9.3")) @@ -13,3 +13,4 @@ addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "1.0.14") addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.4") addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.7.0") addSbtPlugin("com.typesafe.sbt" % "sbt-pgp" % "0.8.3") +addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.0.0") diff --git a/scalafix/data/src/main/scala/fix/conversions/JavaConversionsDataSrc.scala b/scalafix/data/src/main/scala/fix/conversions/JavaConversionsDataSrc.scala index 1f2f9703..222dedef 100644 --- a/scalafix/data/src/main/scala/fix/conversions/JavaConversionsDataSrc.scala +++ b/scalafix/data/src/main/scala/fix/conversions/JavaConversionsDataSrc.scala @@ -1,3 +1,15 @@ +/* + * Scala (https://www.scala-lang.org) + * + * Copyright EPFL and Lightbend, Inc. + * + * Licensed under Apache License 2.0 + * (http://www.apache.org/licenses/LICENSE-2.0). + * + * See the NOTICE file distributed with this work for + * additional information regarding copyright ownership. + */ + package fix.conversions import scala.collection.{immutable => i, mutable => m, concurrent => conc} diff --git a/scalafix/output/src/main/scala/fix/BreakoutSrc.scala b/scalafix/output/src/main/scala/fix/BreakoutSrc.scala index f1083213..8317267f 100644 --- a/scalafix/output/src/main/scala/fix/BreakoutSrc.scala +++ b/scalafix/output/src/main/scala/fix/BreakoutSrc.scala @@ -1,6 +1,3 @@ - - - package fix import scala.collection.{immutable, mutable} diff --git a/scalafix/output/src/main/scala/fix/CanBuildFromSrc.scala b/scalafix/output/src/main/scala/fix/CanBuildFromSrc.scala index adfdf580..617e8e4d 100644 --- a/scalafix/output/src/main/scala/fix/CanBuildFromSrc.scala +++ b/scalafix/output/src/main/scala/fix/CanBuildFromSrc.scala @@ -1,6 +1,3 @@ - - - package fix import scala.language.higherKinds diff --git a/scalafix/output/src/main/scala/fix/CompanionSrc.scala b/scalafix/output/src/main/scala/fix/CompanionSrc.scala index b3516209..0679769a 100644 --- a/scalafix/output/src/main/scala/fix/CompanionSrc.scala +++ b/scalafix/output/src/main/scala/fix/CompanionSrc.scala @@ -1,6 +1,3 @@ - - - package fix import scala.{collection => c} diff --git a/scalafix/output/src/main/scala/fix/CopyToBufferSrc.scala b/scalafix/output/src/main/scala/fix/CopyToBufferSrc.scala index b3f33c9e..5c47f203 100644 --- a/scalafix/output/src/main/scala/fix/CopyToBufferSrc.scala +++ b/scalafix/output/src/main/scala/fix/CopyToBufferSrc.scala @@ -1,6 +1,3 @@ - - - package fix import scala.collection.mutable diff --git a/scalafix/output/src/main/scala/fix/ExperimentalSrc.scala b/scalafix/output/src/main/scala/fix/ExperimentalSrc.scala index fbd96669..44390d69 100644 --- a/scalafix/output/src/main/scala/fix/ExperimentalSrc.scala +++ b/scalafix/output/src/main/scala/fix/ExperimentalSrc.scala @@ -1,6 +1,3 @@ - - - package fix import scala.collection @@ -24,4 +21,4 @@ class ExperimentalSrc(iset: immutable.Set[Int], // Map.zip imap.zip(List()).toMap List().zip(List()) -} \ No newline at end of file +} diff --git a/scalafix/output/src/main/scala/fix/FoldSrc.scala b/scalafix/output/src/main/scala/fix/FoldSrc.scala index 0cbe9681..7a006928 100644 --- a/scalafix/output/src/main/scala/fix/FoldSrc.scala +++ b/scalafix/output/src/main/scala/fix/FoldSrc.scala @@ -1,6 +1,3 @@ - - - package fix class FoldSrc(xs: List[Int]){ @@ -9,4 +6,4 @@ class FoldSrc(xs: List[Int]){ xs.foldLeft(0)(f) xs.foldRight(1)(g) -} \ No newline at end of file +} diff --git a/scalafix/output/src/main/scala/fix/FutureSrc.scala b/scalafix/output/src/main/scala/fix/FutureSrc.scala index 454036db..9d501cb3 100644 --- a/scalafix/output/src/main/scala/fix/FutureSrc.scala +++ b/scalafix/output/src/main/scala/fix/FutureSrc.scala @@ -1,6 +1,3 @@ - - - package fix import scala.concurrent.{Future, ExecutionContext} diff --git a/scalafix/output/src/main/scala/fix/IdempotencySrc.scala b/scalafix/output/src/main/scala/fix/IdempotencySrc.scala index f2e99368..c7801b17 100644 --- a/scalafix/output/src/main/scala/fix/IdempotencySrc.scala +++ b/scalafix/output/src/main/scala/fix/IdempotencySrc.scala @@ -1,6 +1,3 @@ - - - package fix import scala.collection.compat._ diff --git a/scalafix/output/src/main/scala/fix/IterableSrc.scala b/scalafix/output/src/main/scala/fix/IterableSrc.scala index 8730e421..87895b9f 100644 --- a/scalafix/output/src/main/scala/fix/IterableSrc.scala +++ b/scalafix/output/src/main/scala/fix/IterableSrc.scala @@ -1,6 +1,3 @@ - - - package fix import scala.collection.compat._ diff --git a/scalafix/output/src/main/scala/fix/MutSetMapSrc.scala b/scalafix/output/src/main/scala/fix/MutSetMapSrc.scala index 2700e5ff..bc9dd3e7 100644 --- a/scalafix/output/src/main/scala/fix/MutSetMapSrc.scala +++ b/scalafix/output/src/main/scala/fix/MutSetMapSrc.scala @@ -1,6 +1,3 @@ - - - package fix import scala.collection.mutable @@ -10,4 +7,4 @@ class MutSetMapSrc(map: mutable.Map[Int, Int], set: mutable.Set[Int]) { map.clone() += (2 -> 3) (set.clone() += 2).size map.clone() += ((1, 3)) -} \ No newline at end of file +} diff --git a/scalafix/output/src/main/scala/fix/ReplaceToSrc.scala b/scalafix/output/src/main/scala/fix/ReplaceToSrc.scala index c9cc9ee2..966b1f38 100644 --- a/scalafix/output/src/main/scala/fix/ReplaceToSrc.scala +++ b/scalafix/output/src/main/scala/fix/ReplaceToSrc.scala @@ -1,6 +1,3 @@ - - - package fix import scala.collection.compat._ diff --git a/scalafix/output/src/main/scala/fix/RoughlySrc.scala b/scalafix/output/src/main/scala/fix/RoughlySrc.scala index ffc6048c..45987020 100644 --- a/scalafix/output/src/main/scala/fix/RoughlySrc.scala +++ b/scalafix/output/src/main/scala/fix/RoughlySrc.scala @@ -1,6 +1,3 @@ - - - package fix import scala.{collection => c} diff --git a/scalafix/output/src/main/scala/fix/SetMapSrc.scala b/scalafix/output/src/main/scala/fix/SetMapSrc.scala index 918986ef..3882d891 100644 --- a/scalafix/output/src/main/scala/fix/SetMapSrc.scala +++ b/scalafix/output/src/main/scala/fix/SetMapSrc.scala @@ -1,6 +1,3 @@ - - - package fix class SetMapSrc(set: Set[Int], map: Map[Int, Int]) { diff --git a/scalafix/output/src/main/scala/fix/SortedSrc.scala b/scalafix/output/src/main/scala/fix/SortedSrc.scala index 9be31990..2e911fc1 100644 --- a/scalafix/output/src/main/scala/fix/SortedSrc.scala +++ b/scalafix/output/src/main/scala/fix/SortedSrc.scala @@ -1,6 +1,3 @@ - - - package fix import scala.{collection => c} diff --git a/scalafix/output/src/main/scala/fix/TestsSrc.scala b/scalafix/output/src/main/scala/fix/TestsSrc.scala index 9f98a66b..072de3e5 100644 --- a/scalafix/output/src/main/scala/fix/TestsSrc.scala +++ b/scalafix/output/src/main/scala/fix/TestsSrc.scala @@ -1,6 +1,3 @@ - - - package fix import scala.collection.mutable.ArrayBuilder diff --git a/scalafix/output/src/main/scala/fix/TraversableSrc.scala b/scalafix/output/src/main/scala/fix/TraversableSrc.scala index f6d2b221..ba4f5ab9 100644 --- a/scalafix/output/src/main/scala/fix/TraversableSrc.scala +++ b/scalafix/output/src/main/scala/fix/TraversableSrc.scala @@ -1,6 +1,3 @@ - - - package fix import scala.collection.immutable diff --git a/scalafix/output/src/main/scala/fix/conversions/JavaConversionsExplicitCallSrc.scala b/scalafix/output/src/main/scala/fix/conversions/JavaConversionsExplicitCallSrc.scala index 9b600a66..a71ccdcb 100644 --- a/scalafix/output/src/main/scala/fix/conversions/JavaConversionsExplicitCallSrc.scala +++ b/scalafix/output/src/main/scala/fix/conversions/JavaConversionsExplicitCallSrc.scala @@ -1,6 +1,3 @@ - - - package fix.conversions import scala.collection.{immutable => i, mutable => m, concurrent => conc} diff --git a/scalafix/output/src/main/scala/fix/conversions/JavaConversionsGlobalImportSrc.scala b/scalafix/output/src/main/scala/fix/conversions/JavaConversionsGlobalImportSrc.scala index 85f8eb12..a487f3bf 100644 --- a/scalafix/output/src/main/scala/fix/conversions/JavaConversionsGlobalImportSrc.scala +++ b/scalafix/output/src/main/scala/fix/conversions/JavaConversionsGlobalImportSrc.scala @@ -1,6 +1,3 @@ - - - package fix.conversions import scala.collection.{immutable => i, mutable => m, concurrent => conc} diff --git a/scalafix/output/src/main/scala/fix/conversions/JavaConversionsSpecificImportSrc.scala b/scalafix/output/src/main/scala/fix/conversions/JavaConversionsSpecificImportSrc.scala index 15103423..d674d2e3 100644 --- a/scalafix/output/src/main/scala/fix/conversions/JavaConversionsSpecificImportSrc.scala +++ b/scalafix/output/src/main/scala/fix/conversions/JavaConversionsSpecificImportSrc.scala @@ -1,6 +1,3 @@ - - - package fix.conversions import scala.collection.{immutable => i, mutable => m, concurrent => conc} diff --git a/scalafix/output212+/src/main/scala/fix/BreakoutSrc212Plus.scala b/scalafix/output212+/src/main/scala/fix/BreakoutSrc212Plus.scala index c3be95f5..970d843c 100644 --- a/scalafix/output212+/src/main/scala/fix/BreakoutSrc212Plus.scala +++ b/scalafix/output212+/src/main/scala/fix/BreakoutSrc212Plus.scala @@ -1,6 +1,3 @@ - - - package fix import scala.collection.mutable diff --git a/scalafix/output212+/src/main/scala/fix/SortedSrc212Plus.scala b/scalafix/output212+/src/main/scala/fix/SortedSrc212Plus.scala index 24075795..ad39a77c 100644 --- a/scalafix/output212+/src/main/scala/fix/SortedSrc212Plus.scala +++ b/scalafix/output212+/src/main/scala/fix/SortedSrc212Plus.scala @@ -1,6 +1,3 @@ - - - package fix import scala.collection.{mutable => m} diff --git a/scalafix/output212/src/main/scala/fix/CompanionSrc212.scala b/scalafix/output212/src/main/scala/fix/CompanionSrc212.scala index 4bae8dd0..f8c74455 100644 --- a/scalafix/output212/src/main/scala/fix/CompanionSrc212.scala +++ b/scalafix/output212/src/main/scala/fix/CompanionSrc212.scala @@ -1,6 +1,3 @@ - - - package fix import scala.collection.{immutable => i, mutable => m} diff --git a/scalafix/output213-failure/src/main/scala/fix/CanBuildFromNegSrc213Failure.scala b/scalafix/output213-failure/src/main/scala/fix/CanBuildFromNegSrc213Failure.scala index c3d02aaa..dbdd221b 100644 --- a/scalafix/output213-failure/src/main/scala/fix/CanBuildFromNegSrc213Failure.scala +++ b/scalafix/output213-failure/src/main/scala/fix/CanBuildFromNegSrc213Failure.scala @@ -1,5 +1,14 @@ - - +/* + * Scala (https://www.scala-lang.org) + * + * Copyright EPFL and Lightbend, Inc. + * + * Licensed under Apache License 2.0 + * (http://www.apache.org/licenses/LICENSE-2.0). + * + * See the NOTICE file distributed with this work for + * additional information regarding copyright ownership. + */ package fix diff --git a/scalafix/output213/src/main/scala/fix/RetainSrc213.scala b/scalafix/output213/src/main/scala/fix/RetainSrc213.scala index f9340a86..4788eb05 100644 --- a/scalafix/output213/src/main/scala/fix/RetainSrc213.scala +++ b/scalafix/output213/src/main/scala/fix/RetainSrc213.scala @@ -1,6 +1,3 @@ - - - package fix import scala.collection.mutable.{Map, Set} diff --git a/scalafix/output213/src/main/scala/fix/RoughlySrc213.scala b/scalafix/output213/src/main/scala/fix/RoughlySrc213.scala index 26d7d400..d640e498 100644 --- a/scalafix/output213/src/main/scala/fix/RoughlySrc213.scala +++ b/scalafix/output213/src/main/scala/fix/RoughlySrc213.scala @@ -1,6 +1,3 @@ - - - package fix import scala.LazyList diff --git a/scalafix/output213/src/main/scala/fix/TupleNZippedSrc213.scala b/scalafix/output213/src/main/scala/fix/TupleNZippedSrc213.scala index 6dec6766..05b2f8bb 100644 --- a/scalafix/output213/src/main/scala/fix/TupleNZippedSrc213.scala +++ b/scalafix/output213/src/main/scala/fix/TupleNZippedSrc213.scala @@ -1,6 +1,3 @@ - - - package fix import scala.language.postfixOps diff --git a/scalafix/rules/src/main/scala/scala/fix/collection/Breakout.scala b/scalafix/rules/src/main/scala/scala/fix/collection/Breakout.scala index 0170257c..cf611022 100644 --- a/scalafix/rules/src/main/scala/scala/fix/collection/Breakout.scala +++ b/scalafix/rules/src/main/scala/scala/fix/collection/Breakout.scala @@ -1,3 +1,15 @@ +/* + * Scala (https://www.scala-lang.org) + * + * Copyright EPFL and Lightbend, Inc. + * + * Licensed under Apache License 2.0 + * (http://www.apache.org/licenses/LICENSE-2.0). + * + * See the NOTICE file distributed with this work for + * additional information regarding copyright ownership. + */ + package scala.fix.collection import scalafix.v0._ diff --git a/scalafix/rules/src/main/scala/scala/fix/collection/CanBuildFrom.scala b/scalafix/rules/src/main/scala/scala/fix/collection/CanBuildFrom.scala index c53406dd..115e94e6 100644 --- a/scalafix/rules/src/main/scala/scala/fix/collection/CanBuildFrom.scala +++ b/scalafix/rules/src/main/scala/scala/fix/collection/CanBuildFrom.scala @@ -1,3 +1,15 @@ +/* + * Scala (https://www.scala-lang.org) + * + * Copyright EPFL and Lightbend, Inc. + * + * Licensed under Apache License 2.0 + * (http://www.apache.org/licenses/LICENSE-2.0). + * + * See the NOTICE file distributed with this work for + * additional information regarding copyright ownership. + */ + package scala.fix.collection import scalafix._ diff --git a/scalafix/rules/src/main/scala/scala/fix/collection/Collection213CrossCompat.scala b/scalafix/rules/src/main/scala/scala/fix/collection/Collection213CrossCompat.scala index a642d5e7..51332ad6 100644 --- a/scalafix/rules/src/main/scala/scala/fix/collection/Collection213CrossCompat.scala +++ b/scalafix/rules/src/main/scala/scala/fix/collection/Collection213CrossCompat.scala @@ -1,3 +1,15 @@ +/* + * Scala (https://www.scala-lang.org) + * + * Copyright EPFL and Lightbend, Inc. + * + * Licensed under Apache License 2.0 + * (http://www.apache.org/licenses/LICENSE-2.0). + * + * See the NOTICE file distributed with this work for + * additional information regarding copyright ownership. + */ + package scala.fix.collection import scalafix.v0._ diff --git a/scalafix/rules/src/main/scala/scala/fix/collection/Collection213Experimental.scala b/scalafix/rules/src/main/scala/scala/fix/collection/Collection213Experimental.scala index b0c9249a..60df8b84 100644 --- a/scalafix/rules/src/main/scala/scala/fix/collection/Collection213Experimental.scala +++ b/scalafix/rules/src/main/scala/scala/fix/collection/Collection213Experimental.scala @@ -1,3 +1,15 @@ +/* + * Scala (https://www.scala-lang.org) + * + * Copyright EPFL and Lightbend, Inc. + * + * Licensed under Apache License 2.0 + * (http://www.apache.org/licenses/LICENSE-2.0). + * + * See the NOTICE file distributed with this work for + * additional information regarding copyright ownership. + */ + package scala.fix.collection import scalafix.v0._ diff --git a/scalafix/rules/src/main/scala/scala/fix/collection/Collection213Roughly.scala b/scalafix/rules/src/main/scala/scala/fix/collection/Collection213Roughly.scala index d1a2f0f1..8b9b3e7b 100644 --- a/scalafix/rules/src/main/scala/scala/fix/collection/Collection213Roughly.scala +++ b/scalafix/rules/src/main/scala/scala/fix/collection/Collection213Roughly.scala @@ -1,3 +1,15 @@ +/* + * Scala (https://www.scala-lang.org) + * + * Copyright EPFL and Lightbend, Inc. + * + * Licensed under Apache License 2.0 + * (http://www.apache.org/licenses/LICENSE-2.0). + * + * See the NOTICE file distributed with this work for + * additional information regarding copyright ownership. + */ + package scala.fix.collection import scalafix.v0._ diff --git a/scalafix/rules/src/main/scala/scala/fix/collection/Collection213Upgrade.scala b/scalafix/rules/src/main/scala/scala/fix/collection/Collection213Upgrade.scala index 0ba02688..32ae98e2 100644 --- a/scalafix/rules/src/main/scala/scala/fix/collection/Collection213Upgrade.scala +++ b/scalafix/rules/src/main/scala/scala/fix/collection/Collection213Upgrade.scala @@ -1,3 +1,15 @@ +/* + * Scala (https://www.scala-lang.org) + * + * Copyright EPFL and Lightbend, Inc. + * + * Licensed under Apache License 2.0 + * (http://www.apache.org/licenses/LICENSE-2.0). + * + * See the NOTICE file distributed with this work for + * additional information regarding copyright ownership. + */ + package scala.fix.collection import scalafix.v0._ diff --git a/scalafix/rules/src/main/scala/scala/fix/collection/PlaygroundRule.scala b/scalafix/rules/src/main/scala/scala/fix/collection/PlaygroundRule.scala index 0aa87476..95165310 100644 --- a/scalafix/rules/src/main/scala/scala/fix/collection/PlaygroundRule.scala +++ b/scalafix/rules/src/main/scala/scala/fix/collection/PlaygroundRule.scala @@ -1,3 +1,15 @@ +/* + * Scala (https://www.scala-lang.org) + * + * Copyright EPFL and Lightbend, Inc. + * + * Licensed under Apache License 2.0 + * (http://www.apache.org/licenses/LICENSE-2.0). + * + * See the NOTICE file distributed with this work for + * additional information regarding copyright ownership. + */ + package scala.fix.collection import scalafix.v0._ diff --git a/scalafix/rules/src/main/scala/scala/fix/collection/Stable212Base.scala b/scalafix/rules/src/main/scala/scala/fix/collection/Stable212Base.scala index 194bc793..219df9b2 100644 --- a/scalafix/rules/src/main/scala/scala/fix/collection/Stable212Base.scala +++ b/scalafix/rules/src/main/scala/scala/fix/collection/Stable212Base.scala @@ -1,3 +1,15 @@ +/* + * Scala (https://www.scala-lang.org) + * + * Copyright EPFL and Lightbend, Inc. + * + * Licensed under Apache License 2.0 + * (http://www.apache.org/licenses/LICENSE-2.0). + * + * See the NOTICE file distributed with this work for + * additional information regarding copyright ownership. + */ + package scala.fix.collection import scalafix.v1 diff --git a/scalafix/rules/src/main/scala/scala/fix/collection/TypeMatcher.scala b/scalafix/rules/src/main/scala/scala/fix/collection/TypeMatcher.scala index 268a2cdb..1414deba 100644 --- a/scalafix/rules/src/main/scala/scala/fix/collection/TypeMatcher.scala +++ b/scalafix/rules/src/main/scala/scala/fix/collection/TypeMatcher.scala @@ -1,3 +1,15 @@ +/* + * Scala (https://www.scala-lang.org) + * + * Copyright EPFL and Lightbend, Inc. + * + * Licensed under Apache License 2.0 + * (http://www.apache.org/licenses/LICENSE-2.0). + * + * See the NOTICE file distributed with this work for + * additional information regarding copyright ownership. + */ + package scala.fix.collection import scalafix.v0._ diff --git a/scalafix/rules/src/main/scala/scala/fix/collection/package.scala b/scalafix/rules/src/main/scala/scala/fix/collection/package.scala index c9cb3a02..b445a990 100644 --- a/scalafix/rules/src/main/scala/scala/fix/collection/package.scala +++ b/scalafix/rules/src/main/scala/scala/fix/collection/package.scala @@ -1,3 +1,15 @@ +/* + * Scala (https://www.scala-lang.org) + * + * Copyright EPFL and Lightbend, Inc. + * + * Licensed under Apache License 2.0 + * (http://www.apache.org/licenses/LICENSE-2.0). + * + * See the NOTICE file distributed with this work for + * additional information regarding copyright ownership. + */ + package scala.fix import scalafix.v0._ diff --git a/scalafix/tests/src/test/scala/fix/ScalafixTests.scala b/scalafix/tests/src/test/scala/fix/ScalafixTests.scala index f9732c19..f7c1dce6 100644 --- a/scalafix/tests/src/test/scala/fix/ScalafixTests.scala +++ b/scalafix/tests/src/test/scala/fix/ScalafixTests.scala @@ -1,3 +1,15 @@ +/* + * Scala (https://www.scala-lang.org) + * + * Copyright EPFL and Lightbend, Inc. + * + * Licensed under Apache License 2.0 + * (http://www.apache.org/licenses/LICENSE-2.0). + * + * See the NOTICE file distributed with this work for + * additional information regarding copyright ownership. + */ + package fix import scala.meta._