Merge pull request #18 from combinators/DissertationAlgorithm

Push dependencies

.github/workflows/test_and_release.yml

@@ -7,14 +7,14 @@ jobs:
     strategy:
       matrix:
         os: [ windows-latest, ubuntu-latest ]
-        java: [ 8, 11, 15, 16 ]
+        java: [ '8', '11', '16', '17' ]
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v2.3.4
     - name: Set up JDK, Scala, and SBT
       uses: olafurpg/setup-scala@v13
       with:
-        java-version: adopt@1.${{ matrix.java }}
+        java-version: zulu@1.${{ matrix.java }}
     - name: Run tests
       shell: bash
       run: sbt +test
@@ -26,7 +26,7 @@ jobs:
     - name: Set up JDK, Scala, and SBT
       uses: olafurpg/setup-scala@v13
       with:
-        java-version: adopt@1.16
+        java-version: openjdk@1.16.0
     - name: Analyze coverage
       run: sbt clean coverage +test
     - name: Update coverage report 
@@ -51,7 +51,7 @@ jobs:
       if: steps.check_head_of_master.outputs.head_of_master == steps.check_head_of_master.outputs.current_job_ref
       uses: olafurpg/setup-scala@v13
       with:
-        java-version: adopt@1.16
+        java-version: openjdk@1.16.0
     - name: Build and release
       if: steps.check_head_of_master.outputs.head_of_master == steps.check_head_of_master.outputs.current_job_ref
       env:

CHANGELOG.md

@@ -1,6 +1,7 @@
 ### Version 3.0.1
-- Updated dependencies and compiled with newest Scala versions
 - Enumeration of results on single core computers fixed
+- Updated dependencies and compiled with newest Scala versions
+- Tested to work with Java 17
 - CI-Pipeline maintenance
 ### Version 3.0.0
 This version replaces the algorithms by the version published in [A Type-Theoretic Framework for Software Component Synthesis](http://dx.doi.org/10.17877/DE290R-20320).

build.sbt

@@ -5,7 +5,7 @@ lazy val commonSettings = Seq(
   organization := "org.combinators",
 
   scalaVersion := "2.13.6",
-  crossScalaVersions := Seq("2.11.12", "2.12.14", scalaVersion.value),
+  crossScalaVersions := Seq("2.11.12", "2.12.15", scalaVersion.value),
 
   resolvers ++= Seq(
     Resolver.sonatypeRepo("releases"),
@@ -22,7 +22,7 @@ lazy val commonSettings = Seq(
     "-feature",
     "-language:implicitConversions"
   ),
-  ThisBuild / scapegoatVersion := "1.4.9"
+  ThisBuild / scapegoatVersion := "1.4.10"
 ) ++ publishSettings
 
 lazy val examples = (Project(id = "examples", base = file("examples")))
@@ -39,15 +39,15 @@ lazy val root = (Project(id = "cls-scala", base = file(".")))
       libraryDependencies ++= Seq(
         "org.combinators" %% "shapeless-feat" % "0.2.5",
         "org.scala-lang" % "scala-compiler" % scalaVersion.value,
-        "org.scalactic" %% "scalactic" % "3.2.0" % "test",
-        "org.scalatest" %% "scalatest" % "3.2.2" % "test",
-        "ch.qos.logback" % "logback-classic" % "1.2.3",
-        "com.typesafe.scala-logging" %% "scala-logging" % "3.9.2"
+        "org.scalactic" %% "scalactic" % "3.2.10" % "test",
+        "org.scalatest" %% "scalatest" % "3.2.10" % "test",
+        "ch.qos.logback" % "logback-classic" % "1.2.6",
+        "com.typesafe.scala-logging" %% "scala-logging" % "3.9.4"
       ),
       libraryDependencies ++= {
         CrossVersion.partialVersion(scalaVersion.value) match {
           case Some((2, n)) if n >= 13 =>
-            Seq("org.scala-lang.modules" %% "scala-parallel-collections" % "1.0.0")
+            Seq("org.scala-lang.modules" %% "scala-parallel-collections" % "1.0.4")
           case _ => Seq()
         }
       },

project/plugins.sbt

@@ -1,8 +1,8 @@
 logLevel := Level.Warn
-addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.8.2")
+addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.9.0")
 addSbtPlugin("org.scoverage" % "sbt-coveralls" % "1.3.1")
 addSbtPlugin("ch.epfl.scala" % "sbt-release-early" % "2.1.1+10-c6ef3f60")
 addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.6.0")
-addSbtPlugin("com.sksamuel.scapegoat" %% "sbt-scapegoat" % "1.1.0")
-addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.2")
+addSbtPlugin("com.sksamuel.scapegoat" %% "sbt-scapegoat" % "1.1.1")
+addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.3")