From 0881a21a97e7967de4373c057211eecbf1724391 Mon Sep 17 00:00:00 2001 From: Lars Hupel Date: Thu, 13 May 2021 16:56:53 +0200 Subject: [PATCH 01/98] Setting version to 1.1.6-SNAPSHOT --- version.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.sbt b/version.sbt index 6848da0..40dd015 100644 --- a/version.sbt +++ b/version.sbt @@ -1 +1 @@ -ThisBuild / version := "1.1.5" +ThisBuild / version := "1.1.6-SNAPSHOT" From ba4b8ee8e53377abc9847b367dcf075279e9049d Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Mon, 24 May 2021 04:16:36 +0200 Subject: [PATCH 02/98] Update sbt-github-actions to 0.11.0 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 8b14338..910ba97 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -6,4 +6,4 @@ addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.7") addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.0.0") addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.0.0") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.2") -addSbtPlugin("com.codecommit" % "sbt-github-actions" % "0.10.1") +addSbtPlugin("com.codecommit" % "sbt-github-actions" % "0.11.0") From 5aa18b91588d7e0eb995dd7617491e6f29e0904a Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Mon, 24 May 2021 04:16:59 +0200 Subject: [PATCH 03/98] Regenerate workflow with sbt-github-actions --- .github/workflows/ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 87b1540..9ed9edc 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,9 +9,9 @@ name: Continuous Integration on: pull_request: - branches: ['*'] + branches: ['**'] push: - branches: ['*'] + branches: ['**'] env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -51,7 +51,7 @@ jobs: - run: sudo apt install clang libunwind-dev libgc-dev libre2-dev - name: Check that workflows are up to date - run: sbt ++${{ matrix.scala }} githubWorkflowCheck + run: sbt --client '++${{ matrix.scala }}; githubWorkflowCheck' - name: Build project - run: sbt ++${{ matrix.scala }} test \ No newline at end of file + run: sbt --client '++${{ matrix.scala }}; test' \ No newline at end of file From 48efb3e3940b17548d00da1fce1accc9deaacf19 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Fri, 28 May 2021 15:42:15 +0200 Subject: [PATCH 04/98] Update scala-library to 2.12.14 --- .github/workflows/ci.yml | 2 +- build.sbt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 87b1540..39c0b23 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,7 +22,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - scala: [2.12.13, 2.13.4, 3.0.0] + scala: [2.12.14, 2.13.4, 3.0.0] java: [adopt@1.8] runs-on: ${{ matrix.os }} steps: diff --git a/build.sbt b/build.sbt index 09fe4e6..160f93a 100644 --- a/build.sbt +++ b/build.sbt @@ -8,7 +8,7 @@ import sbtcrossproject.CrossPlugin.autoImport.{crossProject, CrossType} ThisBuild / githubWorkflowPublishTargetBranches := Seq() -ThisBuild / crossScalaVersions := Seq("2.12.13", "2.13.4", "3.0.0") +ThisBuild / crossScalaVersions := Seq("2.12.14", "2.13.4", "3.0.0") ThisBuild / githubWorkflowBuildPreamble := Seq( WorkflowStep.Run(List("sudo apt install clang libunwind-dev libgc-dev libre2-dev")) From 3551ff412a5e93ed78d11ecea24e70086e0b64de Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Sat, 29 May 2021 17:26:21 +0200 Subject: [PATCH 05/98] Update scala-library to 2.13.6 (#238) --- .github/workflows/ci.yml | 2 +- build.sbt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9957fa6..bd39f44 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,7 +22,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - scala: [2.12.14, 2.13.4, 3.0.0] + scala: [2.12.14, 2.13.6, 3.0.0] java: [adopt@1.8] runs-on: ${{ matrix.os }} steps: diff --git a/build.sbt b/build.sbt index 160f93a..065aa5f 100644 --- a/build.sbt +++ b/build.sbt @@ -8,7 +8,7 @@ import sbtcrossproject.CrossPlugin.autoImport.{crossProject, CrossType} ThisBuild / githubWorkflowPublishTargetBranches := Seq() -ThisBuild / crossScalaVersions := Seq("2.12.14", "2.13.4", "3.0.0") +ThisBuild / crossScalaVersions := Seq("2.12.14", "2.13.6", "3.0.0") ThisBuild / githubWorkflowBuildPreamble := Seq( WorkflowStep.Run(List("sudo apt install clang libunwind-dev libgc-dev libre2-dev")) @@ -23,7 +23,7 @@ ThisBuild / versionScheme := Some("semver-spec") lazy val commonSettings = Seq( organization := "org.typelevel", name := "discipline", - scalaVersion := "2.13.4", + scalaVersion := "2.13.6", crossScalaVersions := (ThisBuild / crossScalaVersions).value, scalacOptions ++= Seq( "-deprecation", From db83857b3016ca0152f4e047a0ca81afdfb9450f Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Tue, 1 Jun 2021 09:53:36 +0200 Subject: [PATCH 06/98] Update sbt to 1.5.3 --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index 19479ba..67d27a1 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.5.2 +sbt.version=1.5.3 From ac09210b5a37ad05cc5eb02bbef39085622e1342 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Wed, 2 Jun 2021 01:51:17 +0200 Subject: [PATCH 07/98] Update sbt-github-actions to 0.12.0 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 910ba97..c366a9c 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -6,4 +6,4 @@ addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.7") addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.0.0") addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.0.0") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.2") -addSbtPlugin("com.codecommit" % "sbt-github-actions" % "0.11.0") +addSbtPlugin("com.codecommit" % "sbt-github-actions" % "0.12.0") From c6ab7f6e65b3b2ce2767cbb5451c0f3e191f967d Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Wed, 2 Jun 2021 01:51:42 +0200 Subject: [PATCH 08/98] Regenerate workflow with sbt-github-actions --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bd39f44..5d3defc 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -32,7 +32,7 @@ jobs: fetch-depth: 0 - name: Setup Java and Scala - uses: olafurpg/setup-scala@v10 + uses: olafurpg/setup-scala@v12 with: java-version: ${{ matrix.java }} From 848e476e7e946b247be2e875902a93785c2e0ae3 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Tue, 8 Jun 2021 17:12:47 +0200 Subject: [PATCH 09/98] Update sbt-scalajs, scalajs-library, ... to 1.6.0 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index c366a9c..14778fb 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,6 +1,6 @@ addSbtPlugin("com.github.sbt" % "sbt-release" % "1.0.15") addSbtPlugin("io.crashbox" % "sbt-gpg" % "0.2.1") -addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.5.1") +addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.6.0") addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.0") addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.7") addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.0.0") From be6a9e8777e43f18ae7755d9b40ee07506e524dc Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Mon, 14 Jun 2021 09:37:58 +0200 Subject: [PATCH 10/98] Update sbt to 1.5.4 --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index 67d27a1..9edb75b 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.5.3 +sbt.version=1.5.4 From e9096d2bddbeeb0f474f119adf1cfc7457053683 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Thu, 24 Jun 2021 21:17:13 +0200 Subject: [PATCH 11/98] Update sbt-release to 1.1.0 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 14778fb..3a84383 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,4 +1,4 @@ -addSbtPlugin("com.github.sbt" % "sbt-release" % "1.0.15") +addSbtPlugin("com.github.sbt" % "sbt-release" % "1.1.0") addSbtPlugin("io.crashbox" % "sbt-gpg" % "0.2.1") addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.6.0") addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.0") From e76d185bae18d0c76de4e0932ea9ad5f2a29a885 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sat, 3 Jul 2021 05:18:37 +0200 Subject: [PATCH 12/98] Update sbt-scala-native-crossproject, ... to 1.1.0 --- project/plugins.sbt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 3a84383..735ef5a 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -3,7 +3,7 @@ addSbtPlugin("io.crashbox" % "sbt-gpg" % "0.2.1") addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.6.0") addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.0") addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.7") -addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.0.0") -addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.0.0") +addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.1.0") +addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.1.0") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.2") addSbtPlugin("com.codecommit" % "sbt-github-actions" % "0.12.0") From c309dbbf19ac1eac61febefc9dd67eda245bead3 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Fri, 9 Jul 2021 04:11:49 +0200 Subject: [PATCH 13/98] Update sbt-scalafmt to 2.4.3 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 735ef5a..ec34aad 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -5,5 +5,5 @@ addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.0") addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.7") addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.1.0") addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.1.0") -addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.2") +addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.3") addSbtPlugin("com.codecommit" % "sbt-github-actions" % "0.12.0") From d777f316f7e8ca03f250b877534ff51198836d98 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Fri, 9 Jul 2021 16:28:13 +0200 Subject: [PATCH 14/98] Update scala3-library, ... to 3.0.1 --- .github/workflows/ci.yml | 2 +- build.sbt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5d3defc..84c53b3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,7 +22,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - scala: [2.12.14, 2.13.6, 3.0.0] + scala: [2.12.14, 2.13.6, 3.0.1] java: [adopt@1.8] runs-on: ${{ matrix.os }} steps: diff --git a/build.sbt b/build.sbt index 065aa5f..8ae45a6 100644 --- a/build.sbt +++ b/build.sbt @@ -8,7 +8,7 @@ import sbtcrossproject.CrossPlugin.autoImport.{crossProject, CrossType} ThisBuild / githubWorkflowPublishTargetBranches := Seq() -ThisBuild / crossScalaVersions := Seq("2.12.14", "2.13.6", "3.0.0") +ThisBuild / crossScalaVersions := Seq("2.12.14", "2.13.6", "3.0.1") ThisBuild / githubWorkflowBuildPreamble := Seq( WorkflowStep.Run(List("sudo apt install clang libunwind-dev libgc-dev libre2-dev")) From 0a7763fbb816ad53cc440db47dc6ec319e8d4535 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Mon, 12 Jul 2021 14:59:30 +0200 Subject: [PATCH 15/98] Update sbt to 1.5.5 --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index 9edb75b..10fd9ee 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.5.4 +sbt.version=1.5.5 From 6915bc37a7e51b2511490939b25294d11308ad02 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Tue, 3 Aug 2021 23:49:42 +0200 Subject: [PATCH 16/98] Update sbt-scalajs, scalajs-compiler, ... to 1.7.0 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index ec34aad..deb90b3 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,6 +1,6 @@ addSbtPlugin("com.github.sbt" % "sbt-release" % "1.1.0") addSbtPlugin("io.crashbox" % "sbt-gpg" % "0.2.1") -addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.6.0") +addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.7.0") addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.0") addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.7") addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.1.0") From ee42769cf1bd9ac0501c5e021e2d612c5f36d8de Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sun, 15 Aug 2021 03:48:05 +0200 Subject: [PATCH 17/98] Update sbt-github-actions to 0.13.0 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index deb90b3..2fe1dae 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -6,4 +6,4 @@ addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.7") addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.1.0") addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.1.0") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.3") -addSbtPlugin("com.codecommit" % "sbt-github-actions" % "0.12.0") +addSbtPlugin("com.codecommit" % "sbt-github-actions" % "0.13.0") From 55b04b6239d2aff92c68de44a52bb3ea2d1f000d Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sun, 15 Aug 2021 03:48:26 +0200 Subject: [PATCH 18/98] Regenerate workflow with sbt-github-actions --- .github/workflows/ci.yml | 6 +++--- .github/workflows/clean.yml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 84c53b3..4b91e29 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -32,7 +32,7 @@ jobs: fetch-depth: 0 - name: Setup Java and Scala - uses: olafurpg/setup-scala@v12 + uses: olafurpg/setup-scala@v13 with: java-version: ${{ matrix.java }} @@ -51,7 +51,7 @@ jobs: - run: sudo apt install clang libunwind-dev libgc-dev libre2-dev - name: Check that workflows are up to date - run: sbt --client '++${{ matrix.scala }}; githubWorkflowCheck' + run: sbt ++${{ matrix.scala }} githubWorkflowCheck - name: Build project - run: sbt --client '++${{ matrix.scala }}; test' \ No newline at end of file + run: sbt ++${{ matrix.scala }} test diff --git a/.github/workflows/clean.yml b/.github/workflows/clean.yml index b535fcc..547aaa4 100644 --- a/.github/workflows/clean.yml +++ b/.github/workflows/clean.yml @@ -56,4 +56,4 @@ jobs: printf "Deleting '%s' #%d, %'d bytes\n" $name ${ARTCOUNT[$name]} $size ghapi -X DELETE $REPO/actions/artifacts/$id done - done \ No newline at end of file + done From de6832ae766e397357dd2301b16fefa05f72d7e2 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sun, 15 Aug 2021 03:48:28 +0200 Subject: [PATCH 19/98] Update sbt-sonatype to 3.9.9 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index deb90b3..c157363 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -2,7 +2,7 @@ addSbtPlugin("com.github.sbt" % "sbt-release" % "1.1.0") addSbtPlugin("io.crashbox" % "sbt-gpg" % "0.2.1") addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.7.0") addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.0") -addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.7") +addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.9") addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.1.0") addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.1.0") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.3") From 625f79489101e12980908628c849c0019e9bd063 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Wed, 25 Aug 2021 23:26:10 +0200 Subject: [PATCH 20/98] Update sbt-sonatype to 3.9.10 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index cae41e3..c04997d 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -2,7 +2,7 @@ addSbtPlugin("com.github.sbt" % "sbt-release" % "1.1.0") addSbtPlugin("io.crashbox" % "sbt-gpg" % "0.2.1") addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.7.0") addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.0") -addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.9") +addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.10") addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.1.0") addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.1.0") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.3") From 008e54fa9ca37eba2a3f7bfa88bf0b6a16214bc5 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Wed, 1 Sep 2021 14:03:55 +0200 Subject: [PATCH 21/98] Update scala3-library, ... to 3.0.2 --- .github/workflows/ci.yml | 2 +- build.sbt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4b91e29..ae3ee21 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,7 +22,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - scala: [2.12.14, 2.13.6, 3.0.1] + scala: [2.12.14, 2.13.6, 3.0.2] java: [adopt@1.8] runs-on: ${{ matrix.os }} steps: diff --git a/build.sbt b/build.sbt index 8ae45a6..8164066 100644 --- a/build.sbt +++ b/build.sbt @@ -8,7 +8,7 @@ import sbtcrossproject.CrossPlugin.autoImport.{crossProject, CrossType} ThisBuild / githubWorkflowPublishTargetBranches := Seq() -ThisBuild / crossScalaVersions := Seq("2.12.14", "2.13.6", "3.0.1") +ThisBuild / crossScalaVersions := Seq("2.12.14", "2.13.6", "3.0.2") ThisBuild / githubWorkflowBuildPreamble := Seq( WorkflowStep.Run(List("sudo apt install clang libunwind-dev libgc-dev libre2-dev")) From acb8c61bcdecb841723f33c1da8bc302848e76a1 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Wed, 15 Sep 2021 03:13:56 +0200 Subject: [PATCH 22/98] Update scala-library to 2.12.15 --- .github/workflows/ci.yml | 2 +- build.sbt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4b91e29..41d1a66 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,7 +22,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - scala: [2.12.14, 2.13.6, 3.0.1] + scala: [2.12.15, 2.13.6, 3.0.1] java: [adopt@1.8] runs-on: ${{ matrix.os }} steps: diff --git a/build.sbt b/build.sbt index 8ae45a6..2b62eb0 100644 --- a/build.sbt +++ b/build.sbt @@ -8,7 +8,7 @@ import sbtcrossproject.CrossPlugin.autoImport.{crossProject, CrossType} ThisBuild / githubWorkflowPublishTargetBranches := Seq() -ThisBuild / crossScalaVersions := Seq("2.12.14", "2.13.6", "3.0.1") +ThisBuild / crossScalaVersions := Seq("2.12.15", "2.13.6", "3.0.1") ThisBuild / githubWorkflowBuildPreamble := Seq( WorkflowStep.Run(List("sudo apt install clang libunwind-dev libgc-dev libre2-dev")) From 9891e038d30988c3c638e727955391538d24bd39 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sat, 2 Oct 2021 21:10:29 +0200 Subject: [PATCH 23/98] Update scalafmt-core to 3.0.6 --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index 433f001..f838744 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version=2.7.5 +version=3.0.6 align.openParenCallSite = true align.openParenDefnSite = true maxColumn = 120 From dfba22b976fb82b5a08a6c0a07fd86aa6b35f33b Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Wed, 6 Oct 2021 22:35:37 +0200 Subject: [PATCH 24/98] Update sbt-scalajs, scalajs-compiler, ... to 1.7.1 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index c04997d..7f35eb8 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,6 +1,6 @@ addSbtPlugin("com.github.sbt" % "sbt-release" % "1.1.0") addSbtPlugin("io.crashbox" % "sbt-gpg" % "0.2.1") -addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.7.0") +addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.7.1") addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.0") addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.10") addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.1.0") From bae92fc28d42f78bd6346741eda25f232d866760 Mon Sep 17 00:00:00 2001 From: Vasil Vasilev Date: Tue, 19 Oct 2021 21:48:57 +0200 Subject: [PATCH 25/98] Move the build over to `sbt-spiewak` --- .github/workflows/ci.yml | 7 +- .gitignore | 5 +- .scalafmt.conf | 71 ++++++++-- LICENSE | 2 +- build.sbt | 129 ++++-------------- .../scala/org/typelevel/discipline/Laws.scala | 127 +++++++++-------- .../org/typelevel/discipline/Predicate.scala | 21 +++ .../org/typelevel/discipline/LawSpec.scala | 21 +++ .../scala/org/typelevel/discipline/laws.scala | 49 +++++-- project/plugins.sbt | 4 +- version.sbt | 1 - 11 files changed, 246 insertions(+), 191 deletions(-) delete mode 100644 version.sbt diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f30a296..dccbb01 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,9 +9,9 @@ name: Continuous Integration on: pull_request: - branches: ['**'] + branches: [main] push: - branches: ['**'] + branches: [main] env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -53,5 +53,4 @@ jobs: - name: Check that workflows are up to date run: sbt ++${{ matrix.scala }} githubWorkflowCheck - - name: Build project - run: sbt ++${{ matrix.scala }} test + - run: sbt ++${{ matrix.scala }} ci diff --git a/.gitignore b/.gitignore index 9c161fa..6696cc2 100644 --- a/.gitignore +++ b/.gitignore @@ -16,4 +16,7 @@ project/plugins/project/ .*.swo .idea* -/.bsp/ +.bsp/ +.bloop/ +.metals/ +metals.sbt diff --git a/.scalafmt.conf b/.scalafmt.conf index f838744..e48dce0 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,9 +1,64 @@ -version=3.0.6 -align.openParenCallSite = true -align.openParenDefnSite = true -maxColumn = 120 -continuationIndent.defnSite = 2 +version = 3.0.6 + +runner.dialect = Scala213Source3 + +maxColumn = 96 + +includeCurlyBraceInSelectChains = true +includeNoParensInSelectChains = true + +optIn { + breakChainOnFirstMethodDot = false + forceBlankLineBeforeDocstring = true +} + +binPack { + literalArgumentLists = true + parentConstructors = Never +} + +danglingParentheses { + defnSite = false + callSite = false + ctrlSite = false + tupleSite = false + + exclude = [] +} + +newlines { + beforeCurlyLambdaParams = multilineWithCaseOnly + afterCurlyLambda = squash + implicitParamListModifierPrefer = before + sometimesBeforeColonInMethodReturnType = true +} + +align.preset = none +align.stripMargin = true + assumeStandardLibraryStripMargin = true -danglingParentheses.preset = true -rewrite.rules = [AvoidInfix, SortImports, RedundantBraces, RedundantParens, SortModifiers] -docstrings = JavaDoc + +docstrings { + style = Asterisk + oneline = unfold +} + +project.git = true + +trailingCommas = never + +rewrite { + // RedundantBraces honestly just doesn't work, otherwise I'd love to use it + rules = [PreferCurlyFors, RedundantParens, SortImports] + + redundantBraces { + maxLines = 1 + stringInterpolation = true + } +} + +rewriteTokens { + "⇒": "=>" + "→": "->" + "←": "<-" +} diff --git a/LICENSE b/LICENSE index e8ddaad..e70f452 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2013 typelevel.scala +Copyright (c) 2013-2021 Typelevel Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in diff --git a/build.sbt b/build.sbt index 685ef5a..b88471d 100644 --- a/build.sbt +++ b/build.sbt @@ -1,126 +1,51 @@ -import sbtrelease._ -import sbtrelease.ReleasePlugin._ -import sbtrelease.ReleaseStateTransformations._ -import sbtrelease.Utilities._ import sbtcrossproject.CrossPlugin.autoImport.{crossProject, CrossType} -// GHA configuration +ThisBuild / baseVersion := "1.2" -ThisBuild / githubWorkflowPublishTargetBranches := Seq() +ThisBuild / organization := "org.typelevel" +ThisBuild / organizationName := "Typelevel" -ThisBuild / crossScalaVersions := Seq("2.12.15", "2.13.6", "3.0.2") - -ThisBuild / githubWorkflowBuildPreamble := Seq( - WorkflowStep.Run(List("sudo apt install clang libunwind-dev libgc-dev libre2-dev")) +ThisBuild / developers := List( + Developer("larsrh", "Lars Hupel", "", url("https://github.com/larsrh")) ) -// Build configuration - -name := "discipline root project" +ThisBuild / crossScalaVersions := Seq("2.12.15", "2.13.6", "3.0.2") -ThisBuild / versionScheme := Some("semver-spec") +ThisBuild / githubWorkflowTargetBranches := Seq("main") -lazy val commonSettings = Seq( - organization := "org.typelevel", - name := "discipline", - scalaVersion := "2.13.6", - crossScalaVersions := (ThisBuild / crossScalaVersions).value, - scalacOptions ++= Seq( - "-deprecation", - "-feature", - "-language:implicitConversions" - ), - libraryDependencies += "org.scalacheck" %%% "scalacheck" % "1.15.4", - releaseCrossBuild := true, - releaseVcsSign := true, - releaseProcess := Seq[ReleaseStep]( - checkSnapshotDependencies, - inquireVersions, - setReleaseVersion, - commitReleaseVersion, - tagRelease, - releaseStepCommandAndRemaining(s"; + publish"), - setNextVersion, - commitNextVersion, - releaseStepCommand("sonatypeRelease") - ), - // Publishing - publishTo := version.apply { v => - val nexus = "https://oss.sonatype.org/" - if (v.trim.endsWith("SNAPSHOT")) - Some("Snapshots".at(nexus + "content/repositories/snapshots")) - else - Some("Releases".at(nexus + "service/local/staging/deploy/maven2")) - }.value, - credentials += { - Seq("build.publish.user", "build.publish.password").map(k => Option(System.getProperty(k))) match { - case Seq(Some(user), Some(pass)) => - Credentials("Sonatype Nexus Repository Manager", "oss.sonatype.org", user, pass) - case _ => - Credentials(Path.userHome / ".ivy2" / ".credentials") - } - }, - pomIncludeRepository := Function.const(false), - pomExtra := ( - https://github.com/typelevel/discipline - - - MIT - http://www.opensource.org/licenses/mit-license.php - repo - - - - https://github.com/typelevel/discipline - scm:git:git://github.com/typelevel/discipline.git - - - - larsrh - Lars Hupel - https://github.com/larsrh - - +ThisBuild / homepage := Some(url("https://github.com/typelevel/discipline")) +ThisBuild / scmInfo := Some( + ScmInfo( + url("https://github.com/typelevel/discipline"), + "git@github.com:typelevel/discipline.git" ) ) -lazy val commonNativeSettings = Seq( - crossScalaVersions := (ThisBuild / crossScalaVersions).value.filter(_.startsWith("2.")) +ThisBuild / licenses := Seq("MIT" -> url("https://opensource.org/licenses/MIT")) +ThisBuild / startYear := Some(2013) +ThisBuild / endYear := Some(2021) + +ThisBuild / githubWorkflowBuildPreamble := Seq( + WorkflowStep.Run(List("sudo apt install clang libunwind-dev libgc-dev libre2-dev")) ) -lazy val root = project +lazy val discipline = project .in(file(".")) - .settings(commonSettings) - .settings(crossScalaVersions := Seq()) - .settings(noPublishSettings) + .enablePlugins(NoPublishPlugin) .aggregate( - coreJS, - coreJVM, - coreNative + core.jvm, + core.js, + core.native ) lazy val core = crossProject(JSPlatform, JVMPlatform, NativePlatform) .crossType(CrossType.Pure) .in(file("core")) - .settings(commonSettings) .settings( - moduleName := "discipline-core" - ) - .jsSettings( - Test / scalaJSStage := FastOptStage, + name := "discipline", + moduleName := "discipline-core", + libraryDependencies += "org.scalacheck" %%% "scalacheck" % "1.15.4" ) .nativeSettings( - commonNativeSettings + crossScalaVersions := (ThisBuild / crossScalaVersions).value.filter(_.startsWith("2.")) ) - -lazy val coreJVM = core.jvm -lazy val coreJS = core.js -lazy val coreNative = core.native - -// Release plugin - -lazy val noPublishSettings = Seq( - publish := {}, - publishLocal := {}, - publishArtifact := false -) diff --git a/core/src/main/scala/org/typelevel/discipline/Laws.scala b/core/src/main/scala/org/typelevel/discipline/Laws.scala index f69cf65..3932b40 100644 --- a/core/src/main/scala/org/typelevel/discipline/Laws.scala +++ b/core/src/main/scala/org/typelevel/discipline/Laws.scala @@ -1,3 +1,24 @@ +/* + * Copyright (c) 2013-2021 Typelevel + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package org.typelevel.discipline import scala.collection.SortedMap @@ -7,68 +28,53 @@ import org.scalacheck.{Prop, Properties} /** * Root trait of the law cake. * - * Defines a wrapper around scalacheck's `Properties` ([[RuleSet]]), and some - * default implementations. + * Defines a wrapper around scalacheck's `Properties` ([[RuleSet]]), and some default + * implementations. * * Extend this trait if you want to define a set of laws. */ trait Laws { /** - * This trait abstracts over the various ways how the laws of a type class - * can depend on the laws of other type classes. An instance of this trait is - * called a ''rule set''. + * This trait abstracts over the various ways how the laws of a type class can depend on the + * laws of other type classes. An instance of this trait is called a ''rule set''. * - * For that matter, we divide type classes into ''kinds'', where the classes - * of one kind share the number of operations and meaning. For example, - * `Semigroup`, `Monoid` and `Group` all belong to the same kind. On the - * other hand, their additive variants also belong to a common kind, but to - * a different one. + * For that matter, we divide type classes into ''kinds'', where the classes of one kind share + * the number of operations and meaning. For example, `Semigroup`, `Monoid` and `Group` all + * belong to the same kind. On the other hand, their additive variants also belong to a common + * kind, but to a different one. * - * Users of this trait should extend the outer trait [[Laws]] and create - * specialized subtypes for each kind of type class. (See - * [[DefaultRuleSet]] for an example.) + * Users of this trait should extend the outer trait [[Laws]] and create specialized subtypes + * for each kind of type class. (See [[DefaultRuleSet]] for an example.) * - * Consider this example hierarchy: - * 
-   * Semigroup
-   *     |   \
-   *  Monoid   AdditiveSemigroup
-   *     |   \        |
-   *  Group     AdditiveMonoid
-   *         \        |
-   *            AdditiveGroup
-   *
- * They all define their own laws, as well as a couple of parent classes. - * If we want to check the laws of `AdditiveGroup`, we want to avoid checking - * properties twice, i.e. do not want to check `Monoid` laws via `Group` and + * Consider this example hierarchy: 
 Semigroup
+   * | \ Monoid AdditiveSemigroup
+   * | \ | Group AdditiveMonoid \ | AdditiveGroup
They all define their own laws, as well + * as a couple of parent classes. If we want to check the laws of `AdditiveGroup`, we want to + * avoid checking properties twice, i.e. do not want to check `Monoid` laws via `Group` and * also via `AdditiveMonoid`. * - * To address this problem, we define the parent in the same kind as - * ''parent'', and other parents as ''bases''. In this example, the parent of - * `AdditiveGroup` is `AdditiveMonoid`, and its only basis is `Group`. On the other - * hand, the parent of `Group` is `Monoid`, and it does not have any bases. + * To address this problem, we define the parent in the same kind as ''parent'', and other + * parents as ''bases''. In this example, the parent of `AdditiveGroup` is `AdditiveMonoid`, + * and its only basis is `Group`. On the other hand, the parent of `Group` is `Monoid`, and it + * does not have any bases. * - * The set of all properties of a certain class is now defined as union of - * these sets: - * - the properties of the class itself - * - recursively, the properties of all its parents (ignoring their bases) - * - recursively, the set of ''all'' properties of its bases + * The set of all properties of a certain class is now defined as union of these sets: + * - the properties of the class itself + * - recursively, the properties of all its parents (ignoring their bases) + * - recursively, the set of ''all'' properties of its bases * - * Looking at our example, that means that `AdditiveGroup` includes the - * `Monoid` law only once, because it is the parent of its basis. The - * same laws are ignored by its parent `AdditiveMonoid`, hence no redundant - * checks occur. + * Looking at our example, that means that `AdditiveGroup` includes the `Monoid` law only + * once, because it is the parent of its basis. The same laws are ignored by its parent + * `AdditiveMonoid`, hence no redundant checks occur. * - * Of course, classes can have multiple parents and multiple (named) bases. - * The only requirement here is that ''inside one kind'', the identifier of - * a property is unique, since duplicates are eliminated. To avoid name - * clashes ''between different kinds'', the names of properties pulled in - * via a basis are prefixed with the name of the basis. + * Of course, classes can have multiple parents and multiple (named) bases. The only + * requirement here is that ''inside one kind'', the identifier of a property is unique, since + * duplicates are eliminated. To avoid name clashes ''between different kinds'', the names of + * properties pulled in via a basis are prefixed with the name of the basis. * - * For better type-safety, ''parents'' are only allowed to come from the - * same outer instance of [[Laws]], whereas ''bases'' are allowed to come - * from anywhere. + * For better type-safety, ''parents'' are only allowed to come from the same outer instance + * of [[Laws]], whereas ''bases'' are allowed to come from anywhere. */ trait RuleSet { def name: String @@ -79,13 +85,15 @@ trait Laws { private def collectParentProps: SortedMap[String, Prop] = SortedMap(props: _*) ++ parents.flatMap(_.collectParentProps) - /** Assembles all properties. For the rules, see [[RuleSet]]. */ + /** + * Assembles all properties. For the rules, see [[RuleSet]]. + */ final def all: Properties = new AllProperties(name, bases, collectParentProps) } /** - * Convenience trait to mix into subclasses of [[RuleSet]] for - * rule sets which only have one parent. + * Convenience trait to mix into subclasses of [[RuleSet]] for rule sets which only have one + * parent. */ trait HasOneParent { self: RuleSet => def parent: Option[RuleSet] @@ -97,9 +105,9 @@ trait Laws { * Convenience class for rule sets which may have a parent, but no bases. */ class DefaultRuleSet( - val name: String, - val parent: Option[RuleSet], - val props: (String, Prop)* + val name: String, + val parent: Option[RuleSet], + val props: (String, Prop)* ) extends RuleSet with HasOneParent { val bases = Seq.empty @@ -109,11 +117,13 @@ trait Laws { * Convenience class for rule sets without parents and bases. */ class SimpleRuleSet( - name: String, - props: (String, Prop)* + name: String, + props: (String, Prop)* ) extends DefaultRuleSet(name, None, props: _*) - /** Empty rule set. */ + /** + * Empty rule set. + */ def emptyRuleSet: RuleSet = new SimpleRuleSet( name = "" @@ -121,7 +131,10 @@ trait Laws { } -class AllProperties(name: String, bases: Seq[(String, Laws#RuleSet)], collectParentProps: => SortedMap[String, Prop]) +class AllProperties( + name: String, + bases: Seq[(String, Laws#RuleSet)], + collectParentProps: => SortedMap[String, Prop]) extends Properties(name) { for { (baseName, baseProps) <- bases.sortBy(_._1) diff --git a/core/src/main/scala/org/typelevel/discipline/Predicate.scala b/core/src/main/scala/org/typelevel/discipline/Predicate.scala index 3db7392..dbe8d50 100644 --- a/core/src/main/scala/org/typelevel/discipline/Predicate.scala +++ b/core/src/main/scala/org/typelevel/discipline/Predicate.scala @@ -1,3 +1,24 @@ +/* + * Copyright (c) 2013-2021 Typelevel + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package org.typelevel.discipline trait Predicate[A] extends (A => Boolean) { diff --git a/core/src/test/scala/org/typelevel/discipline/LawSpec.scala b/core/src/test/scala/org/typelevel/discipline/LawSpec.scala index f546f0f..ffce644 100644 --- a/core/src/test/scala/org/typelevel/discipline/LawSpec.scala +++ b/core/src/test/scala/org/typelevel/discipline/LawSpec.scala @@ -1,3 +1,24 @@ +/* + * Copyright (c) 2013-2021 Typelevel + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package org.typelevel.discipline import org.scalacheck._ diff --git a/core/src/test/scala/org/typelevel/discipline/laws.scala b/core/src/test/scala/org/typelevel/discipline/laws.scala index 3ddd5f0..8015ff9 100644 --- a/core/src/test/scala/org/typelevel/discipline/laws.scala +++ b/core/src/test/scala/org/typelevel/discipline/laws.scala @@ -1,3 +1,24 @@ +/* + * Copyright (c) 2013-2021 Typelevel + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package org.typelevel.discipline import org.scalacheck.Prop @@ -50,15 +71,15 @@ trait GroupLaws extends Laws { ) class GroupProperties( - name: String, - parent: Option[RuleSet], - props: (String, Prop)* + name: String, + parent: Option[RuleSet], + props: (String, Prop)* ) extends DefaultRuleSet(name, parent, props: _*) class AdditiveProperties( - val base: GroupProperties, - val parent: Option[RuleSet], - val props: (String, Prop)* + val base: GroupProperties, + val parent: Option[RuleSet], + val props: (String, Prop)* ) extends RuleSet with HasOneParent { val name = base.name @@ -122,9 +143,9 @@ object RingLaws extends GroupLaws { ) class MultiplicativeProperties( - val base: GroupLaws => GroupLaws#GroupProperties, - val parent: Option[MultiplicativeProperties], - val props: (String, Prop)* + val base: GroupLaws => GroupLaws#GroupProperties, + val parent: Option[MultiplicativeProperties], + val props: (String, Prop)* ) extends RuleSet with HasOneParent { private val _base = base(RingLaws.this) @@ -134,11 +155,11 @@ object RingLaws extends GroupLaws { } class RingProperties( - val name: String, - val al: AdditiveProperties, - val ml: MultiplicativeProperties, - val parents: Seq[RingProperties], - val props: (String, Prop)* + val name: String, + val al: AdditiveProperties, + val ml: MultiplicativeProperties, + val parents: Seq[RingProperties], + val props: (String, Prop)* ) extends RuleSet { def bases = Seq("additive" -> al, "multiplicative" -> ml) } diff --git a/project/plugins.sbt b/project/plugins.sbt index 7f35eb8..c9d8179 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,9 +1,7 @@ addSbtPlugin("com.github.sbt" % "sbt-release" % "1.1.0") -addSbtPlugin("io.crashbox" % "sbt-gpg" % "0.2.1") addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.7.1") addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.0") -addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.10") addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.1.0") addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.1.0") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.3") -addSbtPlugin("com.codecommit" % "sbt-github-actions" % "0.13.0") +addSbtPlugin("com.codecommit" % "sbt-spiewak-sonatype" % "0.22.1") diff --git a/version.sbt b/version.sbt deleted file mode 100644 index 40dd015..0000000 --- a/version.sbt +++ /dev/null @@ -1 +0,0 @@ -ThisBuild / version := "1.1.6-SNAPSHOT" From d1da602cd0b0179fc8d8f24654e73abd14a09955 Mon Sep 17 00:00:00 2001 From: Vasil Vasilev Date: Tue, 19 Oct 2021 21:59:58 +0200 Subject: [PATCH 26/98] Switch to the typelevel JDK index --- .github/workflows/ci.yml | 3 ++- build.sbt | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dccbb01..e3b283d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,6 +15,7 @@ on: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + JABBA_INDEX: 'https://github.com/typelevel/jdk-index/raw/main/index.json' jobs: build: @@ -23,7 +24,7 @@ jobs: matrix: os: [ubuntu-latest] scala: [2.12.15, 2.13.6, 3.0.2] - java: [adopt@1.8] + java: [adoptium@8] runs-on: ${{ matrix.os }} steps: - name: Checkout current branch (full) diff --git a/build.sbt b/build.sbt index b88471d..ad22e04 100644 --- a/build.sbt +++ b/build.sbt @@ -11,6 +11,9 @@ ThisBuild / developers := List( ThisBuild / crossScalaVersions := Seq("2.12.15", "2.13.6", "3.0.2") +ThisBuild / githubWorkflowJavaVersions := Seq("adoptium@8") +ThisBuild / githubWorkflowEnv += ("JABBA_INDEX" -> "https://github.com/typelevel/jdk-index/raw/main/index.json") + ThisBuild / githubWorkflowTargetBranches := Seq("main") ThisBuild / homepage := Some(url("https://github.com/typelevel/discipline")) From 1fb40d1af0f9776718d9ec6f5de2ddbfc318f997 Mon Sep 17 00:00:00 2001 From: Vasil Vasilev Date: Tue, 19 Oct 2021 22:15:51 +0200 Subject: [PATCH 27/98] Do not install native tools --- .github/workflows/ci.yml | 2 -- build.sbt | 4 ---- 2 files changed, 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e3b283d..b70385a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -49,8 +49,6 @@ jobs: ~/Library/Caches/Coursier/v1 key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }} - - run: sudo apt install clang libunwind-dev libgc-dev libre2-dev - - name: Check that workflows are up to date run: sbt ++${{ matrix.scala }} githubWorkflowCheck diff --git a/build.sbt b/build.sbt index ad22e04..de9e97a 100644 --- a/build.sbt +++ b/build.sbt @@ -28,10 +28,6 @@ ThisBuild / licenses := Seq("MIT" -> url("https://opensource.org/licenses/MIT")) ThisBuild / startYear := Some(2013) ThisBuild / endYear := Some(2021) -ThisBuild / githubWorkflowBuildPreamble := Seq( - WorkflowStep.Run(List("sudo apt install clang libunwind-dev libgc-dev libre2-dev")) -) - lazy val discipline = project .in(file(".")) .enablePlugins(NoPublishPlugin) From f3f6ce1fb36c6b778f51b546da1488ce9bce41a6 Mon Sep 17 00:00:00 2001 From: Vasil Vasilev Date: Tue, 19 Oct 2021 22:31:23 +0200 Subject: [PATCH 28/98] Remove `sbt-release` --- project/plugins.sbt | 1 - 1 file changed, 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index c9d8179..2a40ab8 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,4 +1,3 @@ -addSbtPlugin("com.github.sbt" % "sbt-release" % "1.1.0") addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.7.1") addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.0") addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.1.0") From ed76a248b595c11763744b6a5e5d4377a1a83ea8 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Thu, 21 Oct 2021 03:22:56 +0200 Subject: [PATCH 29/98] Update scalafmt-core to 3.0.7 --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index e48dce0..e04e23b 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = 3.0.6 +version = 3.0.7 runner.dialect = Scala213Source3 From 230eb3e7d5d9535df69a752f2c5b89afe5e53696 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Thu, 21 Oct 2021 19:16:06 +0200 Subject: [PATCH 30/98] Update auxlib, javalib, nativelib, nscplugin, ... to 0.4.1 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 2a40ab8..a818432 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,5 +1,5 @@ addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.7.1") -addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.0") +addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.1") addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.1.0") addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.1.0") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.3") From b98ee76cab16d3a8866e60e442f478aabb5281ea Mon Sep 17 00:00:00 2001 From: Vasil Vasilev Date: Fri, 22 Oct 2021 10:54:43 +0200 Subject: [PATCH 31/98] Towards 1.3 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index de9e97a..b2b5440 100644 --- a/build.sbt +++ b/build.sbt @@ -1,6 +1,6 @@ import sbtcrossproject.CrossPlugin.autoImport.{crossProject, CrossType} -ThisBuild / baseVersion := "1.2" +ThisBuild / baseVersion := "1.3" ThisBuild / organization := "org.typelevel" ThisBuild / organizationName := "Typelevel" From 06009bd2cf0798598780bb166d8fbd12f0b9b7be Mon Sep 17 00:00:00 2001 From: Vasil Vasilev Date: Fri, 22 Oct 2021 11:03:55 +0200 Subject: [PATCH 32/98] Readme updates --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 932593c..baff4fc 100644 --- a/README.md +++ b/README.md @@ -10,13 +10,13 @@ Flexible law checking for Scala Usage ----- -This library is currently available for Scala binary versions 2.11, 2.12, and 2.13. +This library is currently available for Scala binary versions 2.12, 2.13 and 3.0. To use the latest version, include the following in your `build.sbt`: ```scala libraryDependencies += - "org.typelevel" %% "discipline-core" % "1.0.0" + "org.typelevel" %% "discipline-core" % "1.2.0" ``` For a little more info see the ["Law Enforcement using Discipline"](https://typelevel.org/blog/2013/11/17/discipline.html) blog post. @@ -24,7 +24,7 @@ For a little more info see the ["Law Enforcement using Discipline"](https://type Binding to test frameworks -------------------------- -Discipline is built against ScalaCheck 1.14.x. There is also a published artifact for scala.js. +Discipline is built against ScalaCheck 1.15.x. There is also a published artifact for Scala.js and Scala Native. `discipline-core` is required early each Scala release cycle, so we have chosen to keep this repo minimal. Starting with v1.0.0, please find the framework bindings in their new locations: From 1a6ad49c4796e4810ba9ac6d62f842957410c8a8 Mon Sep 17 00:00:00 2001 From: Vasil Vasilev Date: Fri, 22 Oct 2021 11:10:44 +0200 Subject: [PATCH 33/98] Update Scala to 3.1.0 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index b2b5440..6b67d9f 100644 --- a/build.sbt +++ b/build.sbt @@ -9,7 +9,7 @@ ThisBuild / developers := List( Developer("larsrh", "Lars Hupel", "", url("https://github.com/larsrh")) ) -ThisBuild / crossScalaVersions := Seq("2.12.15", "2.13.6", "3.0.2") +ThisBuild / crossScalaVersions := Seq("2.12.15", "2.13.6", "3.1.0") ThisBuild / githubWorkflowJavaVersions := Seq("adoptium@8") ThisBuild / githubWorkflowEnv += ("JABBA_INDEX" -> "https://github.com/typelevel/jdk-index/raw/main/index.json") From 919b4f26795445551d98ab3c2c8610f2dd894487 Mon Sep 17 00:00:00 2001 From: Vasil Vasilev Date: Fri, 22 Oct 2021 11:12:45 +0200 Subject: [PATCH 34/98] Regenerate workflows --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b70385a..46baac9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,7 +23,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - scala: [2.12.15, 2.13.6, 3.0.2] + scala: [2.12.15, 2.13.6, 3.1.0] java: [adoptium@8] runs-on: ${{ matrix.os }} steps: From 2957b6a2c7124a16d81f85b6faeb2b0effc6df72 Mon Sep 17 00:00:00 2001 From: Vasil Vasilev Date: Fri, 22 Oct 2021 11:47:17 +0200 Subject: [PATCH 35/98] Update version labels --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index baff4fc..c764168 100644 --- a/README.md +++ b/README.md @@ -10,13 +10,13 @@ Flexible law checking for Scala Usage ----- -This library is currently available for Scala binary versions 2.12, 2.13 and 3.0. +This library is currently available for Scala binary versions 2.12, 2.13 and 3.1. To use the latest version, include the following in your `build.sbt`: ```scala libraryDependencies += - "org.typelevel" %% "discipline-core" % "1.2.0" + "org.typelevel" %% "discipline-core" % "1.3.0" ``` For a little more info see the ["Law Enforcement using Discipline"](https://typelevel.org/blog/2013/11/17/discipline.html) blog post. @@ -24,7 +24,7 @@ For a little more info see the ["Law Enforcement using Discipline"](https://type Binding to test frameworks -------------------------- -Discipline is built against ScalaCheck 1.15.x. There is also a published artifact for Scala.js and Scala Native. +Discipline is built against ScalaCheck 1.15.x. There is also a published artifact for Scala.js and Scala Native 0.4.1. `discipline-core` is required early each Scala release cycle, so we have chosen to keep this repo minimal. Starting with v1.0.0, please find the framework bindings in their new locations: From 8811209159f8df0ff8622486661f4e6868be79d1 Mon Sep 17 00:00:00 2001 From: Vasil Vasilev Date: Fri, 22 Oct 2021 11:53:37 +0200 Subject: [PATCH 36/98] Add vscode to gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 6696cc2..90be6ac 100644 --- a/.gitignore +++ b/.gitignore @@ -15,6 +15,7 @@ project/plugins/project/ .*.swp .*.swo .idea* +.vscode/ .bsp/ .bloop/ From d33b0819017187f56989592dbc51d9c6913bc940 Mon Sep 17 00:00:00 2001 From: Vasil Vasilev Date: Fri, 22 Oct 2021 11:58:31 +0200 Subject: [PATCH 37/98] Add a maven badge --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index c764168..f7e5ae2 100644 --- a/README.md +++ b/README.md @@ -3,6 +3,7 @@ discipline [![Join the chat at https://gitter.im/typelevel/discipline](https://badges.gitter.im/typelevel/discipline.svg)](https://gitter.im/typelevel/discipline?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) ![Continuous Integration](https://github.com/typelevel/discipline/workflows/Continuous%20Integration/badge.svg) +[![Maven Central](https://maven-badges.herokuapp.com/maven-central/org.typelevel/discipline-core_2.13/badge.svg)](https://maven-badges.herokuapp.com/maven-central/org.typelevel/discipline-core_2.13) Flexible law checking for Scala From 58c092e167027af2f14a503515f2802359f2e4f5 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sat, 30 Oct 2021 08:20:39 +0200 Subject: [PATCH 38/98] Update scalafmt-core to 3.0.8 --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index e04e23b..89fbcaf 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = 3.0.7 +version = 3.0.8 runner.dialect = Scala213Source3 From 774a04cf3ec41e9b089bd1f5f8ad0f7ed3377306 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Mon, 1 Nov 2021 20:46:55 +0100 Subject: [PATCH 39/98] Update scala-library to 2.13.7 --- .github/workflows/ci.yml | 2 +- build.sbt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 46baac9..e9880d0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,7 +23,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - scala: [2.12.15, 2.13.6, 3.1.0] + scala: [2.12.15, 2.13.7, 3.1.0] java: [adoptium@8] runs-on: ${{ matrix.os }} steps: diff --git a/build.sbt b/build.sbt index 6b67d9f..baaac17 100644 --- a/build.sbt +++ b/build.sbt @@ -9,7 +9,7 @@ ThisBuild / developers := List( Developer("larsrh", "Lars Hupel", "", url("https://github.com/larsrh")) ) -ThisBuild / crossScalaVersions := Seq("2.12.15", "2.13.6", "3.1.0") +ThisBuild / crossScalaVersions := Seq("2.12.15", "2.13.7", "3.1.0") ThisBuild / githubWorkflowJavaVersions := Seq("adoptium@8") ThisBuild / githubWorkflowEnv += ("JABBA_INDEX" -> "https://github.com/typelevel/jdk-index/raw/main/index.json") From 53296264ea84e8df070e0275f5d1f37483fc9544 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Wed, 10 Nov 2021 05:15:42 +0100 Subject: [PATCH 40/98] Update scalafmt-core to 3.1.0 --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index 89fbcaf..7574e3b 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = 3.0.8 +version = 3.1.0 runner.dialect = Scala213Source3 From 7a53a03d255311acb673816e3c86fcd39dcee0c0 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sat, 13 Nov 2021 02:48:51 +0100 Subject: [PATCH 41/98] Update scalafmt-core to 3.1.1 --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index 7574e3b..c30f7d0 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = 3.1.0 +version = 3.1.1 runner.dialect = Scala213Source3 From b649bbbe7df1b9c411749c2ef753e0b25a2c977c Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Fri, 19 Nov 2021 10:04:00 +0100 Subject: [PATCH 42/98] Update sbt-scalafmt to 2.4.4 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index a818432..27efd28 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -2,5 +2,5 @@ addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.7.1") addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.1") addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.1.0") addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.1.0") -addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.3") +addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.4") addSbtPlugin("com.codecommit" % "sbt-spiewak-sonatype" % "0.22.1") From 514a0ec4685800326965b8097a5133b95d25ea58 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Mon, 22 Nov 2021 19:06:14 +0100 Subject: [PATCH 43/98] Update scalafmt-core to 3.1.2 --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index c30f7d0..70277da 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = 3.1.1 +version = 3.1.2 runner.dialect = Scala213Source3 From 667bc9f924eec8e26fee1f7efec1c86f02c27a9b Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Tue, 30 Nov 2021 14:08:11 +0100 Subject: [PATCH 44/98] Update scalafmt-core to 3.2.0 --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index 70277da..7dbcfd9 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = 3.1.2 +version = 3.2.0 runner.dialect = Scala213Source3 From 0e91af115be78b550bfb8af95178dc6ccf09ac9c Mon Sep 17 00:00:00 2001 From: Vasil Vasilev Date: Thu, 2 Dec 2021 11:03:31 +0100 Subject: [PATCH 45/98] Update sbt-spiewak-sonatype to 0.23.0 --- .github/workflows/ci.yml | 11 ++++++----- build.sbt | 3 +-- project/plugins.sbt | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e9880d0..14768ae 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,7 +15,6 @@ on: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - JABBA_INDEX: 'https://github.com/typelevel/jdk-index/raw/main/index.json' jobs: build: @@ -24,7 +23,7 @@ jobs: matrix: os: [ubuntu-latest] scala: [2.12.15, 2.13.7, 3.1.0] - java: [adoptium@8] + java: [temurin@8] runs-on: ${{ matrix.os }} steps: - name: Checkout current branch (full) @@ -32,10 +31,12 @@ jobs: with: fetch-depth: 0 - - name: Setup Java and Scala - uses: olafurpg/setup-scala@v13 + - name: Setup Java (temurin@8) + if: matrix.java == 'temurin@8' + uses: actions/setup-java@v2 with: - java-version: ${{ matrix.java }} + distribution: temurin + java-version: 8 - name: Cache sbt uses: actions/cache@v2 diff --git a/build.sbt b/build.sbt index baaac17..c88ed94 100644 --- a/build.sbt +++ b/build.sbt @@ -11,8 +11,7 @@ ThisBuild / developers := List( ThisBuild / crossScalaVersions := Seq("2.12.15", "2.13.7", "3.1.0") -ThisBuild / githubWorkflowJavaVersions := Seq("adoptium@8") -ThisBuild / githubWorkflowEnv += ("JABBA_INDEX" -> "https://github.com/typelevel/jdk-index/raw/main/index.json") +ThisBuild / githubWorkflowJavaVersions := Seq(JavaSpec.temurin("8")) ThisBuild / githubWorkflowTargetBranches := Seq("main") diff --git a/project/plugins.sbt b/project/plugins.sbt index 27efd28..543c4b4 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -3,4 +3,4 @@ addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.1") addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.1.0") addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.1.0") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.4") -addSbtPlugin("com.codecommit" % "sbt-spiewak-sonatype" % "0.22.1") +addSbtPlugin("com.codecommit" % "sbt-spiewak-sonatype" % "0.23.0") From 3dcecba5c94ad8b10f4e637e7a4e30e9ea843298 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Fri, 3 Dec 2021 18:01:25 +0100 Subject: [PATCH 46/98] Update scalafmt-core to 3.2.1 --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index 7dbcfd9..4354c16 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = 3.2.0 +version = 3.2.1 runner.dialect = Scala213Source3 From 9f855419b25cfa006521a8d4a42c91234458b89f Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sat, 4 Dec 2021 06:29:25 +0100 Subject: [PATCH 47/98] Update sbt-scalafmt to 2.4.5 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 543c4b4..dce05d2 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -2,5 +2,5 @@ addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.7.1") addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.1") addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.1.0") addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.1.0") -addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.4") +addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.5") addSbtPlugin("com.codecommit" % "sbt-spiewak-sonatype" % "0.23.0") From aaf6f984e1cf177f45252d6b18264645fb3d16c4 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Mon, 6 Dec 2021 19:55:53 +0100 Subject: [PATCH 48/98] Update auxlib, javalib, nativelib, nscplugin, ... to 0.4.2 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index dce05d2..1fbc0a5 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,5 +1,5 @@ addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.7.1") -addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.1") +addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.2") addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.1.0") addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.1.0") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.5") From 544d71b9f80d39808a34540040b9d8800ca9aefc Mon Sep 17 00:00:00 2001 From: Vasil Vasilev Date: Tue, 7 Dec 2021 15:11:30 +0100 Subject: [PATCH 49/98] Getting ready for 1.4 and easier maintenance --- .github/workflows/ci.yml | 2 +- build.sbt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 14768ae..32d5c0d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,7 +22,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - scala: [2.12.15, 2.13.7, 3.1.0] + scala: [2.12.15, 2.13.7, 3.0.2] java: [temurin@8] runs-on: ${{ matrix.os }} steps: diff --git a/build.sbt b/build.sbt index c88ed94..7acb4eb 100644 --- a/build.sbt +++ b/build.sbt @@ -1,6 +1,6 @@ import sbtcrossproject.CrossPlugin.autoImport.{crossProject, CrossType} -ThisBuild / baseVersion := "1.3" +ThisBuild / baseVersion := "1.4" ThisBuild / organization := "org.typelevel" ThisBuild / organizationName := "Typelevel" @@ -9,7 +9,7 @@ ThisBuild / developers := List( Developer("larsrh", "Lars Hupel", "", url("https://github.com/larsrh")) ) -ThisBuild / crossScalaVersions := Seq("2.12.15", "2.13.7", "3.1.0") +ThisBuild / crossScalaVersions := Seq("2.12.15", "2.13.7", "3.0.2") ThisBuild / githubWorkflowJavaVersions := Seq(JavaSpec.temurin("8")) From 543f63f75b11ef643a957d5bbabfb04e76feb624 Mon Sep 17 00:00:00 2001 From: Vasil Vasilev Date: Tue, 7 Dec 2021 15:30:02 +0100 Subject: [PATCH 50/98] Update version labels --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index f7e5ae2..df677aa 100644 --- a/README.md +++ b/README.md @@ -11,13 +11,13 @@ Flexible law checking for Scala Usage ----- -This library is currently available for Scala binary versions 2.12, 2.13 and 3.1. +This library is currently available for Scala binary versions 2.12, 2.13 and 3.0. To use the latest version, include the following in your `build.sbt`: ```scala libraryDependencies += - "org.typelevel" %% "discipline-core" % "1.3.0" + "org.typelevel" %% "discipline-core" % "1.4.0" ``` For a little more info see the ["Law Enforcement using Discipline"](https://typelevel.org/blog/2013/11/17/discipline.html) blog post. @@ -25,7 +25,7 @@ For a little more info see the ["Law Enforcement using Discipline"](https://type Binding to test frameworks -------------------------- -Discipline is built against ScalaCheck 1.15.x. There is also a published artifact for Scala.js and Scala Native 0.4.1. +Discipline is built against ScalaCheck 1.15.x. There is also a published artifact for Scala.js and Scala Native 0.4.2. `discipline-core` is required early each Scala release cycle, so we have chosen to keep this repo minimal. Starting with v1.0.0, please find the framework bindings in their new locations: From c2522616f87b8d4c50a65c18ebb29a4dd33752e8 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Fri, 10 Dec 2021 14:13:01 +0100 Subject: [PATCH 51/98] Update sbt to 1.5.6 --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index 10fd9ee..bb3a9b7 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.5.5 +sbt.version=1.5.6 From 371a4a36ef50834ad69661473f28412afebbe888 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Wed, 15 Dec 2021 15:14:40 +0100 Subject: [PATCH 52/98] Update sbt to 1.5.7 --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index bb3a9b7..baf5ff3 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.5.6 +sbt.version=1.5.7 From cf05b316056e287ea1ee7b0b14769435b6da9606 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Tue, 21 Dec 2021 10:05:52 +0100 Subject: [PATCH 53/98] Update sbt to 1.5.8 --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index baf5ff3..e64c208 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.5.7 +sbt.version=1.5.8 From 7f278a1b7bda015dd1933e0de13fea12dbeb6cbd Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Thu, 23 Dec 2021 22:32:23 +0100 Subject: [PATCH 54/98] Update scalafmt-core to 3.2.2 --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index 4354c16..35f79cc 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = 3.2.1 +version = 3.2.2 runner.dialect = Scala213Source3 From d6bffdcd197b75ae7ff8fa7e4befef17293883af Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sat, 25 Dec 2021 13:32:10 +0100 Subject: [PATCH 55/98] Update sbt-scalafmt to 2.4.6 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 1fbc0a5..f6bf6dd 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -2,5 +2,5 @@ addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.7.1") addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.2") addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.1.0") addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.1.0") -addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.5") +addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.6") addSbtPlugin("com.codecommit" % "sbt-spiewak-sonatype" % "0.23.0") From 41b1edd1347714761e5af67484cd8e8be9c226de Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Mon, 27 Dec 2021 04:39:41 +0100 Subject: [PATCH 56/98] Update sbt to 1.6.0 --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index e64c208..1e70b0c 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.5.8 +sbt.version=1.6.0 From 09bb461f70dbda22dad8ae61196bfca2096e4df0 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Wed, 29 Dec 2021 10:07:39 +0100 Subject: [PATCH 57/98] Update sbt to 1.6.1 --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index 1e70b0c..3161d21 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.6.0 +sbt.version=1.6.1 From 676c2c9eb50eb2f9095bb7dcfc04644bc1e8f520 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sun, 2 Jan 2022 09:42:51 +0100 Subject: [PATCH 58/98] Update scalafmt-core to 3.3.1 --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index 35f79cc..9da30e6 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = 3.2.2 +version = 3.3.1 runner.dialect = Scala213Source3 From 690bd67209ee826b4b13e6097bb8f71a2456c1d5 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Thu, 13 Jan 2022 21:42:47 +0100 Subject: [PATCH 59/98] Update scala-library to 2.13.8 --- .github/workflows/ci.yml | 2 +- build.sbt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 32d5c0d..0fac554 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,7 +22,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - scala: [2.12.15, 2.13.7, 3.0.2] + scala: [2.12.15, 2.13.8, 3.0.2] java: [temurin@8] runs-on: ${{ matrix.os }} steps: diff --git a/build.sbt b/build.sbt index 7acb4eb..b9c43bc 100644 --- a/build.sbt +++ b/build.sbt @@ -9,7 +9,7 @@ ThisBuild / developers := List( Developer("larsrh", "Lars Hupel", "", url("https://github.com/larsrh")) ) -ThisBuild / crossScalaVersions := Seq("2.12.15", "2.13.7", "3.0.2") +ThisBuild / crossScalaVersions := Seq("2.12.15", "2.13.8", "3.0.2") ThisBuild / githubWorkflowJavaVersions := Seq(JavaSpec.temurin("8")) From 0cc2672eac0d790b8fa2cd39ced3ff133188c4c5 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Thu, 20 Jan 2022 07:34:56 +0100 Subject: [PATCH 60/98] Update scalafmt-core to 3.3.2 --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index 9da30e6..30cd948 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = 3.3.1 +version = 3.3.2 runner.dialect = Scala213Source3 From 225561fa387b062294ac866a2d2e103c30fc1e2d Mon Sep 17 00:00:00 2001 From: Arman Bilge Date: Thu, 20 Jan 2022 17:11:54 +0000 Subject: [PATCH 61/98] Migrate to sbt-typelevel --- .github/workflows/ci.yml | 123 +++++++++++++++++++++++++++++++++++++-- build.sbt | 32 ++-------- project/plugins.sbt | 4 +- 3 files changed, 124 insertions(+), 35 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0fac554..e2bec98 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,11 +9,16 @@ name: Continuous Integration on: pull_request: - branches: [main] + branches: ['**'] push: - branches: [main] + branches: ['**'] + tags: [v*] env: + PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }} + SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }} + SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }} + PGP_SECRET: ${{ secrets.PGP_SECRET }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} jobs: @@ -24,6 +29,7 @@ jobs: os: [ubuntu-latest] scala: [2.12.15, 2.13.8, 3.0.2] java: [temurin@8] + project: [rootJS, rootJVM, rootNative] runs-on: ${{ matrix.os }} steps: - name: Checkout current branch (full) @@ -51,6 +57,115 @@ jobs: key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }} - name: Check that workflows are up to date - run: sbt ++${{ matrix.scala }} githubWorkflowCheck + run: sbt 'project ${{ matrix.project }}' '++${{ matrix.scala }}' 'project /' githubWorkflowCheck - - run: sbt ++${{ matrix.scala }} ci + - name: Check headers and formatting + run: sbt 'project ${{ matrix.project }}' '++${{ matrix.scala }}' headerCheckAll scalafmtCheckAll 'project /' scalafmtSbtCheck + + - name: fastOptJS + if: matrix.project == 'rootJS' + run: sbt 'project ${{ matrix.project }}' '++${{ matrix.scala }}' Test/fastOptJS + + - name: nativeLink + if: matrix.project == 'rootNative' + run: sbt 'project ${{ matrix.project }}' '++${{ matrix.scala }}' Test/nativeLink + + - name: Test + run: sbt 'project ${{ matrix.project }}' '++${{ matrix.scala }}' test + + - name: Check binary compatibility + run: sbt 'project ${{ matrix.project }}' '++${{ matrix.scala }}' mimaReportBinaryIssues + + - name: Generate API documentation + run: sbt 'project ${{ matrix.project }}' '++${{ matrix.scala }}' doc + + - name: Make target directories + run: mkdir -p target .js/target core/.native/target core/.js/target core/.jvm/target .jvm/target .native/target project/target + + - name: Compress target directories + run: tar cf targets.tar target .js/target core/.native/target core/.js/target core/.jvm/target .jvm/target .native/target project/target + + - name: Upload target directories + uses: actions/upload-artifact@v2 + with: + name: target-${{ matrix.os }}-${{ matrix.scala }}-${{ matrix.java }} + path: targets.tar + + publish: + name: Publish Artifacts + needs: [build] + if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main') + strategy: + matrix: + os: [ubuntu-latest] + scala: [3.0.2] + java: [temurin@8] + runs-on: ${{ matrix.os }} + steps: + - name: Checkout current branch (full) + uses: actions/checkout@v2 + with: + fetch-depth: 0 + + - name: Setup Java (temurin@8) + if: matrix.java == 'temurin@8' + uses: actions/setup-java@v2 + with: + distribution: temurin + java-version: 8 + + - name: Cache sbt + uses: actions/cache@v2 + with: + path: | + ~/.sbt + ~/.ivy2/cache + ~/.coursier/cache/v1 + ~/.cache/coursier/v1 + ~/AppData/Local/Coursier/Cache/v1 + ~/Library/Caches/Coursier/v1 + key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }} + + - name: Download target directories (2.12.15) + uses: actions/download-artifact@v2 + with: + name: target-${{ matrix.os }}-2.12.15-${{ matrix.java }} + + - name: Inflate target directories (2.12.15) + run: | + tar xf targets.tar + rm targets.tar + + - name: Download target directories (2.13.8) + uses: actions/download-artifact@v2 + with: + name: target-${{ matrix.os }}-2.13.8-${{ matrix.java }} + + - name: Inflate target directories (2.13.8) + run: | + tar xf targets.tar + rm targets.tar + + - name: Download target directories (3.0.2) + uses: actions/download-artifact@v2 + with: + name: target-${{ matrix.os }}-3.0.2-${{ matrix.java }} + + - name: Inflate target directories (3.0.2) + run: | + tar xf targets.tar + rm targets.tar + + - name: Import signing key + if: env.PGP_SECRET != '' && env.PGP_PASSPHRASE == '' + run: echo $PGP_SECRET | base64 -d | gpg --import + + - name: Import signing key and strip passphrase + if: env.PGP_SECRET != '' && env.PGP_PASSPHRASE != '' + run: | + echo "$PGP_SECRET" | base64 -d > /tmp/signing-key.gpg + echo "$PGP_PASSPHRASE" | gpg --pinentry-mode loopback --passphrase-fd 0 --import /tmp/signing-key.gpg + (echo "$PGP_PASSPHRASE"; echo; echo) | gpg --command-fd 0 --pinentry-mode loopback --change-passphrase $(gpg --list-secret-keys --with-colons 2> /dev/null | grep '^sec:' | cut --delimiter ':' --fields 5 | tail -n 1) + + - name: Publish + run: sbt '++${{ matrix.scala }}' tlRelease diff --git a/build.sbt b/build.sbt index b9c43bc..42fc5d5 100644 --- a/build.sbt +++ b/build.sbt @@ -1,40 +1,16 @@ -import sbtcrossproject.CrossPlugin.autoImport.{crossProject, CrossType} - -ThisBuild / baseVersion := "1.4" - -ThisBuild / organization := "org.typelevel" -ThisBuild / organizationName := "Typelevel" +ThisBuild / tlBaseVersion := "1.4" ThisBuild / developers := List( - Developer("larsrh", "Lars Hupel", "", url("https://github.com/larsrh")) + tlGitHubDev("larsrh", "Lars Hupel") ) ThisBuild / crossScalaVersions := Seq("2.12.15", "2.13.8", "3.0.2") - -ThisBuild / githubWorkflowJavaVersions := Seq(JavaSpec.temurin("8")) - -ThisBuild / githubWorkflowTargetBranches := Seq("main") - -ThisBuild / homepage := Some(url("https://github.com/typelevel/discipline")) -ThisBuild / scmInfo := Some( - ScmInfo( - url("https://github.com/typelevel/discipline"), - "git@github.com:typelevel/discipline.git" - ) -) +ThisBuild / tlVersionIntroduced := Map("3" -> "1.1.5") ThisBuild / licenses := Seq("MIT" -> url("https://opensource.org/licenses/MIT")) ThisBuild / startYear := Some(2013) -ThisBuild / endYear := Some(2021) -lazy val discipline = project - .in(file(".")) - .enablePlugins(NoPublishPlugin) - .aggregate( - core.jvm, - core.js, - core.native - ) +lazy val root = tlCrossRootProject.aggregate(core) lazy val core = crossProject(JSPlatform, JVMPlatform, NativePlatform) .crossType(CrossType.Pure) diff --git a/project/plugins.sbt b/project/plugins.sbt index f6bf6dd..c5a7fc8 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,6 +1,4 @@ addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.7.1") addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.2") -addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.1.0") addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.1.0") -addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.6") -addSbtPlugin("com.codecommit" % "sbt-spiewak-sonatype" % "0.23.0") +addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.4.0") From 3da233dfbd81437ca5e419347a940edec8ad832a Mon Sep 17 00:00:00 2001 From: Arman Bilge Date: Thu, 20 Jan 2022 17:12:33 +0000 Subject: [PATCH 62/98] headers --- core/src/main/scala/org/typelevel/discipline/Laws.scala | 2 +- core/src/main/scala/org/typelevel/discipline/Predicate.scala | 2 +- core/src/test/scala/org/typelevel/discipline/LawSpec.scala | 2 +- core/src/test/scala/org/typelevel/discipline/laws.scala | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/core/src/main/scala/org/typelevel/discipline/Laws.scala b/core/src/main/scala/org/typelevel/discipline/Laws.scala index 3932b40..407087b 100644 --- a/core/src/main/scala/org/typelevel/discipline/Laws.scala +++ b/core/src/main/scala/org/typelevel/discipline/Laws.scala @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013-2021 Typelevel + * Copyright (c) 2013 Typelevel * * Permission is hereby granted, free of charge, to any person obtaining a copy of * this software and associated documentation files (the "Software"), to deal in diff --git a/core/src/main/scala/org/typelevel/discipline/Predicate.scala b/core/src/main/scala/org/typelevel/discipline/Predicate.scala index dbe8d50..b40decb 100644 --- a/core/src/main/scala/org/typelevel/discipline/Predicate.scala +++ b/core/src/main/scala/org/typelevel/discipline/Predicate.scala @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013-2021 Typelevel + * Copyright (c) 2013 Typelevel * * Permission is hereby granted, free of charge, to any person obtaining a copy of * this software and associated documentation files (the "Software"), to deal in diff --git a/core/src/test/scala/org/typelevel/discipline/LawSpec.scala b/core/src/test/scala/org/typelevel/discipline/LawSpec.scala index ffce644..c2caef8 100644 --- a/core/src/test/scala/org/typelevel/discipline/LawSpec.scala +++ b/core/src/test/scala/org/typelevel/discipline/LawSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013-2021 Typelevel + * Copyright (c) 2013 Typelevel * * Permission is hereby granted, free of charge, to any person obtaining a copy of * this software and associated documentation files (the "Software"), to deal in diff --git a/core/src/test/scala/org/typelevel/discipline/laws.scala b/core/src/test/scala/org/typelevel/discipline/laws.scala index 8015ff9..6ddf7d7 100644 --- a/core/src/test/scala/org/typelevel/discipline/laws.scala +++ b/core/src/test/scala/org/typelevel/discipline/laws.scala @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013-2021 Typelevel + * Copyright (c) 2013 Typelevel * * Permission is hereby granted, free of charge, to any person obtaining a copy of * this software and associated documentation files (the "Software"), to deal in From d468dac12bbe6c2da450d1310d74844df75bddd4 Mon Sep 17 00:00:00 2001 From: Arman Bilge Date: Thu, 20 Jan 2022 17:17:10 +0000 Subject: [PATCH 63/98] Exclude Native 3 --- .github/workflows/ci.yml | 3 +++ build.sbt | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e2bec98..6915ffe 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -30,6 +30,9 @@ jobs: scala: [2.12.15, 2.13.8, 3.0.2] java: [temurin@8] project: [rootJS, rootJVM, rootNative] + exclude: + - scala: 3.0.2 + project: rootNative runs-on: ${{ matrix.os }} steps: - name: Checkout current branch (full) diff --git a/build.sbt b/build.sbt index 42fc5d5..d7727da 100644 --- a/build.sbt +++ b/build.sbt @@ -4,8 +4,11 @@ ThisBuild / developers := List( tlGitHubDev("larsrh", "Lars Hupel") ) -ThisBuild / crossScalaVersions := Seq("2.12.15", "2.13.8", "3.0.2") +val scala3 = "3.0.2" +ThisBuild / crossScalaVersions := Seq("2.12.15", "2.13.8", scala3) ThisBuild / tlVersionIntroduced := Map("3" -> "1.1.5") +ThisBuild / githubWorkflowBuildMatrixExclusions += + MatrixExclude(Map("scala" -> scala3, "project" -> "rootNative")) ThisBuild / licenses := Seq("MIT" -> url("https://opensource.org/licenses/MIT")) ThisBuild / startYear := Some(2013) From 10004a8956f9362b182552a3ba47ae7096b7053d Mon Sep 17 00:00:00 2001 From: Arman Bilge Date: Thu, 20 Jan 2022 17:26:09 +0000 Subject: [PATCH 64/98] 1.3.0 was cursed --- build.sbt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index d7727da..69e4e8c 100644 --- a/build.sbt +++ b/build.sbt @@ -21,7 +21,10 @@ lazy val core = crossProject(JSPlatform, JVMPlatform, NativePlatform) .settings( name := "discipline", moduleName := "discipline-core", - libraryDependencies += "org.scalacheck" %%% "scalacheck" % "1.15.4" + libraryDependencies += "org.scalacheck" %%% "scalacheck" % "1.15.4", + mimaPreviousArtifacts ~= { + _.filterNot(_.revision == "1.3.0") // cursed + } ) .nativeSettings( crossScalaVersions := (ThisBuild / crossScalaVersions).value.filter(_.startsWith("2.")) From b9aa7e53e3a448e176963b76e9a0e4c529c36fe2 Mon Sep 17 00:00:00 2001 From: Arman Bilge Date: Thu, 20 Jan 2022 17:32:16 +0000 Subject: [PATCH 65/98] Set version introduced for JS/native --- build.sbt | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/build.sbt b/build.sbt index 69e4e8c..fae4138 100644 --- a/build.sbt +++ b/build.sbt @@ -26,6 +26,14 @@ lazy val core = crossProject(JSPlatform, JVMPlatform, NativePlatform) _.filterNot(_.revision == "1.3.0") // cursed } ) + .jsSettings( + tlVersionIntroduced ~= { + _ ++ List("2.12", "2.13").map(_ -> "1.0.2").toMap + } + ) .nativeSettings( + tlVersionIntroduced ~= { + _ ++ List("2.12", "2.13").map(_ -> "1.1.3").toMap + }, crossScalaVersions := (ThisBuild / crossScalaVersions).value.filter(_.startsWith("2.")) ) From b6818405c78585210270ac19c750c0c1d0a71301 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Fri, 21 Jan 2022 03:44:11 +0100 Subject: [PATCH 66/98] Update sbt-typelevel to 0.4.1 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index c5a7fc8..f855c2a 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,4 +1,4 @@ addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.7.1") addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.2") addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.1.0") -addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.4.0") +addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.4.1") From cf9c457eff16969cfe552b289b7e2340960792da Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sat, 22 Jan 2022 22:24:06 +0100 Subject: [PATCH 67/98] Update scalafmt-core to 3.3.3 --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index 30cd948..f7573f1 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = 3.3.2 +version = 3.3.3 runner.dialect = Scala213Source3 From 89fd8b7105f705d73c5a9df324941e46257ab77b Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Wed, 26 Jan 2022 15:13:30 +0100 Subject: [PATCH 68/98] Update sbt-typelevel to 0.4.3 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index f855c2a..1e6d218 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,4 +1,4 @@ addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.7.1") addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.2") addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.1.0") -addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.4.1") +addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.4.3") From 0bf404420c1e05aa31d6d7bc1fe2b590e38dd7b1 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Wed, 26 Jan 2022 15:14:02 +0100 Subject: [PATCH 69/98] Regenerate workflow with sbt-github-actions --- .github/workflows/ci.yml | 76 ++++++++++++++++++++++++++++++++++------ 1 file changed, 66 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6915ffe..8cb1f07 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -63,6 +63,7 @@ jobs: run: sbt 'project ${{ matrix.project }}' '++${{ matrix.scala }}' 'project /' githubWorkflowCheck - name: Check headers and formatting + if: matrix.java == 'temurin@8' run: sbt 'project ${{ matrix.project }}' '++${{ matrix.scala }}' headerCheckAll scalafmtCheckAll 'project /' scalafmtSbtCheck - name: fastOptJS @@ -77,21 +78,26 @@ jobs: run: sbt 'project ${{ matrix.project }}' '++${{ matrix.scala }}' test - name: Check binary compatibility + if: matrix.java == 'temurin@8' run: sbt 'project ${{ matrix.project }}' '++${{ matrix.scala }}' mimaReportBinaryIssues - name: Generate API documentation + if: matrix.java == 'temurin@8' run: sbt 'project ${{ matrix.project }}' '++${{ matrix.scala }}' doc - name: Make target directories + if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main') run: mkdir -p target .js/target core/.native/target core/.js/target core/.jvm/target .jvm/target .native/target project/target - name: Compress target directories + if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main') run: tar cf targets.tar target .js/target core/.native/target core/.js/target core/.jvm/target .jvm/target .native/target project/target - name: Upload target directories + if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main') uses: actions/upload-artifact@v2 with: - name: target-${{ matrix.os }}-${{ matrix.scala }}-${{ matrix.java }} + name: target-${{ matrix.os }}-${{ matrix.java }}-${{ matrix.scala }}-${{ matrix.project }} path: targets.tar publish: @@ -129,32 +135,82 @@ jobs: ~/Library/Caches/Coursier/v1 key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }} - - name: Download target directories (2.12.15) + - name: Download target directories (2.12.15, rootJS) + uses: actions/download-artifact@v2 + with: + name: target-${{ matrix.os }}-${{ matrix.java }}-2.12.15-rootJS + + - name: Inflate target directories (2.12.15, rootJS) + run: | + tar xf targets.tar + rm targets.tar + + - name: Download target directories (2.12.15, rootJVM) + uses: actions/download-artifact@v2 + with: + name: target-${{ matrix.os }}-${{ matrix.java }}-2.12.15-rootJVM + + - name: Inflate target directories (2.12.15, rootJVM) + run: | + tar xf targets.tar + rm targets.tar + + - name: Download target directories (2.12.15, rootNative) + uses: actions/download-artifact@v2 + with: + name: target-${{ matrix.os }}-${{ matrix.java }}-2.12.15-rootNative + + - name: Inflate target directories (2.12.15, rootNative) + run: | + tar xf targets.tar + rm targets.tar + + - name: Download target directories (2.13.8, rootJS) + uses: actions/download-artifact@v2 + with: + name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.8-rootJS + + - name: Inflate target directories (2.13.8, rootJS) + run: | + tar xf targets.tar + rm targets.tar + + - name: Download target directories (2.13.8, rootJVM) + uses: actions/download-artifact@v2 + with: + name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.8-rootJVM + + - name: Inflate target directories (2.13.8, rootJVM) + run: | + tar xf targets.tar + rm targets.tar + + - name: Download target directories (2.13.8, rootNative) uses: actions/download-artifact@v2 with: - name: target-${{ matrix.os }}-2.12.15-${{ matrix.java }} + name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.8-rootNative - - name: Inflate target directories (2.12.15) + - name: Inflate target directories (2.13.8, rootNative) run: | tar xf targets.tar rm targets.tar - - name: Download target directories (2.13.8) + - name: Download target directories (3.0.2, rootJS) uses: actions/download-artifact@v2 with: - name: target-${{ matrix.os }}-2.13.8-${{ matrix.java }} + name: target-${{ matrix.os }}-${{ matrix.java }}-3.0.2-rootJS - - name: Inflate target directories (2.13.8) + - name: Inflate target directories (3.0.2, rootJS) run: | tar xf targets.tar rm targets.tar - - name: Download target directories (3.0.2) + - name: Download target directories (3.0.2, rootJVM) uses: actions/download-artifact@v2 with: - name: target-${{ matrix.os }}-3.0.2-${{ matrix.java }} + name: target-${{ matrix.os }}-${{ matrix.java }}-3.0.2-rootJVM - - name: Inflate target directories (3.0.2) + - name: Inflate target directories (3.0.2, rootJVM) run: | tar xf targets.tar rm targets.tar From 304e2f1f524ca6b62ee876330821efb711d9d8b2 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Tue, 1 Feb 2022 10:58:25 +0100 Subject: [PATCH 70/98] Update sbt to 1.6.2 --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index 3161d21..c8fcab5 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.6.1 +sbt.version=1.6.2 From 7dafc5bc31b8d585b605071b8b3b1f21648c7a56 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Wed, 2 Feb 2022 04:47:38 +0100 Subject: [PATCH 71/98] Update scala3-library, ... to 3.1.1 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index fae4138..bd94f64 100644 --- a/build.sbt +++ b/build.sbt @@ -4,7 +4,7 @@ ThisBuild / developers := List( tlGitHubDev("larsrh", "Lars Hupel") ) -val scala3 = "3.0.2" +val scala3 = "3.1.1" ThisBuild / crossScalaVersions := Seq("2.12.15", "2.13.8", scala3) ThisBuild / tlVersionIntroduced := Map("3" -> "1.1.5") ThisBuild / githubWorkflowBuildMatrixExclusions += From a0ca865b401e8bbe018159d30e56a238e264bf69 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Wed, 2 Feb 2022 04:48:18 +0100 Subject: [PATCH 72/98] Regenerate workflow with sbt-github-actions --- .github/workflows/ci.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8cb1f07..5ce1d50 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -27,11 +27,11 @@ jobs: strategy: matrix: os: [ubuntu-latest] - scala: [2.12.15, 2.13.8, 3.0.2] + scala: [2.12.15, 2.13.8, 3.1.1] java: [temurin@8] project: [rootJS, rootJVM, rootNative] exclude: - - scala: 3.0.2 + - scala: 3.1.1 project: rootNative runs-on: ${{ matrix.os }} steps: @@ -107,7 +107,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - scala: [3.0.2] + scala: [3.1.1] java: [temurin@8] runs-on: ${{ matrix.os }} steps: @@ -195,22 +195,22 @@ jobs: tar xf targets.tar rm targets.tar - - name: Download target directories (3.0.2, rootJS) + - name: Download target directories (3.1.1, rootJS) uses: actions/download-artifact@v2 with: - name: target-${{ matrix.os }}-${{ matrix.java }}-3.0.2-rootJS + name: target-${{ matrix.os }}-${{ matrix.java }}-3.1.1-rootJS - - name: Inflate target directories (3.0.2, rootJS) + - name: Inflate target directories (3.1.1, rootJS) run: | tar xf targets.tar rm targets.tar - - name: Download target directories (3.0.2, rootJVM) + - name: Download target directories (3.1.1, rootJVM) uses: actions/download-artifact@v2 with: - name: target-${{ matrix.os }}-${{ matrix.java }}-3.0.2-rootJVM + name: target-${{ matrix.os }}-${{ matrix.java }}-3.1.1-rootJVM - - name: Inflate target directories (3.0.2, rootJVM) + - name: Inflate target directories (3.1.1, rootJVM) run: | tar xf targets.tar rm targets.tar From f058f8566b5babd455bfc5bfa459aa16dc732b43 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sat, 5 Feb 2022 19:30:41 +0100 Subject: [PATCH 73/98] Update scalafmt-core to 3.4.1 --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index f7573f1..a38dc26 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = 3.3.3 +version = 3.4.1 runner.dialect = Scala213Source3 From afd7c3fff2fcc2d1b57f5af8a61a390acce2051f Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Thu, 10 Feb 2022 17:37:46 +0100 Subject: [PATCH 74/98] Update sbt-typelevel to 0.4.4 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 1e6d218..826595a 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,4 +1,4 @@ addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.7.1") addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.2") addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.1.0") -addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.4.3") +addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.4.4") From f41071d089e72bc6caff127aad553e8e55e5b5dd Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Thu, 10 Feb 2022 17:38:35 +0100 Subject: [PATCH 75/98] Run prePR with sbt-typelevel --- .github/workflows/ci.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8cb1f07..0b6c47c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,6 +17,7 @@ on: env: PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }} SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }} + SONATYPE_CREDENTIAL_HOST: ${{ secrets.SONATYPE_CREDENTIAL_HOST }} SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }} PGP_SECRET: ${{ secrets.PGP_SECRET }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -66,9 +67,9 @@ jobs: if: matrix.java == 'temurin@8' run: sbt 'project ${{ matrix.project }}' '++${{ matrix.scala }}' headerCheckAll scalafmtCheckAll 'project /' scalafmtSbtCheck - - name: fastOptJS + - name: scalaJSLink if: matrix.project == 'rootJS' - run: sbt 'project ${{ matrix.project }}' '++${{ matrix.scala }}' Test/fastOptJS + run: sbt 'project ${{ matrix.project }}' '++${{ matrix.scala }}' Test/scalaJSLinkerResult - name: nativeLink if: matrix.project == 'rootNative' @@ -217,12 +218,12 @@ jobs: - name: Import signing key if: env.PGP_SECRET != '' && env.PGP_PASSPHRASE == '' - run: echo $PGP_SECRET | base64 -d | gpg --import + run: echo $PGP_SECRET | base64 -di | gpg --import - name: Import signing key and strip passphrase if: env.PGP_SECRET != '' && env.PGP_PASSPHRASE != '' run: | - echo "$PGP_SECRET" | base64 -d > /tmp/signing-key.gpg + echo "$PGP_SECRET" | base64 -di > /tmp/signing-key.gpg echo "$PGP_PASSPHRASE" | gpg --pinentry-mode loopback --passphrase-fd 0 --import /tmp/signing-key.gpg (echo "$PGP_PASSPHRASE"; echo; echo) | gpg --command-fd 0 --pinentry-mode loopback --change-passphrase $(gpg --list-secret-keys --with-colons 2> /dev/null | grep '^sec:' | cut --delimiter ':' --fields 5 | tail -n 1) From 9392acbf9f27c055101cb94e55c87798b893cd6b Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Fri, 11 Feb 2022 23:10:20 +0100 Subject: [PATCH 76/98] Update sbt-typelevel to 0.4.5 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 826595a..d42cb5e 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,4 +1,4 @@ addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.7.1") addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.2") addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.1.0") -addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.4.4") +addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.4.5") From 5083f166525a543b0c0d43b803933c05a9557e4a Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sat, 12 Feb 2022 15:25:40 +0100 Subject: [PATCH 77/98] Update scalafmt-core to 3.4.3 --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index a38dc26..36dd643 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = 3.4.1 +version = 3.4.3 runner.dialect = Scala213Source3 From b2ee5e2a9fd89dbc95b7503e883ec887763a4e9a Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Wed, 2 Mar 2022 06:59:52 +0100 Subject: [PATCH 78/98] Update sbt-typelevel to 0.4.6 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index d42cb5e..26a3be4 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,4 +1,4 @@ addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.7.1") addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.2") addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.1.0") -addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.4.5") +addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.4.6") From a45a2e18d2aa6aa9d5fdfa5c924e2f1fc1a2d106 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Wed, 2 Mar 2022 07:00:34 +0100 Subject: [PATCH 79/98] Run prePR with sbt-typelevel --- .github/workflows/ci.yml | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0b6c47c..b15823a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -41,12 +41,21 @@ jobs: with: fetch-depth: 0 + - name: Download Java (temurin@8) + id: download-java-temurin-8 + if: matrix.java == 'temurin@8' + uses: typelevel/download-java@v1 + with: + distribution: temurin + java-version: 8 + - name: Setup Java (temurin@8) if: matrix.java == 'temurin@8' uses: actions/setup-java@v2 with: - distribution: temurin + distribution: jdkfile java-version: 8 + jdkFile: ${{ steps.download-java-temurin-8.outputs.jdkFile }} - name: Cache sbt uses: actions/cache@v2 @@ -117,12 +126,21 @@ jobs: with: fetch-depth: 0 + - name: Download Java (temurin@8) + id: download-java-temurin-8 + if: matrix.java == 'temurin@8' + uses: typelevel/download-java@v1 + with: + distribution: temurin + java-version: 8 + - name: Setup Java (temurin@8) if: matrix.java == 'temurin@8' uses: actions/setup-java@v2 with: - distribution: temurin + distribution: jdkfile java-version: 8 + jdkFile: ${{ steps.download-java-temurin-8.outputs.jdkFile }} - name: Cache sbt uses: actions/cache@v2 From a1a8da1d2a72932962d9504485b6574379eea401 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Thu, 3 Mar 2022 19:26:56 +0100 Subject: [PATCH 80/98] Update auxlib, javalib, nativelib, nscplugin, ... to 0.4.4 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 26a3be4..df6ad19 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,4 +1,4 @@ addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.7.1") -addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.2") +addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.4") addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.1.0") addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.4.6") From 551716939c1a57b508c6ac5a9ae2e7e5cc1eb12d Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Tue, 22 Mar 2022 23:25:25 +0100 Subject: [PATCH 81/98] Update sbt-scala-native-crossproject to 1.2.0 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 26a3be4..12dbad6 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,4 +1,4 @@ addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.7.1") addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.2") -addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.1.0") +addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.2.0") addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.4.6") From 4e4547b8d6ec88092fd95998d1113496d35a3125 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sun, 27 Mar 2022 21:06:53 +0200 Subject: [PATCH 82/98] Update sbt-typelevel to 0.4.7 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 26a3be4..5d5868b 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,4 +1,4 @@ addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.7.1") addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.2") addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.1.0") -addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.4.6") +addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.4.7") From 826c37c4985bbcda705adc3fc4169f74b532e88e Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sat, 2 Apr 2022 17:14:02 +0200 Subject: [PATCH 83/98] Update scalafmt-core to 3.5.0 --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index 36dd643..9453dfd 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = 3.4.3 +version = 3.5.0 runner.dialect = Scala213Source3 From 09b3707d9621c0f3a9b3489e77c08d924ef9280b Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Tue, 5 Apr 2022 03:34:01 +0200 Subject: [PATCH 84/98] Update sbt-scalajs, scalajs-compiler, ... to 1.10.0 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 26a3be4..fe3454b 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,4 +1,4 @@ -addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.7.1") +addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.10.0") addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.2") addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.1.0") addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.4.6") From 0a8a6fa293a0dcbdcb0bfd1e0a5cbd1342f48492 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Thu, 7 Apr 2022 06:57:42 +0200 Subject: [PATCH 85/98] Update scalafmt-core to 3.5.1 --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index 9453dfd..c29ae38 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = 3.5.0 +version = 3.5.1 runner.dialect = Scala213Source3 From 35435593f3ee3601d3a89141da754270b0329bb4 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Fri, 8 Apr 2022 09:29:27 +0200 Subject: [PATCH 86/98] Update scalacheck to 1.16.0 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index fae4138..ca1ef3a 100644 --- a/build.sbt +++ b/build.sbt @@ -21,7 +21,7 @@ lazy val core = crossProject(JSPlatform, JVMPlatform, NativePlatform) .settings( name := "discipline", moduleName := "discipline-core", - libraryDependencies += "org.scalacheck" %%% "scalacheck" % "1.15.4", + libraryDependencies += "org.scalacheck" %%% "scalacheck" % "1.16.0", mimaPreviousArtifacts ~= { _.filterNot(_.revision == "1.3.0") // cursed } From d0ce00496d9aa971eca2c3a38d4ec8a0cc80c90d Mon Sep 17 00:00:00 2001 From: Arman Bilge Date: Fri, 8 Apr 2022 07:24:14 -0700 Subject: [PATCH 87/98] Bump base version to 1.5 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index bd94f64..725be56 100644 --- a/build.sbt +++ b/build.sbt @@ -1,4 +1,4 @@ -ThisBuild / tlBaseVersion := "1.4" +ThisBuild / tlBaseVersion := "1.5" ThisBuild / developers := List( tlGitHubDev("larsrh", "Lars Hupel") From da25e621ab2316eb281e316bccb70db070578520 Mon Sep 17 00:00:00 2001 From: Arman Bilge Date: Fri, 8 Apr 2022 14:58:19 +0000 Subject: [PATCH 88/98] Cross-publish for Scala 3 + Native --- build.sbt | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/build.sbt b/build.sbt index f00bfa0..ef9fa32 100644 --- a/build.sbt +++ b/build.sbt @@ -7,8 +7,6 @@ ThisBuild / developers := List( val scala3 = "3.1.1" ThisBuild / crossScalaVersions := Seq("2.12.15", "2.13.8", scala3) ThisBuild / tlVersionIntroduced := Map("3" -> "1.1.5") -ThisBuild / githubWorkflowBuildMatrixExclusions += - MatrixExclude(Map("scala" -> scala3, "project" -> "rootNative")) ThisBuild / licenses := Seq("MIT" -> url("https://opensource.org/licenses/MIT")) ThisBuild / startYear := Some(2013) @@ -21,10 +19,7 @@ lazy val core = crossProject(JSPlatform, JVMPlatform, NativePlatform) .settings( name := "discipline", moduleName := "discipline-core", - libraryDependencies += "org.scalacheck" %%% "scalacheck" % "1.16.0", - mimaPreviousArtifacts ~= { - _.filterNot(_.revision == "1.3.0") // cursed - } + libraryDependencies += "org.scalacheck" %%% "scalacheck" % "1.16.0" ) .jsSettings( tlVersionIntroduced ~= { @@ -32,8 +27,9 @@ lazy val core = crossProject(JSPlatform, JVMPlatform, NativePlatform) } ) .nativeSettings( - tlVersionIntroduced ~= { - _ ++ List("2.12", "2.13").map(_ -> "1.1.3").toMap - }, - crossScalaVersions := (ThisBuild / crossScalaVersions).value.filter(_.startsWith("2.")) + tlVersionIntroduced := Map( + "2.12" -> "1.1.3", + "2.13" -> "1.1.3", + "3" -> "1.5.0" + ) ) From b42e01da90522fd0cc1a5fdb8a8bb9eecd924b73 Mon Sep 17 00:00:00 2001 From: Arman Bilge Date: Fri, 8 Apr 2022 14:59:36 +0000 Subject: [PATCH 89/98] Regenerate workflow --- .github/workflows/ci.yml | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 91b062a..7a0e85f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -31,9 +31,6 @@ jobs: scala: [2.12.15, 2.13.8, 3.1.1] java: [temurin@8] project: [rootJS, rootJVM, rootNative] - exclude: - - scala: 3.1.1 - project: rootNative runs-on: ${{ matrix.os }} steps: - name: Checkout current branch (full) @@ -234,6 +231,16 @@ jobs: tar xf targets.tar rm targets.tar + - name: Download target directories (3.1.1, rootNative) + uses: actions/download-artifact@v2 + with: + name: target-${{ matrix.os }}-${{ matrix.java }}-3.1.1-rootNative + + - name: Inflate target directories (3.1.1, rootNative) + run: | + tar xf targets.tar + rm targets.tar + - name: Import signing key if: env.PGP_SECRET != '' && env.PGP_PASSPHRASE == '' run: echo $PGP_SECRET | base64 -di | gpg --import From ecc1b8df1910549aa120632c8cf2e8e7d944b07a Mon Sep 17 00:00:00 2001 From: Arman Bilge Date: Fri, 8 Apr 2022 15:18:34 +0000 Subject: [PATCH 90/98] Set JDK release to 8 --- build.sbt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build.sbt b/build.sbt index f00bfa0..941e00e 100644 --- a/build.sbt +++ b/build.sbt @@ -13,6 +13,8 @@ ThisBuild / githubWorkflowBuildMatrixExclusions += ThisBuild / licenses := Seq("MIT" -> url("https://opensource.org/licenses/MIT")) ThisBuild / startYear := Some(2013) +ThisBuild / tlJdkRelease := Some(8) + lazy val root = tlCrossRootProject.aggregate(core) lazy val core = crossProject(JSPlatform, JVMPlatform, NativePlatform) From 82e90546fabbedd3378de032b03f98a5a928b351 Mon Sep 17 00:00:00 2001 From: Vasil Vasilev Date: Sat, 9 Apr 2022 10:19:12 +0200 Subject: [PATCH 91/98] Minor tweaks to the build file --- build.sbt | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/build.sbt b/build.sbt index fa5014b..b05a4a5 100644 --- a/build.sbt +++ b/build.sbt @@ -4,8 +4,7 @@ ThisBuild / developers := List( tlGitHubDev("larsrh", "Lars Hupel") ) -val scala3 = "3.1.1" -ThisBuild / crossScalaVersions := Seq("2.12.15", "2.13.8", scala3) +ThisBuild / crossScalaVersions := Seq("2.12.15", "2.13.8", "3.1.1") ThisBuild / tlVersionIntroduced := Map("3" -> "1.1.5") ThisBuild / licenses := Seq("MIT" -> url("https://opensource.org/licenses/MIT")) @@ -13,7 +12,11 @@ ThisBuild / startYear := Some(2013) ThisBuild / tlJdkRelease := Some(8) -lazy val root = tlCrossRootProject.aggregate(core) +lazy val root = tlCrossRootProject + .aggregate(core) + .settings( + name := "discipline" + ) lazy val core = crossProject(JSPlatform, JVMPlatform, NativePlatform) .crossType(CrossType.Pure) From 59f84ab00d94adf6d9e4e04058893ea524971316 Mon Sep 17 00:00:00 2001 From: Vasil Vasilev Date: Sat, 9 Apr 2022 21:18:59 +0200 Subject: [PATCH 92/98] Prepare the build for the 1.5.0 release --- build.sbt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build.sbt b/build.sbt index b05a4a5..9757b71 100644 --- a/build.sbt +++ b/build.sbt @@ -12,6 +12,9 @@ ThisBuild / startYear := Some(2013) ThisBuild / tlJdkRelease := Some(8) +ThisBuild / tlSonatypeUseLegacyHost := false +ThisBuild / tlCiReleaseTags := false + lazy val root = tlCrossRootProject .aggregate(core) .settings( From d2d57659d0d89b0fc96ca7511aba53d0ec388ddd Mon Sep 17 00:00:00 2001 From: Vasil Vasilev Date: Sat, 9 Apr 2022 21:21:21 +0200 Subject: [PATCH 93/98] Regenerate GitHub workflows --- .github/workflows/ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7a0e85f..93e35a9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -93,15 +93,15 @@ jobs: run: sbt 'project ${{ matrix.project }}' '++${{ matrix.scala }}' doc - name: Make target directories - if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main') + if: github.event_name != 'pull_request' && (github.ref == 'refs/heads/main') run: mkdir -p target .js/target core/.native/target core/.js/target core/.jvm/target .jvm/target .native/target project/target - name: Compress target directories - if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main') + if: github.event_name != 'pull_request' && (github.ref == 'refs/heads/main') run: tar cf targets.tar target .js/target core/.native/target core/.js/target core/.jvm/target .jvm/target .native/target project/target - name: Upload target directories - if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main') + if: github.event_name != 'pull_request' && (github.ref == 'refs/heads/main') uses: actions/upload-artifact@v2 with: name: target-${{ matrix.os }}-${{ matrix.java }}-${{ matrix.scala }}-${{ matrix.project }} @@ -110,7 +110,7 @@ jobs: publish: name: Publish Artifacts needs: [build] - if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main') + if: github.event_name != 'pull_request' && (github.ref == 'refs/heads/main') strategy: matrix: os: [ubuntu-latest] From d11a7a34b7f2466f56f51e91a17ce0673d6277b2 Mon Sep 17 00:00:00 2001 From: Vasil Vasilev Date: Sat, 9 Apr 2022 21:49:21 +0200 Subject: [PATCH 94/98] Update the readme for the latest release --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index df677aa..4bc1c00 100644 --- a/README.md +++ b/README.md @@ -11,13 +11,13 @@ Flexible law checking for Scala Usage ----- -This library is currently available for Scala binary versions 2.12, 2.13 and 3.0. +This library is currently available for Scala binary versions 2.12, 2.13 and 3.1. To use the latest version, include the following in your `build.sbt`: ```scala libraryDependencies += - "org.typelevel" %% "discipline-core" % "1.4.0" + "org.typelevel" %% "discipline-core" % "1.5.0" ``` For a little more info see the ["Law Enforcement using Discipline"](https://typelevel.org/blog/2013/11/17/discipline.html) blog post. @@ -25,7 +25,7 @@ For a little more info see the ["Law Enforcement using Discipline"](https://type Binding to test frameworks -------------------------- -Discipline is built against ScalaCheck 1.15.x. There is also a published artifact for Scala.js and Scala Native 0.4.2. +Discipline is built against ScalaCheck 1.16.x. There is also a published artifact for Scala.js 1.10 and Scala Native 0.4.4. `discipline-core` is required early each Scala release cycle, so we have chosen to keep this repo minimal. Starting with v1.0.0, please find the framework bindings in their new locations: From 98b7d3e4a164d97fd38477b53c45dfb253bda9b7 Mon Sep 17 00:00:00 2001 From: Vasil Vasilev Date: Sun, 10 Apr 2022 09:04:11 +0200 Subject: [PATCH 95/98] Update Scala.js binary version --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 4bc1c00..cf5d62e 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ For a little more info see the ["Law Enforcement using Discipline"](https://type Binding to test frameworks -------------------------- -Discipline is built against ScalaCheck 1.16.x. There is also a published artifact for Scala.js 1.10 and Scala Native 0.4.4. +Discipline is built against ScalaCheck 1.16.x. There is also a published artifact for Scala.js 1.8 and Scala Native 0.4.4. `discipline-core` is required early each Scala release cycle, so we have chosen to keep this repo minimal. Starting with v1.0.0, please find the framework bindings in their new locations: From f42ee589118eae3a601b7c5404d127c967a0edc2 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Mon, 11 Apr 2022 21:52:15 +0200 Subject: [PATCH 96/98] Update sbt-typelevel to 0.4.9 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 3a5d20c..8fe502b 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,4 +1,4 @@ addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.10.0") addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.4") addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.2.0") -addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.4.7") +addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.4.9") From 609d10c30a116afd242bc9ba4b7bdb54eb490f6d Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Tue, 12 Apr 2022 21:03:08 +0200 Subject: [PATCH 97/98] Update scala3-library, ... to 3.1.2 --- .github/workflows/ci.yml | 4 ++-- build.sbt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 93e35a9..68aaed8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -28,7 +28,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - scala: [2.12.15, 2.13.8, 3.1.1] + scala: [2.12.15, 2.13.8, 3.1.2] java: [temurin@8] project: [rootJS, rootJVM, rootNative] runs-on: ${{ matrix.os }} @@ -114,7 +114,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - scala: [3.1.1] + scala: [3.1.2] java: [temurin@8] runs-on: ${{ matrix.os }} steps: diff --git a/build.sbt b/build.sbt index 9757b71..e7ebc9c 100644 --- a/build.sbt +++ b/build.sbt @@ -4,7 +4,7 @@ ThisBuild / developers := List( tlGitHubDev("larsrh", "Lars Hupel") ) -ThisBuild / crossScalaVersions := Seq("2.12.15", "2.13.8", "3.1.1") +ThisBuild / crossScalaVersions := Seq("2.12.15", "2.13.8", "3.1.2") ThisBuild / tlVersionIntroduced := Map("3" -> "1.1.5") ThisBuild / licenses := Seq("MIT" -> url("https://opensource.org/licenses/MIT")) From fabd99cbf865c614b23edb5fa389ce4f3d77edc2 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Tue, 12 Apr 2022 21:03:35 +0200 Subject: [PATCH 98/98] Regenerate workflow with sbt-github-actions --- .github/workflows/ci.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 68aaed8..044a400 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -211,32 +211,32 @@ jobs: tar xf targets.tar rm targets.tar - - name: Download target directories (3.1.1, rootJS) + - name: Download target directories (3.1.2, rootJS) uses: actions/download-artifact@v2 with: - name: target-${{ matrix.os }}-${{ matrix.java }}-3.1.1-rootJS + name: target-${{ matrix.os }}-${{ matrix.java }}-3.1.2-rootJS - - name: Inflate target directories (3.1.1, rootJS) + - name: Inflate target directories (3.1.2, rootJS) run: | tar xf targets.tar rm targets.tar - - name: Download target directories (3.1.1, rootJVM) + - name: Download target directories (3.1.2, rootJVM) uses: actions/download-artifact@v2 with: - name: target-${{ matrix.os }}-${{ matrix.java }}-3.1.1-rootJVM + name: target-${{ matrix.os }}-${{ matrix.java }}-3.1.2-rootJVM - - name: Inflate target directories (3.1.1, rootJVM) + - name: Inflate target directories (3.1.2, rootJVM) run: | tar xf targets.tar rm targets.tar - - name: Download target directories (3.1.1, rootNative) + - name: Download target directories (3.1.2, rootNative) uses: actions/download-artifact@v2 with: - name: target-${{ matrix.os }}-${{ matrix.java }}-3.1.1-rootNative + name: target-${{ matrix.os }}-${{ matrix.java }}-3.1.2-rootNative - - name: Inflate target directories (3.1.1, rootNative) + - name: Inflate target directories (3.1.2, rootNative) run: | tar xf targets.tar rm targets.tar