Merge pull request #568 from ihostage/header

Change copyright
playframework · Dec 19, 2022 · 05de38d · 05de38d
2 parents a70c912 + 776be9a
commit 05de38d
Show file tree

Hide file tree

Showing 106 changed files with 347 additions and 68 deletions.
diff --git a/README.md b/README.md
@@ -1,3 +1,5 @@
+<!--- Copyright (C) from 2022 The Play Framework Contributors <https://github.com/playframework>, 2011-2021 Lightbend Inc. <https://www.lightbend.com> -->
+
 # Twirl
 
 [![Twitter Follow](https://img.shields.io/twitter/follow/playframework?label=follow&style=flat&logo=twitter&color=brightgreen)](https://twitter.com/playframework)

diff --git a/api/shared/src/main/scala-2.12/play/twirl/api/BaseScalaTemplate.scala b/api/shared/src/main/scala-2.12/play/twirl/api/BaseScalaTemplate.scala
@@ -1,6 +1,7 @@
 /*
- * Copyright (C) Lightbend Inc. <https://www.lightbend.com>
+ * Copyright (C) from 2022 The Play Framework Contributors <https://github.com/playframework>, 2011-2021 Lightbend Inc. <https://www.lightbend.com>
  */
+
 package play.twirl.api
 
 import java.util.Optional

diff --git a/api/shared/src/main/scala-2.12/play/twirl/api/TwirlHelperImports.scala b/api/shared/src/main/scala-2.12/play/twirl/api/TwirlHelperImports.scala
@@ -1,6 +1,7 @@
 /*
- * Copyright (C) Lightbend Inc. <https://www.lightbend.com>
+ * Copyright (C) from 2022 The Play Framework Contributors <https://github.com/playframework>, 2011-2021 Lightbend Inc. <https://www.lightbend.com>
  */
+
 package play.twirl.api
 
 import scala.language.implicitConversions

diff --git a/api/shared/src/main/scala-2.12/play/twirl/api/package.scala b/api/shared/src/main/scala-2.12/play/twirl/api/package.scala
@@ -1,6 +1,7 @@
 /*
- * Copyright (C) Lightbend Inc. <https://www.lightbend.com>
+ * Copyright (C) from 2022 The Play Framework Contributors <https://github.com/playframework>, 2011-2021 Lightbend Inc. <https://www.lightbend.com>
  */
+
 package play.twirl
 
 import scala.reflect.ClassTag

diff --git a/api/shared/src/main/scala-2.13/play/twirl/api/BaseScalaTemplate.scala b/api/shared/src/main/scala-2.13/play/twirl/api/BaseScalaTemplate.scala
@@ -1,6 +1,7 @@
 /*
- * Copyright (C) Lightbend Inc. <https://www.lightbend.com>
+ * Copyright (C) from 2022 The Play Framework Contributors <https://github.com/playframework>, 2011-2021 Lightbend Inc. <https://www.lightbend.com>
  */
+
 package play.twirl.api
 
 import java.util.Optional

diff --git a/api/shared/src/main/scala-2.13/play/twirl/api/TwirlHelperImports.scala b/api/shared/src/main/scala-2.13/play/twirl/api/TwirlHelperImports.scala
@@ -1,6 +1,7 @@
 /*
- * Copyright (C) Lightbend Inc. <https://www.lightbend.com>
+ * Copyright (C) from 2022 The Play Framework Contributors <https://github.com/playframework>, 2011-2021 Lightbend Inc. <https://www.lightbend.com>
  */
+
 package play.twirl.api
 
 import scala.language.implicitConversions

diff --git a/api/shared/src/main/scala-2.13/play/twirl/api/package.scala b/api/shared/src/main/scala-2.13/play/twirl/api/package.scala
@@ -1,6 +1,7 @@
 /*
- * Copyright (C) Lightbend Inc. <https://www.lightbend.com>
+ * Copyright (C) from 2022 The Play Framework Contributors <https://github.com/playframework>, 2011-2021 Lightbend Inc. <https://www.lightbend.com>
  */
+
 package play.twirl
 
 import scala.reflect.ClassTag

diff --git a/api/shared/src/main/scala-3/play/twirl/api/BaseScalaTemplate.scala b/api/shared/src/main/scala-3/play/twirl/api/BaseScalaTemplate.scala
@@ -1,6 +1,7 @@
 /*
- * Copyright (C) Lightbend Inc. <https://www.lightbend.com>
+ * Copyright (C) from 2022 The Play Framework Contributors <https://github.com/playframework>, 2011-2021 Lightbend Inc. <https://www.lightbend.com>
  */
+
 package play.twirl.api
 
 import java.util.Optional

diff --git a/api/shared/src/main/scala-3/play/twirl/api/TwirlHelperImports.scala b/api/shared/src/main/scala-3/play/twirl/api/TwirlHelperImports.scala
@@ -1,6 +1,7 @@
 /*
- * Copyright (C) Lightbend Inc. <https://www.lightbend.com>
+ * Copyright (C) from 2022 The Play Framework Contributors <https://github.com/playframework>, 2011-2021 Lightbend Inc. <https://www.lightbend.com>
  */
+
 package play.twirl.api
 
 import scala.language.implicitConversions

diff --git a/api/shared/src/main/scala-3/play/twirl/api/package.scala b/api/shared/src/main/scala-3/play/twirl/api/package.scala
@@ -1,6 +1,7 @@
 /*
- * Copyright (C) Lightbend Inc. <https://www.lightbend.com>
+ * Copyright (C) from 2022 The Play Framework Contributors <https://github.com/playframework>, 2011-2021 Lightbend Inc. <https://www.lightbend.com>
  */
+
 package play.twirl
 
 import scala.reflect.ClassTag

diff --git a/api/shared/src/main/scala/play/twirl/api/Content.scala b/api/shared/src/main/scala/play/twirl/api/Content.scala
@@ -1,6 +1,7 @@
 /*
- * Copyright (C) Lightbend Inc. <https://www.lightbend.com>
+ * Copyright (C) from 2022 The Play Framework Contributors <https://github.com/playframework>, 2011-2021 Lightbend Inc. <https://www.lightbend.com>
  */
+
 package play.twirl.api
 
 import scala.collection.immutable

diff --git a/api/shared/src/main/scala/play/twirl/api/Format.scala b/api/shared/src/main/scala/play/twirl/api/Format.scala
@@ -1,6 +1,7 @@
 /*
- * Copyright (C) Lightbend Inc. <https://www.lightbend.com>
+ * Copyright (C) from 2022 The Play Framework Contributors <https://github.com/playframework>, 2011-2021 Lightbend Inc. <https://www.lightbend.com>
  */
+
 package play.twirl.api
 
 import scala.collection.immutable

diff --git a/api/shared/src/main/scala/play/twirl/api/Formats.scala b/api/shared/src/main/scala/play/twirl/api/Formats.scala
@@ -1,6 +1,7 @@
 /*
- * Copyright (C) Lightbend Inc. <https://www.lightbend.com>
+ * Copyright (C) from 2022 The Play Framework Contributors <https://github.com/playframework>, 2011-2021 Lightbend Inc. <https://www.lightbend.com>
  */
+
 package play.twirl.api
 
 import play.twirl.api.utils.StringEscapeUtils

diff --git a/api/shared/src/main/scala/play/twirl/api/Template.scala b/api/shared/src/main/scala/play/twirl/api/Template.scala
@@ -1,6 +1,7 @@
 /*
- * Copyright (C) Lightbend Inc. <https://www.lightbend.com>
+ * Copyright (C) from 2022 The Play Framework Contributors <https://github.com/playframework>, 2011-2021 Lightbend Inc. <https://www.lightbend.com>
  */
+
 package play.twirl.api
 
 trait Template0[Result] {

diff --git a/api/shared/src/main/scala/play/twirl/api/TwirlFeatureImports.scala b/api/shared/src/main/scala/play/twirl/api/TwirlFeatureImports.scala
@@ -1,6 +1,7 @@
 /*
- * Copyright (C) Lightbend Inc. <https://www.lightbend.com>
+ * Copyright (C) from 2022 The Play Framework Contributors <https://github.com/playframework>, 2011-2021 Lightbend Inc. <https://www.lightbend.com>
  */
+
 package play.twirl.api
 
 import scala.language.implicitConversions

diff --git a/api/shared/src/main/scala/play/twirl/api/utils/StringEscapeUtils.scala b/api/shared/src/main/scala/play/twirl/api/utils/StringEscapeUtils.scala
@@ -1,6 +1,7 @@
 /*
- * Copyright (C) Lightbend Inc. <https://www.lightbend.com>
+ * Copyright (C) from 2022 The Play Framework Contributors <https://github.com/playframework>, 2011-2021 Lightbend Inc. <https://www.lightbend.com>
  */
+
 package play.twirl.api.utils
 
 object StringEscapeUtils {

diff --git a/api/shared/src/test/scala/play/twirl/api/test/BufferedContentSpec.scala b/api/shared/src/test/scala/play/twirl/api/test/BufferedContentSpec.scala
@@ -1,6 +1,7 @@
 /*
- * Copyright (C) Lightbend Inc. <https://www.lightbend.com>
+ * Copyright (C) from 2022 The Play Framework Contributors <https://github.com/playframework>, 2011-2021 Lightbend Inc. <https://www.lightbend.com>
  */
+
 package play.twirl.api.test
 
 import play.twirl.api._

diff --git a/api/shared/src/test/scala/play/twirl/api/test/FormatSpec.scala b/api/shared/src/test/scala/play/twirl/api/test/FormatSpec.scala
@@ -1,6 +1,7 @@
 /*
- * Copyright (C) Lightbend Inc. <https://www.lightbend.com>
+ * Copyright (C) from 2022 The Play Framework Contributors <https://github.com/playframework>, 2011-2021 Lightbend Inc. <https://www.lightbend.com>
  */
+
 package play.twirl.api
 package test
 

diff --git a/api/shared/src/test/scala/play/twirl/api/test/StringInterpolationSpec.scala b/api/shared/src/test/scala/play/twirl/api/test/StringInterpolationSpec.scala
@@ -1,6 +1,7 @@
 /*
- * Copyright (C) Lightbend Inc. <https://www.lightbend.com>
+ * Copyright (C) from 2022 The Play Framework Contributors <https://github.com/playframework>, 2011-2021 Lightbend Inc. <https://www.lightbend.com>
  */
+
 package play.twirl.api
 package test
 

diff --git a/build.sbt b/build.sbt
@@ -1,3 +1,5 @@
+// Copyright (C) from 2022 The Play Framework Contributors <https://github.com/playframework>, 2011-2021 Lightbend Inc. <https://www.lightbend.com>
+
 import Dependencies._
 
 import com.typesafe.tools.mima.core.IncompatibleMethTypeProblem
@@ -50,7 +52,12 @@ lazy val twirl = project
   .disablePlugins(MimaPlugin)
   .settings(
     crossScalaVersions := Nil, // workaround so + uses project-defined variants
-    publish / skip     := true
+    publish / skip     := true,
+    (Compile / headerSources) ++=
+      ((baseDirectory.value ** ("*.properties" || "*.md" || "*.sbt" || "*.scala.html"))
+        --- (baseDirectory.value ** "target" ** "*")
+        --- (baseDirectory.value / "docs" ** "*")).get ++
+        (baseDirectory.value / "project" ** "*.scala" --- (baseDirectory.value ** "target" ** "*")).get
   )
   .aggregate(apiJvm, apiJs, parser, compiler, plugin)
 

diff --git a/compiler/src/main/java/play/japi/twirl/compiler/TwirlCompiler.java b/compiler/src/main/java/play/japi/twirl/compiler/TwirlCompiler.java
@@ -1,6 +1,7 @@
 /*
- * Copyright (C) Lightbend Inc. <https://www.lightbend.com>
+ * Copyright (C) from 2022 The Play Framework Contributors <https://github.com/playframework>, 2011-2021 Lightbend Inc. <https://www.lightbend.com>
  */
+
 package play.japi.twirl.compiler;
 
 import java.io.File;

diff --git a/compiler/src/main/scala/play/twirl/compiler/TwirlCompiler.scala b/compiler/src/main/scala/play/twirl/compiler/TwirlCompiler.scala
@@ -1,6 +1,7 @@
 /*
- * Copyright (C) Lightbend Inc. <https://www.lightbend.com>
+ * Copyright (C) from 2022 The Play Framework Contributors <https://github.com/playframework>, 2011-2021 Lightbend Inc. <https://www.lightbend.com>
  */
+
 package play.twirl.compiler
 
 import java.io.File

diff --git a/compiler/src/test/java/play/japi/twirl/compiler/TwirlCompilerTest.java b/compiler/src/test/java/play/japi/twirl/compiler/TwirlCompilerTest.java
@@ -1,6 +1,7 @@
 /*
- * Copyright (C) Lightbend Inc. <https://www.lightbend.com>
+ * Copyright (C) from 2022 The Play Framework Contributors <https://github.com/playframework>, 2011-2021 Lightbend Inc. <https://www.lightbend.com>
  */
+
 package play.japi.twirl.compiler;
 
 import static org.junit.Assert.*;

diff --git a/compiler/src/test/resources/argImports.scala.html b/compiler/src/test/resources/argImports.scala.html
@@ -1,4 +1,6 @@
-@* header comment *@
+@****************************************************************************************************************************************************
+ * Copyright (C) from 2022 The Play Framework Contributors <https://github.com/playframework>, 2011-2021 Lightbend Inc. <https://www.lightbend.com> *
+ ****************************************************************************************************************************************************@
 
 @import java.io.File
 @import java.net.URL

diff --git a/compiler/src/test/resources/blockWithNestedTuple.scala.html b/compiler/src/test/resources/blockWithNestedTuple.scala.html
@@ -1,3 +1,7 @@
+@****************************************************************************************************************************************************
+ * Copyright (C) from 2022 The Play Framework Contributors <https://github.com/playframework>, 2011-2021 Lightbend Inc. <https://www.lightbend.com> *
+ ****************************************************************************************************************************************************@
+
 @(args: Seq[(String, String)])
 
 @args.zipWithIndex.map { case ((k, v), index) =>

diff --git a/compiler/src/test/resources/blockWithTuple.scala.html b/compiler/src/test/resources/blockWithTuple.scala.html
@@ -1,3 +1,7 @@
+@****************************************************************************************************************************************************
+ * Copyright (C) from 2022 The Play Framework Contributors <https://github.com/playframework>, 2011-2021 Lightbend Inc. <https://www.lightbend.com> *
+ ****************************************************************************************************************************************************@
+
 @(args: Seq[(String, String)])
 
 @args.map { case (k, v) =>

diff --git a/compiler/src/test/resources/callByName.scala.html b/compiler/src/test/resources/callByName.scala.html
@@ -1,3 +1,7 @@
+@****************************************************************************************************************************************************
+ * Copyright (C) from 2022 The Play Framework Contributors <https://github.com/playframework>, 2011-2021 Lightbend Inc. <https://www.lightbend.com> *
+ ****************************************************************************************************************************************************@
+
 @(name: => String)
 
 <h1>Hello @name!</h1>
diff --git a/compiler/src/test/resources/elseIf.scala.html b/compiler/src/test/resources/elseIf.scala.html
@@ -1,3 +1,7 @@
+@****************************************************************************************************************************************************
+ * Copyright (C) from 2022 The Play Framework Contributors <https://github.com/playframework>, 2011-2021 Lightbend Inc. <https://www.lightbend.com> *
+ ****************************************************************************************************************************************************@
+
 @(test : Int)
 
 @if(test == 0) {

diff --git a/compiler/src/test/resources/error.scala.html b/compiler/src/test/resources/error.scala.html
@@ -1,2 +1,5 @@
+@****************************************************************************************************************************************************
+ * Copyright (C) from 2022 The Play Framework Contributors <https://github.com/playframework>, 2011-2021 Lightbend Inc. <https://www.lightbend.com> *
+ ****************************************************************************************************************************************************@
 
 <h1>Hello @world</h1>
diff --git a/compiler/src/test/resources/errorInTemplateArgs.scala.html b/compiler/src/test/resources/errorInTemplateArgs.scala.html
@@ -1,3 +1,7 @@
+@****************************************************************************************************************************************************
+ * Copyright (C) from 2022 The Play Framework Contributors <https://github.com/playframework>, 2011-2021 Lightbend Inc. <https://www.lightbend.com> *
+ ****************************************************************************************************************************************************@
+
 @(name)
 
 <h1>Hello @name</h1>
diff --git a/compiler/src/test/resources/escapebrace.scala.html b/compiler/src/test/resources/escapebrace.scala.html
@@ -1,3 +1,7 @@
+@****************************************************************************************************************************************************
+ * Copyright (C) from 2022 The Play Framework Contributors <https://github.com/playframework>, 2011-2021 Lightbend Inc. <https://www.lightbend.com> *
+ ****************************************************************************************************************************************************@
+
 @(maybe: Option[String])
 @for(s <- maybe) {
 @s: @}

diff --git a/compiler/src/test/resources/existential.scala.html b/compiler/src/test/resources/existential.scala.html
@@ -1,2 +1,6 @@
+@****************************************************************************************************************************************************
+ * Copyright (C) from 2022 The Play Framework Contributors <https://github.com/playframework>, 2011-2021 Lightbend Inc. <https://www.lightbend.com> *
+ ****************************************************************************************************************************************************@
+
 @(list: List[_])
 @list
diff --git a/compiler/src/test/resources/hello.scala.html b/compiler/src/test/resources/hello.scala.html
@@ -1,3 +1,7 @@
+@****************************************************************************************************************************************************
+ * Copyright (C) from 2022 The Play Framework Contributors <https://github.com/playframework>, 2011-2021 Lightbend Inc. <https://www.lightbend.com> *
+ ****************************************************************************************************************************************************@
+
 @(name:String)
 
 <h1>Hello @name!</h1>@{ <h1>xml</h1> }
diff --git a/compiler/src/test/resources/helloNull.scala.html b/compiler/src/test/resources/helloNull.scala.html
@@ -1,3 +1,7 @@
+@****************************************************************************************************************************************************
+ * Copyright (C) from 2022 The Play Framework Contributors <https://github.com/playframework>, 2011-2021 Lightbend Inc. <https://www.lightbend.com> *
+ ****************************************************************************************************************************************************@
+
 @(name: String)
 
 <h1>Hello @name!</h1>
diff --git a/compiler/src/test/resources/htmlInner.scala.html b/compiler/src/test/resources/htmlInner.scala.html
@@ -1,6 +1,7 @@
-@*
-This is a comment
-*@
+@****************************************************************************************************************************************************
+ * Copyright (C) from 2022 The Play Framework Contributors <https://github.com/playframework>, 2011-2021 Lightbend Inc. <https://www.lightbend.com> *
+ ****************************************************************************************************************************************************@
+
 @(name:String, items:List[String])(repeat:Int)
 
 <h1>Hello @name</h1>

diff --git a/compiler/src/test/resources/htmlParam.scala.html b/compiler/src/test/resources/htmlParam.scala.html
@@ -1,3 +1,7 @@
+@****************************************************************************************************************************************************
+ * Copyright (C) from 2022 The Play Framework Contributors <https://github.com/playframework>, 2011-2021 Lightbend Inc. <https://www.lightbend.com> *
+ ****************************************************************************************************************************************************@
+
 @(content: Html)
 
 Content:

diff --git a/compiler/src/test/resources/ifWithBrackets.scala.html b/compiler/src/test/resources/ifWithBrackets.scala.html
@@ -1,3 +1,7 @@
+@****************************************************************************************************************************************************
+ * Copyright (C) from 2022 The Play Framework Contributors <https://github.com/playframework>, 2011-2021 Lightbend Inc. <https://www.lightbend.com> *
+ ****************************************************************************************************************************************************@
+
 @(name:String)
 
 @if(name == "twirl") {

diff --git a/compiler/src/test/resources/ifWithoutBrackets.scala.html b/compiler/src/test/resources/ifWithoutBrackets.scala.html
@@ -1,3 +1,7 @@
+@****************************************************************************************************************************************************
+ * Copyright (C) from 2022 The Play Framework Contributors <https://github.com/playframework>, 2011-2021 Lightbend Inc. <https://www.lightbend.com> *
+ ****************************************************************************************************************************************************@
+
 @(name:String, surname: String)
 
 @if(name == "twirl") @{if(surname == "play") "twirl-play" else "twirl"}
diff --git a/compiler/src/test/resources/ifWithoutBracketsComplex.scala.html b/compiler/src/test/resources/ifWithoutBracketsComplex.scala.html
@@ -1,3 +1,7 @@
+@****************************************************************************************************************************************************
+ * Copyright (C) from 2022 The Play Framework Contributors <https://github.com/playframework>, 2011-2021 Lightbend Inc. <https://www.lightbend.com> *
+ ****************************************************************************************************************************************************@
+
 @(name:String, surname: String)
 
 @main(content: Html) = {

diff --git a/compiler/src/test/resources/importsDefault.scala.html b/compiler/src/test/resources/importsDefault.scala.html
@@ -1,2 +1,6 @@
+@****************************************************************************************************************************************************
+ * Copyright (C) from 2022 The Play Framework Contributors <https://github.com/playframework>, 2011-2021 Lightbend Inc. <https://www.lightbend.com> *
+ ****************************************************************************************************************************************************@
+
 @()
 @{"" ?: "foo"}
diff --git a/compiler/src/test/resources/inject.scala.html b/compiler/src/test/resources/inject.scala.html
@@ -1,3 +1,7 @@
+@****************************************************************************************************************************************************
+ * Copyright (C) from 2022 The Play Framework Contributors <https://github.com/playframework>, 2011-2021 Lightbend Inc. <https://www.lightbend.com> *
+ ****************************************************************************************************************************************************@
+
 @this(a: String, b: Int)
 
 @(c: String)

diff --git a/compiler/src/test/resources/injectComments.scala.html b/compiler/src/test/resources/injectComments.scala.html
@@ -1,4 +1,6 @@
-@* Copyright 2016 Lightbend Inc *@
+@****************************************************************************************************************************************************
+ * Copyright (C) from 2022 The Play Framework Contributors <https://github.com/playframework>, 2011-2021 Lightbend Inc. <https://www.lightbend.com> *
+ ****************************************************************************************************************************************************@
 
 @**
  * A template

diff --git a/compiler/src/test/resources/injectNoArgs.scala.html b/compiler/src/test/resources/injectNoArgs.scala.html
@@ -1,3 +1,7 @@
+@****************************************************************************************************************************************************
+ * Copyright (C) from 2022 The Play Framework Contributors <https://github.com/playframework>, 2011-2021 Lightbend Inc. <https://www.lightbend.com> *
+ ****************************************************************************************************************************************************@
+
 @this()
 
 @(a: String)

diff --git a/compiler/src/test/resources/injectParamGroups.scala.html b/compiler/src/test/resources/injectParamGroups.scala.html
@@ -1,3 +1,7 @@
+@****************************************************************************************************************************************************
+ * Copyright (C) from 2022 The Play Framework Contributors <https://github.com/playframework>, 2011-2021 Lightbend Inc. <https://www.lightbend.com> *
+ ****************************************************************************************************************************************************@
+
 @this(a: String)(b: Int)(implicit c: String)
 
 @(d: String)

diff --git a/compiler/src/test/resources/long.scala.html b/compiler/src/test/resources/long.scala.html
@@ -1,3 +1,7 @@
+@****************************************************************************************************************************************************
+ * Copyright (C) from 2022 The Play Framework Contributors <https://github.com/playframework>, 2011-2021 Lightbend Inc. <https://www.lightbend.com> *
+ ****************************************************************************************************************************************************@
+
 PRIDE AND PREJUDICE
 
 By Jane Austen