From 0ab80c6d36188997e64cb7e2df9f501cc05477de Mon Sep 17 00:00:00 2001 From: Jan Bessai Date: Fri, 1 Oct 2021 05:59:03 +0200 Subject: [PATCH 1/3] Push dependencies --- .github/workflows/test_and_release.yml | 6 +++--- CHANGELOG.md | 3 ++- build.sbt | 14 +++++++------- project/plugins.sbt | 6 +++--- 4 files changed, 15 insertions(+), 14 deletions(-) diff --git a/.github/workflows/test_and_release.yml b/.github/workflows/test_and_release.yml index ad4d6fc..c698708 100644 --- a/.github/workflows/test_and_release.yml +++ b/.github/workflows/test_and_release.yml @@ -7,7 +7,7 @@ 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 @@ -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: adopt@1.17 - 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: adopt@1.17 - name: Build and release if: steps.check_head_of_master.outputs.head_of_master == steps.check_head_of_master.outputs.current_job_ref env: diff --git a/CHANGELOG.md b/CHANGELOG.md index 9ba7fbd..db52afc 100644 --- a/CHANGELOG.md +++ b/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). diff --git a/build.sbt b/build.sbt index 9b11f16..875e2c1 100644 --- a/build.sbt +++ b/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() } }, diff --git a/project/plugins.sbt b/project/plugins.sbt index 9d831c3..9219b6a 100644 --- a/project/plugins.sbt +++ b/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") From 4ff842d8cc0dd37ad1c973f43903b7db7ea4424b Mon Sep 17 00:00:00 2001 From: Jan Bessai Date: Fri, 1 Oct 2021 06:14:03 +0200 Subject: [PATCH 2/3] Adjust java version in ci-pipeline --- .github/workflows/test_and_release.yml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/workflows/test_and_release.yml b/.github/workflows/test_and_release.yml index c698708..aef8c75 100644 --- a/.github/workflows/test_and_release.yml +++ b/.github/workflows/test_and_release.yml @@ -7,14 +7,14 @@ jobs: strategy: matrix: os: [ windows-latest, ubuntu-latest ] - java: [ 8, 11, 16, 17 ] + 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 @@ -25,8 +25,6 @@ jobs: - uses: actions/checkout@v2.3.4 - name: Set up JDK, Scala, and SBT uses: olafurpg/setup-scala@v13 - with: - java-version: adopt@1.17 - name: Analyze coverage run: sbt clean coverage +test - name: Update coverage report @@ -50,8 +48,6 @@ jobs: - name: Set up JDK, Scala, and SBT 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.17 - name: Build and release if: steps.check_head_of_master.outputs.head_of_master == steps.check_head_of_master.outputs.current_job_ref env: From d889de2864ea577758004b4a1ba8ae4686dca93a Mon Sep 17 00:00:00 2001 From: Jan Bessai Date: Fri, 1 Oct 2021 06:58:27 +0200 Subject: [PATCH 3/3] Compile coverage and release with OpenJDK 16 --- .github/workflows/test_and_release.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/test_and_release.yml b/.github/workflows/test_and_release.yml index aef8c75..d23dbd1 100644 --- a/.github/workflows/test_and_release.yml +++ b/.github/workflows/test_and_release.yml @@ -25,6 +25,8 @@ jobs: - uses: actions/checkout@v2.3.4 - name: Set up JDK, Scala, and SBT uses: olafurpg/setup-scala@v13 + with: + java-version: openjdk@1.16.0 - name: Analyze coverage run: sbt clean coverage +test - name: Update coverage report @@ -48,6 +50,8 @@ jobs: - name: Set up JDK, Scala, and SBT 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: 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: