0.5.0 - scala 2.13.4 + jsoup 1.13.1 + scala test 3.2.2

Readme.md

@@ -14,11 +14,11 @@ To achieve simplicity the templates are kept simple but the "merge" requires a b
 
 ## Quick Start 
 
-Include dependency (for `scala 2.10` use version `0.2.2`).  [![Download](https://api.bintray.com/packages/ppurang/maven/abctemplates/images/download.svg)](https://bintray.com/ppurang/maven/abctemplates/_latestVersion)
+Include dependency (for `scala 2.10` use version `0.2.2`, `scala 2.12` use `0.4.1`, `scala 2.13` use `0.5.0` ).  [![Download](https://api.bintray.com/packages/ppurang/maven/abctemplates/images/download.svg)](https://bintray.com/ppurang/maven/abctemplates/_latestVersion)
 
 ```scala
 libraryDependencies ++= Seq(
-  "org.purang.net" %% "abctemplates" % "0.4.0" withSources()
+  "org.purang.net" %% "abctemplates" % "0.5.0" withSources()
   )
 ```
 

build.sbt

@@ -1,65 +1,20 @@
 name := "abctemplates"
 
-version := "0.4.2"
+version := "0.5.0"
 
 organization := "org.purang.net"
 
-scalaVersion := "2.12.10"
-
-//crossScalaVersions := Seq("2.11.12", "2.12.10", "2.13.1")
+scalaVersion := "2.13.4"
 
 libraryDependencies ++= Seq(
-  "org.jsoup" % "jsoup" % "1.12.1" withSources(),
-  "org.scalatest" %% "scalatest" % "3.0.8" % "test"
+  "org.jsoup" % "jsoup" % "1.13.1" withSources(),
+  "org.scalatest" %% "scalatest" % "3.2.2" % "test"
 )
 
 resolvers ++= Seq(
   "Sonatype OSS Snapshots" at "https://oss.sonatype.org/content/repositories/snapshots"
 )
 
-scalacOptions in ThisBuild ++= Seq(
-  "-deprecation", // Emit warning and location for usages of deprecated APIs.
-  "-encoding",
-  "utf-8", // Specify character encoding used by source files.
-  "-explaintypes", // Explain type errors in more detail.
-  "-feature", // Emit warning and location for usages of features that should be imported explicitly.
-  "-language:existentials", // Existential types (besides wildcard types) can be written and inferred
-  "-language:experimental.macros", // Allow macro definition (besides implementation and application)
-  "-language:higherKinds", // Allow higher-kinded types
-  "-language:implicitConversions", // Allow definition of implicit functions called views
-  "-unchecked", // Enable additional warnings where generated code depends on assumptions.
-  "-Xcheckinit", // Wrap field accessors to throw an exception on uninitialized access.
-  "-Xfatal-warnings", // Fail the compilation if there are any warnings.
-  "-Xfuture", // Turn on future language features.
-  "-Xlint:adapted-args", // Warn if an argument list is modified to match the receiver.
-  "-Xlint:by-name-right-associative", // By-name parameter of right associative operator.
-  "-Xlint:constant", // Evaluation of a constant arithmetic expression results in an error.
-  "-Xlint:delayedinit-select", // Selecting member of DelayedInit.
-  "-Xlint:inaccessible", // Warn about inaccessible types in method signatures.
-  "-Xlint:infer-any", // Warn when a type argument is inferred to be `Any`.
-  "-Xlint:missing-interpolator", // A string literal appears to be missing an interpolator id.
-  "-Xlint:nullary-override", // Warn when non-nullary `def f()' overrides nullary `def f'.
-  "-Xlint:nullary-unit", // Warn when nullary methods return Unit.
-  "-Xlint:option-implicit", // Option.apply used implicit view.
-  "-Xlint:package-object-classes", // Class or object defined in package object.
-  "-Xlint:poly-implicit-overload", // Parameterized overloaded implicit methods are not visible as view bounds.
-  "-Xlint:private-shadow", // A private field (or class parameter) shadows a superclass field.
-  "-Xlint:stars-align", // Pattern sequence wildcard must align with sequence component.
-  "-Xlint:type-parameter-shadow", // A local type parameter shadows a type already in scope.
-  "-Xlint:unsound-match", // Pattern match may not be typesafe.
-  "-Yno-adapted-args", // Do not adapt an argument list (either by inserting () or creating a tuple) to match the receiver.
-  "-Ypartial-unification", // Enable partial unification in type constructor inference
-  "-Ywarn-dead-code", // Warn when dead code is identified.
-  "-Ywarn-extra-implicit", // Warn when more than one implicit parameter section is defined.
-  "-Ywarn-inaccessible", // Warn about inaccessible types in method signatures.
-  "-Ywarn-infer-any", // Warn when a type argument is inferred to be `Any`.
-  "-Ywarn-nullary-override", // Warn when non-nullary `def f()' overrides nullary `def f'.
-  "-Ywarn-nullary-unit", // Warn when nullary methods return Unit.
-  "-Ywarn-numeric-widen", // Warn when numerics are widened.
-  "-Ywarn-unused",
-  "-Ywarn-value-discard" // Warn when non-Unit expression results are unused.
-)
-
 cancelable := true
 
 fork := true

project/build.properties

@@ -1 +1 @@
-sbt.version=1.3.2
+sbt.version=1.4.6

project/plugins.sbt

@@ -1,8 +1,5 @@
-resolvers += Resolver.url(
-  "bintray-sbt-plugin-releases",
-  url("http://dl.bintray.com/content/sbt/sbt-plugin-releases"))(
-  Resolver.ivyStylePatterns)
+addSbtPlugin("org.foundweekends" % "sbt-bintray" % "0.5.6")
 
-addSbtPlugin("org.foundweekends" % "sbt-bintray" % "0.5.4")
+addSbtPlugin("org.wartremover" % "sbt-wartremover" % "2.4.13")
 
-addSbtPlugin("org.wartremover" % "sbt-wartremover" % "2.4.3")
+addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat" % "0.1.16")

src/test/scala/org/purang/net/abctemplates/TemplateSpec.scala

@@ -1,11 +1,13 @@
 package org.purang.net.abctemplates
 
-import org.scalatest._
+import org.scalatest.flatspec.AnyFlatSpec
+import org.scalatest.matchers.should.Matchers
 
 
 // Note: we test fragment merges only because for now that validates the underlying merge
 @SuppressWarnings(Array("org.wartremover.warts.NonUnitStatements","org.wartremover.warts.ToString"))
-class TemplateSpec extends FlatSpec with Matchers {
+class TemplateSpec extends AnyFlatSpec with Matchers
+{
 
   "ABC Templates" should "allow fragment merge with a single key" in {
     val h: String =