implement v2 interfaces

Author: celadari

.bsp/sbt.json

@@ -0,0 +1 @@
+{"name":"sbt","version":"1.5.5","bspVersion":"2.0.0-M5","languages":["scala"],"argv":["/usr/lib/jvm/java-8-openjdk-amd64/jre/bin/java","-Xms100m","-Xmx100m","-classpath","/home/celadari/.local/share/JetBrains/IdeaIC2021.2/Scala/launcher/sbt-launch.jar","xsbt.boot.Boot","-bsp","--sbt-launch-jar=/home/celadari/.local/share/JetBrains/IdeaIC2021.2/Scala/launcher/sbt-launch.jar"]}

.github/workflows/linter.yml

@@ -0,0 +1,16 @@
+name: Linter CI
+on: [push]
+jobs:
+  linter:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up JDK 11
+        uses: actions/setup-java@v2
+        with:
+          java-version: '11'
+          distribution: 'adopt'
+      - name: Run Scalastyle Linter
+        run: |
+          sbt +scalastyle
+          sbt +test:scalastyle

.github/workflows/test.yml

@@ -0,0 +1,59 @@
+name: Test Coverage CI
+on: [push]
+jobs:
+  retrieve-scala-versions:
+    runs-on: ubuntu-20.04
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up JDK 11
+        uses: actions/setup-java@v2
+        with:
+          java-version: '11'
+          distribution: 'adopt'
+      - name: Retrieve Scala Versions from build.sbt file
+        id: set-matrix
+        run: |
+          scala_versions=$(sbt +scalaBinaryVersion | cut -f2 -d " " | grep "^[0-9]\.[0-9][0-9]$")
+          run: echo "::set-output name=matrix::$scala_versions"
+    outputs:
+      matrix: ${{ steps.set-matrix.outputs.matrix }}
+
+  test-coverage:
+    runs-on: ubuntu-20.04
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up JDK 11
+        uses: actions/setup-java@v2
+        with:
+          java-version: '11'
+          distribution: 'adopt'
+      - name: Run Sbt Test and Generate Report on Multiple Scala Versions
+        run: |
+          sbt +coverage +test
+          sbt +coverageReport
+      - uses: actions/upload-artifact@v2
+        with:
+          name: coverage-report
+          path: ./target/scala-[0-9].[0-9][0-9]
+
+  upload-coverage:
+    runs-on: ubuntu-latest
+    needs: [retrieve-scala-versions, test-coverage]
+    strategy:
+      fail-fast: false
+      matrix:
+        scala_version: ${{ fromJson(needs.retrieve-scala-versions.outputs.matrix) }}
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/download-artifact@v2
+        with:
+          name: coverage-report
+          path: ./target/
+      - uses: codecov/codecov-action@v2
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}
+          directory: ./target/scala-${{ matrix.scala_version }}/
+          flags: unittests,${{ matrix.scala_version }}
+          name: codecov-json-logic-scala
+          fail_ci_if_error: true
+          verbose: true

README.md

@@ -20,7 +20,7 @@ This project is compiled, tested, and published for the following Scala versions
 * 2.10.7
 * 2.11.12
 * 2.12.6
-* 2.13.1
+* 2.13.2
 
 # Table of Contents
 1. [Installation]()

build.sbt

@@ -4,28 +4,51 @@ organization := "com.github.celadari"
 
 homepage := Some(url("https://github.com/celadari/json-logic-scala"))
 
-version := "1.1.0"
+version := "2.0.0"
 
-scalaVersion := "2.10.7"
+scalaVersion := "2.13.2"
 
-crossScalaVersions := Seq("2.10.7", "2.11.12", "2.12.6", "2.13.1")
+crossScalaVersions := Seq("2.11.12", "2.12.13", "2.13.2")
 
 resolvers ++= Seq(
   "sonatype-snapshots" at "https://oss.sonatype.org/content/repositories/snapshots",
-  "sonatype-releases"  at "https://oss.sonatype.org/content/repositories/releases"
+  "sonatype-releases"  at "https://oss.sonatype.org/content/repositories/releases",
 )
 
-val typeSafeVersions = Map("2.10" -> "2.6.14", "2.11" -> "2.7.4", "2.12" -> "2.8.1", "2.13" -> "2.8.1")
+// This forbids including Scala related libraries into the dependency
+autoScalaLibrary := false
+
+// scalastyle:off magic.number
 def resolveVersion(scalaV: String, versionsResolver: Map[String, String]): String = versionsResolver(scalaV.slice(0, 4))
 
-libraryDependencies ++= {
-  Seq(
-    "org.scala-lang" % "scala-compiler" % scalaVersion.value,
-    "com.typesafe.play" %% "play-json" % resolveVersion(scalaVersion.value, typeSafeVersions)
-  )
-}
+val typeSafeVersions = Map("2.10" -> "2.6.14", "2.11" -> "2.7.4", "2.12" -> "2.8.1", "2.13" -> "2.8.1")
+
+libraryDependencies ++= Seq(
+    "com.typesafe.play" %% "play-json" % resolveVersion(scalaVersion.value, typeSafeVersions),
+    "org.apache.xbean" % "xbean-finder" % "4.20",
+    "org.apache.xbean" % "xbean-reflect" % "4.20",
+    "org.scalatest" %% "scalatest" % "3.2.9" % Test
+)
+
+// scalacOptions ++= ("-feature" :: "-language:postfixOps" :: "-language:implicitConversions" :: Nil)
+scalacOptions ++= Seq(
+  "-encoding", "utf8",
+  "-deprecation",
+  "-feature",
+  "-language:higherKinds",
+  if (Set("2.12", "2.13").contains(scalaVersion.value.slice(0, 4))) "-Ywarn-unused:imports" else "-Ywarn-unused-import",
+  if (Set("2.11", "2.12").contains(scalaVersion.value.slice(0, 4))) "-Xmax-classfile-name" else "",
+  if (Set("2.11", "2.12").contains(scalaVersion.value.slice(0, 4))) "128" else "",
+  "-language:existentials",
+  if (scalaVersion.value.slice(0, 4) == "2.11") "-Xfatal-warnings"
+  else if (scalaVersion.value.slice(0, 4) == "2.12") ""
+  else "-Werror"
+)
 
-scalacOptions ++= ("-feature" :: "-language:postfixOps" :: "-language:implicitConversions" :: Nil)
+Test / testOptions += Tests.Argument("-oGK")
+
+// scalastyle unit test configuration
+Test / scalastyleConfig := baseDirectory.value / "scalastyle-test-config.xml"
 
 // Publishing stuff for sonatype
 publishTo := {
@@ -37,13 +60,13 @@ publishConfiguration := publishConfiguration.value.withOverwrite(true)
 
 credentials += Credentials(Path.userHome / ".sbt" / ".credentials")
 
-publishArtifact in Test := false
+Test / publishArtifact := false
 
 publishMavenStyle := true
 
 pomIncludeRepository := { _ => false }
 
-pomExtra := (
+pomExtra :=
          <scm>
             <url>git@github.com:celadari/json-logic-scala.git</url>
             <connection>scm:git:git@github.com:celadari/json-logic-scala.git</connection>
@@ -55,11 +78,7 @@ pomExtra := (
               <url>https://github.com/celadari</url>
             </developer>
          </developers>
- )
-
-licenses += ("MIT", url("http://mit-license.org/"))
 
-// Scaladoc publishing stuff
-enablePlugins(GhpagesPlugin, SiteScaladocPlugin)
+licenses += ("MIT", url("https://mit-license.org/"))
 
-git.remoteRepo := "git@github.com:celadari/json-logic-scala.git"
+// Scaladoc publishing stuff

project/build.properties

@@ -1 +1 @@
-sbt.version=1.3.8
+sbt.version=1.5.5

project/plugins.sbt

@@ -1,7 +1,7 @@
 resolvers += "jgit-repo" at "https://download.eclipse.org/jgit/maven"
 
-addSbtPlugin("com.typesafe.sbt" % "sbt-ghpages" % "0.6.3")  // https://github.com/sbt/sbt-ghpages
+addSbtPlugin("com.beautiful-scala" % "sbt-scalastyle" % "1.5.0")
 
-addSbtPlugin("com.jsuereth" % "sbt-pgp" % "2.0")
+addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.8.2")
 
-addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.6")
+addSbtPlugin("com.jsuereth" % "sbt-pgp" % "latest.integration")