From b6d49a6f400c5897527ec138134c5ca09960e8a0 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Sun, 9 May 2021 21:22:54 +0200 Subject: [PATCH 01/84] Update shapeless to 2.3.6 (#328) --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index c6fb15db..59151c07 100644 --- a/build.sbt +++ b/build.sbt @@ -10,7 +10,7 @@ lazy val buildSettings = Seq( val catsVersion = "2.6.0" val disciplineMunitVersion = "1.0.8" val kindProjectorVersion = "0.11.3" -val shapelessVersion = "2.3.5" +val shapelessVersion = "2.3.6" lazy val commonSettings = Seq( scalacOptions := Seq( From 5ea0427317fb88399b3b07688500cbd8f0c98bfc Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Mon, 10 May 2021 07:24:30 +0200 Subject: [PATCH 02/84] Update sbt to 1.5.2 (#329) --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index f0be67b9..19479ba4 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.5.1 +sbt.version=1.5.2 From dbb19aa6d8abc780e9fbcbef37d8d1bcf26ffa69 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Thu, 13 May 2021 15:29:35 +0200 Subject: [PATCH 03/84] Update kind-projector to 0.12.0 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 59151c07..ca90453f 100644 --- a/build.sbt +++ b/build.sbt @@ -9,7 +9,7 @@ lazy val buildSettings = Seq( val catsVersion = "2.6.0" val disciplineMunitVersion = "1.0.8" -val kindProjectorVersion = "0.11.3" +val kindProjectorVersion = "0.12.0" val shapelessVersion = "2.3.6" lazy val commonSettings = Seq( From 050637060201e05da3f058555020dc6fe877eb27 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Thu, 13 May 2021 18:14:48 +0200 Subject: [PATCH 04/84] Update sbt-mima-plugin to 0.9.1 (#333) --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 0c193570..98191138 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -5,5 +5,5 @@ addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.0.0") addSbtPlugin("com.thoughtworks.sbt-api-mappings" % "sbt-api-mappings" % "3.0.0") addSbtPlugin("com.codecommit" % "sbt-github-actions" % "0.10.1") addSbtPlugin("com.geirsson" % "sbt-ci-release" % "1.5.7") -addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.9.0") +addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.9.1") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.2") From 51243f689fb942fb5ea9a3df3f4410d518a67ebd Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Fri, 14 May 2021 00:31:32 +0200 Subject: [PATCH 05/84] Update discipline-munit to 1.0.9 (#335) --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index ca90453f..c566d2a2 100644 --- a/build.sbt +++ b/build.sbt @@ -8,7 +8,7 @@ lazy val buildSettings = Seq( ) val catsVersion = "2.6.0" -val disciplineMunitVersion = "1.0.8" +val disciplineMunitVersion = "1.0.9" val kindProjectorVersion = "0.12.0" val shapelessVersion = "2.3.6" From 9c750ebcbed386374892beea21a65a7eefbe1b2a Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Fri, 14 May 2021 00:37:45 +0200 Subject: [PATCH 06/84] Update alleycats-core, cats-core, ... to 2.6.1 (#334) Co-authored-by: Georgi Krastev --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index c566d2a2..8aaac1fa 100644 --- a/build.sbt +++ b/build.sbt @@ -7,7 +7,7 @@ lazy val buildSettings = Seq( organization := "org.typelevel" ) -val catsVersion = "2.6.0" +val catsVersion = "2.6.1" val disciplineMunitVersion = "1.0.9" val kindProjectorVersion = "0.12.0" val shapelessVersion = "2.3.6" From 598d05b84ec7028ba8668ce1b10e541aaacd8c2c Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Sat, 15 May 2021 14:18:21 +0200 Subject: [PATCH 07/84] Update kind-projector to 0.13.0 (#337) --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 8aaac1fa..8738d378 100644 --- a/build.sbt +++ b/build.sbt @@ -9,7 +9,7 @@ lazy val buildSettings = Seq( val catsVersion = "2.6.1" val disciplineMunitVersion = "1.0.9" -val kindProjectorVersion = "0.12.0" +val kindProjectorVersion = "0.13.0" val shapelessVersion = "2.3.6" lazy val commonSettings = Seq( From 135e8563d382f2732a96c1ee73a0a1360404b8a6 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Mon, 17 May 2021 03:05:51 +0200 Subject: [PATCH 08/84] Update shapeless to 2.3.7 (#338) --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 8738d378..a2cba0a9 100644 --- a/build.sbt +++ b/build.sbt @@ -10,7 +10,7 @@ lazy val buildSettings = Seq( val catsVersion = "2.6.1" val disciplineMunitVersion = "1.0.9" val kindProjectorVersion = "0.13.0" -val shapelessVersion = "2.3.6" +val shapelessVersion = "2.3.7" lazy val commonSettings = Seq( scalacOptions := Seq( From f00741c7754c7f2eb64a85a74c5c83086f9986d7 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Wed, 19 May 2021 11:02:11 +0200 Subject: [PATCH 09/84] Update scala-library, scala-reflect to 2.13.6 (#339) --- .github/workflows/ci.yml | 4 ++-- build.sbt | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 061a75cd..5cf1a66a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,7 +23,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - scala: [2.12.13, 2.13.5] + scala: [2.12.13, 2.13.6] java: [adopt@1.8] ci: [validateJVM, validateJS, validateNative] runs-on: ${{ matrix.os }} @@ -63,7 +63,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - scala: [2.13.5] + scala: [2.13.6] java: [adopt@1.8] runs-on: ${{ matrix.os }} steps: diff --git a/build.sbt b/build.sbt index a2cba0a9..8a2b3ee1 100644 --- a/build.sbt +++ b/build.sbt @@ -1,7 +1,7 @@ import sbt._ -ThisBuild / crossScalaVersions := Seq("2.12.13", "2.13.5") -ThisBuild / scalaVersion := "2.13.5" +ThisBuild / crossScalaVersions := Seq("2.12.13", "2.13.6") +ThisBuild / scalaVersion := "2.13.6" lazy val buildSettings = Seq( organization := "org.typelevel" From 098bc17d72400901c76f6df3da67094a44c53ee9 Mon Sep 17 00:00:00 2001 From: Georgi Krastev Date: Fri, 21 May 2021 15:29:16 +0300 Subject: [PATCH 10/84] Add VSCode .ignore files (#344) --- .gitignore | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.gitignore b/.gitignore index e575c582..84783bc4 100644 --- a/.gitignore +++ b/.gitignore @@ -17,6 +17,13 @@ target/ *.iml *.iws +# Ignore project files for VSCode +.bloop +.bsp +.metals +.vscode +metals.sbt + # Ignore OS X metadata .DS_Store From 67d3d2094612ab0a7b3a3d848d825e3d8119bc11 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Mon, 24 May 2021 08:34:50 +0200 Subject: [PATCH 11/84] Update sbt-github-actions to 0.11.0 (#348) --- .github/workflows/ci.yml | 10 +++++----- project/plugins.sbt | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5cf1a66a..28c87495 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: ['**'] tags: [v*] env: @@ -51,10 +51,10 @@ 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 --client '++${{ matrix.scala }}; githubWorkflowCheck' - name: Validation - run: sbt ++${{ matrix.scala }} '${{ matrix.ci }}' + run: sbt --client '++${{ matrix.scala }}; ${{ matrix.ci }}' publish: name: Publish Artifacts @@ -96,4 +96,4 @@ jobs: PGP_SECRET: ${{ secrets.PGP_SECRET }} SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }} SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }} - run: sbt ++${{ matrix.scala }} ci-release \ No newline at end of file + run: sbt --client '++${{ matrix.scala }}; ci-release' \ No newline at end of file diff --git a/project/plugins.sbt b/project/plugins.sbt index 98191138..50afd90f 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -3,7 +3,7 @@ addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.0") addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.0.0") addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.0.0") addSbtPlugin("com.thoughtworks.sbt-api-mappings" % "sbt-api-mappings" % "3.0.0") -addSbtPlugin("com.codecommit" % "sbt-github-actions" % "0.10.1") +addSbtPlugin("com.codecommit" % "sbt-github-actions" % "0.11.0") addSbtPlugin("com.geirsson" % "sbt-ci-release" % "1.5.7") addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.9.1") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.2") From e003cbe5a168394494d935e86928667b47b77ec9 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Wed, 26 May 2021 14:40:46 +0200 Subject: [PATCH 12/84] Update sbt-mima-plugin to 0.9.2 (#350) --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 50afd90f..27284636 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -5,5 +5,5 @@ addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.0.0") addSbtPlugin("com.thoughtworks.sbt-api-mappings" % "sbt-api-mappings" % "3.0.0") addSbtPlugin("com.codecommit" % "sbt-github-actions" % "0.11.0") addSbtPlugin("com.geirsson" % "sbt-ci-release" % "1.5.7") -addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.9.1") +addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.9.2") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.2") From 50bd39719900c700fc5a59aa83f8a8e997249eda Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Mon, 31 May 2021 13:50:32 +0200 Subject: [PATCH 13/84] Update scala-library, scala-reflect to 2.12.14 (#351) --- .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 28c87495..f59d6fc8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,7 +23,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - scala: [2.12.13, 2.13.6] + scala: [2.12.14, 2.13.6] java: [adopt@1.8] ci: [validateJVM, validateJS, validateNative] runs-on: ${{ matrix.os }} diff --git a/build.sbt b/build.sbt index 8a2b3ee1..023b36a8 100644 --- a/build.sbt +++ b/build.sbt @@ -1,6 +1,6 @@ import sbt._ -ThisBuild / crossScalaVersions := Seq("2.12.13", "2.13.6") +ThisBuild / crossScalaVersions := Seq("2.12.14", "2.13.6") ThisBuild / scalaVersion := "2.13.6" lazy val buildSettings = Seq( From 589b76bfce6e317998ee70c1b9c2aabfe0782f4d Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Tue, 1 Jun 2021 11:30:38 +0200 Subject: [PATCH 14/84] Update sbt to 1.5.3 (#352) --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index 19479ba4..67d27a1d 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.5.2 +sbt.version=1.5.3 From ae083b28612f0ad9bb5385dffd6efb1d616c6736 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Wed, 2 Jun 2021 01:54:06 +0200 Subject: [PATCH 15/84] 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 27284636..e2261280 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -3,7 +3,7 @@ addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.0") addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.0.0") addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.0.0") addSbtPlugin("com.thoughtworks.sbt-api-mappings" % "sbt-api-mappings" % "3.0.0") -addSbtPlugin("com.codecommit" % "sbt-github-actions" % "0.11.0") +addSbtPlugin("com.codecommit" % "sbt-github-actions" % "0.12.0") addSbtPlugin("com.geirsson" % "sbt-ci-release" % "1.5.7") addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.9.2") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.2") From de20cc24d945d6b3ff89fc36cf065edd2b008086 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Wed, 2 Jun 2021 01:54:45 +0200 Subject: [PATCH 16/84] Regenerate workflow with sbt-github-actions --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f59d6fc8..b8a13066 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -34,7 +34,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 }} @@ -73,7 +73,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 a24fb7a2924056e517d550cbde616d5444883e57 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Tue, 8 Jun 2021 17:13:40 +0200 Subject: [PATCH 17/84] 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 e2261280..b284bafd 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,4 +1,4 @@ -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.portable-scala" % "sbt-scalajs-crossproject" % "1.0.0") addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.0.0") From 0c958fde3dd456f11bd5d5c5d3cf631b05954e55 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Mon, 14 Jun 2021 10:32:52 +0200 Subject: [PATCH 18/84] Update sbt to 1.5.4 (#365) --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index 67d27a1d..9edb75b7 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.5.3 +sbt.version=1.5.4 From 42b81b3ae4591f736e8b92493a2122bf319df1ab Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Sat, 3 Jul 2021 10:16:39 +0200 Subject: [PATCH 19/84] Update sbt-scala-native-crossproject, ... to 1.1.0 (#366) --- project/plugins.sbt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index b284bafd..1e61f3d7 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,7 +1,7 @@ addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.6.0") addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.0") -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("com.thoughtworks.sbt-api-mappings" % "sbt-api-mappings" % "3.0.0") addSbtPlugin("com.codecommit" % "sbt-github-actions" % "0.12.0") addSbtPlugin("com.geirsson" % "sbt-ci-release" % "1.5.7") From db4a4f27487d2b6dff1decfacc256e57132578b5 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Fri, 9 Jul 2021 07:29:20 +0200 Subject: [PATCH 20/84] Update sbt-scalafmt to 2.4.3 (#367) --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 1e61f3d7..0e06d4c2 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -6,4 +6,4 @@ addSbtPlugin("com.thoughtworks.sbt-api-mappings" % "sbt-api-mappings" % "3.0.0") addSbtPlugin("com.codecommit" % "sbt-github-actions" % "0.12.0") addSbtPlugin("com.geirsson" % "sbt-ci-release" % "1.5.7") addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.9.2") -addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.2") +addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.3") From a20a3ef39a53416e0eb352dc586cce26a98f6518 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Mon, 12 Jul 2021 15:38:19 +0200 Subject: [PATCH 21/84] Update sbt to 1.5.5 (#368) --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index 9edb75b7..10fd9eee 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.5.4 +sbt.version=1.5.5 From 1576bec8c79f5ffa008ce24d3f976de62cbdba6a Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Wed, 4 Aug 2021 10:00:42 +0200 Subject: [PATCH 22/84] Update sbt-scalajs, scalajs-compiler, ... to 1.7.0 (#369) --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 0e06d4c2..4f656477 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,4 +1,4 @@ -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.portable-scala" % "sbt-scalajs-crossproject" % "1.1.0") addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.1.0") From 34aa1db9c9307cea8ece42883308e2b94c09f9d3 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Sun, 15 Aug 2021 08:01:46 +0200 Subject: [PATCH 23/84] Update sbt-github-actions to 0.13.0 (#370) --- .github/workflows/ci.yml | 10 +++++----- .github/workflows/clean.yml | 2 +- project/plugins.sbt | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b8a13066..112f37af 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -34,7 +34,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,10 +51,10 @@ jobs: key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }} - name: Check that workflows are up to date - run: sbt --client '++${{ matrix.scala }}; githubWorkflowCheck' + run: sbt ++${{ matrix.scala }} githubWorkflowCheck - name: Validation - run: sbt --client '++${{ matrix.scala }}; ${{ matrix.ci }}' + run: sbt ++${{ matrix.scala }} '${{ matrix.ci }}' publish: name: Publish Artifacts @@ -73,7 +73,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 }} @@ -96,4 +96,4 @@ jobs: PGP_SECRET: ${{ secrets.PGP_SECRET }} SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }} SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }} - run: sbt --client '++${{ matrix.scala }}; ci-release' \ No newline at end of file + run: sbt ++${{ matrix.scala }} ci-release diff --git a/.github/workflows/clean.yml b/.github/workflows/clean.yml index b535fcc1..547aaa43 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 diff --git a/project/plugins.sbt b/project/plugins.sbt index 4f656477..701e89f0 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -3,7 +3,7 @@ addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.0") addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.1.0") addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.1.0") addSbtPlugin("com.thoughtworks.sbt-api-mappings" % "sbt-api-mappings" % "3.0.0") -addSbtPlugin("com.codecommit" % "sbt-github-actions" % "0.12.0") +addSbtPlugin("com.codecommit" % "sbt-github-actions" % "0.13.0") addSbtPlugin("com.geirsson" % "sbt-ci-release" % "1.5.7") addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.9.2") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.3") From 3c36ce303caab626eb11238b634502063c0e846e Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Thu, 19 Aug 2021 13:15:10 +0200 Subject: [PATCH 24/84] Update scalafmt-core to 3.0.0 (#371) * Update scalafmt-core to 3.0.0 * Reformat with scalafmt 3.0.0 --- .scalafmt.conf | 2 +- .../scala-2.12/cats/derived/semiauto.scala | 10 +++++----- .../scala-2.13/cats/derived/semiauto.scala | 10 +++++----- .../src/main/scala/cats/derived/package.scala | 19 +++++++++---------- core/src/main/scala/cats/derived/show.scala | 12 ++++-------- .../scala/cats/derived/util/liftSome.scala | 4 ++-- .../scala/cats/derived/KittensSuite.scala | 6 ++---- 7 files changed, 28 insertions(+), 35 deletions(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index d45701aa..785d550d 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = "2.7.5" +version = "3.0.0" align.preset = none maxColumn = 120 includeNoParensInSelectChains = false diff --git a/core/src/main/scala-2.12/cats/derived/semiauto.scala b/core/src/main/scala-2.12/cats/derived/semiauto.scala index 84f3ec56..ed8d0a14 100644 --- a/core/src/main/scala-2.12/cats/derived/semiauto.scala +++ b/core/src/main/scala-2.12/cats/derived/semiauto.scala @@ -1,7 +1,7 @@ package cats.derived -/** allows semi automatically derive each instance. The derivation might need help when - * there are fields with a type constructor that comes with instances, e.g. +/** allows semi automatically derive each instance. The derivation might need help when there are fields with a type + * constructor that comes with instances, e.g. * {{{ * scala> case class Bar(a: String) * scala> case class Foo(bars: List[Bar]) @@ -25,9 +25,9 @@ package cats.derived * scala> implicit val fooShow: Show[Foo] = { | * import cats.derived.auto.show._ | * cats.derived.semiauto.show | - * } - * scala> Foo(List(Bar("a"))).show - * res3: String = Foo(bars = List(Bar(a = a))) + * } + * scala> Foo(List(Bar("a"))).show + * res3: String = Foo(bars = List(Bar(a = a))) * }}} */ object semiauto extends SemiAutoInstances diff --git a/core/src/main/scala-2.13/cats/derived/semiauto.scala b/core/src/main/scala-2.13/cats/derived/semiauto.scala index b096422b..4bc63587 100644 --- a/core/src/main/scala-2.13/cats/derived/semiauto.scala +++ b/core/src/main/scala-2.13/cats/derived/semiauto.scala @@ -4,8 +4,8 @@ package derived import alleycats.{ConsK, Empty, EmptyK, Pure} import cats.kernel.{CommutativeMonoid, CommutativeSemigroup} -/** allows semi automatically derive each instance. The derivation might need help when - * there are fields with a type constructor that comes with instances, e.g. +/** allows semi automatically derive each instance. The derivation might need help when there are fields with a type + * constructor that comes with instances, e.g. * {{{ * scala> case class Bar(a: String) * scala> case class Foo(bars: List[Bar]) @@ -29,9 +29,9 @@ import cats.kernel.{CommutativeMonoid, CommutativeSemigroup} * scala> implicit val fooShow: Show[Foo] = { | * import cats.derived.auto.show._ | * cats.derived.semiauto.show | - * } - * scala> Foo(List(Bar("a"))).show - * res3: String = Foo(bars = List(Bar(a = a))) + * } + * scala> Foo(List(Bar("a"))).show + * res3: String = Foo(bars = List(Bar(a = a))) * }}} */ object semiauto { diff --git a/core/src/main/scala/cats/derived/package.scala b/core/src/main/scala/cats/derived/package.scala index 6ec9fa08..005ad2a9 100644 --- a/core/src/main/scala/cats/derived/package.scala +++ b/core/src/main/scala/cats/derived/package.scala @@ -6,9 +6,8 @@ import cats.derived.util.VersionSpecific.Lazy import cats.kernel.{CommutativeMonoid, CommutativeSemigroup} import shapeless.{Cached, Refute} -/** Fully automatically derive the instance, note that this derivation is not cached, so it - * will re-derive every time an instance is needed in the application, which could - * significantly impact the compilation time. +/** Fully automatically derive the instance, note that this derivation is not cached, so it will re-derive every time an + * instance is needed in the application, which could significantly impact the compilation time. */ object auto { @@ -277,8 +276,8 @@ object auto { } } -/** cached cache the derived instance but this cache are global, so be cautious only use it - * when there is only one instance globally in your application. +/** cached cache the derived instance but this cache are global, so be cautious only use it when there is only one + * instance globally in your application. */ object cached { @@ -495,8 +494,8 @@ abstract private[derived] class SemiAutoInstances { def iterable[F[_], A](fa: F[A])(implicit F: MkIterable[F]): Iterable[A] = F.iterable(fa) } -/** allows semi automatically derive each instance. The derivation might need help when - * there are fields with a type constructor that comes with instances, e.g. +/** allows semi automatically derive each instance. The derivation might need help when there are fields with a type + * constructor that comes with instances, e.g. * {{{ * scala> case class Bar(a: String) * scala> case class Foo(bars: List[Bar]) @@ -520,9 +519,9 @@ abstract private[derived] class SemiAutoInstances { * scala> implicit val fooShow: Show[Foo] = { | * import cats.derived.auto.show._ | * cats.derived.semi.show | - * } - * scala> Foo(List(Bar("a"))).show - * res3: String = Foo(bars = List(Bar(a = a))) + * } + * scala> Foo(List(Bar("a"))).show + * res3: String = Foo(bars = List(Bar(a = a))) * }}} */ @deprecated(message = "Use semiauto instead.", since = "2.1.0") diff --git a/core/src/main/scala/cats/derived/show.scala b/core/src/main/scala/cats/derived/show.scala index 1af55e90..0994808f 100644 --- a/core/src/main/scala/cats/derived/show.scala +++ b/core/src/main/scala/cats/derived/show.scala @@ -8,16 +8,12 @@ import util.VersionSpecific.{Lazy, OrElse} import scala.annotation.implicitNotFound import scala.reflect.ClassTag -/** Due to a limitation in the way Shapeless' `describe` is currently - * implemented, `Show` can't be derived for ADTs which are _both_ - * recursive _and_ generic in one or more type parameters. +/** Due to a limitation in the way Shapeless' `describe` is currently implemented, `Show` can't be derived for ADTs + * which are _both_ recursive _and_ generic in one or more type parameters. * - * See: - * https://github.com/typelevel/kittens/pull/48#issue-249836267 - * https://github.com/milessabin/shapeless/issues/750 + * See: https://github.com/typelevel/kittens/pull/48#issue-249836267 https://github.com/milessabin/shapeless/issues/750 * - * See the test suite for more precise examples of what can and cannot - * be derived. + * See the test suite for more precise examples of what can and cannot be derived. */ @implicitNotFound("""Could not derive an instance of Show[A] where A = ${A}. Make sure that A satisfies one of the following conditions: diff --git a/core/src/main/scala/cats/derived/util/liftSome.scala b/core/src/main/scala/cats/derived/util/liftSome.scala index da63115a..35d59337 100644 --- a/core/src/main/scala/cats/derived/util/liftSome.scala +++ b/core/src/main/scala/cats/derived/util/liftSome.scala @@ -18,8 +18,8 @@ package cats.derived.util import shapeless._ -/** Summons all available instances of the typeclass `F` for members of the coproduct `C`. - * Unlike `LiftAll` members of the coproduct without an instance will be skipped in the result. +/** Summons all available instances of the typeclass `F` for members of the coproduct `C`. Unlike `LiftAll` members of + * the coproduct without an instance will be skipped in the result. */ sealed trait LiftSome[F[_], C <: Coproduct] extends Serializable { type Out <: HList diff --git a/core/src/test/scala/cats/derived/KittensSuite.scala b/core/src/test/scala/cats/derived/KittensSuite.scala index 924f256a..0f631bfd 100644 --- a/core/src/test/scala/cats/derived/KittensSuite.scala +++ b/core/src/test/scala/cats/derived/KittensSuite.scala @@ -21,10 +21,8 @@ import cats.syntax.AllSyntax import munit.DisciplineSuite import org.scalacheck.Test.Parameters -/** An opinionated stack of traits to improve consistency and reduce - * boilerplate in Kittens tests. Note that unlike the corresponding - * CatsSuite in the Cat project, this trait does not mix in any - * instances. +/** An opinionated stack of traits to improve consistency and reduce boilerplate in Kittens tests. Note that unlike the + * corresponding CatsSuite in the Cat project, this trait does not mix in any instances. */ abstract class KittensSuite extends DisciplineSuite with AllSyntax { override val scalaCheckTestParameters: Parameters = super.scalaCheckTestParameters From 445f630b9f671c9ac6adf8c2806c4fa44e3be662 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Wed, 25 Aug 2021 14:06:26 +0200 Subject: [PATCH 25/84] Update sbt-mima-plugin to 1.0.0 (#372) --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 701e89f0..83d738bd 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -5,5 +5,5 @@ addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.1.0") addSbtPlugin("com.thoughtworks.sbt-api-mappings" % "sbt-api-mappings" % "3.0.0") addSbtPlugin("com.codecommit" % "sbt-github-actions" % "0.13.0") addSbtPlugin("com.geirsson" % "sbt-ci-release" % "1.5.7") -addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.9.2") +addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.0.0") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.3") From 07e77c4d892741bd19b01d4c1f9eaa6382264e8b Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Fri, 27 Aug 2021 07:41:07 +0200 Subject: [PATCH 26/84] Update kind-projector to 0.13.1 (#373) --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 023b36a8..1a72ca27 100644 --- a/build.sbt +++ b/build.sbt @@ -9,7 +9,7 @@ lazy val buildSettings = Seq( val catsVersion = "2.6.1" val disciplineMunitVersion = "1.0.9" -val kindProjectorVersion = "0.13.0" +val kindProjectorVersion = "0.13.1" val shapelessVersion = "2.3.7" lazy val commonSettings = Seq( From e2e8bbec6ff036f52279d00c63bea7bdb2d4e8a8 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Fri, 27 Aug 2021 19:58:06 +0200 Subject: [PATCH 27/84] Update scalafmt-core to 3.0.1 (#378) --- .scalafmt.conf | 2 +- core/src/test/scala/cats/derived/adtdefns.scala | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index 785d550d..b8bc587b 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = "3.0.0" +version = "3.0.1" align.preset = none maxColumn = 120 includeNoParensInSelectChains = false diff --git a/core/src/test/scala/cats/derived/adtdefns.scala b/core/src/test/scala/cats/derived/adtdefns.scala index fa638819..9c678d9b 100644 --- a/core/src/test/scala/cats/derived/adtdefns.scala +++ b/core/src/test/scala/cats/derived/adtdefns.scala @@ -258,7 +258,7 @@ object TestDefns { Arbitrary(Arbitrary.arbitrary[Option[A]].map(GenericAdtCase.apply)) implicit def cogen[A: Cogen]: Cogen[GenericAdt[A]] = - Cogen[Option[A]].contramap({ case GenericAdtCase(value) => value }) + Cogen[Option[A]].contramap { case GenericAdtCase(value) => value } } final case class CaseClassWOption[A](value: Option[A]) From 22bdc37ea62b7fbb18a8ab61a097f05cbd15a082 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Sat, 4 Sep 2021 09:10:25 +0200 Subject: [PATCH 28/84] Update kind-projector to 0.13.2 (#381) --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 1a72ca27..be9086d4 100644 --- a/build.sbt +++ b/build.sbt @@ -9,7 +9,7 @@ lazy val buildSettings = Seq( val catsVersion = "2.6.1" val disciplineMunitVersion = "1.0.9" -val kindProjectorVersion = "0.13.1" +val kindProjectorVersion = "0.13.2" val shapelessVersion = "2.3.7" lazy val commonSettings = Seq( From 38e4973264ae62ee6fa928fc6db5f431939e1eb2 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Sat, 4 Sep 2021 09:10:49 +0200 Subject: [PATCH 29/84] Update scalafmt-core to 3.0.2 (#380) --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index b8bc587b..4943fb66 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = "3.0.1" +version = "3.0.2" align.preset = none maxColumn = 120 includeNoParensInSelectChains = false From fd900180b627411cf4b5a2fa0b516922e0238ce3 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Sat, 11 Sep 2021 07:10:12 +0200 Subject: [PATCH 30/84] Update scalafmt-core to 3.0.3 (#382) --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index 4943fb66..633fa060 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = "3.0.2" +version = "3.0.3" align.preset = none maxColumn = 120 includeNoParensInSelectChains = false From ee37778952b6ee79e1defaf0db2ab4c92dd4c27d Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Fri, 17 Sep 2021 21:52:17 +0200 Subject: [PATCH 31/84] Update scalafmt-core to 3.0.4 (#384) --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index 633fa060..77f91195 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = "3.0.3" +version = "3.0.4" align.preset = none maxColumn = 120 includeNoParensInSelectChains = false From 210658e957d8f87e2e63c6d4527e63acab693e39 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Mon, 20 Sep 2021 13:30:25 +0200 Subject: [PATCH 32/84] Update scala-library, scala-reflect to 2.12.15 (#383) --- .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 112f37af..03a66de7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,7 +23,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - scala: [2.12.14, 2.13.6] + scala: [2.12.15, 2.13.6] java: [adopt@1.8] ci: [validateJVM, validateJS, validateNative] runs-on: ${{ matrix.os }} diff --git a/build.sbt b/build.sbt index be9086d4..67a1e028 100644 --- a/build.sbt +++ b/build.sbt @@ -1,6 +1,6 @@ import sbt._ -ThisBuild / crossScalaVersions := Seq("2.12.14", "2.13.6") +ThisBuild / crossScalaVersions := Seq("2.12.15", "2.13.6") ThisBuild / scalaVersion := "2.13.6" lazy val buildSettings = Seq( From fcf2f589ba2d7481d4c50af68860ba8f49e33595 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Thu, 23 Sep 2021 07:43:13 +0200 Subject: [PATCH 33/84] Update sbt-ci-release to 1.5.9 (#385) --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 83d738bd..ae50bbc5 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -4,6 +4,6 @@ addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.1.0") addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.1.0") addSbtPlugin("com.thoughtworks.sbt-api-mappings" % "sbt-api-mappings" % "3.0.0") addSbtPlugin("com.codecommit" % "sbt-github-actions" % "0.13.0") -addSbtPlugin("com.geirsson" % "sbt-ci-release" % "1.5.7") +addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.9") addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.0.0") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.3") From a9345b73da9ad05cc622f9c35017c4f14d52953b Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Sat, 25 Sep 2021 22:00:21 +0200 Subject: [PATCH 34/84] Update scalafmt-core to 3.0.5 (#386) --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index 77f91195..61027fce 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = "3.0.4" +version = "3.0.5" align.preset = none maxColumn = 120 includeNoParensInSelectChains = false From d8c885383c5f64bd22a3201502d6cb2dcb893146 Mon Sep 17 00:00:00 2001 From: Georgi Krastev Date: Sun, 26 Sep 2021 19:51:45 +0200 Subject: [PATCH 35/84] Remove unnecessary instance (#388) It was merged in cats-core. --- .../scala/cats/derived/commutativeSemigroup.scala | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/core/src/test/scala/cats/derived/commutativeSemigroup.scala b/core/src/test/scala/cats/derived/commutativeSemigroup.scala index 3d03ac7a..d96945dd 100644 --- a/core/src/test/scala/cats/derived/commutativeSemigroup.scala +++ b/core/src/test/scala/cats/derived/commutativeSemigroup.scala @@ -66,23 +66,12 @@ class CommutativeSemigroupSuite extends KittensSuite { } object CommutativeSemigroupSuite { - - // can be removed once kittens depends on a version of cats that includes https://github.com/typelevel/cats/pull/2834 - implicit def commutativeSemigroupOption[A](implicit sa: CommutativeSemigroup[A]): CommutativeSemigroup[Option[A]] = - new CommutativeSemigroup[Option[A]] { - def combine(x: Option[A], y: Option[A]): Option[A] = - cats.instances.option.catsKernelStdMonoidForOption(sa).combine(x, y) - } - final case class Mul(value: Int) object Mul { - implicit val eqv: Eq[Mul] = Eq.fromUniversalEquals - implicit val arbitrary: Arbitrary[Mul] = Arbitrary(Arbitrary.arbitrary[Int].map(apply)) - implicit val commutativeSemigroup: CommutativeSemigroup[Mul] = CommutativeSemigroup.instance((x, y) => Mul(x.value * y.value)) } From a5368c7e2ced311e9df7cf98d542382fd9aef482 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Sun, 3 Oct 2021 07:26:05 +0200 Subject: [PATCH 36/84] Update scalafmt-core to 3.0.6 (#390) --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index 61027fce..1f3d86fe 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = "3.0.5" +version = "3.0.6" align.preset = none maxColumn = 120 includeNoParensInSelectChains = false From 449954fa6fe5b2dc6534f24a5709f1d25e03603d Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Wed, 6 Oct 2021 19:26:56 +0200 Subject: [PATCH 37/84] Update sbt-mima-plugin to 1.0.1 (#391) --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index ae50bbc5..1864b901 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -5,5 +5,5 @@ addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.1.0") addSbtPlugin("com.thoughtworks.sbt-api-mappings" % "sbt-api-mappings" % "3.0.0") addSbtPlugin("com.codecommit" % "sbt-github-actions" % "0.13.0") addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.9") -addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.0.0") +addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.0.1") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.3") From 94c888f0a779c0f34a4a5c2614eb937250c46585 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Thu, 7 Oct 2021 09:45:27 +0200 Subject: [PATCH 38/84] Update sbt-scalajs, scalajs-compiler, ... to 1.7.1 (#392) --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 1864b901..22fb7419 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,4 +1,4 @@ -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.portable-scala" % "sbt-scalajs-crossproject" % "1.1.0") addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.1.0") From aa1c3a7601f51c25cf2056d2042faa81ee0d270f Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Thu, 14 Oct 2021 17:45:20 +0200 Subject: [PATCH 39/84] Update sbt-ci-release to 1.5.10 (#396) --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 22fb7419..4951dde5 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -4,6 +4,6 @@ addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.1.0") addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.1.0") addSbtPlugin("com.thoughtworks.sbt-api-mappings" % "sbt-api-mappings" % "3.0.0") addSbtPlugin("com.codecommit" % "sbt-github-actions" % "0.13.0") -addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.9") +addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.10") addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.0.1") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.3") From f14b11891f3bde8d7ca9d18088655fb66c3b536e Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Thu, 21 Oct 2021 07:22:21 +0200 Subject: [PATCH 40/84] Update scalafmt-core to 3.0.7 (#397) --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index 1f3d86fe..e5b403fe 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = "3.0.6" +version = "3.0.7" align.preset = none maxColumn = 120 includeNoParensInSelectChains = false From ef0d2dac061ad69682e6d89500c16452919a28c1 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Thu, 21 Oct 2021 19:32:32 +0200 Subject: [PATCH 41/84] Update auxlib, javalib, nativelib, nscplugin, ... to 0.4.1 (#398) --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 4951dde5..b46ebb6f 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("com.thoughtworks.sbt-api-mappings" % "sbt-api-mappings" % "3.0.0") From ca0ef5faa19b1ac9ea4890bb5ee93246992c8446 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Sat, 30 Oct 2021 13:36:13 +0200 Subject: [PATCH 42/84] Update scalafmt-core to 3.0.8 (#399) --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index e5b403fe..7dab321b 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = "3.0.7" +version = "3.0.8" align.preset = none maxColumn = 120 includeNoParensInSelectChains = false From efa60194bf666936d5ba20876e5e438c8556f965 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Wed, 3 Nov 2021 17:06:47 +0100 Subject: [PATCH 43/84] Update scala-library, scala-reflect to 2.13.7 (#400) --- .github/workflows/ci.yml | 4 ++-- build.sbt | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 03a66de7..c81b2c8e 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] + scala: [2.12.15, 2.13.7] java: [adopt@1.8] ci: [validateJVM, validateJS, validateNative] runs-on: ${{ matrix.os }} @@ -63,7 +63,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - scala: [2.13.6] + scala: [2.13.7] java: [adopt@1.8] runs-on: ${{ matrix.os }} steps: diff --git a/build.sbt b/build.sbt index 67a1e028..f64be560 100644 --- a/build.sbt +++ b/build.sbt @@ -1,7 +1,7 @@ import sbt._ -ThisBuild / crossScalaVersions := Seq("2.12.15", "2.13.6") -ThisBuild / scalaVersion := "2.13.6" +ThisBuild / crossScalaVersions := Seq("2.12.15", "2.13.7") +ThisBuild / scalaVersion := "2.13.7" lazy val buildSettings = Seq( organization := "org.typelevel" From 333bd1dd9f3f1194d89e2561c2f1ed17711870ca Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Mon, 15 Nov 2021 11:22:45 +0100 Subject: [PATCH 44/84] Update scalafmt-core to 3.1.1 (#403) * Update scalafmt-core to 3.1.1 * Specify runner dialect explicitly Co-authored-by: Georgi Krastev --- .scalafmt.conf | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index 7dab321b..38719261 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,5 @@ -version = "3.0.8" +version = "3.1.1" +runner.dialect = scala213 align.preset = none maxColumn = 120 includeNoParensInSelectChains = false @@ -9,3 +10,4 @@ rewrite.redundantBraces.stringInterpolation = true rewrite.redundantBraces.methodBodies = true rewrite.redundantBraces.generalExpressions = true rewriteTokens = { "⇒": "=>", "→": "->", "←": "<-" } +fileOverride { "glob:**/*.sbt" { runner.dialect = scala212 } } From e50f2b4ecf691c81c692f60d1de853002f34b175 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Fri, 19 Nov 2021 09:26:09 +0100 Subject: [PATCH 45/84] Update sbt-scalafmt to 2.4.4 (#404) --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index b46ebb6f..fd4f08f4 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -6,4 +6,4 @@ addSbtPlugin("com.thoughtworks.sbt-api-mappings" % "sbt-api-mappings" % "3.0.0") addSbtPlugin("com.codecommit" % "sbt-github-actions" % "0.13.0") addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.10") addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.0.1") -addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.3") +addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.4") From c4903a02c18683a0486ffe206794043d813cfd29 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Mon, 22 Nov 2021 23:23:33 +0100 Subject: [PATCH 46/84] Update scalafmt-core to 3.1.2 (#405) --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index 38719261..9cf0a5ba 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = "3.1.1" +version = "3.1.2" runner.dialect = scala213 align.preset = none maxColumn = 120 From 846ec21060528adee4482bbf7bd551fb92b4f0fe Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Sun, 28 Nov 2021 12:01:41 +0100 Subject: [PATCH 47/84] Update alleycats-core, cats-core, ... to 2.7.0 (#406) --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index f64be560..074ffee6 100644 --- a/build.sbt +++ b/build.sbt @@ -7,7 +7,7 @@ lazy val buildSettings = Seq( organization := "org.typelevel" ) -val catsVersion = "2.6.1" +val catsVersion = "2.7.0" val disciplineMunitVersion = "1.0.9" val kindProjectorVersion = "0.13.2" val shapelessVersion = "2.3.7" From 26b59b10bfcca69771c63a47ac181511fd2027ab Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Tue, 30 Nov 2021 10:06:39 +0100 Subject: [PATCH 48/84] Update scalafmt-core to 3.2.0 (#407) --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index 9cf0a5ba..b3bf3492 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = "3.1.2" +version = "3.2.0" runner.dialect = scala213 align.preset = none maxColumn = 120 From bdd279b8e7f384c6785293d66ea2eb3237bae23f Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Thu, 2 Dec 2021 12:45:42 +0100 Subject: [PATCH 49/84] Update sbt-github-actions to 0.14.2 (#409) * Update sbt-github-actions to 0.14.2 * Set Java version to Temurin 8 Co-authored-by: Georgi Krastev --- .github/workflows/ci.yml | 20 ++++++++++++-------- build.sbt | 2 +- project/plugins.sbt | 2 +- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c81b2c8e..d14aa2e5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,7 +24,7 @@ jobs: matrix: os: [ubuntu-latest] scala: [2.12.15, 2.13.7] - java: [adopt@1.8] + java: [temurin@8] ci: [validateJVM, validateJS, validateNative] runs-on: ${{ matrix.os }} steps: @@ -33,10 +33,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 @@ -64,7 +66,7 @@ jobs: matrix: os: [ubuntu-latest] scala: [2.13.7] - java: [adopt@1.8] + java: [temurin@8] runs-on: ${{ matrix.os }} steps: - name: Checkout current branch (full) @@ -72,10 +74,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 074ffee6..4e5d2cc4 100644 --- a/build.sbt +++ b/build.sbt @@ -109,7 +109,7 @@ lazy val publishSettings = Seq( lazy val noPublishSettings = publish / skip := true -ThisBuild / githubWorkflowJavaVersions := Seq("adopt@1.8") +ThisBuild / githubWorkflowJavaVersions := List(JavaSpec.temurin("8")) ThisBuild / githubWorkflowArtifactUpload := false ThisBuild / githubWorkflowBuildMatrixAdditions += "ci" -> List("validateJVM", "validateJS", "validateNative") ThisBuild / githubWorkflowBuild := List(WorkflowStep.Sbt(List("${{ matrix.ci }}"), name = Some("Validation"))) diff --git a/project/plugins.sbt b/project/plugins.sbt index fd4f08f4..8b027358 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -3,7 +3,7 @@ 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("com.thoughtworks.sbt-api-mappings" % "sbt-api-mappings" % "3.0.0") -addSbtPlugin("com.codecommit" % "sbt-github-actions" % "0.13.0") +addSbtPlugin("com.codecommit" % "sbt-github-actions" % "0.14.2") addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.10") addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.0.1") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.4") From ef5bd23fdb0c5c27229b6a55bf1e596763a2c5e4 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Sat, 4 Dec 2021 02:03:17 +0100 Subject: [PATCH 50/84] Update scalafmt-core to 3.2.1 (#410) --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index b3bf3492..5e4e70f7 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = "3.2.0" +version = "3.2.1" runner.dialect = scala213 align.preset = none maxColumn = 120 From 47633a983ec0e4ebd6df971122a6e768df5eba24 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Sat, 4 Dec 2021 10:48:26 +0100 Subject: [PATCH 51/84] Update sbt-scalafmt to 2.4.5 (#411) --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 8b027358..f94b467f 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -6,4 +6,4 @@ addSbtPlugin("com.thoughtworks.sbt-api-mappings" % "sbt-api-mappings" % "3.0.0") addSbtPlugin("com.codecommit" % "sbt-github-actions" % "0.14.2") addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.10") addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.0.1") -addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.4") +addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.5") From a597d2e1c855e6ec9cd921277a3fe0b423e76d16 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Tue, 7 Dec 2021 10:27:15 +0100 Subject: [PATCH 52/84] Update auxlib, javalib, nativelib, nscplugin, ... to 0.4.2 (#412) --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index f94b467f..729a4ac4 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("com.thoughtworks.sbt-api-mappings" % "sbt-api-mappings" % "3.0.0") From 7b8b3a821df0b02d136cb467b3210684d1324697 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Fri, 10 Dec 2021 15:18:03 +0100 Subject: [PATCH 53/84] Update sbt to 1.5.6 (#413) --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index 10fd9eee..bb3a9b7d 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.5.5 +sbt.version=1.5.6 From 4ec1e22a437494c23f53d161a6b18b2c7b6f48c4 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Sat, 11 Dec 2021 16:01:00 +0100 Subject: [PATCH 54/84] Update sbt-scalajs, scalajs-compiler, ... to 1.8.0 (#414) --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 729a4ac4..f97499bb 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.8.0") 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") From 5d050714b2f77a904b28e6397e6d6da4625c37b3 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Wed, 15 Dec 2021 16:05:28 +0100 Subject: [PATCH 55/84] Update sbt to 1.5.7 (#415) --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index bb3a9b7d..baf5ff3e 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.5.6 +sbt.version=1.5.7 From 649ff511fab553443b7e71b16d875407deaa4cd4 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Tue, 21 Dec 2021 12:46:49 +0100 Subject: [PATCH 56/84] Update sbt to 1.5.8 (#416) --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index baf5ff3e..e64c208f 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.5.7 +sbt.version=1.5.8 From c5b9ea287055be21a7b2a94fb2f7f13582be07e6 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Thu, 23 Dec 2021 23:07:40 +0100 Subject: [PATCH 57/84] Update scalafmt-core to 3.2.2 (#417) --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index 5e4e70f7..0699f199 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = "3.2.1" +version = "3.2.2" runner.dialect = scala213 align.preset = none maxColumn = 120 From 22047526c9fa078f9c5b5768a390e640ae5788a7 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Sat, 25 Dec 2021 12:30:40 +0100 Subject: [PATCH 58/84] Update scalafmt-core to 3.3.0 (#419) --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index 0699f199..4265f8f4 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = "3.2.2" +version = "3.3.0" runner.dialect = scala213 align.preset = none maxColumn = 120 From b787b3a9666d4785c58e7611b9f84ba398d871d8 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Sat, 25 Dec 2021 12:32:57 +0100 Subject: [PATCH 59/84] Update sbt-scalafmt to 2.4.6 (#418) --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index f97499bb..113850cf 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -6,4 +6,4 @@ addSbtPlugin("com.thoughtworks.sbt-api-mappings" % "sbt-api-mappings" % "3.0.0") addSbtPlugin("com.codecommit" % "sbt-github-actions" % "0.14.2") addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.10") addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.0.1") -addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.5") +addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.6") From 01563459de86d36084d14d735e56753c9d990cd3 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Mon, 27 Dec 2021 07:33:58 +0100 Subject: [PATCH 60/84] Update sbt to 1.6.0 (#420) --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index e64c208f..1e70b0c1 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.5.8 +sbt.version=1.6.0 From 4a2f403af6711a493e8f5e3ba9d5766b446ce3c7 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Wed, 29 Dec 2021 10:42:45 +0100 Subject: [PATCH 61/84] Update sbt to 1.6.1 (#421) --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index 1e70b0c1..3161d214 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.6.0 +sbt.version=1.6.1 From 0db7d4934a8e9fe1f856e76fac0a9fe506357974 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Sun, 2 Jan 2022 10:46:19 +0100 Subject: [PATCH 62/84] Update scalafmt-core to 3.3.1 (#424) --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index 4265f8f4..2783e587 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = "3.3.0" +version = "3.3.1" runner.dialect = scala213 align.preset = none maxColumn = 120 From c61791eeeef20f2f83f187a0789b932d9bc808ef Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Thu, 13 Jan 2022 13:32:17 +0100 Subject: [PATCH 63/84] Update scala-library, scala-reflect to 2.13.8 (#426) --- .github/workflows/ci.yml | 4 ++-- build.sbt | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d14aa2e5..3c65e7cd 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.7] + scala: [2.12.15, 2.13.8] java: [temurin@8] ci: [validateJVM, validateJS, validateNative] runs-on: ${{ matrix.os }} @@ -65,7 +65,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - scala: [2.13.7] + scala: [2.13.8] java: [temurin@8] runs-on: ${{ matrix.os }} steps: diff --git a/build.sbt b/build.sbt index 4e5d2cc4..34a37f42 100644 --- a/build.sbt +++ b/build.sbt @@ -1,7 +1,7 @@ import sbt._ -ThisBuild / crossScalaVersions := Seq("2.12.15", "2.13.7") -ThisBuild / scalaVersion := "2.13.7" +ThisBuild / crossScalaVersions := Seq("2.12.15", "2.13.8") +ThisBuild / scalaVersion := "2.13.8" lazy val buildSettings = Seq( organization := "org.typelevel" From 890f6ca75d127517a36fff50a0377698961f9dc7 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Thu, 20 Jan 2022 09:00:51 +0100 Subject: [PATCH 64/84] Update scalafmt-core to 3.3.2 (#428) --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index 2783e587..fde1ff30 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = "3.3.1" +version = "3.3.2" runner.dialect = scala213 align.preset = none maxColumn = 120 From 140c3cd80a31fa6cde1e6dd43c3d3814387b9fc3 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Sat, 22 Jan 2022 16:21:11 +0100 Subject: [PATCH 65/84] Update auxlib, javalib, nativelib, nscplugin, ... to 0.4.3 (#430) --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 113850cf..84061d83 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,5 +1,5 @@ addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.8.0") -addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.2") +addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.3") addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.1.0") addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.1.0") addSbtPlugin("com.thoughtworks.sbt-api-mappings" % "sbt-api-mappings" % "3.0.0") From 70e0073af6c91f0baa1e8df0174f9fdc2115c850 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Sat, 22 Jan 2022 23:01:59 +0100 Subject: [PATCH 66/84] Update scalafmt-core to 3.3.3 (#431) --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index fde1ff30..146b4942 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = "3.3.2" +version = "3.3.3" runner.dialect = scala213 align.preset = none maxColumn = 120 From 2a8377a666e1074914a9998f1428d1bc21296ce0 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Sun, 30 Jan 2022 20:00:36 +0100 Subject: [PATCH 67/84] Update scalafmt-core to 3.4.0 (#432) --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index 146b4942..1a675b38 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = "3.3.3" +version = "3.4.0" runner.dialect = scala213 align.preset = none maxColumn = 120 From b870d758b0957fcf6df084b1bd9726e5518e5719 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Tue, 1 Feb 2022 11:40:20 +0100 Subject: [PATCH 68/84] Update sbt to 1.6.2 (#434) --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index 3161d214..c8fcab54 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.6.1 +sbt.version=1.6.2 From 8bf3ca1e1cc9744bd38dc97fd6eaf6d705f3ea67 Mon Sep 17 00:00:00 2001 From: Arman Bilge Date: Sun, 6 Feb 2022 08:45:49 -0800 Subject: [PATCH 69/84] Migrate to sbt-typelevel-ci-release (#429) * Migrate to sbt-typelevel-ci-release * Rescope publish settings * Set tlVersionIntroduced * Poke ci * Update to latest sbt-typelevel --- .github/workflows/ci.yml | 127 +++++++++++++++++++++++++++++++++++---- .sbtrc | 2 +- build.sbt | 87 ++++++++------------------- project/plugins.sbt | 4 +- 4 files changed, 143 insertions(+), 77 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3c65e7cd..982fe5b0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,6 +15,10 @@ on: 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: @@ -25,7 +29,7 @@ jobs: os: [ubuntu-latest] scala: [2.12.15, 2.13.8] java: [temurin@8] - ci: [validateJVM, validateJS, validateNative] + project: [rootJS, rootJVM, rootNative] runs-on: ${{ matrix.os }} steps: - name: Checkout current branch (full) @@ -53,15 +57,49 @@ 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 - - name: Validation - run: sbt ++${{ matrix.scala }} '${{ matrix.ci }}' + - name: Check formatting + run: sbt 'project ${{ matrix.project }}' '++${{ matrix.scala }}' scalafmtCheckAll 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 + 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.java }}-${{ matrix.scala }}-${{ matrix.project }} + path: targets.tar publish: name: Publish Artifacts needs: [build] - if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v')) + if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main') strategy: matrix: os: [ubuntu-latest] @@ -93,11 +131,76 @@ jobs: ~/Library/Caches/Coursier/v1 key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }} - - uses: olafurpg/setup-gpg@v3 + - 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 }}-${{ matrix.java }}-2.13.8-rootNative + + - name: Inflate target directories (2.13.8, 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 -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) - - env: - PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }} - PGP_SECRET: ${{ secrets.PGP_SECRET }} - SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }} - SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }} - run: sbt ++${{ matrix.scala }} ci-release + - name: Publish + run: sbt '++${{ matrix.scala }}' tlRelease diff --git a/.sbtrc b/.sbtrc index 741a9b6e..39ec4794 100644 --- a/.sbtrc +++ b/.sbtrc @@ -1 +1 @@ -alias boot = ;reload ;project kittens ;iflast shell +alias boot = ;reload ;project / ;iflast shell diff --git a/build.sbt b/build.sbt index 34a37f42..2d9af0d1 100644 --- a/build.sbt +++ b/build.sbt @@ -2,10 +2,8 @@ import sbt._ ThisBuild / crossScalaVersions := Seq("2.12.15", "2.13.8") ThisBuild / scalaVersion := "2.13.8" - -lazy val buildSettings = Seq( - organization := "org.typelevel" -) +ThisBuild / tlBaseVersion := "2.3" +ThisBuild / organization := "org.typelevel" val catsVersion = "2.7.0" val disciplineMunitVersion = "1.0.9" @@ -36,43 +34,34 @@ lazy val commonSettings = Seq( "org.typelevel" %%% "alleycats-core" % catsVersion, "com.chuusai" %%% "shapeless" % shapelessVersion, "org.typelevel" %%% "cats-testkit" % catsVersion % Test, + "org.scalameta" %%% "munit" % "0.7.29" % Test, "org.typelevel" %%% "discipline-munit" % disciplineMunitVersion % Test, "org.scala-lang" % "scala-reflect" % scalaVersion.value % Test, compilerPlugin(("org.typelevel" %% "kind-projector" % kindProjectorVersion).cross(CrossVersion.full)) ), - Test / parallelExecution := false, - versionScheme := Some("semver-spec"), - mimaPreviousArtifacts := Set(organization.value %% moduleName.value % "2.2.1") + Test / parallelExecution := false ) console / initialCommands := """import shapeless._, cats._, cats.derived._""" -lazy val commonJsSettings = Seq( - Global / scalaJSStage := FastOptStage, - Test / scalaJSLinkerConfig ~= (_.withModuleKind(ModuleKind.CommonJSModule)) -) - -lazy val coreSettings = - Seq.concat(buildSettings, commonSettings, crossVersionSharedSources, publishSettings) - -lazy val kittens = project - .in(file(".")) - .aggregate(coreJS, coreJVM, coreNative) - .dependsOn(coreJS, coreJVM, coreNative) - .settings(coreSettings: _*) - .settings(noPublishSettings) +lazy val root = tlCrossRootProject.aggregate(core) lazy val core = crossProject(JVMPlatform, JSPlatform, NativePlatform) .crossType(CrossType.Pure) .settings(moduleName := "kittens") - .settings(coreSettings: _*) - .jsSettings(commonJsSettings: _*) + .settings(commonSettings: _*) + .jsSettings( + tlVersionIntroduced := List("2.12", "2.13").map(_ -> "2.1.0").toMap + ) + .nativeSettings( + tlVersionIntroduced := List("2.12", "2.13").map(_ -> "2.2.2").toMap + ) lazy val coreJVM = core.jvm lazy val coreJS = core.js lazy val coreNative = core.native -addCommandAlias("root", ";project kittens") +addCommandAlias("root", ";project /") addCommandAlias("jvm", ";project coreJVM") addCommandAlias("js", ";project coreJS") addCommandAlias("native", ";project coreNative") @@ -87,43 +76,19 @@ addCommandAlias("mima", "coreJVM/mimaReportBinaryIssues") addCommandAlias("fmt", "all scalafmtSbt scalafmtAll") addCommandAlias("fmtCheck", "all scalafmtSbtCheck scalafmtCheckAll") -lazy val crossVersionSharedSources: Seq[Setting[_]] = Seq(Compile, Test).map { sc => - (sc / unmanagedSourceDirectories) ++= (sc / unmanagedSourceDirectories).value.map { dir: File => - new File(dir.getPath + "_" + scalaBinaryVersion.value) - } -} - -lazy val publishSettings = Seq( - Test / publishArtifact := false, - pomIncludeRepository := (_ => false), - homepage := Some(url("https://github.com/typelevel/kittens")), - licenses := Seq("Apache 2" -> url("http://www.apache.org/licenses/LICENSE-2.0.txt")), - scmInfo := Some(ScmInfo(url("https://github.com/typelevel/kittens"), "scm:git:git@github.com:typelevel/kittens.git")), - developers := List( - Developer("milessabin", "Miles Sabin", "", url("http://milessabin.com/blog")), - Developer("kailuowang", "Kai(luo) Wang", "kailuo.wang@gmail.com", url("http://kailuowang.com/")), - Developer("joroKr21", "Georgi Krastev", "joro.kr.21@gmail.com", url("https://twitter.com/Joro_Kr")) - ) +ThisBuild / licenses := Seq("Apache 2" -> url("http://www.apache.org/licenses/LICENSE-2.0.txt")) +ThisBuild / developers := List( + Developer("milessabin", "Miles Sabin", "", url("http://milessabin.com/blog")), + Developer("kailuowang", "Kai(luo) Wang", "kailuo.wang@gmail.com", url("http://kailuowang.com/")), + Developer("joroKr21", "Georgi Krastev", "joro.kr.21@gmail.com", url("https://twitter.com/Joro_Kr")) ) -lazy val noPublishSettings = - publish / skip := true - -ThisBuild / githubWorkflowJavaVersions := List(JavaSpec.temurin("8")) -ThisBuild / githubWorkflowArtifactUpload := false -ThisBuild / githubWorkflowBuildMatrixAdditions += "ci" -> List("validateJVM", "validateJS", "validateNative") -ThisBuild / githubWorkflowBuild := List(WorkflowStep.Sbt(List("${{ matrix.ci }}"), name = Some("Validation"))) -ThisBuild / githubWorkflowTargetTags ++= Seq("v*") -ThisBuild / githubWorkflowPublishTargetBranches := Seq(RefPredicate.StartsWith(Ref.Tag("v"))) -ThisBuild / githubWorkflowPublishPreamble += WorkflowStep.Use(UseRef.Public("olafurpg", "setup-gpg", "v3")) -ThisBuild / githubWorkflowPublish := Seq( - WorkflowStep.Sbt( - List("ci-release"), - env = Map( - "PGP_PASSPHRASE" -> "${{ secrets.PGP_PASSPHRASE }}", - "PGP_SECRET" -> "${{ secrets.PGP_SECRET }}", - "SONATYPE_PASSWORD" -> "${{ secrets.SONATYPE_PASSWORD }}", - "SONATYPE_USERNAME" -> "${{ secrets.SONATYPE_USERNAME }}" +ThisBuild / tlCiReleaseBranches := Seq("main") +ThisBuild / githubWorkflowBuild ~= { steps => + val formatStep = WorkflowStep + .Sbt( + List("scalafmtCheckAll", "scalafmtSbtCheck"), + name = Some("Check formatting") ) - ) -) + formatStep +: steps +} diff --git a/project/plugins.sbt b/project/plugins.sbt index 84061d83..93ad1a99 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -3,7 +3,5 @@ addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.3") addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.1.0") addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.1.0") addSbtPlugin("com.thoughtworks.sbt-api-mappings" % "sbt-api-mappings" % "3.0.0") -addSbtPlugin("com.codecommit" % "sbt-github-actions" % "0.14.2") -addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.10") -addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.0.1") +addSbtPlugin("org.typelevel" % "sbt-typelevel-ci-release" % "0.4.3") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.6") From d88292ed6fd6985329afc901d6e35ebb55162c29 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Sun, 6 Feb 2022 17:46:08 +0100 Subject: [PATCH 70/84] Update scalafmt-core to 3.4.2 (#436) --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index 1a675b38..2ef94741 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = "3.4.0" +version = "3.4.2" runner.dialect = scala213 align.preset = none maxColumn = 120 From e14abe2c77dcd65b75a1b961fd82955e84644209 Mon Sep 17 00:00:00 2001 From: Georgi Krastev Date: Sun, 6 Feb 2022 19:42:04 +0100 Subject: [PATCH 71/84] Use predefined Apache 2 license (#437) --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 2d9af0d1..2c9e06a7 100644 --- a/build.sbt +++ b/build.sbt @@ -76,7 +76,7 @@ addCommandAlias("mima", "coreJVM/mimaReportBinaryIssues") addCommandAlias("fmt", "all scalafmtSbt scalafmtAll") addCommandAlias("fmtCheck", "all scalafmtSbtCheck scalafmtCheckAll") -ThisBuild / licenses := Seq("Apache 2" -> url("http://www.apache.org/licenses/LICENSE-2.0.txt")) +ThisBuild / licenses := Seq(License.Apache2) ThisBuild / developers := List( Developer("milessabin", "Miles Sabin", "", url("http://milessabin.com/blog")), Developer("kailuowang", "Kai(luo) Wang", "kailuo.wang@gmail.com", url("http://kailuowang.com/")), From e4ce051d66ecdb18e17663d51d27a6dd5f5c36f3 Mon Sep 17 00:00:00 2001 From: Arman Bilge Date: Sun, 6 Feb 2022 10:45:34 -0800 Subject: [PATCH 72/84] Enable snapshots on master (#438) * Delete .sbtrc * Publish snapshots from master --- .github/workflows/ci.yml | 8 ++++---- .sbtrc | 1 - build.sbt | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) delete mode 100644 .sbtrc diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 982fe5b0..a7d14044 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -82,15 +82,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' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/master') 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' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/master') 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' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/master') uses: actions/upload-artifact@v2 with: name: target-${{ matrix.os }}-${{ matrix.java }}-${{ matrix.scala }}-${{ matrix.project }} @@ -99,7 +99,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' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/master') strategy: matrix: os: [ubuntu-latest] diff --git a/.sbtrc b/.sbtrc deleted file mode 100644 index 39ec4794..00000000 --- a/.sbtrc +++ /dev/null @@ -1 +0,0 @@ -alias boot = ;reload ;project / ;iflast shell diff --git a/build.sbt b/build.sbt index 2c9e06a7..a2ba8a96 100644 --- a/build.sbt +++ b/build.sbt @@ -83,7 +83,7 @@ ThisBuild / developers := List( Developer("joroKr21", "Georgi Krastev", "joro.kr.21@gmail.com", url("https://twitter.com/Joro_Kr")) ) -ThisBuild / tlCiReleaseBranches := Seq("main") +ThisBuild / tlCiReleaseBranches := Seq("master") ThisBuild / githubWorkflowBuild ~= { steps => val formatStep = WorkflowStep .Sbt( From cb4f8c2bae28a1606c34630266bc76074d859d21 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Thu, 10 Feb 2022 23:34:40 +0100 Subject: [PATCH 73/84] Update sbt-typelevel-ci-release to 0.4.4 (#442) * Update sbt-typelevel-ci-release to 0.4.4 * Regenerate workflow with sbt-github-actions --- .github/workflows/ci.yml | 9 +++++---- project/plugins.sbt | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a7d14044..60cb67e8 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 }} @@ -62,9 +63,9 @@ jobs: - name: Check formatting run: sbt 'project ${{ matrix.project }}' '++${{ matrix.scala }}' scalafmtCheckAll 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' @@ -193,12 +194,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) diff --git a/project/plugins.sbt b/project/plugins.sbt index 93ad1a99..d99dda6f 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -3,5 +3,5 @@ addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.3") addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.1.0") addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.1.0") addSbtPlugin("com.thoughtworks.sbt-api-mappings" % "sbt-api-mappings" % "3.0.0") -addSbtPlugin("org.typelevel" % "sbt-typelevel-ci-release" % "0.4.3") +addSbtPlugin("org.typelevel" % "sbt-typelevel-ci-release" % "0.4.4") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.6") From 5fd152b43531f324e7f81939e62c2425b3b0b72b Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Sat, 12 Feb 2022 07:51:18 +0100 Subject: [PATCH 74/84] Update sbt-typelevel-ci-release to 0.4.5 (#443) --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index d99dda6f..c7f249e9 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -3,5 +3,5 @@ addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.3") addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.1.0") addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.1.0") addSbtPlugin("com.thoughtworks.sbt-api-mappings" % "sbt-api-mappings" % "3.0.0") -addSbtPlugin("org.typelevel" % "sbt-typelevel-ci-release" % "0.4.4") +addSbtPlugin("org.typelevel" % "sbt-typelevel-ci-release" % "0.4.5") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.6") From 3145a001b91206fb43378644647cbbd6c8e3e64f Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Sat, 12 Feb 2022 15:59:15 +0100 Subject: [PATCH 75/84] Update scalafmt-core to 3.4.3 (#444) --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index 2ef94741..acd85d15 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = "3.4.2" +version = "3.4.3" runner.dialect = scala213 align.preset = none maxColumn = 120 From 60a3def1fd0daf0d3fa51daf0322781f6044dad6 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Sun, 13 Feb 2022 17:20:44 +0100 Subject: [PATCH 76/84] Update shapeless to 2.3.8 (#445) --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index a2ba8a96..aa145503 100644 --- a/build.sbt +++ b/build.sbt @@ -8,7 +8,7 @@ ThisBuild / organization := "org.typelevel" val catsVersion = "2.7.0" val disciplineMunitVersion = "1.0.9" val kindProjectorVersion = "0.13.2" -val shapelessVersion = "2.3.7" +val shapelessVersion = "2.3.8" lazy val commonSettings = Seq( scalacOptions := Seq( From 7d881b7cae924fc5959dc17733c4e64abb4607c5 Mon Sep 17 00:00:00 2001 From: Georgi Krastev Date: Sun, 13 Feb 2022 18:43:41 +0100 Subject: [PATCH 77/84] Reformat --- .../main/scala-3/cats/derived/Derived.scala | 18 +++++++++--------- .../scala-3/cats/derived/DerivedShow.scala | 9 ++++----- .../scala-3/cats/derived/contravariant.scala | 5 ++--- .../src/main/scala-3/cats/derived/emptyk.scala | 6 +++--- .../main/scala-3/cats/derived/invariant.scala | 11 +++++------ .../main/scala-3/cats/derived/monoidk.scala | 8 ++++---- .../scala-3/cats/derived/partialOrder.scala | 16 ++++++++-------- .../main/scala-3/cats/derived/semigroupk.scala | 11 +++++------ .../cats/derived/CommutativeMonoidSuite.scala | 2 +- .../derived/CommutativeSemigroupSuite.scala | 2 +- .../scala-3/cats/derived/MonoidSuite.scala | 2 +- .../scala-3/cats/derived/ReducibleTests.scala | 4 +++- .../scala-3/cats/derived/SemigroupSuite.scala | 2 +- .../test/scala-3/cats/derived/adtdefns.scala | 2 +- 14 files changed, 48 insertions(+), 50 deletions(-) diff --git a/core/src/main/scala-3/cats/derived/Derived.scala b/core/src/main/scala-3/cats/derived/Derived.scala index 6c6c0ddc..ccbd0683 100644 --- a/core/src/main/scala-3/cats/derived/Derived.scala +++ b/core/src/main/scala-3/cats/derived/Derived.scala @@ -19,15 +19,15 @@ object Derived: object Or extends OrInstances: def apply[A](instance: A): Or[A] = instance extension [A](or: Or[A]) def unify: A = or - extension [I[f[_], t] <: K0.Instances[f, t], F[_], T] - (inst: I[Or0[F], T]) @targetName("unifyK0") def unify: I[F, T] = inst - extension [I[f[_[_]], t[_]] <: K1.Instances[f, t], F[_[_]], T[_]] - (inst: I[Or1[F], T]) @targetName("unifyK1") def unify: I[F, T] = inst - extension [I[f[_[_[_]]], t[_[_]]] <: K11.Instances[f, t], F[_[_[_]]], T[_[_]]] - (inst: I[Or11[F], T]) @targetName("unifyK11") def unify: I[F, T] = inst - extension [I[f[_[_, _]], t[_, _]] <: K2.Instances[f, t], F[_[_, _]], T[_, _]] - (inst: I[Or2[F], T]) @targetName("unifyK2") def unify: I[F, T] = inst - + extension [I[f[_], t] <: K0.Instances[f, t], F[_], T](inst: I[Or0[F], T]) + @targetName("unifyK0") def unify: I[F, T] = inst + extension [I[f[_[_]], t[_]] <: K1.Instances[f, t], F[_[_]], T[_]](inst: I[Or1[F], T]) + @targetName("unifyK1") def unify: I[F, T] = inst + extension [I[f[_[_[_]]], t[_[_]]] <: K11.Instances[f, t], F[_[_[_]]], T[_[_]]](inst: I[Or11[F], T]) + @targetName("unifyK11") def unify: I[F, T] = inst + extension [I[f[_[_, _]], t[_, _]] <: K2.Instances[f, t], F[_[_, _]], T[_, _]](inst: I[Or2[F], T]) + @targetName("unifyK2") def unify: I[F, T] = inst + sealed abstract class OrInstances: inline given [A]: Derived.Or[A] = summonFrom { case instance: A => Derived.Or(instance) diff --git a/core/src/main/scala-3/cats/derived/DerivedShow.scala b/core/src/main/scala-3/cats/derived/DerivedShow.scala index fa5379d5..747acae3 100644 --- a/core/src/main/scala-3/cats/derived/DerivedShow.scala +++ b/core/src/main/scala-3/cats/derived/DerivedShow.scala @@ -21,13 +21,13 @@ object DerivedShow: given K0.CoproductInstances[Show, A] = inst.unify new Coproduct[Show, A] {} - trait Product[F[x] <: Show[x], A](using inst: K0.ProductInstances[F, A], labelling: Labelling[A]) - extends Show[A]: + trait Product[F[x] <: Show[x], A](using inst: K0.ProductInstances[F, A], labelling: Labelling[A]) extends Show[A]: def show(a: A): String = val prefix = labelling.label val labels = labelling.elemLabels val n = labels.size - if n <= 0 then prefix else + if n <= 0 then prefix + else val sb = new StringBuilder(prefix) sb.append('(') var i = 0 @@ -43,7 +43,6 @@ object DerivedShow: sb.append(')') sb.toString - trait Coproduct[F[x] <: Show[x], A](using inst: K0.CoproductInstances[F, A]) - extends Show[A]: + trait Coproduct[F[x] <: Show[x], A](using inst: K0.CoproductInstances[F, A]) extends Show[A]: def show(a: A): String = inst.fold(a)([t] => (st: F[t], t: t) => st.show(t)) diff --git a/core/src/main/scala-3/cats/derived/contravariant.scala b/core/src/main/scala-3/cats/derived/contravariant.scala index 82d42e75..e55af0c3 100644 --- a/core/src/main/scala-3/cats/derived/contravariant.scala +++ b/core/src/main/scala-3/cats/derived/contravariant.scala @@ -3,8 +3,7 @@ package cats.derived import cats.Contravariant import shapeless3.deriving.K1 -trait GenericContravariant[T[x[_]] <: Contravariant[x], F[_]](using inst: K1.Instances[T, F]) - extends Contravariant[F]: +trait GenericContravariant[T[x[_]] <: Contravariant[x], F[_]](using inst: K1.Instances[T, F]) extends Contravariant[F]: def contramap[A, B](fa: F[A])(f: B => A): F[B] = inst.map(fa)( [t[_]] => (contra: T[t], t0: t[A]) => contra.contramap(t0)(f) @@ -13,4 +12,4 @@ trait GenericContravariant[T[x[_]] <: Contravariant[x], F[_]](using inst: K1.Ins trait ContravariantDerivation: extension (F: Contravariant.type) inline def derived[F[_]](using gen: K1.Generic[F]): Contravariant[F] = - new GenericContravariant[Contravariant, F]{} + new GenericContravariant[Contravariant, F] {} diff --git a/core/src/main/scala-3/cats/derived/emptyk.scala b/core/src/main/scala-3/cats/derived/emptyk.scala index 39cac71b..f30221ba 100644 --- a/core/src/main/scala-3/cats/derived/emptyk.scala +++ b/core/src/main/scala-3/cats/derived/emptyk.scala @@ -3,12 +3,12 @@ package cats.derived import alleycats.{Empty, EmptyK} import shapeless3.deriving.{Const, K1} -trait ProductEmptyK[T[x[_]] <: EmptyK[x], F[_]]( - using inst: K1.ProductInstances[T, F] +trait ProductEmptyK[T[x[_]] <: EmptyK[x], F[_]](using + inst: K1.ProductInstances[T, F] ) extends EmptyK[F]: def empty[A]: F[A] = inst.construct([t[_]] => (emp: T[t]) => emp.empty[A]) trait EmptyKDerivation: extension (E: EmptyK.type) inline def derived[F[_]](using gen: K1.ProductGeneric[F]): EmptyK[F] = - new ProductEmptyK[EmptyK, F]{} + new ProductEmptyK[EmptyK, F] {} diff --git a/core/src/main/scala-3/cats/derived/invariant.scala b/core/src/main/scala-3/cats/derived/invariant.scala index 801b0dab..74d9dcc4 100644 --- a/core/src/main/scala-3/cats/derived/invariant.scala +++ b/core/src/main/scala-3/cats/derived/invariant.scala @@ -3,13 +3,12 @@ package cats.derived import cats.Invariant import shapeless3.deriving.K1 -trait GenericInvariant[T[x[_]] <: Invariant[x], F[_]](using inst: K1.Instances[T, F]) - extends Invariant[F]: - def imap[A, B](fa: F[A])(f: A => B)(g: B => A): F[B] = inst.map(fa)( - [t[_]] => (inv: T[t], t0: t[A]) => inv.imap(t0)(f)(g) - ) +trait GenericInvariant[T[x[_]] <: Invariant[x], F[_]](using inst: K1.Instances[T, F]) extends Invariant[F]: + def imap[A, B](fa: F[A])(f: A => B)(g: B => A): F[B] = inst.map(fa)( + [t[_]] => (inv: T[t], t0: t[A]) => inv.imap(t0)(f)(g) + ) trait InvariantDerivation: extension (F: Invariant.type) inline def derived[F[_]](using gen: K1.Generic[F]): Invariant[F] = - new GenericInvariant[Invariant, F]{} + new GenericInvariant[Invariant, F] {} diff --git a/core/src/main/scala-3/cats/derived/monoidk.scala b/core/src/main/scala-3/cats/derived/monoidk.scala index a8be9c91..cc5e878c 100644 --- a/core/src/main/scala-3/cats/derived/monoidk.scala +++ b/core/src/main/scala-3/cats/derived/monoidk.scala @@ -4,9 +4,9 @@ import cats.{Monoid, MonoidK} import shapeless3.deriving.{Const, K1} trait ProductMonoidK[T[x[_]] <: MonoidK[x], F[_]](using inst: K1.ProductInstances[T, F]) - extends ProductSemigroupK[T, F], MonoidK[F]: - def empty[A]: F[A] = inst.construct([t[_]] => (emp: T[t]) => emp.empty[A]) + extends ProductSemigroupK[T, F], + MonoidK[F]: + def empty[A]: F[A] = inst.construct([t[_]] => (emp: T[t]) => emp.empty[A]) trait MonoidKDerivation: - extension (F: MonoidK.type) - inline def derived[F[_]](using gen: K1.Generic[F]): MonoidK[F] = ??? + extension (F: MonoidK.type) inline def derived[F[_]](using gen: K1.Generic[F]): MonoidK[F] = ??? diff --git a/core/src/main/scala-3/cats/derived/partialOrder.scala b/core/src/main/scala-3/cats/derived/partialOrder.scala index 29cb75e9..aa82a43a 100644 --- a/core/src/main/scala-3/cats/derived/partialOrder.scala +++ b/core/src/main/scala-3/cats/derived/partialOrder.scala @@ -3,14 +3,14 @@ package cats.derived import cats.PartialOrder import shapeless3.deriving.{K0, Complete} -trait ProductPartialOrder[T[x] <: PartialOrder[x], A](using inst: K0.ProductInstances[T, A]) - extends PartialOrder[A]: +trait ProductPartialOrder[T[x] <: PartialOrder[x], A](using inst: K0.ProductInstances[T, A]) extends PartialOrder[A]: def partialCompare(x: A, y: A): Double = inst.foldLeft2(x, y)(0: Double)( - [t] => (acc: Double, ord: T[t], t0: t, t1: t) => { - val cmp = ord.partialCompare(t0, t1) - Complete(cmp != 0)(cmp)(acc) + [t] => + (acc: Double, ord: T[t], t0: t, t1: t) => { + val cmp = ord.partialCompare(t0, t1) + Complete(cmp != 0)(cmp)(acc) } ) @@ -18,7 +18,7 @@ trait CoproductPartialOrder[T[x] <: PartialOrder[x], A](using inst: K0.Coproduct extends PartialOrder[A]: def partialCompare(x: A, y: A): Double = - inst.fold2(x, y)(Double.NaN : Double)( + inst.fold2(x, y)(Double.NaN: Double)( [t] => (ord: T[t], t0: t, t1: t) => ord.partialCompare(t0, t1) ) @@ -28,7 +28,7 @@ trait PartialOrderDerivation: gen.derive(productPartialOrder, coproductPartialOrder) given productPartialOrder[A](using K0.ProductInstances[PartialOrder, A]): PartialOrder[A] = - new ProductPartialOrder[PartialOrder, A]{} + new ProductPartialOrder[PartialOrder, A] {} given coproductPartialOrder[A](using K0.CoproductInstances[PartialOrder, A]): PartialOrder[A] = - new CoproductPartialOrder[PartialOrder, A]{} + new CoproductPartialOrder[PartialOrder, A] {} diff --git a/core/src/main/scala-3/cats/derived/semigroupk.scala b/core/src/main/scala-3/cats/derived/semigroupk.scala index 22e8d1f1..c9b000f3 100644 --- a/core/src/main/scala-3/cats/derived/semigroupk.scala +++ b/core/src/main/scala-3/cats/derived/semigroupk.scala @@ -3,13 +3,12 @@ package cats.derived import cats.{Semigroup, SemigroupK} import shapeless3.deriving.{Const, K1} -trait ProductSemigroupK[T[x[_]] <: SemigroupK[x], F[_]](using inst: K1.ProductInstances[T, F]) - extends SemigroupK[F]: - def combineK[A](x: F[A], y: F[A]): F[A] = inst.map2[A, A, A](x,y)( - [t[_]] => (smgrpk: T[t], t0: t[A], t1: t[A]) => smgrpk.combineK(t0, t1) - ) +trait ProductSemigroupK[T[x[_]] <: SemigroupK[x], F[_]](using inst: K1.ProductInstances[T, F]) extends SemigroupK[F]: + def combineK[A](x: F[A], y: F[A]): F[A] = inst.map2[A, A, A](x, y)( + [t[_]] => (smgrpk: T[t], t0: t[A], t1: t[A]) => smgrpk.combineK(t0, t1) + ) trait SemigroupKDerivation: extension (F: SemigroupK.type) inline def derived[F[_]](using gen: K1.ProductGeneric[F]): SemigroupK[F] = - new ProductSemigroupK[SemigroupK, F]{} + new ProductSemigroupK[SemigroupK, F] {} diff --git a/core/src/test/scala-3/cats/derived/CommutativeMonoidSuite.scala b/core/src/test/scala-3/cats/derived/CommutativeMonoidSuite.scala index 2f6d8002..b423ea0d 100644 --- a/core/src/test/scala-3/cats/derived/CommutativeMonoidSuite.scala +++ b/core/src/test/scala-3/cats/derived/CommutativeMonoidSuite.scala @@ -33,7 +33,7 @@ class CommutativeMonoidSuite extends KittensSuite: inline def testCommutativeMonoid(inline context: String): Unit = checkAll(s"$context.CommutativeMonoid[Foo]", commutativeMonoidTests[CommutativeFoo].commutativeMonoid) // FIXME: Doesn't work - //checkAll(s"$context.CommutativeMonoid[Recursive]", commutativeMonoidTests[Recursive].commutativeMonoid) + // checkAll(s"$context.CommutativeMonoid[Recursive]", commutativeMonoidTests[Recursive].commutativeMonoid) checkAll(s"$context.CommutativeMonoid[Box[Mul]]", commutativeMonoidTests[Box[Mul]].commutativeMonoid) checkAll( s"$context.CommutativeMonoid is Serializable", diff --git a/core/src/test/scala-3/cats/derived/CommutativeSemigroupSuite.scala b/core/src/test/scala-3/cats/derived/CommutativeSemigroupSuite.scala index f261f29c..2adaf003 100644 --- a/core/src/test/scala-3/cats/derived/CommutativeSemigroupSuite.scala +++ b/core/src/test/scala-3/cats/derived/CommutativeSemigroupSuite.scala @@ -36,7 +36,7 @@ class CommutativeSemigroupSuite extends KittensSuite: commutativeSemigroupTests[CommutativeFoo].commutativeSemigroup ) // FIXME: Doesn't work - //checkAll(s"$context.CommutativeSemigroup[Recursive]", commutativeSemigroupTests[Recursive].commutativeSemigroup) + // checkAll(s"$context.CommutativeSemigroup[Recursive]", commutativeSemigroupTests[Recursive].commutativeSemigroup) checkAll(s"$context.CommutativeSemigroup[Box[Mul]]", commutativeSemigroupTests[Box[Mul]].commutativeSemigroup) checkAll( s"$context.CommutativeSemigroup is Serializable", diff --git a/core/src/test/scala-3/cats/derived/MonoidSuite.scala b/core/src/test/scala-3/cats/derived/MonoidSuite.scala index bab92c9b..8822d8e2 100644 --- a/core/src/test/scala-3/cats/derived/MonoidSuite.scala +++ b/core/src/test/scala-3/cats/derived/MonoidSuite.scala @@ -34,7 +34,7 @@ class MonoidSuite extends KittensSuite: checkAll(s"$context.Monoid[Interleaved[Int]]", monoidTests[Interleaved[Int]].monoid) checkAll(s"$context.Monoid[Box[Mul]]", monoidTests[Box[Mul]].monoid) // FIXME: Doesn't work - //checkAll(s"$context.Monoid[Recursive]", monoidTests[Recursive].monoid) + // checkAll(s"$context.Monoid[Recursive]", monoidTests[Recursive].monoid) checkAll(s"$context.Monoid is Serializable", SerializableTests.serializable(summonInline[Monoid[Foo]])) test(s"$context.Monoid respects existing instances") { val box = summonInline[Monoid[Box[Mul]]] diff --git a/core/src/test/scala-3/cats/derived/ReducibleTests.scala b/core/src/test/scala-3/cats/derived/ReducibleTests.scala index 11055315..b0595b3e 100644 --- a/core/src/test/scala-3/cats/derived/ReducibleTests.scala +++ b/core/src/test/scala-3/cats/derived/ReducibleTests.scala @@ -33,4 +33,6 @@ object ReducibleTests: DerivedReducible[NonEmptyTree] @main def run() = - println(DerivedFunctor[ReducibleTests.MyList].map(ReducibleTests.MyList.Con(42, ReducibleTests.MyList.Non))(_.toString)) + println( + DerivedFunctor[ReducibleTests.MyList].map(ReducibleTests.MyList.Con(42, ReducibleTests.MyList.Non))(_.toString) + ) diff --git a/core/src/test/scala-3/cats/derived/SemigroupSuite.scala b/core/src/test/scala-3/cats/derived/SemigroupSuite.scala index 0e2a764c..571685b5 100644 --- a/core/src/test/scala-3/cats/derived/SemigroupSuite.scala +++ b/core/src/test/scala-3/cats/derived/SemigroupSuite.scala @@ -34,7 +34,7 @@ class SemigroupSuite extends KittensSuite: checkAll(s"$context.Semigroup[Interleaved[Int]]", semigroupTests[Interleaved[Int]].semigroup) checkAll(s"$context.Semigroup[Box[Mul]]", semigroupTests[Box[Mul]].semigroup) // FIXME: Doesn't work - //checkAll(s"$context.Semigroup[Recursive]", semigroupTests[Recursive].semigroup) + // checkAll(s"$context.Semigroup[Recursive]", semigroupTests[Recursive].semigroup) checkAll(s"$context.Semigroup is Serializable", SerializableTests.serializable(summonInline[Semigroup[Foo]])) test(s"$context.Semigroup respects existing instances") { val box = summonInline[Semigroup[Box[Mul]]] diff --git a/core/src/test/scala-3/cats/derived/adtdefns.scala b/core/src/test/scala-3/cats/derived/adtdefns.scala index 43ded5b5..86e67b30 100644 --- a/core/src/test/scala-3/cats/derived/adtdefns.scala +++ b/core/src/test/scala-3/cats/derived/adtdefns.scala @@ -261,7 +261,7 @@ object TestDefns { Arbitrary(Arbitrary.arbitrary[Option[A]].map(GenericAdtCase.apply)) implicit def cogen[A: Cogen]: Cogen[GenericAdt[A]] = - Cogen[Option[A]].contramap({ case GenericAdtCase(value) => value }) + Cogen[Option[A]].contramap { case GenericAdtCase(value) => value } } final case class CaseClassWOption[A](value: Option[A]) From 157e5a87c7ca8309535d9c78fe3b4192652125fe Mon Sep 17 00:00:00 2001 From: Georgi Krastev Date: Sun, 13 Feb 2022 18:48:27 +0100 Subject: [PATCH 78/84] Release from Dotty branch Co-authored-by: Arman Bilge --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 94bfc0e1..dc7a6483 100644 --- a/build.sbt +++ b/build.sbt @@ -83,7 +83,7 @@ ThisBuild / developers := List( Developer("joroKr21", "Georgi Krastev", "joro.kr.21@gmail.com", url("https://twitter.com/Joro_Kr")) ) -ThisBuild / tlCiReleaseBranches := Seq("master") +ThisBuild / tlCiReleaseBranches := Seq("dotty") ThisBuild / githubWorkflowBuild ~= { steps => WorkflowStep.Sbt( List("scalafmtCheckAll", "scalafmtSbtCheck"), From cb48f0a01aecdf52396ae6c4cf293964d5e0227f Mon Sep 17 00:00:00 2001 From: Georgi Krastev Date: Sun, 13 Feb 2022 18:50:40 +0100 Subject: [PATCH 79/84] Update Scala.js to 1.9.0 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index c7f249e9..07a17558 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,4 +1,4 @@ -addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.8.0") +addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.9.0") addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.3") addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.1.0") addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.1.0") From ebda79babb1fc000473d3ff37c00bac158c1da06 Mon Sep 17 00:00:00 2001 From: Georgi Krastev Date: Sun, 13 Feb 2022 18:52:04 +0100 Subject: [PATCH 80/84] Regenerate workflow --- .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 4c9d5fa3..ae250d4d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -79,15 +79,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/master') + if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/dotty') run: mkdir -p target .js/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/master') + if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/dotty') run: tar cf targets.tar target .js/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/master') + if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/dotty') uses: actions/upload-artifact@v2 with: name: target-${{ matrix.os }}-${{ matrix.java }}-${{ matrix.scala }}-${{ matrix.project }} @@ -96,7 +96,7 @@ jobs: publish: name: Publish Artifacts needs: [build] - if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/master') + if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/dotty') strategy: matrix: os: [ubuntu-latest] From 107f1973c5fdd37391f51d66e8414e709d3edb12 Mon Sep 17 00:00:00 2001 From: Georgi Krastev Date: Sun, 13 Feb 2022 19:06:54 +0100 Subject: [PATCH 81/84] Specify Munit version explicitly --- build.sbt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index dc7a6483..b513a7d4 100644 --- a/build.sbt +++ b/build.sbt @@ -10,6 +10,7 @@ ThisBuild / tlBaseVersion := "3.0" ThisBuild / organization := "org.typelevel" val catsVersion = "2.7.0" +val munitVersion = "0.7.29" val disciplineMunitVersion = "1.0.9" val kindProjectorVersion = "0.13.2" val shapeless2Version = "2.3.8" @@ -37,7 +38,8 @@ lazy val commonSettings = Seq( "org.typelevel" %%% "cats-core" % catsVersion, "org.typelevel" %%% "alleycats-core" % catsVersion, "org.typelevel" %%% "cats-testkit" % catsVersion % Test, - "org.typelevel" %%% "discipline-munit" % disciplineMunitVersion % Test + "org.typelevel" %%% "discipline-munit" % disciplineMunitVersion % Test, + "org.scalameta" %%% "munit" % munitVersion % Test ), libraryDependencies ++= (CrossVersion.partialVersion(scalaVersion.value) match { case Some((3, _)) => From bfe98406a57573fefe0fed82d734ed137a542580 Mon Sep 17 00:00:00 2001 From: Georgi Krastev Date: Sun, 13 Feb 2022 19:08:55 +0100 Subject: [PATCH 82/84] Don't override scalacOptions --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index b513a7d4..0f2b2163 100644 --- a/build.sbt +++ b/build.sbt @@ -17,7 +17,7 @@ val shapeless2Version = "2.3.8" val shapeless3Version = "3.0.4" lazy val commonSettings = Seq( - scalacOptions := Seq( + scalacOptions ++= Seq( "-feature", "-language:higherKinds", "-language:implicitConversions", From 3f3d1e1f88ad997bfd9646dd81bcc72f3eb0d4c7 Mon Sep 17 00:00:00 2001 From: Georgi Krastev Date: Sun, 13 Feb 2022 19:15:23 +0100 Subject: [PATCH 83/84] Check sbt formatting in root project Co-authored-by: Arman Bilge --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 0f2b2163..5e23b87a 100644 --- a/build.sbt +++ b/build.sbt @@ -88,7 +88,7 @@ ThisBuild / developers := List( ThisBuild / tlCiReleaseBranches := Seq("dotty") ThisBuild / githubWorkflowBuild ~= { steps => WorkflowStep.Sbt( - List("scalafmtCheckAll", "scalafmtSbtCheck"), + List("scalafmtCheckAll", "root/scalafmtSbtCheck"), name = Some("Check formatting") ) +: steps } From 8fc4dd6e93c58e3881e2ac5d34c7f1a44aa8aee7 Mon Sep 17 00:00:00 2001 From: Georgi Krastev Date: Sun, 13 Feb 2022 19:15:59 +0100 Subject: [PATCH 84/84] githubWorkflowGenerate --- .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 ae250d4d..b93dc6cd 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -61,7 +61,7 @@ jobs: run: sbt 'project ${{ matrix.project }}' '++${{ matrix.scala }}' 'project /' githubWorkflowCheck - name: Check formatting - run: sbt 'project ${{ matrix.project }}' '++${{ matrix.scala }}' scalafmtCheckAll scalafmtSbtCheck + run: sbt 'project ${{ matrix.project }}' '++${{ matrix.scala }}' scalafmtCheckAll root/scalafmtSbtCheck - name: scalaJSLink if: matrix.project == 'rootJS'