From cbc3bcf94072f5ea9ff899aa0cfe5991191a1f74 Mon Sep 17 00:00:00 2001
From: Jan Bessai <Jan.Bessai@tu-dortmund.de>
Date: Wed, 23 Apr 2025 18:12:54 +0200
Subject: [PATCH 1/7] Tests pass with new versions

---
 README.md                                     |  2 +-
 build.sbt                                     | 47 ++++++++++---------
 project/build.properties                      |  2 +-
 project/plugins.sbt                           | 13 ++---
 .../persistable/JavaPersistable.scala         |  5 +-
 .../persistable/ResourcePersistable.scala     |  2 +-
 .../combinators/templating/twirl/Java.scala   |  9 ++--
 .../combinators/templating/twirl/Python.scala |  1 -
 .../templating/JavaTemplateTest.scala.java    |  8 ++--
 .../persistable/JavaPersistableTest.scala     |  9 ++--
 .../persistable/PersistableTest.scala         |  7 +--
 .../PythonWithPathPersistableTest.scala       |  5 +-
 .../persistable/ResourcePersistableTest.scala |  9 ++--
 .../persistable/TempDirectoryFixture.scala    |  7 +--
 .../templating/twirl/JavaTest.scala           | 10 ++--
 .../templating/twirl/PythonTest.scala         |  3 +-
 16 files changed, 72 insertions(+), 67 deletions(-)

diff --git a/README.md b/README.md
index e598bb9..b14e1ae 100644
--- a/README.md
+++ b/README.md
@@ -22,7 +22,7 @@ You can search for released versions [here](http://search.maven.org/#search%7Cga
 
 To obtain the latest unreleased development version, clone the repository and run `sbt publishLocal`.
 
-Currently, Scala 2.11, 2.12 and 2.13 are supported.
+Currently, Scala 2.13, 3.3 and 3.6 are supported.
 
 ## Examples
 
diff --git a/build.sbt b/build.sbt
index 6b4edeb..1b00240 100644
--- a/build.sbt
+++ b/build.sbt
@@ -4,24 +4,28 @@ import sbt.Resolver
 lazy val commonSettings = Seq(
   organization := "org.combinators",
 
-  scalaVersion := "2.13.1",
-  crossScalaVersions := Seq("2.11.12", "2.12.10", scalaVersion.value),
+  scalaVersion := "3.6.4",
+  crossScalaVersions := Seq("2.13.16", "3.3.5", scalaVersion.value),
 
-  resolvers ++= Seq(
-    Resolver.sonatypeRepo("releases"),
-    Resolver.typesafeRepo("releases"),
-    Resolver.sonatypeRepo("snapshots"),
-    Resolver.typesafeRepo("snapshots")
-  ),
+  resolvers ++= Resolver.sonatypeOssRepos("releases"),
+  resolvers += Resolver.typesafeRepo("releases"),
 
-  headerLicense := Some(HeaderLicense.ALv2("2017-2019", "Jan Bessai")),
+  headerLicense := Some(HeaderLicense.ALv2("2017-2025", "Jan Bessai")),
 
   scalacOptions ++= Seq(
     "-unchecked",
     "-deprecation",
     "-feature",
     "-language:implicitConversions"
-  )
+  ),
+  scalacOptions ++= {
+    if (scalaVersion.value >= "2.13.14" && scalaVersion.value < "3.0") Seq(
+      // "-Xsource:3",
+      "-Xsource:3-cross"
+    )
+    else Nil
+  },
+  ThisBuild/scapegoatVersion := "3.1.8"
 ) ++ publishSettings
 
 lazy val root = (Project(id = "templating", base = file(".")))
@@ -31,16 +35,15 @@ lazy val root = (Project(id = "templating", base = file(".")))
     .settings(
       moduleName := "templating",
       libraryDependencies ++= Seq(
-        "org.scalactic" %% "scalactic" % "3.0.8" % "test",
-        "org.scalatest" %% "scalatest" % "3.0.8" % "test",
-        "com.github.javaparser" % "javaparser-core" % "3.14.14",
-        "org.apache.commons" % "commons-text" % "1.8",
-        "commons-io" % "commons-io" % "2.6" % "test",
-        "org.scala-lang.modules" %% "scala-collection-compat" % "2.1.2"
+        "org.scalactic" %% "scalactic" % "3.2.19" % "test",
+        "org.scalatest" %% "scalatest" % "3.2.19" % "test",
+        "com.github.javaparser" % "javaparser-core" % "3.26.4",
+        "org.apache.commons" % "commons-text" % "1.13.1",
+        "commons-io" % "commons-io" % "2.19.0" % "test"
       ),
 
-      sourceDirectories in (Test, TwirlKeys.compileTemplates) += sourceDirectory.value / "test" / "java-templates",
-      resourceDirectories in Test += sourceDirectory.value / "resources",
+      Test / TwirlKeys.compileTemplates / sourceDirectories += sourceDirectory.value / "test" / "java-templates",
+      Test / resourceDirectories += sourceDirectory.value / "resources",
       TwirlKeys.templateImports := Seq(),
       TwirlKeys.templateFormats += ("java" -> "org.combinators.templating.twirl.JavaFormat"),
       TwirlKeys.templateImports += "scala.collection.immutable._",
@@ -53,7 +56,7 @@ lazy val root = (Project(id = "templating", base = file(".")))
       TwirlKeys.templateImports += "com.github.javaparser.ast.stmt._",
       TwirlKeys.templateImports += "com.github.javaparser.ast.`type`._",
 
-      sourceDirectories in (Test, TwirlKeys.compileTemplates) += sourceDirectory.value / "test" / "python-templates",
+      Test / TwirlKeys.compileTemplates / sourceDirectories += sourceDirectory.value / "test" / "python-templates",
       TwirlKeys.templateFormats += ("py" -> "org.combinators.templating.twirl.PythonFormat"),
       TwirlKeys.templateImports += "org.combinators.templating.twirl.Python"
     )
@@ -64,13 +67,11 @@ lazy val publishSettings = Seq(
   licenses := Seq("Apache 2" -> url("http://www.apache.org/licenses/LICENSE-2.0.txt")),
   scmInfo := Some(ScmInfo(url("https://www.github.com/combinators/templating"), "scm:git:git@github.com:combinators/templating.git")),
   developers := List(
-    Developer("JanBessai", "Jan Bessai", "jan.bessai@tu-dortmund.de", url("http://janbessai.github.io")),
+    Developer("JanBessai", "Jan Bessai", "jan.bessai@tu-dortmund.de", url("http://noprotocol.net")),
     Developer("heineman", "George T. Heineman", "heineman@wpi.edu", url("http://www.cs.wpi.edu/~heineman")),
     Developer("BorisDuedder", "Boris Düdder", "boris.d@di.ku.dk", url("http://duedder.net"))
   ),
-
-  pgpPublicRing := file("travis/local.pubring.asc"),
-  pgpSecretRing := file("travis/local.secring.asc"),
+  publishTo := sonatypePublishToBundle.value,
 )
 
 lazy val noPublishSettings = Seq(
diff --git a/project/build.properties b/project/build.properties
index dca663d..53bb739 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1 +1 @@
-sbt.version = 1.2.8
+sbt.version = 1.10.11
diff --git a/project/plugins.sbt b/project/plugins.sbt
index fad8e57..ee7a024 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -1,7 +1,8 @@
 logLevel := Level.Warn
-addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.10")
-addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.6.0")
-addSbtPlugin("org.scoverage" % "sbt-coveralls" % "1.2.7")
-addSbtPlugin("com.typesafe.sbt" % "sbt-twirl" % "1.4.2")
-addSbtPlugin("ch.epfl.scala" % "sbt-release-early" % "2.1.1")
-addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.2.0")
+addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.3.1")
+addSbtPlugin("org.scoverage" % "sbt-coveralls" % "1.3.15")
+addSbtPlugin("org.playframework.twirl" % "sbt-twirl" % "2.0.8")
+addSbtPlugin("io.shiftleft" % "sbt-ci-release-early" % "2.0.49")
+addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.10.0")
+addSbtPlugin("com.sksamuel.scapegoat" %% "sbt-scapegoat" % "1.2.12")
+addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.4")
diff --git a/src/main/scala/org/combinators/templating/persistable/JavaPersistable.scala b/src/main/scala/org/combinators/templating/persistable/JavaPersistable.scala
index 9b677f9..47d2b81 100644
--- a/src/main/scala/org/combinators/templating/persistable/JavaPersistable.scala
+++ b/src/main/scala/org/combinators/templating/persistable/JavaPersistable.scala
@@ -23,7 +23,6 @@ import com.github.javaparser.ast.expr.{Name, NameExpr}
 import com.github.javaparser.ast.visitor.GenericVisitorAdapter
 
 import scala.collection.immutable._
-import scala.collection.compat._
 import scala.jdk.CollectionConverters._
 
 trait JavaPersistableInstances {
@@ -51,7 +50,7 @@ trait JavaPersistableInstances {
           }
         val clsName = s"${compilationUnit.getTypes.asScala.head.getName}.java"
         val fullPath = "src" +: "main" +: "java" +: pkg :+ clsName
-        Paths.get(fullPath.head, fullPath.tail : _*)
+        Paths.get(fullPath.head, fullPath.tail*)
       }
     }
 }
@@ -59,4 +58,4 @@ trait JavaPersistableInstances {
 object JavaPersistable extends JavaPersistableInstances {
   type Aux[TT] = Persistable { type T = TT }
   def apply[T](implicit persistable: Aux[T]): Aux[T] = persistable
-}
\ No newline at end of file
+}
diff --git a/src/main/scala/org/combinators/templating/persistable/ResourcePersistable.scala b/src/main/scala/org/combinators/templating/persistable/ResourcePersistable.scala
index be0a627..109a098 100644
--- a/src/main/scala/org/combinators/templating/persistable/ResourcePersistable.scala
+++ b/src/main/scala/org/combinators/templating/persistable/ResourcePersistable.scala
@@ -24,7 +24,7 @@ import java.nio.file.{Files, Path, Paths}
   * @param persistTo the name of the file where to store the resource.
   * @param classToLoadResource the class which will be used to load the resource (@see
   */
-case class BundledResource(name: String, persistTo: Path, classToLoadResource: Class[_] = getClass)
+case class BundledResource(name: String, persistTo: Path, classToLoadResource: Class[?] = classOf[BundledResource])
 
 trait ResourcePersistableInstances {
   def bundledResourceInstance: ResourcePersistable.Aux = new Persistable {
diff --git a/src/main/scala/org/combinators/templating/twirl/Java.scala b/src/main/scala/org/combinators/templating/twirl/Java.scala
index 955b3ea..cdb7a67 100644
--- a/src/main/scala/org/combinators/templating/twirl/Java.scala
+++ b/src/main/scala/org/combinators/templating/twirl/Java.scala
@@ -27,7 +27,6 @@ import com.github.javaparser.ast.{CompilationUnit, ImportDeclaration, Node}
 import org.apache.commons.text.StringEscapeUtils
 import play.twirl.api.{BufferedContent, Format, Formats}
 
-import scala.collection.compat._
 import scala.collection.immutable._
 import scala.jdk.CollectionConverters._
 
@@ -67,10 +66,10 @@ class Java private(elements: Seq[Java], text: String) extends BufferedContent[Ja
   def nameExpression(): NameExpr = expression()
 
   /** Parses this element as a class body declaration (e.g. a method or a field). */
-  def classBodyDeclaration(): BodyDeclaration[_] = StaticJavaParser.parseBodyDeclaration(fullText)
+  def classBodyDeclaration(): BodyDeclaration[?] = StaticJavaParser.parseBodyDeclaration(fullText)
 
   /** Parses this element as multiple class body declarations. */
-  def classBodyDeclarations(): Seq[BodyDeclaration[_]] =
+  def classBodyDeclarations(): Seq[BodyDeclaration[?]] =
     StaticJavaParser.parse(s"class C { $fullText }").getTypes.asScala.head.getMembers.asScala.to(Seq)
 
   /** Parses this element as multiple field declarations. */
@@ -86,7 +85,7 @@ class Java private(elements: Seq[Java], text: String) extends BufferedContent[Ja
     classBodyDeclarations().map(_.asInstanceOf[ConstructorDeclaration])
 
   /** Parses this element as an interface body declaration (e.g. a method signature). */
-  def interfaceBodyDeclaration(): BodyDeclaration[_] = StaticJavaParser.parseBodyDeclaration(fullText)
+  def interfaceBodyDeclaration(): BodyDeclaration[?] = StaticJavaParser.parseBodyDeclaration(fullText)
 
   /** Parses this element as a type (e.g. the in  X foo = (X)bar). */
   def tpe(): Type = StaticJavaParser.parseType(fullText)
@@ -106,7 +105,7 @@ object Java {
   def apply(node: Node): Java = Java(node.toString)
 
   /** Creates a Java fragment with initial content from the asts `nodes`. */
-  def apply(nodes: Seq[Node]): Java = new Java(Seq(nodes map apply : _*))
+  def apply(nodes: Seq[Node]): Java = new Java(Seq((nodes map apply)*))
 }
 
 object JavaFormat extends Format[Java] {
diff --git a/src/main/scala/org/combinators/templating/twirl/Python.scala b/src/main/scala/org/combinators/templating/twirl/Python.scala
index 5ecf52b..62b028f 100644
--- a/src/main/scala/org/combinators/templating/twirl/Python.scala
+++ b/src/main/scala/org/combinators/templating/twirl/Python.scala
@@ -20,7 +20,6 @@ import org.apache.commons.text.StringEscapeUtils
 import play.twirl.api.{BufferedContent, Format, Formats}
 
 import scala.collection.immutable
-import scala.collection.compat._
 
 /**
   * A Python fragment.
diff --git a/src/test/java-templates/org/combinators/templating/JavaTemplateTest.scala.java b/src/test/java-templates/org/combinators/templating/JavaTemplateTest.scala.java
index b037f76..a9a8f06 100644
--- a/src/test/java-templates/org/combinators/templating/JavaTemplateTest.scala.java
+++ b/src/test/java-templates/org/combinators/templating/JavaTemplateTest.scala.java
@@ -5,12 +5,12 @@
     someString: Expression,
     qualifiedName: Name,
     nameExpression: NameExpr,
-    singleDecl: BodyDeclaration[_],
-    multiDecls: Seq[BodyDeclaration[_]],
+    singleDecl: BodyDeclaration[?],
+    multiDecls: Seq[BodyDeclaration[?]],
     fieldDeclarations: Seq[FieldDeclaration],
     methodDeclarations: Seq[MethodDeclaration],
     constructors: Seq[ConstructorDeclaration],
-    interfaceMethod: BodyDeclaration[_],
+    interfaceMethod: BodyDeclaration[?],
     tpe: Type)
 
 @Java(imp)
@@ -44,4 +44,4 @@ public static void messUpEnviornment() {
 
 public interface FooI {
     @Java(interfaceMethod)
-}
\ No newline at end of file
+}
diff --git a/src/test/scala/org/combinators/templating/persistable/JavaPersistableTest.scala b/src/test/scala/org/combinators/templating/persistable/JavaPersistableTest.scala
index 59c0620..94bdceb 100644
--- a/src/test/scala/org/combinators/templating/persistable/JavaPersistableTest.scala
+++ b/src/test/scala/org/combinators/templating/persistable/JavaPersistableTest.scala
@@ -7,8 +7,9 @@ import JavaPersistable._
 import org.combinators.templating.twirl.Java
 
 import org.scalatest._
+import funspec._
 
-class JavaPersistableTest extends FunSpec {
+class JavaPersistableTest extends AnyFunSpec {
   val className = "Foo"
   val classText = s"import whatever; class $className {}"
   val persistableInstance: Persistable.Aux[CompilationUnit] = JavaPersistable.apply
@@ -19,7 +20,7 @@ class JavaPersistableTest extends FunSpec {
       it(s"should use 'src/main/java/$className.java' as path") {
         val expectedPathComponents = pathPrefix :+ s"$className.java"
         assert(persistableInstance.path(Java(classText).compilationUnit())
-          == Paths.get(expectedPathComponents.head, expectedPathComponents.tail:_*))
+          == Paths.get(expectedPathComponents.head, expectedPathComponents.tail*))
       }
     }
     describe("when it contains multiple classes and interfaces") {
@@ -27,7 +28,7 @@ class JavaPersistableTest extends FunSpec {
         val otherClassText = "interface FooI {}\n class Bar {}"
         val expectedPathComponents = pathPrefix :+ s"$className.java"
         assert(persistableInstance.path(Java(Seq(classText, otherClassText).mkString("\n")).compilationUnit())
-          == Paths.get(expectedPathComponents.head, expectedPathComponents.tail:_*))
+          == Paths.get(expectedPathComponents.head, expectedPathComponents.tail*))
       }
     }
     describe("when it contains a package declaration") {
@@ -36,7 +37,7 @@ class JavaPersistableTest extends FunSpec {
         val packagesText = s"package ${packages.mkString(".")};"
         val expectedPathComponents = pathPrefix ++ packages :+ s"$className.java"
         assert(persistableInstance.path(Java(Seq(packagesText, classText).mkString("\n")).compilationUnit())
-          == Paths.get(expectedPathComponents.head, expectedPathComponents.tail:_*))
+          == Paths.get(expectedPathComponents.head, expectedPathComponents.tail*))
       }
     }
     it("should store text that parses back to an equal CompilationUnit") {
diff --git a/src/test/scala/org/combinators/templating/persistable/PersistableTest.scala b/src/test/scala/org/combinators/templating/persistable/PersistableTest.scala
index f8fb4ed..1b73f9b 100644
--- a/src/test/scala/org/combinators/templating/persistable/PersistableTest.scala
+++ b/src/test/scala/org/combinators/templating/persistable/PersistableTest.scala
@@ -3,15 +3,16 @@ package org.combinators.templating.persistable
 import java.nio.file.{FileAlreadyExistsException, Files, Path, Paths}
 
 import org.scalatest._
+import funspec._
 
-class PersistableTest extends fixture.FunSpec with TempDirectoryFixture with GivenWhenThen {
+class PersistableTest extends FixtureAnyFunSpec with TempDirectoryFixture with GivenWhenThen {
   val persistable: Persistable.Aux[String] = new Persistable {
     override type T = String
     override def rawText(elem: T): Array[Byte] = elem.getBytes
     override def path(elem: T): Path = Paths.get(elem)
   }
   describe("Persisting a String to a file named by its content") {
-    it("should create a file named by its content") { tmpDir: Path =>
+    it("should create a file named by its content") { (tmpDir: Path) =>
       Given("an element to persist")
       val elementToPersist = "test"
 
@@ -34,7 +35,7 @@ class PersistableTest extends fixture.FunSpec with TempDirectoryFixture with Giv
   }
 
   describe("Persisting an element that specifies a subdirectory") {
-    it("should create a subdirectory") { tmpDir: Path =>
+    it("should create a subdirectory") { (tmpDir: Path) =>
       Given("an element to persist")
       val elementToPersistInSubdir = Paths.get("foo", "test").toString
 
diff --git a/src/test/scala/org/combinators/templating/persistable/PythonWithPathPersistableTest.scala b/src/test/scala/org/combinators/templating/persistable/PythonWithPathPersistableTest.scala
index 3cc9828..661f4b2 100644
--- a/src/test/scala/org/combinators/templating/persistable/PythonWithPathPersistableTest.scala
+++ b/src/test/scala/org/combinators/templating/persistable/PythonWithPathPersistableTest.scala
@@ -5,12 +5,13 @@ import java.nio.file.{FileAlreadyExistsException, Files, Path, Paths}
 import PythonWithPathPersistable._
 import org.combinators.templating.twirl.Python
 import org.scalatest._
+import funspec._
 
-class PythonWithPathPersistableTest extends fixture.FunSpec with TempDirectoryFixture with GivenWhenThen {
+class PythonWithPathPersistableTest extends FixtureAnyFunSpec with TempDirectoryFixture with GivenWhenThen {
   val persistable: PythonWithPathPersistable.Aux[PythonWithPath] = PythonWithPathPersistable.apply
 
   describe("Persisting a piece of Python code to a file") {
-    it("should create a file named by its content") { tmpDir: Path =>
+    it("should create a file named by its content") { (tmpDir: Path) =>
       Given("an element to persist")
       val elementToPersist: PythonWithPath =
         PythonWithPath(
diff --git a/src/test/scala/org/combinators/templating/persistable/ResourcePersistableTest.scala b/src/test/scala/org/combinators/templating/persistable/ResourcePersistableTest.scala
index 60c7f1a..fe0d6be 100644
--- a/src/test/scala/org/combinators/templating/persistable/ResourcePersistableTest.scala
+++ b/src/test/scala/org/combinators/templating/persistable/ResourcePersistableTest.scala
@@ -3,16 +3,17 @@ package org.combinators.templating.persistable
 import java.nio.file.{FileAlreadyExistsException, Files, Path, Paths}
 
 import org.scalatest._
+import funspec._
 
-class ResourcePersistableTest extends fixture.FunSpec with TempDirectoryFixture with GivenWhenThen {
+class ResourcePersistableTest extends FixtureAnyFunSpec with TempDirectoryFixture with GivenWhenThen {
 
   val persistableInstance: Persistable.Aux[BundledResource] = ResourcePersistable.apply
 
   describe("Persisting a picture from the resources folder") {
-    it("should create a file named by its content") { tmpDir: Path =>
+    it("should create a file named by its content") { (tmpDir: Path) =>
       Given("a resource to persist")
       val elementToPersist: BundledResource =
-        BundledResource("res/GammaMtau.png", Paths.get("test", "path", "picture.png"), getClass)
+        BundledResource("res/GammaMtau.png", Paths.get("test", "path", "picture.png"), getClass())
 
       When("persisting it")
       persistableInstance.persist(tmpDir.toAbsolutePath, elementToPersist)
@@ -32,4 +33,4 @@ class ResourcePersistableTest extends fixture.FunSpec with TempDirectoryFixture
       persistableInstance.persistOverwriting(tmpDir.toAbsolutePath, elementToPersist)
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/test/scala/org/combinators/templating/persistable/TempDirectoryFixture.scala b/src/test/scala/org/combinators/templating/persistable/TempDirectoryFixture.scala
index 55baeb0..0bd9816 100644
--- a/src/test/scala/org/combinators/templating/persistable/TempDirectoryFixture.scala
+++ b/src/test/scala/org/combinators/templating/persistable/TempDirectoryFixture.scala
@@ -3,11 +3,12 @@ package org.combinators.templating.persistable
 import java.nio.file.{Files, Path}
 
 import org.apache.commons.io.FileUtils
-import org.scalatest.{Outcome, fixture}
+import org.scalatest.{Outcome, funspec}
+import funspec._
 
-trait TempDirectoryFixture { self: fixture.FunSpec =>
+trait TempDirectoryFixture { self: FixtureAnyFunSpec =>
   type FixtureParam = Path
-  def withFixture(test: OneArgTest): Outcome = {
+  override def withFixture(test: OneArgTest): Outcome = {
     val tmpDir = Files.createTempDirectory("inhabitants")
     try withFixture(test.toNoArgTest(tmpDir))
     finally FileUtils.deleteDirectory(tmpDir.toFile)
diff --git a/src/test/scala/org/combinators/templating/twirl/JavaTest.scala b/src/test/scala/org/combinators/templating/twirl/JavaTest.scala
index 868208d..9b48187 100644
--- a/src/test/scala/org/combinators/templating/twirl/JavaTest.scala
+++ b/src/test/scala/org/combinators/templating/twirl/JavaTest.scala
@@ -6,10 +6,10 @@ import com.github.javaparser.ast.body.{BodyDeclaration, ConstructorDeclaration,
 import com.github.javaparser.ast.expr._
 import com.github.javaparser.ast.stmt.Statement
 import org.scalatest._
+import funspec._
 import scala.collection.immutable._
-import scala.collection.compat._
 
-class JavaTest extends FunSpec {
+class JavaTest extends AnyFunSpec {
   val expected: String =
     """
        |import bar.Bar;
@@ -111,14 +111,14 @@ class JavaTest extends FunSpec {
          |  super(zs);
          |  System.disco();
          |}""".stripMargin).constructors()
-  val singleDecl: BodyDeclaration[_] =
+  val singleDecl: BodyDeclaration[?] =
     Java(
       s"""
          |public static void main(String[] args) {
          |  System.out.println("The application has crashed");
          |  System.out.println("Never run this application again");
          |}""".stripMargin).classBodyDeclaration()
-  val multiDecls: Seq[BodyDeclaration[_]] =
+  val multiDecls: Seq[BodyDeclaration[?]] =
     Java(
       s"""
          |public static volatile String gargh = "GAAAAAAARRRG!!";
@@ -135,7 +135,7 @@ class JavaTest extends FunSpec {
          |      System.out.println(withThisArg);
          |      hiddenEffect(); // I break my contract }:->
          |    }""".stripMargin).methodDeclarations()
-  val interfaceMethod: BodyDeclaration[_] =
+  val interfaceMethod: BodyDeclaration[?] =
     Java("public default void doFoos(YYY$_ZZZ x) { System.out.println(x.toString()); }").interfaceBodyDeclaration()
 
   describe("Rendering a Java template with lots of stuff and strings in it") {
diff --git a/src/test/scala/org/combinators/templating/twirl/PythonTest.scala b/src/test/scala/org/combinators/templating/twirl/PythonTest.scala
index 01084e1..f374830 100644
--- a/src/test/scala/org/combinators/templating/twirl/PythonTest.scala
+++ b/src/test/scala/org/combinators/templating/twirl/PythonTest.scala
@@ -1,8 +1,9 @@
 package org.combinators.templating.twirl
 
 import org.scalatest._
+import funspec._
 
-class PythonTest extends FunSpec {
+class PythonTest extends AnyFunSpec {
   val expected: String =
     """
       |class Foo(object):

From cfa0dd5e731a9812a1371542763532cf0c0c5795 Mon Sep 17 00:00:00 2001
From: Jan Bessai <Jan.Bessai@tu-dortmund.de>
Date: Wed, 23 Apr 2025 18:13:36 +0200
Subject: [PATCH 2/7] Update headers

---
 .../templating/persistable/JavaPersistable.scala |  2 +-
 .../templating/persistable/Persistable.scala     |  2 +-
 .../persistable/PythonWithPathPersistable.scala  |  2 +-
 .../persistable/ResourcePersistable.scala        |  2 +-
 .../org/combinators/templating/twirl/Java.scala  |  2 +-
 .../combinators/templating/twirl/Python.scala    |  2 +-
 .../persistable/JavaPersistableTest.scala        | 16 ++++++++++++++++
 .../templating/persistable/PersistableTest.scala | 16 ++++++++++++++++
 .../PythonWithPathPersistableTest.scala          | 16 ++++++++++++++++
 .../persistable/ResourcePersistableTest.scala    | 16 ++++++++++++++++
 .../persistable/TempDirectoryFixture.scala       | 16 ++++++++++++++++
 .../combinators/templating/twirl/JavaTest.scala  | 16 ++++++++++++++++
 .../templating/twirl/PythonTest.scala            | 16 ++++++++++++++++
 13 files changed, 118 insertions(+), 6 deletions(-)

diff --git a/src/main/scala/org/combinators/templating/persistable/JavaPersistable.scala b/src/main/scala/org/combinators/templating/persistable/JavaPersistable.scala
index 47d2b81..3daa1a0 100644
--- a/src/main/scala/org/combinators/templating/persistable/JavaPersistable.scala
+++ b/src/main/scala/org/combinators/templating/persistable/JavaPersistable.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2019 Jan Bessai
+ * Copyright 2017-2025 Jan Bessai
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/scala/org/combinators/templating/persistable/Persistable.scala b/src/main/scala/org/combinators/templating/persistable/Persistable.scala
index 88e80b8..a15731d 100644
--- a/src/main/scala/org/combinators/templating/persistable/Persistable.scala
+++ b/src/main/scala/org/combinators/templating/persistable/Persistable.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2019 Jan Bessai
+ * Copyright 2017-2025 Jan Bessai
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/scala/org/combinators/templating/persistable/PythonWithPathPersistable.scala b/src/main/scala/org/combinators/templating/persistable/PythonWithPathPersistable.scala
index ab09a4c..05fd019 100644
--- a/src/main/scala/org/combinators/templating/persistable/PythonWithPathPersistable.scala
+++ b/src/main/scala/org/combinators/templating/persistable/PythonWithPathPersistable.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2019 Jan Bessai
+ * Copyright 2017-2025 Jan Bessai
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/scala/org/combinators/templating/persistable/ResourcePersistable.scala b/src/main/scala/org/combinators/templating/persistable/ResourcePersistable.scala
index 109a098..15122ed 100644
--- a/src/main/scala/org/combinators/templating/persistable/ResourcePersistable.scala
+++ b/src/main/scala/org/combinators/templating/persistable/ResourcePersistable.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2019 Jan Bessai
+ * Copyright 2017-2025 Jan Bessai
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/scala/org/combinators/templating/twirl/Java.scala b/src/main/scala/org/combinators/templating/twirl/Java.scala
index cdb7a67..36f77d1 100644
--- a/src/main/scala/org/combinators/templating/twirl/Java.scala
+++ b/src/main/scala/org/combinators/templating/twirl/Java.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2019 Jan Bessai
+ * Copyright 2017-2025 Jan Bessai
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/scala/org/combinators/templating/twirl/Python.scala b/src/main/scala/org/combinators/templating/twirl/Python.scala
index 62b028f..2470ce2 100644
--- a/src/main/scala/org/combinators/templating/twirl/Python.scala
+++ b/src/main/scala/org/combinators/templating/twirl/Python.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2019 Jan Bessai
+ * Copyright 2017-2025 Jan Bessai
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/scala/org/combinators/templating/persistable/JavaPersistableTest.scala b/src/test/scala/org/combinators/templating/persistable/JavaPersistableTest.scala
index 94bdceb..c8fcc7a 100644
--- a/src/test/scala/org/combinators/templating/persistable/JavaPersistableTest.scala
+++ b/src/test/scala/org/combinators/templating/persistable/JavaPersistableTest.scala
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2017-2025 Jan Bessai
+ *
+ * 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.
+ */
+
 package org.combinators.templating.persistable
 
 import java.nio.file.Paths
diff --git a/src/test/scala/org/combinators/templating/persistable/PersistableTest.scala b/src/test/scala/org/combinators/templating/persistable/PersistableTest.scala
index 1b73f9b..8f9fe92 100644
--- a/src/test/scala/org/combinators/templating/persistable/PersistableTest.scala
+++ b/src/test/scala/org/combinators/templating/persistable/PersistableTest.scala
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2017-2025 Jan Bessai
+ *
+ * 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.
+ */
+
 package org.combinators.templating.persistable
 
 import java.nio.file.{FileAlreadyExistsException, Files, Path, Paths}
diff --git a/src/test/scala/org/combinators/templating/persistable/PythonWithPathPersistableTest.scala b/src/test/scala/org/combinators/templating/persistable/PythonWithPathPersistableTest.scala
index 661f4b2..8c8ae50 100644
--- a/src/test/scala/org/combinators/templating/persistable/PythonWithPathPersistableTest.scala
+++ b/src/test/scala/org/combinators/templating/persistable/PythonWithPathPersistableTest.scala
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2017-2025 Jan Bessai
+ *
+ * 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.
+ */
+
 package org.combinators.templating.persistable
 
 import java.nio.file.{FileAlreadyExistsException, Files, Path, Paths}
diff --git a/src/test/scala/org/combinators/templating/persistable/ResourcePersistableTest.scala b/src/test/scala/org/combinators/templating/persistable/ResourcePersistableTest.scala
index fe0d6be..7a9dc28 100644
--- a/src/test/scala/org/combinators/templating/persistable/ResourcePersistableTest.scala
+++ b/src/test/scala/org/combinators/templating/persistable/ResourcePersistableTest.scala
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2017-2025 Jan Bessai
+ *
+ * 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.
+ */
+
 package org.combinators.templating.persistable
 
 import java.nio.file.{FileAlreadyExistsException, Files, Path, Paths}
diff --git a/src/test/scala/org/combinators/templating/persistable/TempDirectoryFixture.scala b/src/test/scala/org/combinators/templating/persistable/TempDirectoryFixture.scala
index 0bd9816..ee489cf 100644
--- a/src/test/scala/org/combinators/templating/persistable/TempDirectoryFixture.scala
+++ b/src/test/scala/org/combinators/templating/persistable/TempDirectoryFixture.scala
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2017-2025 Jan Bessai
+ *
+ * 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.
+ */
+
 package org.combinators.templating.persistable
 
 import java.nio.file.{Files, Path}
diff --git a/src/test/scala/org/combinators/templating/twirl/JavaTest.scala b/src/test/scala/org/combinators/templating/twirl/JavaTest.scala
index 9b48187..1ff44f4 100644
--- a/src/test/scala/org/combinators/templating/twirl/JavaTest.scala
+++ b/src/test/scala/org/combinators/templating/twirl/JavaTest.scala
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2017-2025 Jan Bessai
+ *
+ * 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.
+ */
+
 package org.combinators.templating.twirl
 
 import com.github.javaparser.ast.ImportDeclaration
diff --git a/src/test/scala/org/combinators/templating/twirl/PythonTest.scala b/src/test/scala/org/combinators/templating/twirl/PythonTest.scala
index f374830..344e516 100644
--- a/src/test/scala/org/combinators/templating/twirl/PythonTest.scala
+++ b/src/test/scala/org/combinators/templating/twirl/PythonTest.scala
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2017-2025 Jan Bessai
+ *
+ * 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.
+ */
+
 package org.combinators.templating.twirl
 
 import org.scalatest._

From a7e89f9a9ccc84db5f52d57fa4b5af34fe1acfce Mon Sep 17 00:00:00 2001
From: Jan Bessai <Jan.Bessai@tu-dortmund.de>
Date: Wed, 23 Apr 2025 18:16:20 +0200
Subject: [PATCH 3/7] Remove old travis CI

---
 .travis.yml            |  30 ------------------------------
 travis/secrets.tar.enc | Bin 20496 -> 0 bytes
 2 files changed, 30 deletions(-)
 delete mode 100644 .travis.yml
 delete mode 100644 travis/secrets.tar.enc

diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 6891398..0000000
--- a/.travis.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-sudo: false
-language: scala
-stages:
-  - test
-  - name: deploy
-    if: branch = master AND NOT type IN (pull_request)
-
-script: sbt +test
-
-jobs:
-  include:
-    - dist: trusty
-      stage: test
-      jdk: oraclejdk8
-    - stage: test
-      jdk: openjdk11
-      script: sbt clean test &&
-                sbt coverage ++2.12.10 test &&
-                sbt ++2.12.10 coverageReport coveralls
-    - stage: deploy
-      jdk: openjdk11
-      script: |
-        openssl aes-256-cbc -K $encrypted_edd93504cc75_key -iv $encrypted_edd93504cc75_iv -in travis/secrets.tar.enc -out travis/local.secrets.tar -d &&
-          tar xv -C travis -f travis/local.secrets.tar &&
-          sbt +releaseEarly
-env:
-  global:
-  - secure: oaQO0OktBq1UUw490+zw/bioSFmfkHz9X7sLpoOCT9NzAPwHOXDNIaoYubu+HXbgvSfsId+x4QR2wT1cH+njBMwvImQWrkfWODTAxfSVEuqThWlVKTmfYCoNcbMpFOIQYpSWqx7pb8VeNMr1p2Ql6ov3lNvUpRNvIwxbfUBCYy3mL/H4/1XFDy7emSmgr/I56Pmg6woMi7T7zoEFMozKPQG2rkB3/yU53CtRWMTDU4p3R33bFP5+Q314jkLN/x8E6p83DXSlHw5CNCybrndvBN2Ugylpn5XbINyW78yEc1uDpMDjgQ6/nFldFLBsZ9jVJNOLFHwxEcPCHKS22SVZ50mpek5zvUDHGKGodl2Ct1J2dO/kV3Mk15y/ndiapUJvZ/JLUwbgNmF1zzTsrvWdGiHnPOz4MWfkUAe5L8pAVNs0wul0AihbkcthD2hQu3EnDxjx1Mf0yjov58orv7q0Euf7Wnmzmu9orx+KBbCX7UFs6SsFZiM8jbyEy50K+Evmub1Qd+UYc/xspboM6vidKd61+O2YTnQ26MsFV0cn6GvkphqsbjfSep/cvm9gOtYiwo959v7MX8ApMXU28hK01rf0BlnBBVuXd8cNuTW7B6SAQM1HRxjkfze6VukGYQFe8RLuuhqfbAXCpui1lcKaQf2G9jTrse0+ROszqqLEaTU=
-  - secure: BNveA1KQHK2DWg4Q4Oogvo3BDZP17zHjMiEf1JzIt06dB3QZ4ZYONTOPgXvL3XrFGJZe40pnAmrQezlrpRK2X8JPNbYpYh7aHB6AGQmJzHU1BNVI/0GuN+y0jUJaM8oH83z2S4sm8BZA015YIWmV8P0OELcTNxglgOwj9yo0SB5Xrd7qeAfmho9Lg1pN42LhuZK8LzxsTtrInR9k2dYKIsIwEkrNSqycqOVs1mLGX++wvj3qGf4a2GibswhQ3k1rG5jfeT9HjHDzFdWlOvn4jH8TasA3yBoNCgUEA8lIR9fSKGkbS72o4X5OsOLP6qykobcLAIK7SAFOXRY1xhJESFgLBIQQa09XmI0T3YLglXIdz78m/4stQ4firF249Ph3Uj2656uiiwGgCNku6kRDNj9HN5y/RtsZaoNC304nrXYpIhMPNFuekfcmB7fWhczsU0aXzfRBvjrXWq+jpFoKh2En6WFDEeMaDTmbGdN4Qyb1zL1Yw2lXdg2Blxm24H+E5J4FHnCSJU81xmAzR4LgBEqQdGJW0n31mMgXG9NNJEPjo1hYn/OvXDIQOhg3IO0OENX3PS8UxtlhX1/fMyLVN/JmHdXUR1r0b/v/NtKrYlZgveJ5EB162NYGy8QKT2K2iDjk1nkBJ8GFNocaXWmAjsmAb5A2lBYMZYULMrLTTjM=
-  - secure: DKrbKFUrrnFC7JTgDWf0w8KIqT/3dHJphVKv4UkvvLJ7vuCWYQ+82QRzey/LFGCGq4nS545qWyZBZDXHQbBukJZuC+rqilcXRoE05QP42PuWhDJ00f68U5ciE5D5o9S7qGwo2zKFxt7g8pGuebQBb0BYrV9ilAbCF7wVGdWfkjq4h65nPcMJNaXoq7sDcIDXdnKbYBE5KFjglv5coRkyLm+LSyPbPClt+fnCJq6lYFXTqoecWOWMiCQdnCmanWB4Av/AYfuGOt6nIR8WTpHOT/KMkvKv/lNJ2p+mCRe22Th9eKQZvep/XPtwaueYO/c0zpc/dz7XEapXhzdoEGDhLRZfiuy1fXyHuMb4vhLYJBZ3d1t3hN5IkK/1RFWF6PCdoRYnxrMYbMT2uJTA3sVVA8YBQw99OkV9Y/N/SSAkSkJnCuaCeiLPb/OMZlxLY6hs93HbLDBDp935wRL8UZnsLA/bq6/1i7USF4HwI2aZQbhzbbqSXnVbtPvdTQEx4dORWenJraIBl+6LGKA93vimOxi8GkqAbAlgIeUvPH24t4yvHbX+AHCLpHTL7sS6Fl1gc3VLJrzPs21tliNOA3DYjXvNkYZRsdppGXR3nlCuUFlN9hd6pf0WJtYQUrjVPPJ7Nthx2J1y/o5HWAxHpNB9829djuG+nFvXPWJHfYZeNKI=
diff --git a/travis/secrets.tar.enc b/travis/secrets.tar.enc
deleted file mode 100644
index a3bac9efc1fdde677a3657b9c2c0862d4c4ca608..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 20496
zcmV(rK<>YnTfcj69P+^-IvDr+U1ObVwS{xOb%2|{Ystz6hz8AFw-VdArR&fnW$_qm
z2U?|p_4Oq4YC~6ZBrgu3Ul~{D^HrpP%m>62CqNuZ@_0fC8t^;IN3%>aHo|ZR8*Oy@
z1!YM6^+0m=T;x*pDi$rp*nNlEe>v_A0G=@#uPFJcYTkYApb{GgB{8ldN{fA-ylJ`E
z`5%wie3`gJ))Ny^B9+u4<e_RAYhhZSM@a%Y@PEHRnBWxcVi?OaHU9KRZM|B3hLri(
zR(DgqSg_d_yT)8poTbVkMAvfP7Uh;LJvrOW{=|5uW3+E*@iOCAX3&E0BUg8GPv)RC
zpZ2+NPP^TI3%#JN7c6p{i(dZp0{)y1NfX+8UiJl<Bx(i^mjKDJqK59nkE>VtDR9wS
zFg`J>#}kmox!0d;L?bJe_1jF@kf_D<P>U&sD-~l5p(a9z&T=^^b!R_4*}WxA;pg+I
z>%}f6-!&C*Tb7N%QyphDcQPKbh$+RR3nJE7fpCaK(mDql<ooK+EQwk@tKKp+_l27E
zJJHwsd8~R8z_CE-E%}7BUux6PAOqKL$F5JR(da#(PLn`dwR<h?dEwsJq*weNTU&2%
z&6b*|%?=H1y^;CgJ%_@*o4*;fT`Yk?mAc5I+i@q`+=Ptg#*|OQC%QG{9tS!Qu$`aN
zn~}mCH+`zm{rQyxX?>p6C893#xLaKtwi*R*o?(=<ZR82g-<u};%PvtS$}k1uUwv(6
zE?N6Os}2WZq03JKX3kisz?6dyBhK?N3|nt2k|~Wt?D9!2%={*rw2~bWg>i5MkO*g@
zl|0eGdDL--n#S~c4zDe<=p+}Jv0$^K7&vowiJraLy4pQ)PA&jT0VrCTN(-{X{KRrC
zE6mV{l6f%&{Bc@4BhDE%Csv$T672Z}s-Hw6r4;-@Pz&vJFt0D2+TnMvZj-oGKE+dQ
zBv60MiD~WbD_&mGYd#*F0BBC&9QPYoIQKR?gz~L({P|VOyow%YNi`v2+uydnsC@SI
z0=kT0-oInVpwH&(hh3eGDGeBDi*_LBjDQm)7Iu*M|5xz5jN>#MoJW6EdQHS>?Rjmh
zTZy8ALX0ajqH7frE*S4FfY@fB*`Semn;*S?uOR-ARi!f^iBYabwSZMuYFXn<)O3YI
zq53+t^3jkA!tHemq-j+gI2yDjPTqQ|WP#oL<Q7=W?i*q~+alj_*fsATbLh9#^-v)R
zW|GA#>4`CS{yxgbp<)$WZ5~7x2yxHrv?NM?^foA^nz##e-ZBF_97TJS^m@}gfNj!a
zPjppFi~nwG^VZr^QZAwflAu6?9mwFTa!Kex%n>;#B^6z3UO@L|4${JHpx_VQIpQB`
zwromDeOND$OwUY}YI8RVwI2_@#%*8l-~&fn()D99S*pXUpNk~x7H+j<{+8;A5A)|v
zPM63+B?<EmFzLH3+&#HG*n1&bSgKKZEBG*Z-`cvJ!IAYA1#zw|9Z+Uu%we9!D4#nq
zAOfS^Ue`W$f*P}>joH4>bB1(Pzl|bf8kt{up1S#e*U4*EStv|cfcn)K*4qKrsqpG&
zS`bo@z9Y?OMNWCL7{zph^0WPG!%XeCgA-PFt^80wt5uR@?4s>1)vQz+-!;Tub@?y1
zkB0u3wB|+>y#-JPuBk*f&6XIc?(Z2Ya-6Wz2C|C-CiJ$Mr?Pcz(3pvry?u!%05Cx(
zcSlD~*yg_D%H%gn`a^?2x(ur%v^0mK$){kKP=7<o<)YpL)I&2{m=5%ewJ>-aDcbu0
zfU&K|%jLE_&Vd#1$SoEI?p@>*tAccB0iSVXiyVW1Iwtz^`N6@Qr5zIecePrFefROS
zp%HL1l9rC0NvnB+$mvPd-{>ssq?<&zK_m%)D7Kr0LK&;k%LdHS#kvdq)Fi5D!L)t%
zbFEm+-Eb<jzvIhAUv+y-IT1@&xPk8^DZcc3SDJ~J<W0f|{!xb_rvbPXvk5T8pY$_{
z-2o~s`SZ}p0hrz?IPKk2Bft9Bc<LOa@wP><189Q98F`;du2jtA)(*XJ4snwGZ&Q+p
z1$#&7Jxo~b*xT0sXJPXZtVa6It96Vrm)CM_=}RCl#z0vhkWCb0$d=1X8{g|)M}Kz6
zaRU|USmDC8u9iK@!V0XWswN#Rs^bXe<trj+V@*v2ogZgKb>~J{QPN-0tR9`1#SD84
zzF)iYx3?j``GEn(qH%*XdYHarFIk%F0mVb;6x-KGGBciKneb3Z;3euAJF^RD!YZ6z
zRcIv!w78sxoKTi1%_}7?IMvZ#E{4k$XByc_p(v+<SgJY~c3ujwkzx`319a<9v|cn0
zHlLdHzec>EunIEpcqdU7zX04SND^BSA<USe&=J@O9}kRr9NynLG9e~bG~YtT^D+Ax
z-kDNPvjvewTz5%i-m<AN$8Y~fYGE%I7gRmx*V<zJKJ%D=%IB;#og;`g9iSknI;JA(
zM5(_Zn5KAPJ$O!Oe34`mLPums+DHC*9lI#k&l(-s$a97i1WImd#tgX~GkzCurK`vR
zhUjo{ZPMZ;Ti8^mXFjxjl<D2o;T>uDzS34P5hyhcz0FA4#145tBz|zfK!DzIYZ-6c
z%QazGfL8Zrn+JuWeKI|<OP6IK-n$dzi<8q!#T%E;|BU&wm~_~@bWjlVaynCBp6rVG
z&rUo)W3`b*WJwd8)2`^nE0m%$T$y!^B1tv$qwI}tN27o3oEuAsaM9(vHuMo4L_yNz
z+a@-ZkbIr$N1FxLnanF3Gkl1rqEO_g7~LTXabq0U9a523r`&k(O}cST7R?wbNs%Xq
z=G&XiDJ0)cHUU6_?))wh^Z1+`QXcN}s)a0GNE0A~QszVr=895HXf0I{U{s#qZ4ZCu
zos??v9^9MQl}C_8s41q$U1(J6iTn&D8WzrGl}d!CuE5Zx<cay9P$UI@#i4e_g-?)8
zUDbq#C%PMn{CP@jMjWgN0%&l698`$DkS!K`wM9^-{fzV-;c0CA^Vs^-I}Vt4RF9sv
z6;<4vx$k-n$r>%2=HwM1u<VHRSqu`C(JT~BnE}!Oe^pI&l}?rj0w{qpXFdV2zjaZT
z*QFl0CJOX$?w@g);14`p_3>Q~_mk5enP;^ie#4*AP9t6vq8mO6zBv@hbwdn(=7+7+
z<6Za_kql5Wj4}<hvOGKyxz%Pl{!b2ggKI0sJfUC;O|9Qi6j!UhJGLl@!~m?Ay<B%W
zs@<N(@to)Mg-LA<_IumGu>(R=@dlAkZ7PNGkk(_o%=>z_<r!MbWUsh(-)S}rH9PnD
zxiu4$x0#Qvh1~d~2G35jz8Rlf(!m#}uhz8s`Wu2g!HEI?ic~H0i+JL%D~@C5qUA{Y
zzd}mnNh2GWw%7ZlX4;W}GB%lC7BqQ@vi)dDm$Ht<WweN*>>T6Z0zkZ&5+`@#^lV^N
zqx5x0%}*JvSb8A10u-~PGU?~l7k%RT0y|!SgI=Zc7O~WAh}0tBqyMG!i0lnzP;)mp
zifE@vAcuQ#VE*7QM)SbUb)p(^{m5gtxj+acu5dri4$@c-H*ph{7`dyGOWSMx`}AeN
z$_$9TulNMTd7r)JVqSRU&iiE$>FD%@o{@j>k7NKLWA)gSK}itacPKK={5hlOzG+G&
z(eV_9&&g>qDnIGD3w-=8(0kdA`d-=Mxyl<|nb=yS1oqjXgUB|TZ`YPKJfYEHo{B%E
z!xYSM=T{H%<@R6-=xL@;hI}Q@zGH1bXZZb4s)^evJN`G%%-vvcaP`rO?ra5w>(zJ+
zorN=pkamK4WV!K0N51Y!FFASK%Z@K#%H?wlQ_26t@Q`T*@(X8w-9*tJhC7kD={<>!
zpWNy=;DeJ7_&-hbT3pp_Z9eFI(|_|<8uO)sB;<wchCd(xtpgpcF>%de`R%?S?K3Df
zB4AEfi__cXhND_E=q(Ci{ys;ph`;P=4lLA7upY)GkgL;FgW#V7t)}ZLak*Nc3Udxz
zF&5nqNH`-4NDRdJ@xv;(AL=YVclIERShU#;v!swJIYQig<-xQD$cKU-_lglj2w0~V
zN>RPRsV-}*+Hjv0MvuL6@0+e~ipOcSz9)-erOtZABl+oyie%uG`8Yq9d|V=tTmvl>
z@<k5Ni2ji3^tE=ODHJeRn8RjmTf?9Bqzcs=OaydV3!9$+Z=B`Omk5~j-r%bKAT8X<
zA`W{Z;3SORTvsI=*R=SD13vCz#S9tQhIUl$=JnIOW`sm~7s&gn4T>Tu0A_}mD4N6k
z^hArgR}$$Ra>GLn_(*1W9$J_#f@G7TZeTk<s&UF&$y}ZJ|5HrQ@V0cMgS0eTtA3Jb
zw}!^F!GKp;kQiXLh5^3J5D3(_XBOjnBdzc9`m)~}EgMjLdC`5?yeBYZAG)6BR*G$N
zY8$B9qH*mTnTBehpMY3yZzKxj72^mxxok9yT<<b<I4_G3D240)>)^+Nn9ST8jq_6!
zrDRtz^OC<PLZt1%y6yu6fv5+2RLhg887YMiGiPi}c!{;2rt^*O>t$$M>oA`;b9b8t
zVbsZ(>e=GlU5a;tZUaP9Jin=5Q@|!~8*kwGS>6L1Sh=9(0OXgGfjKE`HPI@5BiX|K
zo4#;vAFZ+VkMb~6v`$|r>h>9_Vxt~2q8;02TF(LqMX+_(c4vOvO&LC0KNppyW2&js
ze@Dq$sDauC+(snXLEb2aks{&!L3M$^P-gPT%eSvO3qT#xt2wD;^^9NNJ2o2K%(FPu
zWeYSPZtMG`_61qmJ*xVH$9zUMrZ0+)Rn-P2PaIUqCaq53O1mY}of%-4pgICHWj<GB
z)?zY_P*yRWQG7M+ifAVUGd(M_U(|L;0}gf==A#C(Cqya6gX(RHc&yP>k;QT{fhw{D
zZ5p_`KxKZ{8tk0)9w77`8g{K!A9-5p#|!{AO+bI*&HcYrnON-b9+AZ#!8@~V#NAtq
ztqwCWHJNChgb+BBURR5Ahp-`z>*G0yOFz03Ouke*3XlO~TRC9WJ0Hy>8tjwT`KhJB
z%tC|E7G*K`k!K3&q-W(CyD}yobMc(#AB~Re5%`n-dN*9V73ZWP;&2p6C5yC-Kh#fv
zAl*3!VJjg1)Hgm%-Sl!nR`nUYBQ-u&@TZ$&=^Y4nlHj=UKs#?xVvgsu5*b`B@>0It
zxpMlU`FNpigv_;6y=sJc8!J*PbFPLRCc2-F89vsY$ut9}ECgJU%)x^(56@(!tv(g6
zO_V=prN{t<4W7X}bkBVToe+ifUZtF5{0f^}q_}41m(}f5v*us$Vp3VwKHTCFToUo5
z_t>+ZT%yn_Ptfe~qj&}0kG1V19zX^e?;o_$2;4rCUZy}&Ypv3*L!1z-@|{^Wl(A8?
zR4fRg(fvl%7ZMNqi5S4J6)@ac{SAE23?H66dpom+vXLI>M82x%HvG#o0`*;PR=h(D
z)76#+05Ksqd>Ac>jcI!sxUVsoDd<}O?@sM&BhW<CVg==f6t3z#8ka$sGfn$wrtowf
zCrceFvVkF^`&aGGy@Gf6Lre7(L}GSxz<66Dgr%<5OW~nxC}mKk?#tPl*<sjs_?pdL
z%a@~ZRq*~lXQZ#4ZcsaiR;=_Nc48dAg2qc19)zn#x(!%m7Kkv~9n+@-t4(kw(nE&F
zJ-Uc@Ld)xSw@`DZb-xF#2z`y)&pXX)_07AJKSxxty^%A_zd8}@N2e_E^0zbB*R6cF
z*w1)Z3p3ep*EofOEkyyXafAmgmROc@JkjFCj;yp=HFRs#KmNNutY*&tUe3Wq{2WRL
zSwrjM&O~`>u(w7Tz*&E?;RsO@wv<ARd*<(ukk{?n1o&<Hxvo+jp54Df13f==YjthE
zQ7nGhF_MKshCb(nLDYXDqpjiiV0cC>4Oo2GmIp`!`JbLMd2Ib%jTHRHEF;;7^8u9g
ztYpV;mfLgoTH&I>5cU~w2j+qtotxN%#--WBjMw!rbPwPFDQVZ>he$TlnAXk|la*dn
z(%StuS+)B3a)2zJD9CCfF^k+=mqL@7$7@hxXDeaO?3VT$&g1BnV!vg0hd*n!cc8HX
zAVCEO14<je2A^0oN6J~_+Yy)b5y$-sCz0$=#$JOtG6>lI6e-$+1fcPX`?cMj8@~%}
z7(I@qe93?R9q7$?8f|nSiBLoP#@plIiLx?MA{wIgP{#u*?o0$cK#cs1bAFe&gcl4I
zXr@4XQVIt!qk<~G16IW#;I8eLJTVoY;%<Fp{6d(>qne^LRQB02DWGN;goO4=&h9n3
z&@`sv!0}4he69n94s=_J3^l;~bGwk#;thaJ1bTmtE5J0Qj^B=vypw~;Tvq-m#pW1p
z!siD0GC`*eTXOL%@M3Qvkw0^F>w9E6e0F>omu-(b*V4Wcuw#V1-oX?Ju-xotXYTA!
zotq|&yYnA$lb;#LBoqHrd;I2qoRDv+X0wge(}uIJF$?UKRI_bVbTTBDP39<N)oiT6
zBvQ?6CzaA4h9zm2#^jRGQj?so;Jw18rcCb+X2>off3^{D!E)xN9AbteGc4u6();Nn
zQj^;I>dM0JLIgD9p1tLS8;%Tuz#BIORrc*8&H@mXy-$b|g(G1h02AxRJgiHNa^DE$
zoKuB8OKNcJ%NC3NUvU1d2f$Rk1%;?l%LIQr&!k4F);kex75=ZW5@c`KqCSx?i`|n@
zA44y9vuoH<{jlJsFplN$7Se4(I3k+ms_bF**BZSpMMz!F<jcyx_~Ym;)igs9hpsdC
zeZwUQj&fCmgHq|UdWkS*0j$Pw(rx_Nt+#ODZ%+7#id=Mf_~-yY0e@nLX}S2+*P9p<
zInZsA-UR9S=y9awg6cR{h(4uP^f@F{a?5VepW8)0J$^Z>QF=j=hb;Iq<G(aIJFwz6
zR644VRtVUl0aNudzK#2PTXN#+yrE3d9;TO~Wc9Lx=js}z2!BXm&un%6X>NpU)&6Ww
z9avHX=ysOg`APSy8C#%im*!xI<UNhgQz`_cxD80L=8-EbPm+4?J;>zW4W}T|u&Q@M
zcWCG%cy~~^ETQIhy0a!d#c=(l@Xw%lGK&!R-KRZsuR{(J?}>kmq&0iQZA8ZpyMZ6X
zlV(QrsK9K=FAj-Z@7xGBo-Esdi`;4%Yw&vrFW$fB9&Jr!aP-OK;}K1Id-_9Vu~W+b
zJ8=dsCf$g6+;J|*n#ovmgcvmSGwn$N{64~Gt?g^_Trwf;yK#i?N(HPZssEN~!7rU9
zF;L7iP2Z(NoxSL3s;X#PE`G_ChCc}Y@o!o<J0MF{WKR=kLq)y6oR*g7Qo_&gp8xFJ
zo!*@n&Jr)h`%LWxWag`o<hMNXxDWlVZbojOB5D!m+X0Qaz}q6S{jLvdoto!}c3UQN
z&g^$@hrZQ}bU=(@H7QA)Kzac?9d`_X?0!ms_+K;pPi2GXEx|ZCh&&DB?4I~1GdK&Y
z)vAxf{Q^-=<Roqn*sS=5%i*FZ)1%jyPz=(Z-MX|p;~(Ckw0u@>NajJ}_5=w4WwRjT
z_aVr=+S5B_i}B;>zgy;<#Rj2pP;qxsHXTdX3O2Pue~9M8OXS?Py(*5jV>^SAw?Y%c
zeio0NtFg%47|IKk&piA`4#cDEbhSer*{wJN%h0(MYve9fr@^d2J;6Y9VOlXoPfO!#
zl7nsZrRkrRFiEW)oylI+0dHF~;GZJ5`j#dNjZ&`;5DuK8pp9FH<z46lr!>Cy6DqGp
z-Fye0HQQgm6jOk+<Z9Y<<_Ha@jUp*=<p>AsTXK82;G>UTfR?!3fSl~U+|`+t@0I$;
zkzWlqF^4*$<~09o?#rFpTSYw;j5etAT=6e)p!l6J%S5A8Y!nbLoBf3Me-e|cM@y|^
z{~D$Vl6!qo@&2^mCRCWot1_c!Oh%mFKZLXtH4kr@`$Pq1jt_1UG=BOV2DKH-Z8xwj
z=yc~IaIVOU9Fml}l6oLJvat_0Y%7CKp_H`)_BYLRyM<k0p9>{cd*`@+HdysecO>b;
z8}JR6bovkiQ{slLpB8Xsv7)8A`^@pA1{3>tG2tCOb)6l6&esz3tTYC>l7%4kgSyQt
z(MTm-sq0IxQ#$n2ijmCdwKF|Z)GZO37AHL~5s*Rbm@_UkkTbp+41FbgnoT~8S89eV
zY}&u084IrqQFHf2Io|h!mT21MB1{iT(8nq<o5BzD-WN5La~5~hWcg2{#YgE{qiKP)
z0_M+JYM-Hsq6hW9==?s=xeT*@<x_(*T>uwc|99EZ^LP{Dk)N6YwyGM2j&8Y98Y$mw
zzSHPl8equ1n~hg3Itj1f3hiTXWqum@lF?;gZ9t2mA^oeaTLHXH*qyCNFwt8-ovqv2
zs~{Ij5l=`Z81&wXy$EDo;GNDHyy)e;ssei*TVD2(jv?%Pn)YR~C1ShnhioCm){AY7
zpWaI)guY8T?Smdr+aW$EF-2+)wM1K)lt#+qSu&1cN<d|IV<R#3`Ef=us}OzCOacRW
zvi<PrRgNqz1YA{cM;*d-uY>j#<zKnZ-|6r5cA=w6o0cfWeMp=g=bDsacG_gfA6oWF
zM%vTK%aR>88HSIIobXlX_`N6yABTlUgP1>xImP+{U9_#M&2Tk{<b&=JW*2PwY+y4N
zVPeqW*RI{sEh&<*s)|5cju|tK|E(h8C#{w^Pk7_ce&(+M>ERbXh}d}8VWb~GrP=mX
zp|(L6V%M;X1Y4~gQVUv^4)<D%Nj=x^Zx5I|@Gj_DTnN~icnfX8g|sOI6g6Ad(jH>O
zUt`)X@cVakq4^nh(I1}bBc00_xi7t)KM*$3S^hV)he*!}r2Z?2_EWo}zCN?k2hIME
zWX$U)y(P^O_tRP)f`=20-f_HoyX=O(P1L;NG)TXEVdr%&96xQt2lO*KjdQ^i{U*@3
zlqLTidxW{MC)PskO+LnOa(V|;^Rh=)ac;WuWK6$;U=sl%@&}dX&|@%G0$I6HL%Jq?
z*h+nb9qF`$<7vf*EGWt3AB<y<Z9|vZ<bWz*jDeT&T_EkBFqUjwsQtGfkUODUJp$wa
zzgMy_1{NslPhWn@Ak9SK02{rJ>lqtRYMnD_t^jTFb?Y31nHd>s!Bo=>6nl;fQ*fJ7
z^gJK|_vBF<D7hanrVzTyVno$G35{7_FO@WCG6wy82PsxNgIVTbV*>dagYf+anQq3K
z!4M_0c_=KaRa}nv;}TS1Uv3J>$}7HOaUp!w+4r;#H)se7c!U}ul^aYt*0*V-_NeD3
zNOUD_@YG~8-&D<j$h3?YHa`*t**;jBknU~sp}u0F1HckZXt`xC$AM&eanCIf`%=tl
z;rA<xeP@f`#mJuiVicb4ZVw3iRAa<wOx<+1gO+#m=<dMW_r0bAnjJgo0d&Ikm5bp<
z^hz9Sp<l*_YuH9zEJPTVW9;zRRcL-A-BC2yZZ@+o9ik6&Q0{!^p_J70NSprmOU`Xn
zw2T!A*ogcWwc&0OJST5vkJe}@2NJypnwd^;=pPwyw@0mZqcKX3&8lrsB!WccJxAfX
z&TQ06pf1WhCj~lG$0b&dvN2(OGKTEvuI)_#YkmvKDjRZQ#$XEahFqQkHJ03Mz_pog
z?{RL0cg8xiX6b*$m^9j_WfZ>N!cMC@uK4M7V{$djOQfm1xii#OrgttT&B&69Zb8*+
zu>KF#H8EG)cTLCPWwWWAoC(<2&jYH`MBluFO{vYiXTdmWFTot(#LiAl<>1ML_%aKp
zbC1C_FjzQ9s?vR6mOJL&6ZTg^&n~c?`yByq?hYYG5-Q2{Of&Mz_weC($O_3VH)?m4
zmU8DPi^3e_4)X@LTS+WmZ03Etmz9*TW^EOL&{yUp#N9dX!luqor`a8@G%yW^8p94a
zN=<H|%F4~3ApnEb{XN?cVyRvav+*k-kuyy3kRGC#It~4l$Lsgt&3$|9xPMSQn)3!T
zmd?;?N{zYbcN>VxT;0eZCAD_S)P`D8xb`mBd%&&M82bx{FQwz!NNZfE_PQfJMF8`-
z62_xVh}wij7>?xe2_*H{ocaBy3Vl@X-HDN~?}|_e6xEl{FuIFBN|||BH&Tv1uz|4m
z?On>x81hKLVt-|I@UV<bC1h?$44M}$)gR2M!GkZo0Yk@YbAziBkz->Y{YWJ%Dvt_E
zR#Q=nMdn>Gemcbybs_@N4~QB{0_(<|ugi`Xwh2W-Uo;lM!!FZ#w^~xr1ulsy>S|Yp
zsYx60m%s5-8veMo4tdY`gmF-BV7TlM7q5_<Sq4@l^FdmjHI(NOtP>w-WI8yK=U})#
zT5%>wTkb9GCW}>m6&9_*Nsc>9O>p7Oa8hvmFByWc)d=!M4fa0$LesN${Y(o%$3bQt
z4@y#PPF7VR#yOz1ze3xVO}_BBe_}Yg<vqq#YEoNJ$=&xajKvO<v^c<#=*(Iywf-{B
zH14FQej?lG&{943D`Ko|A134GztXKPgQ6Hp!u{W-KF^Hw>IVc0W5G=0ars7^XqtOr
zr!jmt@=$A`jxwv?gGkJW6J(Y7!<mq<B=*>j$qaS<ft%ge^BHee<lNCn6fQp^Tr&J1
zD5ngQ6DUBMEUb?PIBJAOaPd}lBQio`a-SKm129afVw76cIhF6@W#q;-q=J--uIZrc
zTv-6S0adj-hryT5pJQTUwHBW_81cP6q^UC*+M|<#()nS4dvve!L7Rus)>9ul)27FK
z+rt*eTJqm-Bly$Rp3jaOS6qN%_bq5G8n_}P0Hxn?`BB|})mIQ`4^b;F{GA-`I79C^
z9Bc`Vwi$SLC3jW}%G69c*@p#1UgM889|CX+Cn7ehAl;P1Is28-x|DjaQo0Pu1jM6?
z%}JTqR=4XZJEJ>NDil0J7CFNJ*FVW<w(wk8|7mWWbQOD2#Bw8;PzD2U<&_f9q6Ii^
zL;Y~KbTnrYS}Kz|8l>KU9D`!MU>y1kE+7f)1J1D??DC^>WiTdC5ac^&Dqhl*SqNp8
zm~Ezy==<W8HXdfk<yUq`w3x5OVDsKLV$u0;3PTH7eHJ^I$LA-<H~=p)e#u&mEP<Ln
zkUWq5HJ2e-*TlFUkk#jKSKJgH!^xyWrSl`dOeamO>`HBnux;yG-Ql^|F-z+2G>@xP
z#Vrt?PljOl1EE~9PhN4$p(pAj(eG<R*BU>f4YSK}av}Z`IIfi%10yZ=JM3>I1Z=J`
z{kae1Z4s;*z<yxDjcOq-%Z*&XB^aOQxJN(2@lUcCMGb^F_N*1Vl^^NMVGAb4&zL<L
z8Q|6+%f@{MP2CwkZ5UDr07(pYz?#?LW+<jA0I63=y~~^lG+hOVBv!A;SeB%4FW?Rx
zSx-fF3X;G&|M+O8DT=e>7G^wF%0{GFV>Fc&f?_EFB1=1qGXw1rffBS&r*rn%i%rg~
zc@)wfpIhzDx#}kO*+6NBefy=H)QAvDJ*vy5{Kwt347ytk=qp#(7JlRJ04M-^T<X7~
z<y=<CmA)HAOO;fHfeTMP`c~bik^HuXaVk%cgCvPrLifq+YGuiqJmjvOhk#??Vd*!}
zc%n4B<RZqtW9-Ux^)1gj<tkbjqCHzwI#8p!Q_6{>{R#NRGVR?VoY*M=;}M(9e4)>I
z0)qfH7)XtQvEHXl*v-7Pd&_c4{dM$+(T7WFpV~-AWof9|Gu{iEN>xRYBB{NRl*?zR
zNBgAqq;c(n3iV5S)GoN1vBmZ46!I2IHO87vh@QE!GZ#VgNZ6z{#TBCx9HvKX8Rr^)
z-4iV`<AK&J$G!Q194XJ!pSl>#YltZIbXm)ijrxc{J0z1dyCNe7lvt`?9j5|2V<`b#
z(FQC&)2PiD`gn-Y`<17P;$=w&pf{(fLSi-yU~vvlVX<+l=U*L+|2p_x8Z)vTw#!lF
z3K=*Uh4Od|mZAl2nEcVZ!~=)9jX;~(PHU9z3LW~KSo5L$ND>$WX_MEwAD6H=T<PLV
z>2%o9uWxtcxyR@^NadUWj4yz~F)&v6R^@*P?LH6~Ulb9eFw3Df?vxs?GmP0u8uWX%
z%sFe8OF6D03jz4xo)h=grZwBKMj*@bCcaD8Y@6jE;}M^Q)D*u=X@iasCBRXtt7W|!
zV^~y`;Z832Y3LnQOzWhI)yMKQtq{BRZ~jF0(v!Ne7>=G(*<cuER_}R?F2wxCA1GGq
zO0ibP9VzK@u7lnKQEvj^ri%%%I(C)^rsKu+=uHg01*i?YnDK-f%$7hEt>>kr_<DCL
z8GcQ@(vMxciH((mAvGL~rKbyt`=vm6!Ox~5j^pS<;a&qYyMdxF!7c`xUsm*I4E=06
zhIhbBItT2`8Pt96*O}1{@dUL#nu)ETs-~ja1F>6=IQw)kaD4giDD8Q8u7^}>()g{t
z-qE4%sh-^^^qV7TFzn9?H5Yv(N2rTmM+hiEA%ZJE=QRuf<zKKXicq)Pp<^P*UF=`a
z7-B;NZJ(k+{dmIg^rW$Cno3-IKb;+%!M1HQ!(j95;R$%1N#r3``w%UOyJxCSCLc8O
zIrLi(O};^~9kWsaa?lh7aN>4|><Up!UyB8RH`=JC{?IDbf8*jP!z|fmxh%vqzuSeW
zzmIOj8aJNZ5{qb;+^V`pT0M666UCG;U*=saeV{~{01;ho#%smh8JdwN53C<vq>Aw?
z9a|@P_0TxD&}3essm3J9U}&SSU`^9KKAaMd8R@j}{nhZ+z`@g3+1UL@_cTLky#6)w
zF-%KdH`NaaK+G0O95oMc80aNI*IQzP1bbA!O2J4XC!ak5P`1}R$g_HG2I=PGQhjtI
z-EfV?k{NiD*K5MTV~Jy3cEGghiiF>X!YfJu9<|sgrMhx>j^wjy2<0p|q4j2<VCWzN
zM88LcDj74`AUf&>ky!|Ttib`NOo)$kmWbPXi!D(z+ZbNlUp|2OnEoC!1m64DC#tS@
zsBZ52?p0_}mnbHv`&HdE!hYixgw39mUS*SBoRh(-p75^uKWTVP0!+U)EeA83NBLM>
zvGB&OwiR5t3|F`oa}qo6zjnSS9jZ)-7`nCT)Id<H)N|zYtMsXVBdHN5Nw3hDWZ3P)
z^&e++*qtAki|SRc*n?pmZm&LSN>`&Vp;JXSf%Bc4EF-38JVsnVAjhLdPenB#!FB8t
z!POA>*P_E8R&YmFV=#|$ciGy*uvR>aqv`pLwL_Y_fL38ah2o9-Z3PfC$@4U9X_r$k
zJW0)Cic-7dtVX~Iict}zcUZwXRJ>_I{m&+3gbhg8ZoeGexhX1bR3mmBP$cQN&)&i0
zD)K*C->p{L-=P-s`58k9Q8Miq4$CPpc0AR8$JlOIhH3?2N5+rsmRtIjjz?>ZBvZWT
zjFn4f9XPnqGl=y|eYPOa__|$xJ+GN%?8Th?PK0;+PvbSf%4r!Pyi-zPLIt-ZU6}WM
z_u4qZi`EBk`0l+D)2PNRAVG)3Pjct14q^4u%7U)qx>jI;fJtaQ410kEsyNcGJu)G4
zD0EmOajqCbZKin>B$2_&WM)n7<TildjU3&``HpA*#xn?Tzc6t0W`_34f210yZ!!m-
zrzC3;4Q%5_(_S<1$Y&-vy0<~zE#n+bJjHQ#Y+f$5Kd!@o<!g#D!Lbsx<<{QRUf8oh
zW6emTw+zT*o}l)t&TxgMMHRC}T(P8kWv3m*$$YoXA=;wVL~W0v8xK=Urby$U6+Se`
z-q}@5yXGe+0=~|vwG{ymd0=?Tdf^p3Y#j&mWGEV&=2WqXOA9R%V{>O(-)6M)Aex;<
zZf_MS$APz||FSy#Ayu=*hE#~-Usxi1d*qX1CK=0ayKjV)^$)Kes4BYbUR#~*LJ%O@
zSUetS@_9L+>^Jw8CYz0U_Fj0@N-|ft_dv|~ZJQEPLve*eLFqV<8$?aowXdU3d#Z+J
zn|H;tTf_MPd48wJO3IRf@Jc%{D@H-wt@$fk=6>}{?sQ_yC#3N2F{JP2olN!X%UVEB
z6bi$9^N@Co_d{J!>Mbk`7lFKX5DjA#0r_jRbcq3qcO2jftp){ShV&eT(kp<E=aRWa
zz1Y>l{t56*5xLIuj7_rjsRHG#<?O~d^^a75W_?A7*>;x=z3IbOe(#6qYZU5ze~GaG
z%5Y<JUM(OA=Z_nZ%jhx*)XIWVQfD;{w|~S(?0WZU-MQ5TC^)tl;68;Q{0LNnBD6nY
z44)PjcY56N@58+JHw*zm`hd^k>uFg4U;e9^+@HdEx_VB&CDLi^8@hfImA32sdo;%t
zqMh-kn85O=9*!~b3MDe=QCmS!P#DLfAL)Ipbg@n~M?IUW$)2SQ`{{6Ea)@#SoviyL
zoM}C~$2gpm5c|i<Gm3iCch{oPUb7xN$Bi~r6l|LS6K5)gVLzg>f`y_%%85I&h$Tgi
zBH&hbvKYge+x(hscl{p|_<P^)U&J}Nw3Fu&{N24pjd9Q}P_-vOta=!I57|$smlsQ)
z5Krn`<_=#x5WCZFrh8JeW4yIr9FU0-WS#=H=*G|1K*EciC`E13@6-@Jn;4Cw@jPtP
zVS?aX(&qH;s&?keJC-wvp2EJ-L(>j0@rpaK`c@;G`Envs$sNp6wTJ~awfNQK9~NiY
zdNNND0iEXu5x&Lgv{Gb*;4z3Buw4z`)a$+rc7`2u*<2(De0)`TP|N*>wdgsC>Jw4C
zc2Yr|Q?p$IZ+*Kcrii57lbpY6=?W$ZdlRptq9?d|_%(%DTW>IICf!YZVTKz=dqwVZ
z!tfxSmjQDdJ;7;IlZ=bcZA)K=D6!bv_d`Ef)YWAuBr!BqLaUcM!cuYe$S}kgS{GU$
zcU!*z?MDv%9^WF*3jvzW_7S5>7H(q|<!>9Jpb$+b3?RX?AK(|FY;?op%r%4F#ZYZp
z!eIjQ>#z$en;T-8V^uafJ4N}34aM-<JH{eq<r-D9YHwlTUm4}nF~D=0fkmxAlQPOV
zIw=2T9$2rb3SWwH%c&lT?tXi#3h&B4T99PjThijqD4-$HhVr4VXbYh|L^1#lACI%G
zGwkS-+^rNr?&-yZ$yV|Lmzj~`R#HBvVa|@0GYD&zHM_^aVHA~8Rr`;G$GTH3FuAj3
zmtci|KK;1U0t#qhf}NwuCp($1x$opeaBQeBGMd-cq!44X(`W~}>dLe{A{$!mgf-Kc
zn6<juys=jHV;8#3QJP|xf}G)G1U%sxAk<a~Q5y{(mF?ce?nOxqac%10`zbwYF)@D1
z9phPZk2gg=`ZB=sYsC8$G#5MY^G-x|&{1r~=(k^l+pcI~hwJUi^oC|)0JJoVRHS=N
zI24f8-?sq2ukhKu^<qm1kaY6mxTooGCF<N8=^gmpQ`nIo0T|#+jd}<<fUH~6!jgR6
zVl;frP5r1j9DS<aa9l4DvS&;?z%)RY2R9(3%Q=91ZW{*gBOdZZFiA-K4~^u&(38Ik
z^wgmOyC#|Bdw(>-wk#i)Iz(Ttj<S?3UPtN(X?&vV<G0_n0Wek~JRvIM%g|%HH-#t(
zv*BZgkq7=mXY5@=<>z-Hl#k~v^XIb~yGPozWGQ9T8_vZ0eDGVr9O>-blG@Jp3R=}W
z_*7ep55&c!47-5I`Vx_kxmduR-s{9yDsa<%8O?Ny1d$l-2C>*mZXqZj*HgbaX|o|J
zI@>kT)q^>AA59^k7g18EEJi9QIWxUelSeujE#jlU&KV5CXrRrc(Rdg4XslZy(AO-s
zOXcx>WJ6ZJSH^CD-OouLhAQ7z+=P&*jrDULZZ-zL;$TX1RkGWbps((12lfG<<vQq8
zlAYRtR^1w`u*wF*tp*UMT6rj(MElH3I3s-nk086Xk(wN?QZ!$vH)KL34-m!(`LCLY
zJM)DSpIvEMQ*;YvOEl@QG}h^hjbkYW))?|&M3qCMPogS@6cPh{11JQS2Cj<a)()vh
z(PC-9?jF?>24{3TE(szlRcKhi=GN$b`5$bzmmJoW{0e%kx1ceIy76yaC>(g+a@oxs
za`ug;yQ5eCdFIhPyJ6e*k`r%Wo0OrXdtA<l;E=`I0^M5rI8q397aVg+L9fm_aFse}
zROv>EbDjDiDt$y%vFPllK|Nz9Q-#+^G-VTcWjBRYvD~Yv+R=DUEH1)}w3M!_r_`~$
zF_RnlIlmH&c_D)gbGR&;#0_2rT5WpA=}F@<GZ3Ys*BE7H)ZugY*?O9&ybZ>&4;BMt
znxBB?Fy=5R{(%(<-?~X|5u@n555AQvnYN;hqlPvm08yh)-bnhZP;-j`P?J6{Q^hi=
zBjQ>ib)?v<Xk4lGf6fdAB=Y*WaHyjYj3>JOxId-jcyJW;)}FvmIo_I$r1T0o2t&an
zGqkec#sQ82_$xj(4N4v+%?n{RDI+ix_<k>|IM*uOIQ)d>1pog46W>|9?O>yOkKv%H
z{ixv49B8Rq$iu~A{hF~6%s>6bA%9{A!2-cI+66ZmNemBz>1PytMH+_#`iILh_$;c2
zJd?RT3B9HGFaQhu^Ai~bl1~+hyX&@D76}jDWeg+(avufw-b|ZcPPn5=>X1-Io;lS1
z;}^WrdvRgNkbQzw_*U{=72$O0w%L4cn@|28Em_e=NrTD^hhoqPL}3lwGFWP4#)n0x
zlq5=Nba^?roA~vL5wQE!)BSimUA=I9W3*$lk?09cUqDiT%R7;GuoJh4@ZByrH;{}9
z0;<YkanX@T*XF>g#(glFiY#A(=-TeA2@F?%%bCM&)6E!yj!9N_;5!k7h^2mYkwq5Q
zA@xb%c4-<(F!U}NuPnn+sr<li38JEE(2phJ5yn3>u@PUfK+WT2+&Zx}LxXs1TswC(
zuzk7x3RnjmxkqV@o_20#iHiJ`PG855^49l-3*XnpSjee!Yi&-G^?E*%DY~WDZSf3)
zO*u+-n}(k2eBuZ;&4C$R+7O#0WGee{&*i?cMs*#5B;K?#3TQD1TZmd$?ANCEaYkDN
z;pH;|4C#rg8h=50vJ+E@MIy_fjJmIqn`BB<&T@E?9*1(qK&KRn#pUF9IX(3dLMR_T
zz!7qEt1$Z1u<IV1+JoJT*I2r0jjrrk%uM)MBQ}Mr%*!Zm+YG(!1#$aT+7H~yFwB=W
zg5zz=7ePkoGVCSd_WI=JMM~{$Y_55(GYvmZe_l~`9jLfb)&G-rwt5p1&Mz?GB#r_Q
ze~BWFSdv0=Jj^_NcFA!+ZK<=`dgrA;KTGj@MWN%_z5+BAOx(;Wd)wLZvuj#GVu-`j
zH*=>8>ig0w&)%1HCz*+YZ{Ey-n=}Z+Km6Kv`i||S@es6v+i|o_C9lK1D+D~J!F+v{
z#~Ns<659I)zoB{yOH(~xmU#bJFcg3i4*x60YOM;!=5(LrNH7f1YXG20KZ^1~NH)hH
z%rM@@U?efIH^2o6AP}FQ8swYp;paVLk7E-IdddG2n9~_%tdTz^(E*hv;)?8iea;_i
zKM1mjxF3~;on%g^e~p!N;e~PWc`mP{Elo0t)CB9MgN;C&I#CA<EVz4vr!gPF1oyOB
z;hZNaw(;5EO5w-GS)---*=$%+Vt3vNxSBDKAAQOl?oanc;0Q7%U*4URMkpbIu23bk
z2GXi@Y3XXYFEnwV6vdv@Ay7%=LT}@4Ye~X!KE;(;NtsI$mYI<TuzLKBN0abf@7g$c
zrvV>&oi+e@P`0(RvoYBX4Fy?ijZ*N)(l>`u*q>o0vy`w{L%z>!9}=e27Pn0e&M6W|
z%*W++gask4II86joNF9TUY+og|0WDoBRv3LjdjqrbxZBTq0M&1YmWotL$=>C^oxpa
zL#UKo!U^@Ew-<msF+m0eGdr|9(EDRPNuxZd)Cj1whY2yVf-5THE(HLu4ex93g&Lfo
zE?p(|Xz69c3g#ltL;iYbm5)&eP*QgtOBo~AoBAXbW9~|P2YDM6<lXhUqWI?rLvo*c
zn_^250A6TLeSJR305y$~_8j#gifonpmG>8Z1?mm*1Bh*;Do|w{i?!%<UxZxfNwhNG
zbbAO7&}p3+*~!F^xs^c*IDD;PxFaq$TCCYNx$eh8qkG~z21~k|woj<VLf)K^r*9u<
z*)_@f0N=zy&=2ZtSe`Q5BDtEiH7ih%@6!+_3eE6ledi-cGI#g!wx{iV*I`UwaFn%G
zWp)u``D*BSOZ&9I*Uik{12odjZ3d)pw!o=Fm#NZ)v_8y~8Drya6NKpiH;S1^V%`Wm
zXg|sYTGriA5-QVHf+`}1#8;J6q0CY=2D{+?Cu9Mrj2CgZ(OMM?`*Qs&ug(a0y}}}5
z!;uS|3M#evsg;yqWZe7=#R^WjUSL!td;^!!6@XT;e3KthiWY!%gWyEFxd<hHX`#?x
zpk{3af0<ns%N1#-V1aK7a|YmS39$dNS;`qRD^F_wu-kitJxv`=)sLD#c&A`hw1>DD
zS+0c6o`9Cu_s|OFzwr&gGkrh8S8r=v8@&^db<E_Ue&HS?q*ZrBjeL<iKaY)WA;ojZ
zy-gae;HpSCqa{2-EkP{ltKkr^@}l3PfV&9429~g`K@D9v@{i=PEYy5r1QC?o+)(bc
z4s5+A78J#A?+yi`t|aUH!+Q_Fc99n0KP-B2<dBRy6@AyUkdy*x^rQurViXN}cp=)K
z@dsp>+K_;x!f!nWM<`^XOY>Fo;yjCPxtvDiuC6&6${%x_p)8yHM@t`Cxt|6rI6|bq
z9HUVH^!=ym9fq9bdGGqUO$BelNn>~8FL};`OWh|%Edv-bC5BN@mx6b~aIe)!p|wMz
zevC`us2?@=rocglA;Ydcu}*liZc4+*vpp1}tT~PpH|lXyZjAc`4`J2Ly`wg1f|bz?
z2Wm$w0#l^^hUY?Fav*2!mpn4lKn22M+&&zn77`t7jIpJdu)P|P_}otLUk^j>-{NaP
z(E>4d-%j5YIGvO7irGb|8VdS|RjL<fruK<L>mm21(&{2*+0tqv;u@LQA{VZ}ODiI0
zL;37@i9XUe@pQIA-uZ^c8M(<FAQtV%1(Sn(a9rYItcqrefLh}eFtkciH~x&!Wm-xc
z`!#5yIDU+nMy+oO_?g5KDmG9Md4k7vv1qSxpDNEMr<xuUk$jC()CN;Ygu;yG%e*Rp
zvV?lbn2zIb_*HDCTq{A`#k4Py>H96{4V1L<#>465eRDU%r;;oy)JKH^q;L_5rXC=8
z7*X)SB-7`IQ6^~&(+m8eBRrs{t}bk^P^l=j!)*qj9K7my6UnULkd@z~_Gs{DO}GTV
zE$$_|`qq)df<iZ2rAb5;!+8zudBE}=!Lj-sZV1zPJF>{@(ORc}A3bW)LTGY@9f5Nk
zOi5Tsm~&?VMwyEtDM}gcxFo_Ft9O@+jS=WqkcVuMLh5_1{Vzftb>|_T_v02(+`WJD
z!K1x|<2N$%JN%&n79|7gj$o8jjXshj2^ejDqrC>D^MnQl_|vU1LCqy~-{NL2DK2&{
ztDjU2$wKQJHV4HCOtK6F%tb1@p@RUHiYbs`Z?lbE1ftgSO~R7Je(}|l+DUSpwu|^K
zqwZk`=l4X^$8NCNp01y%4lMzL*k=sb@h6{K^xGhs)jQqJSsiZwEh@<ANjg2D#`0`T
zV4)Bow$j=gT`N*JYOx`ZntNBW*`9>1g=$l9n~&$I3=6i25vi2$LzlIT5+yed$40}s
ze%jJ#h2C>e6V{fvZGoWL6bg!^l7rImHD6Y<tyyz@;_9UWudz}PBQ-i-=aAzU75O^{
z#-E65ZcQuvkN0AU)E>sYPs~z5nDSS<AOOO6ObXk3zPJN~ia${r+hVzgXc8vQN(AE5
zq)LU(7GM+Gc&!WR$>E%5eMeVF_GRs0FFRL>q*3@+MMv26kzu@<OkvOsclN*@mqv8b
z^nd`CbgV4TVaoTk7ewed%$x@&vLj;D8IA;w<h{8hm|aWH7!M~Dj8GPT(DMjxUkUsY
zXa1tmtEH!EoRa#JlI*RQSAs8T<J#6&x$qD!y=R1tzm&&a8q_OMLL<oV_B;3<hql4-
zI1Y0$5%;LfHG~l5tWlI7_(QH|mA<=Snvh$Vhg*;mtxa}^6JVFIm2&J2IZMOa_=aB%
zkVI%hTJ#QzJC$=$qI9<hZDY<euxTb6g^QJbby_~el?s3OLNQO0Dm9v@c2vknwC}|;
z(l##!(0ieT2YG}Q`^8|hS7H9QFAHg$$2kKCaZ8c65uuaEQt5@f?nqUBMZyRL8NMKb
z)J(GscPQ5PaAnHrbR*a$G7<=Y-*>G&iOqpG296j3BXOdf37(0XqZ09sAPZXt3ZmR_
zoCaok3nogXTc>NgdcWH(s6_wb?c1_tXd7tZ%3qTbfAf@jk1mPNkh}G?Jz~gwAp(nj
zDR8MwrMDuTr?I7=_&Vpqj(dLHg@GjvAb30<T6TE<B<WIUqJRld^S0RBftdLZ8H8)~
zGxywQNFo-A04OsyK!G77XwT~B3)eG0x@`T&x*f0d_iNTHicUIIFXtFoBeiK$*<VmI
z&S14evKP>@`Tws1$@7H5#jk+VkjMfogwQ@_3j~>e@Zm>VpCLAmY=&i1x6S^yPuti!
zJgfX^k33_fd?lPIffQO{)OfIMFY8K-vraj75cOIO<#m>baw^AAVGy+d>!Si$`YR99
zFbsMIFuKoqVSIjpWe{FAHc2Q(k~4ARfSZVf-B52id#N7E+Kw&RZsdrU#g_Rt5GGHS
z?Lh^32b>9k<ym?6;20F;?E7><9+YN7usBBA(DOo0@PH!<B0GW%Jx~%2Ca3@M(nmW&
zV^&_DA2Ek92G^HIfRGgZNoj&I5dp)7l?$DlbGw<EK6~FyELy46>@{XrlS9y^r3S-3
zu=t@1((p4A$vtl?a#s-Id^S9r)E9+iUZ>VxqiJ0L+cV-VRsAaISw_&nUYtD7*vEHg
zS{dRVOuy)Y{eVs&7dkn$O@Is;8$;Y7v2GIAaznC1P_k8qo<xW=_oWGtjQHP|2tQ@|
z5ng2;kHcfbT{x)ToVSX{8156Dq-%Z}Bp1C#s(q9Wsq04!?kINS@Bd|=TzuQm#G$*`
z(L5>kfL5z}@Se`T3V<J9BebE6zmKN011m_Ajat2YtoHJb&c|KvKU<tQ4dw9|p&c*Y
zyEjmM!yrxoLV_#FybNF2!1PsJ#c`#Bs{{$+rY(;Kbn{+*%%?5=*_jB_$$^;g*Ynvp
z^p{vBjN`qF#O0y{!Km-mWDyrtPet2_r`U(nHk*-QEA|k~v2G9*$zR9KywEzDdH&A0
z$s{84A-M?$brtHng+bOLGyQQEAXmQwB}|uu77Tm21V#e*tgIdIks8qDvHT+}DpA&^
zKHy_XMB&XIN`(O}Nw!TA>Lt2mqKR8K*O+vyz&f0ML2q7g<i<yVt?_VQI2YC8#PJ)i
zRnZW8rh5`HqRW)rJr)N0db=1KXO1pw-whVvGF12Izo@c{E=A7k*Q;OJi@<V@e)@ih
zZd{Ls;Hp9&TU!yf8!{{l5O<|IjM?dz$5vB~Lh#?yju72<$r>94t~Xy}8`{DNo3A5E
zKtj!62bnS7NdB5Jtao%4>i(!c{n%<x1DZ)Ux`4paF?=x`QV4c^fph)KclYfET&F&2
zi&~PD0)5o@56|&~9kZ(O!DKIH&S%a7g4APVFLhuQ@MGaFCAALw!$>CH>dr0$*%ljR
zloQl^JuQf&hg1%Wb$WhbQneakSN^%*Uq6D+H95E0rHZz$?wQa#UmA;P$dRKPNSP?-
zU?{i2x|W-D>X`QTS92O!0`uHT=PIt_XcKcp!1xn2-M@wG=N+!Z!*1^XkeF>`EZu;(
zQM+}FYRB(@G;E+X>378RTL?^NdDIAQ*wp+i0sjvG@B%;W()BBQB+F_jQUEe|xIe$-
zAcOrd5hl6)x~0G9Ys-r;$44KdPSINJ#JzyCAm#l;kTMkNoHvcXN@IxL{P3b%I9WVc
zS{m82(@jp8o$2qD-LsPu5uO_=9L>y(-97hi-(UpCwzXSjh4U&&gQDK(jacq=Gle{9
ztVJI`Z4kx;Nvt#BuQP!HE07t5`0P>agr>XBTz!9Z&j4Cg>}@7cp1?i^!d0?9lT&e!
zvaGAIL0D}b$Ai3TH~h+JDI%IM0x9zzkviBzyX&|n<=;p`^f_kAEHT7637I%j<mDpU
za1qH;3qrP7*n~9?R*m5#M8kWNR5IGDTeVC00zG-kqA|EgnPN5*fJjIL1XdhjXsKoX
z$e=UfuyBOBDCk8gBfns;Vsty|{Wrk2{gEsRUog{%_*Q5-5Nux<8Z-vQ^}RKjDKCjx
zW*m}xY6z+<o5BXC>Ggi80M<n0oQW$thvwWfM@Xo>KCrS7fMeRscT`_m<`oo=t9W6(
zHpVL$1EQGQUuLHZRf$Gwa?8M!@_wbBjuiMwnfAL>fwHU^MU;bTNbqY5bu8a~_BA}D
zb$bPaq<=M(V|-l8+kl!a7(ldm>kzXgGvEMd5iJfgW+D*$q^%HojRPGhPd2(HtIa0S
zi(~}`{2Eqk@OIa(vmJU{3z(G|8W6Ybo+7GI`Q0L64m~fGdjZ$Y?L*izrv0KU%RoPS
zhVehWr_@J#SfW7(1IQojF7PXvL3nu?YG}Kv1#C`iG80zrr~?C4e?}$KWpc-MY%?y!
z1sv*)JLeX^5V);NOCZj*Q=z}^!a;bUc5#BJbDx)h;|sbs<B#VzMHNFk*D-C}=y%BX
zg#5F{i2`Ic3A*2xGNhW!3EG7fXx4r>l<s?PdxgR~gsurCUSxeHIxr7t4oylxtHmv$
znRX*twyBUhCr8r{=C9sKFmN#m!WYaXJq76%Nu!Q}POiytc|Lcfp%8jdaPwHRuT$8<
z@pc=<X(`Lf=lkR~iHZwlmE_N_yQ#t7h#OR$TMMR}!LM^3LkvRP+x&q9TCyPZup-1z
zJ<&qB*bI0@?Q<=*BC*iXQ3WgCGRPP?z<GH_Ie<SLQAzpP^Y;X#)bg$?t6*m0r60Ud
zZIJnv(u~pd)FFt0jJ6pyr#Q#QUQ~=QougZjd}q?-{%NQ)r&1V5X@m^|Bt0p)T6E*G
z_$voqLif_V<K0RCZsb+>GS&w=nVb$ZL-~xd`b;pxg=ra~u=$3S#zoOdCvB0s4ly#3
ziF9Co+*+6<F;Oz!s~n7xk(X*lLwydaSX+a0p1mr<->fU_R*gEZ`0-}EXrQtnXnKti
z(ku1>P%XbOA?KhQD{F}u@Ex{)tXd}HsV6t{7_0O74m+%Vc?qFj2%QY#EQPR?#_q<-
z$c(=l-tsuyA+beOglFi(IfTd-n||3;tz=`0o7R1$71@^c;}h5Z2?BS_fD`X;T(^)P
znU3tRLkUU%D*K0VVloe}KeI1$)}5B1!hgL8r8@e)>CvpCI9WBT9Atu&cPuAugzYHE
z)e~F*`_&g=Oo8kM52`<eOc$r>>nVAC5OBe)PL{A1QGoPN4RBwr)M{22zI2h1$I(zt
z(*W9>WWW>U_`EI9L+x!h!F6nT);yvHih-{JIrp|FGyw0<CA!z|cF#2l1K?z)m&WQL
zm+za<O-|*he%meC9+TMp7omJf86q@C(x4Nt+$LpSq$UI>B>FiPWa)CwOkr`Kx3LBp
zi<>f8W{@5%wv)2O&T{A+Xnn-@5{vQ9?^<z<-!fo;mr~n;D&O7x<4pen7{!Nmt|MUF
zuJa!g1!25~|7;ygSFE4SK^T3;1MYy6f?KE%M>Qym)?qT@mk@3|(aX+krwNPmSmKy6
zvdT%|!Grq58q%j8;?qq<*g0X5W2vr6-nC@l%DC|IeFbgKfrZy#W~uJX`A5FuiSpZg
z^luaG#9xN<*RfmM$ZW;GC4paiugD$a=N1xYZdS5g=}JSjf&7#SZg#J&mz1f2QZ;}-
zx_19^AaxPtOE%L7kh9JnrzBfvv)k@hTeQvLqQFDW&1|@##w!5nK@gAKb|k_+az>D+
zeMNzNLd`P<b@OA6E7Y}iw+4cNt<Ge;q88p~&hoZb^M}A{TW>Rf9$cE3p86aLTUglB
zJJGIe1*)RudVEwmHKp}GR<a~^Vp2D$D%-bA12)UZiTwT{?=-Jaj+mVu(wt(yB9|7p
z7w~`LBWuPa${vnKQ}Oyp{@qzPS_>&G_1ezQKZ^XTXv3G>a~&&0y;hWObTddl+OnQf
zg(}XUhdT0$Q`?+PIewcgy$5cBe=3hTlW$*Sr!vK~9oSMZDx4}?ny@Q=N9l}w^YPjo
zMx8k+%qPs_p3?Ua8Afl9M^`<n`Q)=yRqZfJ0@$an%(;+SOMf<5)8*lYIOVyCMvRKL
z8Kl@-BIADyiHbX#MAod$u+a)W5Fk@L>W*E4e_DP@RKz&V5&&Bfn6U)?>3!%f==A~@
zfipP1XJe-9C0_Dj1k`jTM0^QiJ(j7TY|r;UPiMsz)V*3OWrE{8(7lQ}OW6zLc*bv)
zO%yIkW&>Nmk{yYL(iSb}QdBxVhu^WmqYx#+)jwh?k{ii?L<L<vIuqgI&@yZki3O$C
zFuc7($-y8wb^LXP^g`DdqIA^}rVN&ZIm)d6?i?r;bZFJLM46%xJWv+Q2)=H>Hb1?8
zXSqh4!^%=ERf!J~37_#S9)`65kPN_sz7$ug0MT+RCrRn7A!+TWJQ`0L$dlU%bfZEz
z4E*{)JebvYu%jcXGj@bq;CE=Ko3h)jV+8YMMrKmMc6>T43Z4*DZ3u+4T}ZJ;D_{H&
z>mhHK1j%-FLP(6YZ#9sMjhOr3wHS}phJ@!9<BX&&PMV5|x9<6~a&AI`B_;>Cc;1>w
z0=mw%YV3-40MVID6!+(Y&R-xpn9{E|3nsaifqYpjwo8;s^X3tF;3H_1u1_6IJ?lAL
zd>r)!Mve-lqGi;mP%^Q6q8c85l7>zT+uCEZtOaV*5dpt53g=GE{~O?Nfas{5w_aDR
z$+DxZWrzY%s?oK6_4G4haXX$4+ifvu9&6HA-}+g;6d3NXehzs@Sr2*UH<6`AQ;;~v
zAkt}_o>rmnik7r(F6u3N0=>?iasah$?y3Ba{oh9lD8IHti*Z9B4w}z5fhuoXlTYt-
zLhZ**EonjuuvJ#Ci~3DLXsM|&u%ix07vj37dvr20z>Rx(l65)#Y$24P2A|O(3Gw&J
zo!hNOc1wFBT!6l6Mgz&}H=%Oe=YWlblm)uPS2AIPPps0;CoavlA?K{Rd-$t{zZ|^&
z5k!XIvk&ECd;&}_w+LoW$0@bsByc!lGA0shWyLkC2j7<|@3<FB8q_DBE}^z8wgLu!
zm)brM{l+|BRR?X__IK|%@vf6~K<dBrhiPnLRYDyTZ?=^HdMl@M;a1`3w#y6F_rUf8
zW$(0bgtvdT>t7A;yFpI$T;fWt!j_8c#^z;3+K6-tA2y528~ABx`3|oncz_`?xRFLC
zO1F%+Ft@USOwfdqz;0kEp4WRaZmkWqY+Urs=@rfm;0FJ$fs+s*sO@roEdR1e+l+xI
zC#Ec35?-8uJ8>E!@SSb75pE+I1n{61Ooa;t?+KPAiiK+YSKDDwztx{AgpOw2pX_b-
zai~U~h_70~LK864lx?#ROEBhF)1g&Eey}dUT(%>`Lj8%#cgD>Zuc4X-HdfLG9Eaqa
ztU$;|NKpWEerlrF*TkU-pKt?YD7FebDVu};T$c&y;qP{!!<L5Q2o9dfx)YSMAH-S;
zLSF=W^NkoVSyDF*BT|<0Ilx_|3^i4hMNFb1{z2TL`obtg)xW<m4RNG1>lYW0oU7Xf
z#lUC1MNP)B?(<5h6*=wdp1e~Q5^@~(h!NCi9fCJzq4>7S!KZz_wjC6Wyfu>(uD*dt
zRUT_KQkjvHA^vQBKs3B;TN|F6g#l(TqEj?fGfmJY1?W@eK1fA!UxD%3df%glNq7Aq
z3EfCt7`e@Za*R!;cLtY_t~&==r*auJ1POBr;?eW3%O(zPdGw||$vOoOP5eyF+XZEO
z{L_%Hc=8&`=HSLTliO;`@~~g5)CN|T@pLJX*D2|1dObm08R<zHeci%&Fn0jcOb$b4
zHFI3f&{dG~%ivSSFz6r9BmYQ*7cTm^1?hpE&>&2FlwPKE*3=4XOMQALbQtJwITPhq
z8=eNzBxr7r*aY$5p1PveY;uupv_on6)~G=r=n)D|j<3aPtNwb0p}0B+;(cbNF^1Cx
z#Y&!F+K(_)cS}inD<VqZ<quVnYnihWhiN6iyqoE*N48x<kTfNGp|mi*s4N1z0;}9I
z>qTS&bP}^nBGHnaiP!_y4`zsdo8c!%V~;%Qv;rdav%2Q3<`1r0+4hxz@L`J@rN*)I
z?B27^)es;{jc<~b$=_DRA367kvD0$g=`;)X%*`OyKL5VxBE@OGlI!iw&0o#Zgkj;R
z<z@~xEROcPl;^0_MD(-$4VB1BA5ZFfLn<c!Y_QUw?x<7iqvm)zw)R43v<i)Fn|RsP
z9j<JZXkgJSZzX~08|4;ewVv<Ao@@5@TYz=v_$V)yB+i0Q0_`>vU}YKcGmhx29g#hD
zTe>V!uVXN)nSt~`Fut>Xz5-_AXl%Ws!g@9DXEN%)ZUqo<KxHy+Ge=CNmc)2OK@4A|
zdKNlCBdE9+jM#Y0Ta+aoHU9D5O+PRNAJnC;aQ&m)S!z^irj7>ZfaxFU<}#hWzdf{m
ztO$b!6<rhm2d6c+d&q7xN1nFyxxx8XI940+w-1ko<)!(BPQAd9!J?bbTZ-FzWCBUZ
zLn(w+uh$ZmV+$daR0}rp0c{#abv7%YHOrb!3?e(7CJ)g}giN%n1kw5fq~8B2{Fj-P
z$1?stzfTBNU0`z1Q;kbs-+zMLEi*b1$fH&Y%2A)OdlNz&GU%FuN5IYg)cnG(ExqA`
zf`GI?Q=TV~n9}JI)o-A-Qcc+*KhonWthKg0`Ru48K(TbIZ@r56)Y+r4Lw|y&E~TiS
zOn&a^o@c2F**`?}5&YiW=A&I8*OCiHrmbNb<I9m;_5jz96r&XFikXF>GB2ADiG^}v
z1M|hm7j?qBK~6>sXCpR^dAX~Cfscs<Icc>rGip$nUC~K}s{Z`QLr5<6C^8-2XEMwZ
zJrJH$U`-IQ<k+s%eLpxp7E<}ebq+VTO<j4^zaN9Pw!~BUXQ<&jSPACy4k}`3q1wC;
zNPbRF5ip2a>HPbolvg8z!_sdgDV&I(-i%??990O$xHny)v|w;7*Lkgg^y|9Lg@5KJ
zROjKQLpB)FRnoxx;@t)0WCtI1if9&19Ba+jwhS+Fo)@tTkeKa2gP89sh#L<y<Cj~5
XXN(tY;(P+?bGNNIflhbSmDp_hvreYr


From 4718a680dce645e55ec4b530cf7d77bb35ab812e Mon Sep 17 00:00:00 2001
From: Jan Bessai <Jan.Bessai@tu-dortmund.de>
Date: Wed, 23 Apr 2025 18:35:55 +0200
Subject: [PATCH 4/7] Add github CI Script

---
 .github/workflows/test_and_release.yml | 81 ++++++++++++++++++++++++++
 1 file changed, 81 insertions(+)
 create mode 100644 .github/workflows/test_and_release.yml

diff --git a/.github/workflows/test_and_release.yml b/.github/workflows/test_and_release.yml
new file mode 100644
index 0000000..6725587
--- /dev/null
+++ b/.github/workflows/test_and_release.yml
@@ -0,0 +1,81 @@
+name: Test code, update coverage, and release master branch
+
+on: [ push, pull_request ]
+
+jobs:
+  test:
+    strategy:
+      matrix:
+        os: [ windows-latest, ubuntu-latest ]
+        java: [ '11', '17', '21' ]
+    runs-on: ${{ matrix.os }}
+    steps:
+    - uses: actions/checkout@v4.2.2
+    - name: Setup JDK
+      uses: actions/setup-java@v4
+      with:
+        distribution: temurin
+        java-version: ${{ matrix.java }}
+    - name: Setup sbt launcher
+      uses: sbt/setup-sbt@v1.1.7
+    - name: Run tests
+      shell: bash
+      run: sbt +test
+  coverage:
+    runs-on: ubuntu-latest
+    needs: test
+    steps:
+    - uses: actions/checkout@v4.2.2
+    - name: Setup JDK
+      uses: actions/setup-java@v4
+      with:
+        distribution: temurin
+        java-version: 21
+    - name: Setup sbt launcher
+      uses: sbt/setup-sbt@v1.1.7
+    - name: Analyze coverage
+      run: sbt clean coverage +test
+    - name: Update coverage report 
+      env:
+        COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        COVERALLS_FLAG_NAME: Scala ${{ matrix.scala }}
+      run: sbt coverageReport coveralls
+  release:
+    runs-on: ubuntu-latest
+    needs: [ test, coverage ]
+    steps:
+    - uses: actions/checkout@v4.2.2
+    - name: Check if we are head of master 
+      id: check_head_of_master
+      run: |
+        git fetch origin master &&
+        MASTER=`git rev-parse origin/master` &&
+        echo "::set-output name=head_of_master::$MASTER" &&
+        CURRENT=`git rev-list -n 1 ${{ github.ref }} || echo "NOT_MASTER"` &&
+        echo "::set-output name=current_job_ref::$CURRENT"
+    - name: Set up JDK
+      if: steps.check_head_of_master.outputs.head_of_master == steps.check_head_of_master.outputs.current_job_ref
+      uses: actions/setup-java@v4
+      with:
+        distribution: temurin
+        java-version: 21
+    - name: Set up SBT
+      if: steps.check_head_of_master.outputs.head_of_master == steps.check_head_of_master.outputs.current_job_ref
+      uses: sbt/setup-sbt@v1.1.7 
+    - name: Build and release
+      if: steps.check_head_of_master.outputs.head_of_master == steps.check_head_of_master.outputs.current_job_ref
+      env:
+        SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
+        SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
+        SONA_USER: ${{ secrets.SONATYPE_USERNAME }}
+        SONA_PASS: ${{ secrets.SONATYPE_PASSWORD }}
+        GPG_PRIVATE: ${{ secrets.GPG_PRIVATE }}
+        PGP_PASS: ${{ secrets.PGP_PASS }}
+        CI: github
+      run: |
+        git fetch --prune --unshallow --tags &&
+        export GPG_TTY=$(tty) &&
+        echo $GPG_PRIVATE | base64 -d | gpg --passphrase=$PGP_PASS --yes --batch --pinentry-mode loopback --import &&
+        export PATH=`pwd`/.github/bin:$PATH &&
+        sbt + test ciReleaseTagNextVersion ciReleaseSonatype
+

From 7552226101899e1655f37cc0741f2014cf1ead09 Mon Sep 17 00:00:00 2001
From: Jan Bessai <Jan.Bessai@tu-dortmund.de>
Date: Wed, 23 Apr 2025 18:40:56 +0200
Subject: [PATCH 5/7] Scalafmt the source

---
 .scalafmt.conf                                | 10 +++
 .../persistable/JavaPersistable.scala         | 24 +++---
 .../templating/persistable/Persistable.scala  | 25 ++++---
 .../PythonWithPathPersistable.scala           |  4 +-
 .../persistable/ResourcePersistable.scala     | 19 +++--
 .../combinators/templating/twirl/Java.scala   | 53 +++++++++----
 .../combinators/templating/twirl/Python.scala | 28 +++----
 .../persistable/JavaPersistableTest.scala     | 44 ++++++++---
 .../persistable/PersistableTest.scala         | 38 +++++++---
 .../PythonWithPathPersistableTest.scala       | 28 +++++--
 .../persistable/ResourcePersistableTest.scala | 34 +++++++--
 .../persistable/TempDirectoryFixture.scala    |  2 +-
 .../templating/twirl/JavaTest.scala           | 74 ++++++++++---------
 .../templating/twirl/PythonTest.scala         |  9 +--
 14 files changed, 266 insertions(+), 126 deletions(-)
 create mode 100644 .scalafmt.conf

diff --git a/.scalafmt.conf b/.scalafmt.conf
new file mode 100644
index 0000000..ca9f6ca
--- /dev/null
+++ b/.scalafmt.conf
@@ -0,0 +1,10 @@
+version = 3.9.4
+rewrite.rules = [ AvoidInfix, SortImports ]
+runner.dialect = scala36
+project {
+  git = true
+  excludeFilters = [
+    plugin/src/sbt-test
+  ]
+  layout = StandardConvention
+}
diff --git a/src/main/scala/org/combinators/templating/persistable/JavaPersistable.scala b/src/main/scala/org/combinators/templating/persistable/JavaPersistable.scala
index 3daa1a0..cb6b008 100644
--- a/src/main/scala/org/combinators/templating/persistable/JavaPersistable.scala
+++ b/src/main/scala/org/combinators/templating/persistable/JavaPersistable.scala
@@ -26,25 +26,29 @@ import scala.collection.immutable._
 import scala.jdk.CollectionConverters._
 
 trait JavaPersistableInstances {
-  /** Persistable instance for a compilation unit.
-    * Derives path and file names from the package and the name of the first declared type.
+
+  /** Persistable instance for a compilation unit. Derives path and file names
+    * from the package and the name of the first declared type.
     */
   implicit def compilationUnitInstance: JavaPersistable.Aux[CompilationUnit] =
     new Persistable {
       type T = CompilationUnit
-      override def rawText(compilationUnit: CompilationUnit) = compilationUnit.toString.getBytes
+      override def rawText(compilationUnit: CompilationUnit) =
+        compilationUnit.toString.getBytes
       override def path(compilationUnit: CompilationUnit) = {
         val pkg: Seq[String] =
           compilationUnit.getPackageDeclaration.orElse(null) match {
             case null => Seq.empty
             case somePkg =>
-              somePkg.accept(new GenericVisitorAdapter[Seq[String], Unit] {
-                override def visit(name: NameExpr, arg: Unit): Seq[String] = Seq(name.getNameAsString)
-                override def visit(name: Name, arg: Unit): Seq[String] =
-                  Option(name.getQualifier.orElse(null))
-                    .map((q: Name) => q.accept(this, arg))
-                    .getOrElse(Seq.empty[String]) :+ name.getIdentifier
-              },
+              somePkg.accept(
+                new GenericVisitorAdapter[Seq[String], Unit] {
+                  override def visit(name: NameExpr, arg: Unit): Seq[String] =
+                    Seq(name.getNameAsString)
+                  override def visit(name: Name, arg: Unit): Seq[String] =
+                    Option(name.getQualifier.orElse(null))
+                      .map((q: Name) => q.accept(this, arg))
+                      .getOrElse(Seq.empty[String]) :+ name.getIdentifier
+                },
                 ()
               )
           }
diff --git a/src/main/scala/org/combinators/templating/persistable/Persistable.scala b/src/main/scala/org/combinators/templating/persistable/Persistable.scala
index a15731d..cc99e8c 100644
--- a/src/main/scala/org/combinators/templating/persistable/Persistable.scala
+++ b/src/main/scala/org/combinators/templating/persistable/Persistable.scala
@@ -21,24 +21,27 @@ import java.io.File
 
 /** Type class for persistable objects (inhabitants). */
 trait Persistable {
+
   /** The type of the object to persist */
   type T
+
   /** Serialized representation of the object */
   def rawText(elem: T): Array[Byte]
-  /** Path where to store the object `elem` (relative to some later specified root) */
+
+  /** Path where to store the object `elem` (relative to some later specified
+    * root)
+    */
   def path(elem: T): Path
 
-  /**
-    * Computes the full path where to place `elem` relative to `basePath`.
+  /** Computes the full path where to place `elem` relative to `basePath`.
     */
   def fullPath(basePath: Path, elem: T): Path = {
     basePath.resolve(path(elem))
   }
 
-
-  /**
-    * Persists this object to an object dependent path under `basePath` and returns the persisted file.
-    * Overwrites any pre-existing files under `basePath` / `path`.
+  /** Persists this object to an object dependent path under `basePath` and
+    * returns the persisted file. Overwrites any pre-existing files under
+    * `basePath` / `path`.
     */
   def persistOverwriting(basePath: Path, elem: T): File = {
     val fp = fullPath(basePath, elem)
@@ -48,9 +51,9 @@ trait Persistable {
     fp.toFile
   }
 
-  /**
-    * Persists this object to an object dependent path under `basePath` and returns the persisted file.
-    * Throws an `FileAlreadyExistsException` if the file already exists.
+  /** Persists this object to an object dependent path under `basePath` and
+    * returns the persisted file. Throws an `FileAlreadyExistsException` if the
+    * file already exists.
     */
   def persist(basePath: Path, elem: T): File = {
     val fp = fullPath(basePath, elem)
@@ -64,4 +67,4 @@ object Persistable {
   type Aux[TT] = Persistable { type T = TT }
 
   def apply[T](implicit persistable: Aux[T]): Aux[T] = persistable
-}
\ No newline at end of file
+}
diff --git a/src/main/scala/org/combinators/templating/persistable/PythonWithPathPersistable.scala b/src/main/scala/org/combinators/templating/persistable/PythonWithPathPersistable.scala
index 05fd019..058989e 100644
--- a/src/main/scala/org/combinators/templating/persistable/PythonWithPathPersistable.scala
+++ b/src/main/scala/org/combinators/templating/persistable/PythonWithPathPersistable.scala
@@ -24,8 +24,10 @@ import org.combinators.templating.twirl.Python
 case class PythonWithPath(code: Python, persistTo: Path)
 
 trait PythonWithPathPersistableInstances {
+
   /** Persistable instance for [PythonWithPath]. */
-  implicit def pythonWithPathPersistable: PythonWithPathPersistable.Aux[PythonWithPath] = new Persistable {
+  implicit def pythonWithPathPersistable
+      : PythonWithPathPersistable.Aux[PythonWithPath] = new Persistable {
     type T = PythonWithPath
     def rawText(elem: PythonWithPath): Array[Byte] = elem.code.getCode.getBytes
     def path(elem: PythonWithPath): Path = elem.persistTo
diff --git a/src/main/scala/org/combinators/templating/persistable/ResourcePersistable.scala b/src/main/scala/org/combinators/templating/persistable/ResourcePersistable.scala
index 15122ed..7ad640b 100644
--- a/src/main/scala/org/combinators/templating/persistable/ResourcePersistable.scala
+++ b/src/main/scala/org/combinators/templating/persistable/ResourcePersistable.scala
@@ -20,18 +20,27 @@ import java.nio.file.{Files, Path, Paths}
 
 /** A persistable resource on the classpath.
   *
-  * @param name the name by which to locate the resource within the classpath.
-  * @param persistTo the name of the file where to store the resource.
-  * @param classToLoadResource the class which will be used to load the resource (@see
+  * @param name
+  *   the name by which to locate the resource within the classpath.
+  * @param persistTo
+  *   the name of the file where to store the resource.
+  * @param classToLoadResource
+  *   the class which will be used to load the resource (@see
   */
-case class BundledResource(name: String, persistTo: Path, classToLoadResource: Class[?] = classOf[BundledResource])
+case class BundledResource(
+    name: String,
+    persistTo: Path,
+    classToLoadResource: Class[?] = classOf[BundledResource]
+)
 
 trait ResourcePersistableInstances {
   def bundledResourceInstance: ResourcePersistable.Aux = new Persistable {
     override type T = BundledResource
     override def path(elem: BundledResource): Path = elem.persistTo
     override def rawText(elem: BundledResource): Array[Byte] =
-      Files.readAllBytes(Paths.get(elem.classToLoadResource.getResource(elem.name).toURI))
+      Files.readAllBytes(
+        Paths.get(elem.classToLoadResource.getResource(elem.name).toURI)
+      )
   }
 }
 
diff --git a/src/main/scala/org/combinators/templating/twirl/Java.scala b/src/main/scala/org/combinators/templating/twirl/Java.scala
index 36f77d1..7dfba27 100644
--- a/src/main/scala/org/combinators/templating/twirl/Java.scala
+++ b/src/main/scala/org/combinators/templating/twirl/Java.scala
@@ -20,7 +20,12 @@ import java.io.StringReader
 
 import com.github.javaparser._
 import com.github.javaparser.ast.`type`.Type
-import com.github.javaparser.ast.body.{BodyDeclaration, ConstructorDeclaration, FieldDeclaration, MethodDeclaration}
+import com.github.javaparser.ast.body.{
+  BodyDeclaration,
+  ConstructorDeclaration,
+  FieldDeclaration,
+  MethodDeclaration
+}
 import com.github.javaparser.ast.expr.{Expression, Name, NameExpr, SimpleName}
 import com.github.javaparser.ast.stmt.Statement
 import com.github.javaparser.ast.{CompilationUnit, ImportDeclaration, Node}
@@ -31,7 +36,8 @@ import scala.collection.immutable._
 import scala.jdk.CollectionConverters._
 
 /** A Java fragment. */
-class Java private(elements: Seq[Java], text: String) extends BufferedContent[Java](elements, text) {
+class Java private (elements: Seq[Java], text: String)
+    extends BufferedContent[Java](elements, text) {
   def this(text: String) = this(Nil, Formats.safe(text))
   def this(elements: Seq[Java]) = this(elements, "")
 
@@ -44,7 +50,8 @@ class Java private(elements: Seq[Java], text: String) extends BufferedContent[Ja
   def compilationUnit(): CompilationUnit = StaticJavaParser.parse(fullText)
 
   /** Parses an import declaration. */
-  def importDeclaration(): ImportDeclaration = StaticJavaParser.parseImport(fullText)
+  def importDeclaration(): ImportDeclaration =
+    StaticJavaParser.parseImport(fullText)
 
   /** Parses this element as a single statement. */
   def statement(): Statement = StaticJavaParser.parseStatement(fullText)
@@ -54,7 +61,8 @@ class Java private(elements: Seq[Java], text: String) extends BufferedContent[Ja
     StaticJavaParser.parseBlock(s"{ $fullText }").getStatements.asScala.to(Seq)
 
   /** Parses this element as an expression. */
-  def expression[T <: Expression](): T = StaticJavaParser.parseExpression[T](fullText)
+  def expression[T <: Expression](): T =
+    StaticJavaParser.parseExpression[T](fullText)
 
   /** Parses this element as a (potentially qualified) name. */
   def name(): Name = StaticJavaParser.parseName(fullText)
@@ -65,12 +73,22 @@ class Java private(elements: Seq[Java], text: String) extends BufferedContent[Ja
   /** Parses this element as a (unqualified) name expression. */
   def nameExpression(): NameExpr = expression()
 
-  /** Parses this element as a class body declaration (e.g. a method or a field). */
-  def classBodyDeclaration(): BodyDeclaration[?] = StaticJavaParser.parseBodyDeclaration(fullText)
+  /** Parses this element as a class body declaration (e.g. a method or a
+    * field).
+    */
+  def classBodyDeclaration(): BodyDeclaration[?] =
+    StaticJavaParser.parseBodyDeclaration(fullText)
 
   /** Parses this element as multiple class body declarations. */
   def classBodyDeclarations(): Seq[BodyDeclaration[?]] =
-    StaticJavaParser.parse(s"class C { $fullText }").getTypes.asScala.head.getMembers.asScala.to(Seq)
+    StaticJavaParser
+      .parse(s"class C { $fullText }")
+      .getTypes
+      .asScala
+      .head
+      .getMembers
+      .asScala
+      .to(Seq)
 
   /** Parses this element as multiple field declarations. */
   def fieldDeclarations(): Seq[FieldDeclaration] =
@@ -84,8 +102,11 @@ class Java private(elements: Seq[Java], text: String) extends BufferedContent[Ja
   def constructors(): Seq[ConstructorDeclaration] =
     classBodyDeclarations().map(_.asInstanceOf[ConstructorDeclaration])
 
-  /** Parses this element as an interface body declaration (e.g. a method signature). */
-  def interfaceBodyDeclaration(): BodyDeclaration[?] = StaticJavaParser.parseBodyDeclaration(fullText)
+  /** Parses this element as an interface body declaration (e.g. a method
+    * signature).
+    */
+  def interfaceBodyDeclaration(): BodyDeclaration[?] =
+    StaticJavaParser.parseBodyDeclaration(fullText)
 
   /** Parses this element as a type (e.g. the in  X foo = (X)bar). */
   def tpe(): Type = StaticJavaParser.parseType(fullText)
@@ -93,10 +114,13 @@ class Java private(elements: Seq[Java], text: String) extends BufferedContent[Ja
 
 /** Helper for Java utility methods. */
 object Java {
+
   /** Creates a Java fragment with initial content specified. */
   def apply(text: String): Java = new Java(text)
 
-  /** Creates a Java fragment with initial content from the given `text` separated by `separator`. */
+  /** Creates a Java fragment with initial content from the given `text`
+    * separated by `separator`.
+    */
   def apply(text: Seq[String], separator: String = ";"): Java = {
     apply(text.mkString(separator))
   }
@@ -105,19 +129,22 @@ object Java {
   def apply(node: Node): Java = Java(node.toString)
 
   /** Creates a Java fragment with initial content from the asts `nodes`. */
-  def apply(nodes: Seq[Node]): Java = new Java(Seq((nodes map apply)*))
+  def apply(nodes: Seq[Node]): Java = new Java(Seq((nodes.map(apply))*))
 }
 
 object JavaFormat extends Format[Java] {
+
   /** Integrates `text` without performing any escaping process.
     *
-    * @param text Text to integrate
+    * @param text
+    *   Text to integrate
     */
   def raw(text: String): Java = Java(text)
 
   /** Escapes `text` using Java String rules.
     *
-    * @param text Text to integrate
+    * @param text
+    *   Text to integrate
     */
   def escape(text: String): Java = Java(StringEscapeUtils.escapeJava(text))
 
diff --git a/src/main/scala/org/combinators/templating/twirl/Python.scala b/src/main/scala/org/combinators/templating/twirl/Python.scala
index 2470ce2..5296c01 100644
--- a/src/main/scala/org/combinators/templating/twirl/Python.scala
+++ b/src/main/scala/org/combinators/templating/twirl/Python.scala
@@ -21,10 +21,10 @@ import play.twirl.api.{BufferedContent, Format, Formats}
 
 import scala.collection.immutable
 
-/**
-  * A Python fragment.
+/** A Python fragment.
   */
-class Python private(elements: immutable.Seq[Python], text: String) extends BufferedContent[Python](elements, text) {
+class Python private (elements: immutable.Seq[Python], text: String)
+    extends BufferedContent[Python](elements, text) {
   def this(text: String) = this(Nil, Formats.safe(text))
   def this(elements: immutable.Seq[Python]) = this(elements, "")
 
@@ -48,33 +48,36 @@ class Python private(elements: immutable.Seq[Python], text: String) extends Buff
   def getCode: String = fullText
 }
 
-/**
-  * Helper for Python utility methods.
+/** Helper for Python utility methods.
   */
 object Python {
+
   /** Creates a Python fragment with initial content specified. */
   def apply(text: String): Python = {
     new Python(text)
   }
 
-  /** Creates a Python fragment with initial content from the given `text` separated by `separator`. */
+  /** Creates a Python fragment with initial content from the given `text`
+    * separated by `separator`.
+    */
   def apply(text: Seq[String], separator: String = ";"): Python = {
     apply(text.mkString(separator))
   }
 }
 
 object PythonFormat extends Format[Python] {
-  /**
-    * Integrates `text` without performing any escaping process.
+
+  /** Integrates `text` without performing any escaping process.
     *
-    * @param text Text to integrate
+    * @param text
+    *   Text to integrate
     */
   def raw(text: String): Python = Python(text)
 
-  /**
-    * Escapes `text` using Python String rules.
+  /** Escapes `text` using Python String rules.
     *
-    * @param text Text to integrate
+    * @param text
+    *   Text to integrate
     */
   def escape(text: String): Python = Python(StringEscapeUtils.escapeJava(text))
 
@@ -85,4 +88,3 @@ object PythonFormat extends Format[Python] {
   def fill(elements: immutable.Seq[Python]): Python = new Python(elements)
 
 }
-
diff --git a/src/test/scala/org/combinators/templating/persistable/JavaPersistableTest.scala b/src/test/scala/org/combinators/templating/persistable/JavaPersistableTest.scala
index c8fcc7a..7d289c3 100644
--- a/src/test/scala/org/combinators/templating/persistable/JavaPersistableTest.scala
+++ b/src/test/scala/org/combinators/templating/persistable/JavaPersistableTest.scala
@@ -28,38 +28,62 @@ import funspec._
 class JavaPersistableTest extends AnyFunSpec {
   val className = "Foo"
   val classText = s"import whatever; class $className {}"
-  val persistableInstance: Persistable.Aux[CompilationUnit] = JavaPersistable.apply
+  val persistableInstance: Persistable.Aux[CompilationUnit] =
+    JavaPersistable.apply
   val pathPrefix = Seq("src", "main", "java")
 
   describe("Persisting a Java compilation unit") {
     describe(s"when it contains only one class $className and no package") {
       it(s"should use 'src/main/java/$className.java' as path") {
         val expectedPathComponents = pathPrefix :+ s"$className.java"
-        assert(persistableInstance.path(Java(classText).compilationUnit())
-          == Paths.get(expectedPathComponents.head, expectedPathComponents.tail*))
+        assert(
+          persistableInstance.path(Java(classText).compilationUnit())
+            == Paths.get(
+              expectedPathComponents.head,
+              expectedPathComponents.tail*
+            )
+        )
       }
     }
     describe("when it contains multiple classes and interfaces") {
       it("should use the name of the first class to determine the path") {
         val otherClassText = "interface FooI {}\n class Bar {}"
         val expectedPathComponents = pathPrefix :+ s"$className.java"
-        assert(persistableInstance.path(Java(Seq(classText, otherClassText).mkString("\n")).compilationUnit())
-          == Paths.get(expectedPathComponents.head, expectedPathComponents.tail*))
+        assert(
+          persistableInstance.path(
+            Java(Seq(classText, otherClassText).mkString("\n"))
+              .compilationUnit()
+          )
+            == Paths.get(
+              expectedPathComponents.head,
+              expectedPathComponents.tail*
+            )
+        )
       }
     }
     describe("when it contains a package declaration") {
       it("should prefix the path with a directory structure for the package") {
         val packages = Seq("foo", "bar")
         val packagesText = s"package ${packages.mkString(".")};"
-        val expectedPathComponents = pathPrefix ++ packages :+ s"$className.java"
-        assert(persistableInstance.path(Java(Seq(packagesText, classText).mkString("\n")).compilationUnit())
-          == Paths.get(expectedPathComponents.head, expectedPathComponents.tail*))
+        val expectedPathComponents =
+          pathPrefix ++ packages :+ s"$className.java"
+        assert(
+          persistableInstance.path(
+            Java(Seq(packagesText, classText).mkString("\n")).compilationUnit()
+          )
+            == Paths.get(
+              expectedPathComponents.head,
+              expectedPathComponents.tail*
+            )
+        )
       }
     }
     it("should store text that parses back to an equal CompilationUnit") {
       val originalUnit = Java(classText).compilationUnit()
-      assert(Java(new String(persistableInstance.rawText(originalUnit))).compilationUnit() == originalUnit)
+      assert(
+        Java(new String(persistableInstance.rawText(originalUnit)))
+          .compilationUnit() == originalUnit
+      )
     }
   }
 }
-
diff --git a/src/test/scala/org/combinators/templating/persistable/PersistableTest.scala b/src/test/scala/org/combinators/templating/persistable/PersistableTest.scala
index 8f9fe92..19ec9f8 100644
--- a/src/test/scala/org/combinators/templating/persistable/PersistableTest.scala
+++ b/src/test/scala/org/combinators/templating/persistable/PersistableTest.scala
@@ -21,7 +21,10 @@ import java.nio.file.{FileAlreadyExistsException, Files, Path, Paths}
 import org.scalatest._
 import funspec._
 
-class PersistableTest extends FixtureAnyFunSpec with TempDirectoryFixture with GivenWhenThen {
+class PersistableTest
+    extends FixtureAnyFunSpec
+    with TempDirectoryFixture
+    with GivenWhenThen {
   val persistable: Persistable.Aux[String] = new Persistable {
     override type T = String
     override def rawText(elem: T): Array[Byte] = elem.getBytes
@@ -40,12 +43,18 @@ class PersistableTest extends FixtureAnyFunSpec with TempDirectoryFixture with G
       assert(Files.exists(expectedPath))
 
       And("the file should have exactly the specified contents")
-      assert(Files.readAllBytes(expectedPath).sameElements(elementToPersist.getBytes))
+      assert(
+        Files.readAllBytes(expectedPath).sameElements(elementToPersist.getBytes)
+      )
 
       And("trying to persist the same element again should raise an exception")
-      assertThrows[FileAlreadyExistsException](persistable.persist(tmpDir.toAbsolutePath, elementToPersist))
+      assertThrows[FileAlreadyExistsException](
+        persistable.persist(tmpDir.toAbsolutePath, elementToPersist)
+      )
 
-      Then("it should not produce the exception when overwrite semantics is specified")
+      Then(
+        "it should not produce the exception when overwrite semantics is specified"
+      )
       persistable.persistOverwriting(tmpDir.toAbsolutePath, elementToPersist)
     }
   }
@@ -68,13 +77,24 @@ class PersistableTest extends FixtureAnyFunSpec with TempDirectoryFixture with G
       assert(Files.exists(expectedFileInSubdir))
 
       And("the file should have exactly the specified contents")
-      assert(Files.readAllBytes(expectedFileInSubdir).sameElements(elementToPersistInSubdir.getBytes))
+      assert(
+        Files
+          .readAllBytes(expectedFileInSubdir)
+          .sameElements(elementToPersistInSubdir.getBytes)
+      )
 
       And("trying to persist the same element again should raise an exception")
-      assertThrows[FileAlreadyExistsException](persistable.persist(tmpDir.toAbsolutePath, elementToPersistInSubdir))
-
-      Then("it should not produce the exception when overwrite semantics is specified")
-      persistable.persistOverwriting(tmpDir.toAbsolutePath, elementToPersistInSubdir)
+      assertThrows[FileAlreadyExistsException](
+        persistable.persist(tmpDir.toAbsolutePath, elementToPersistInSubdir)
+      )
+
+      Then(
+        "it should not produce the exception when overwrite semantics is specified"
+      )
+      persistable.persistOverwriting(
+        tmpDir.toAbsolutePath,
+        elementToPersistInSubdir
+      )
     }
   }
 }
diff --git a/src/test/scala/org/combinators/templating/persistable/PythonWithPathPersistableTest.scala b/src/test/scala/org/combinators/templating/persistable/PythonWithPathPersistableTest.scala
index 8c8ae50..7d31579 100644
--- a/src/test/scala/org/combinators/templating/persistable/PythonWithPathPersistableTest.scala
+++ b/src/test/scala/org/combinators/templating/persistable/PythonWithPathPersistableTest.scala
@@ -23,8 +23,12 @@ import org.combinators.templating.twirl.Python
 import org.scalatest._
 import funspec._
 
-class PythonWithPathPersistableTest extends FixtureAnyFunSpec with TempDirectoryFixture with GivenWhenThen {
-  val persistable: PythonWithPathPersistable.Aux[PythonWithPath] = PythonWithPathPersistable.apply
+class PythonWithPathPersistableTest
+    extends FixtureAnyFunSpec
+    with TempDirectoryFixture
+    with GivenWhenThen {
+  val persistable: PythonWithPathPersistable.Aux[PythonWithPath] =
+    PythonWithPathPersistable.apply
 
   describe("Persisting a piece of Python code to a file") {
     it("should create a file named by its content") { (tmpDir: Path) =>
@@ -34,22 +38,32 @@ class PythonWithPathPersistableTest extends FixtureAnyFunSpec with TempDirectory
           Python(s"""class Foo:
                     |    pass
                 """.stripMargin),
-          Paths.get("bar/test.py"))
+          Paths.get("bar/test.py")
+        )
 
       When("persisting it")
       persistable.persist(tmpDir.toAbsolutePath, elementToPersist)
 
       Then("its corresponding file should exist")
-      val expectedPath = tmpDir.toAbsolutePath.resolve(elementToPersist.persistTo)
+      val expectedPath =
+        tmpDir.toAbsolutePath.resolve(elementToPersist.persistTo)
       assert(Files.exists(expectedPath))
 
       And("the file should have exactly the specified contents")
-      assert(Files.readAllBytes(expectedPath).sameElements(elementToPersist.code.getCode.getBytes))
+      assert(
+        Files
+          .readAllBytes(expectedPath)
+          .sameElements(elementToPersist.code.getCode.getBytes)
+      )
 
       And("trying to persist the same element again should raise an exception")
-      assertThrows[FileAlreadyExistsException](persistable.persist(tmpDir.toAbsolutePath, elementToPersist))
+      assertThrows[FileAlreadyExistsException](
+        persistable.persist(tmpDir.toAbsolutePath, elementToPersist)
+      )
 
-      Then("it should not produce the exception when overwrite semantics is specified")
+      Then(
+        "it should not produce the exception when overwrite semantics is specified"
+      )
       persistable.persistOverwriting(tmpDir.toAbsolutePath, elementToPersist)
     }
   }
diff --git a/src/test/scala/org/combinators/templating/persistable/ResourcePersistableTest.scala b/src/test/scala/org/combinators/templating/persistable/ResourcePersistableTest.scala
index 7a9dc28..8154662 100644
--- a/src/test/scala/org/combinators/templating/persistable/ResourcePersistableTest.scala
+++ b/src/test/scala/org/combinators/templating/persistable/ResourcePersistableTest.scala
@@ -21,32 +21,50 @@ import java.nio.file.{FileAlreadyExistsException, Files, Path, Paths}
 import org.scalatest._
 import funspec._
 
-class ResourcePersistableTest extends FixtureAnyFunSpec with TempDirectoryFixture with GivenWhenThen {
+class ResourcePersistableTest
+    extends FixtureAnyFunSpec
+    with TempDirectoryFixture
+    with GivenWhenThen {
 
-  val persistableInstance: Persistable.Aux[BundledResource] = ResourcePersistable.apply
+  val persistableInstance: Persistable.Aux[BundledResource] =
+    ResourcePersistable.apply
 
   describe("Persisting a picture from the resources folder") {
     it("should create a file named by its content") { (tmpDir: Path) =>
       Given("a resource to persist")
       val elementToPersist: BundledResource =
-        BundledResource("res/GammaMtau.png", Paths.get("test", "path", "picture.png"), getClass())
+        BundledResource(
+          "res/GammaMtau.png",
+          Paths.get("test", "path", "picture.png"),
+          getClass()
+        )
 
       When("persisting it")
       persistableInstance.persist(tmpDir.toAbsolutePath, elementToPersist)
 
       Then("its corresponding file should exist")
-      val expectedPath: Path = tmpDir.toAbsolutePath.resolve(elementToPersist.persistTo)
+      val expectedPath: Path =
+        tmpDir.toAbsolutePath.resolve(elementToPersist.persistTo)
       assert(Files.exists(expectedPath))
 
       And("the file should have exactly the specified contents")
-      val resourceBytes = Files.readAllBytes(Paths.get(getClass.getResource("res/GammaMtau.png").toURI))
+      val resourceBytes = Files.readAllBytes(
+        Paths.get(getClass.getResource("res/GammaMtau.png").toURI)
+      )
       assert(Files.readAllBytes(expectedPath).sameElements(resourceBytes))
 
       And("trying to persist the same element again should raise an exception")
-      assertThrows[FileAlreadyExistsException](persistableInstance.persist(tmpDir.toAbsolutePath, elementToPersist))
+      assertThrows[FileAlreadyExistsException](
+        persistableInstance.persist(tmpDir.toAbsolutePath, elementToPersist)
+      )
 
-      Then("it should not produce the exception when overwrite semantics is specified")
-      persistableInstance.persistOverwriting(tmpDir.toAbsolutePath, elementToPersist)
+      Then(
+        "it should not produce the exception when overwrite semantics is specified"
+      )
+      persistableInstance.persistOverwriting(
+        tmpDir.toAbsolutePath,
+        elementToPersist
+      )
     }
   }
 }
diff --git a/src/test/scala/org/combinators/templating/persistable/TempDirectoryFixture.scala b/src/test/scala/org/combinators/templating/persistable/TempDirectoryFixture.scala
index ee489cf..38984a8 100644
--- a/src/test/scala/org/combinators/templating/persistable/TempDirectoryFixture.scala
+++ b/src/test/scala/org/combinators/templating/persistable/TempDirectoryFixture.scala
@@ -19,7 +19,7 @@ package org.combinators.templating.persistable
 import java.nio.file.{Files, Path}
 
 import org.apache.commons.io.FileUtils
-import org.scalatest.{Outcome, funspec}
+import org.scalatest.{funspec, Outcome}
 import funspec._
 
 trait TempDirectoryFixture { self: FixtureAnyFunSpec =>
diff --git a/src/test/scala/org/combinators/templating/twirl/JavaTest.scala b/src/test/scala/org/combinators/templating/twirl/JavaTest.scala
index 1ff44f4..5dd01d6 100644
--- a/src/test/scala/org/combinators/templating/twirl/JavaTest.scala
+++ b/src/test/scala/org/combinators/templating/twirl/JavaTest.scala
@@ -18,7 +18,12 @@ package org.combinators.templating.twirl
 
 import com.github.javaparser.ast.ImportDeclaration
 import com.github.javaparser.ast.`type`.Type
-import com.github.javaparser.ast.body.{BodyDeclaration, ConstructorDeclaration, FieldDeclaration, MethodDeclaration}
+import com.github.javaparser.ast.body.{
+  BodyDeclaration,
+  ConstructorDeclaration,
+  FieldDeclaration,
+  MethodDeclaration
+}
 import com.github.javaparser.ast.expr._
 import com.github.javaparser.ast.stmt.Statement
 import org.scalatest._
@@ -94,28 +99,28 @@ class JavaTest extends AnyFunSpec {
        |}
     """.stripMargin
 
-  val importDecl: ImportDeclaration = Java("import bar.Bar;").importDeclaration()
+  val importDecl: ImportDeclaration =
+    Java("import bar.Bar;").importDeclaration()
   val className: SimpleName = Java("YYY$_ZZZ").simpleName()
-  val singleStatement: Statement = Java(s"""System.out.println("never do this in practice!");""").statement()
-  val multiStatements: Seq[Statement] = Java(
-    s"""
+  val singleStatement: Statement =
+    Java(s"""System.out.println("never do this in practice!");""").statement()
+  val multiStatements: Seq[Statement] = Java(s"""
        |int x = 1; // I don't know
        |for (int y = 10; y > x; y--) {
        |  System.out.println("why I do this");
        |}""".stripMargin).statements()
-  val someString: StringLiteralExpr = Java(""""Ei cän \" dö Ünicöð€"""").expression()
+  val someString: StringLiteralExpr =
+    Java(""""Ei cän \" dö Ünicöð€"""").expression()
   val tpe: Type = Java("Hululu.Lalala[][]").tpe()
   val fieldDeclarations: Seq[FieldDeclaration] =
-    Java(
-      s"""
+    Java(s"""
          |static X xoo = null;
          |Y yoo = new Yoo();
          |Z[] zoos;""".stripMargin).fieldDeclarations()
   val name: Name = Java("some.EnvironmentClass.xoo").name()
   val nameExpr: NameExpr = Java("xoo").nameExpression()
   val constructors: Seq[ConstructorDeclaration] =
-    Java(
-      s"""
+    Java(s"""
          |/** By default do crazyness. */
          |public YYY$$_ZZZ() {
          |  System.disco();
@@ -128,22 +133,19 @@ class JavaTest extends AnyFunSpec {
          |  System.disco();
          |}""".stripMargin).constructors()
   val singleDecl: BodyDeclaration[?] =
-    Java(
-      s"""
+    Java(s"""
          |public static void main(String[] args) {
          |  System.out.println("The application has crashed");
          |  System.out.println("Never run this application again");
          |}""".stripMargin).classBodyDeclaration()
   val multiDecls: Seq[BodyDeclaration[?]] =
-    Java(
-      s"""
+    Java(s"""
          |public static volatile String gargh = "GAAAAAAARRRG!!";
          |@nobodyunderstands public int getReason() { return reason; }
          |public int reason = 42;""".stripMargin).classBodyDeclarations()
 
   val methodDecls: Seq[MethodDeclaration] =
-    Java(
-      s"""
+    Java(s"""
          |private void hiddenEffect() {
          |      System.evil();
          |    }
@@ -152,28 +154,34 @@ class JavaTest extends AnyFunSpec {
          |      hiddenEffect(); // I break my contract }:->
          |    }""".stripMargin).methodDeclarations()
   val interfaceMethod: BodyDeclaration[?] =
-    Java("public default void doFoos(YYY$_ZZZ x) { System.out.println(x.toString()); }").interfaceBodyDeclaration()
+    Java(
+      "public default void doFoos(YYY$_ZZZ x) { System.out.println(x.toString()); }"
+    ).interfaceBodyDeclaration()
 
   describe("Rendering a Java template with lots of stuff and strings in it") {
-    val rendered: JavaFormat.Appendable = org.combinators.templating.java.JavaTemplateTest.render(
-      imp = importDecl,
-      className = className,
-      singleStatement = singleStatement,
-      multiStatements = multiStatements,
-      someString = someString,
-      qualifiedName = name,
-      nameExpression = nameExpr,
-      singleDecl = singleDecl,
-      multiDecls = multiDecls,
-      fieldDeclarations = fieldDeclarations,
-      methodDeclarations = methodDecls,
-      constructors = constructors,
-      interfaceMethod = interfaceMethod,
-      tpe = tpe)
+    val rendered: JavaFormat.Appendable =
+      org.combinators.templating.java.JavaTemplateTest.render(
+        imp = importDecl,
+        className = className,
+        singleStatement = singleStatement,
+        multiStatements = multiStatements,
+        someString = someString,
+        qualifiedName = name,
+        nameExpression = nameExpr,
+        singleDecl = singleDecl,
+        multiDecls = multiDecls,
+        fieldDeclarations = fieldDeclarations,
+        methodDeclarations = methodDecls,
+        constructors = constructors,
+        interfaceMethod = interfaceMethod,
+        tpe = tpe
+      )
     describe("when parsing it") {
       val parsedResult = rendered.compilationUnit()
       it("should be equal to the expected result") {
-        assert(Java(expected).compilationUnit().toString == parsedResult.toString)
+        assert(
+          Java(expected).compilationUnit().toString == parsedResult.toString
+        )
       }
     }
   }
diff --git a/src/test/scala/org/combinators/templating/twirl/PythonTest.scala b/src/test/scala/org/combinators/templating/twirl/PythonTest.scala
index 344e516..2b63879 100644
--- a/src/test/scala/org/combinators/templating/twirl/PythonTest.scala
+++ b/src/test/scala/org/combinators/templating/twirl/PythonTest.scala
@@ -43,14 +43,12 @@ class PythonTest extends AnyFunSpec {
 
   val clsName: Python = Python("Foo")
   val body: Python =
-    Python(
-      """self.blah = "eggs!"
+    Python("""self.blah = "eggs!"
         |if true:
         |    pass
         |else:
         |    pass""".stripMargin)
-  val bodyTight: Python = Python(
-    """if false:
+  val bodyTight: Python = Python("""if false:
       |    pass
       |else:
       |    pass""".stripMargin)
@@ -61,7 +59,8 @@ class PythonTest extends AnyFunSpec {
       clsName = clsName,
       text = text,
       body = body,
-      bodyTight = bodyTight)
+      bodyTight = bodyTight
+    )
     it("should produce exactly the expected substitution") {
       assert(expected.trim == rendered.getCode.trim)
     }

From fe193a6ae41d488774d6e8303c0d2332286004d2 Mon Sep 17 00:00:00 2001
From: Heineman <heineman@wpi.edu>
Date: Tue, 29 Apr 2025 12:02:07 -0400
Subject: [PATCH 6/7] convert backslash N into System.lineSeparator()

---
 src/main/scala/org/combinators/templating/twirl/Python.scala | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/scala/org/combinators/templating/twirl/Python.scala b/src/main/scala/org/combinators/templating/twirl/Python.scala
index 5296c01..72aa743 100644
--- a/src/main/scala/org/combinators/templating/twirl/Python.scala
+++ b/src/main/scala/org/combinators/templating/twirl/Python.scala
@@ -35,13 +35,13 @@ class Python private (elements: immutable.Seq[Python], text: String)
 
   /** Indents this fragment by 4 spaces. */
   def indent: Python = {
-    Python(fullText.linesIterator.map(l => s"    $l").mkString("\n"))
+    Python(fullText.linesIterator.map(l => s"    $l").mkString(System.lineSeparator()))
   }
 
   /** Indents everything except the first line in this fragment by 4 spaces. */
   def indentExceptFirst: Python = {
     val lines: Seq[String] = fullText.linesIterator.to(Seq)
-    Python((lines.head +: lines.tail.map(l => s"    $l")).mkString("\n"))
+    Python((lines.head +: lines.tail.map(l => s"    $l")).mkString(System.lineSeparator()))
   }
 
   /** Returns the code of this fragment as a String. */

From 07ea044773b066f799a7e513fe820dd61ba0daa8 Mon Sep 17 00:00:00 2001
From: Jan Bessai <Jan.Bessai@tu-dortmund.de>
Date: Tue, 29 Apr 2025 18:21:26 +0200
Subject: [PATCH 7/7] Fix PGP environment variable name

---
 .github/workflows/test_and_release.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test_and_release.yml b/.github/workflows/test_and_release.yml
index 6725587..183cd6c 100644
--- a/.github/workflows/test_and_release.yml
+++ b/.github/workflows/test_and_release.yml
@@ -69,13 +69,13 @@ jobs:
         SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
         SONA_USER: ${{ secrets.SONATYPE_USERNAME }}
         SONA_PASS: ${{ secrets.SONATYPE_PASSWORD }}
-        GPG_PRIVATE: ${{ secrets.GPG_PRIVATE }}
+        PGP_SECRET: ${{ secrets.PGP_SECRET }}
         PGP_PASS: ${{ secrets.PGP_PASS }}
         CI: github
       run: |
         git fetch --prune --unshallow --tags &&
         export GPG_TTY=$(tty) &&
-        echo $GPG_PRIVATE | base64 -d | gpg --passphrase=$PGP_PASS --yes --batch --pinentry-mode loopback --import &&
+        echo $PGP_SECRET | base64 -d | gpg --passphrase=$PGP_PASS --yes --batch --pinentry-mode loopback --import &&
         export PATH=`pwd`/.github/bin:$PATH &&
         sbt + test ciReleaseTagNextVersion ciReleaseSonatype