From 6982aab6fab75b49d7d8a37cc992d119e43b5137 Mon Sep 17 00:00:00 2001 From: "typelevel-steward[bot]" <106827141+typelevel-steward[bot]@users.noreply.github.com> Date: Thu, 18 Apr 2024 07:28:14 -1000 Subject: [PATCH 01/11] Update sbt to 1.9.9 (#607) Co-authored-by: typelevel-steward[bot] <106827141+typelevel-steward[bot]@users.noreply.github.com> Co-authored-by: P. Oscar Boykin --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index abbbce5d..04267b14 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.9.8 +sbt.version=1.9.9 From 4b9d64ada69228ee7f7c7d35cd2dfdb97f4e8373 Mon Sep 17 00:00:00 2001 From: "typelevel-steward[bot]" <106827141+typelevel-steward[bot]@users.noreply.github.com> Date: Thu, 18 Apr 2024 07:32:39 -1000 Subject: [PATCH 02/11] Update scala-library to 2.12.19 (#610) * Update scala-library to 2.12.19 * Regenerate GitHub Actions workflow Executed command: sbt githubWorkflowGenerate --------- Co-authored-by: typelevel-steward[bot] <106827141+typelevel-steward[bot]@users.noreply.github.com> Co-authored-by: P. Oscar Boykin --- .github/workflows/ci.yml | 20 ++++++++++---------- build.sbt | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 50053876..5e4985b0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -28,7 +28,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - scala: [2.13.12, 2.12.18, 3.3.0] + scala: [2.13.12, 2.12.19, 3.3.0] java: [temurin@8] project: [rootJS, rootJVM, rootNative] runs-on: ${{ matrix.os }} @@ -180,32 +180,32 @@ jobs: tar xf targets.tar rm targets.tar - - name: Download target directories (2.12.18, rootJS) + - name: Download target directories (2.12.19, rootJS) uses: actions/download-artifact@v3 with: - name: target-${{ matrix.os }}-${{ matrix.java }}-2.12.18-rootJS + name: target-${{ matrix.os }}-${{ matrix.java }}-2.12.19-rootJS - - name: Inflate target directories (2.12.18, rootJS) + - name: Inflate target directories (2.12.19, rootJS) run: | tar xf targets.tar rm targets.tar - - name: Download target directories (2.12.18, rootJVM) + - name: Download target directories (2.12.19, rootJVM) uses: actions/download-artifact@v3 with: - name: target-${{ matrix.os }}-${{ matrix.java }}-2.12.18-rootJVM + name: target-${{ matrix.os }}-${{ matrix.java }}-2.12.19-rootJVM - - name: Inflate target directories (2.12.18, rootJVM) + - name: Inflate target directories (2.12.19, rootJVM) run: | tar xf targets.tar rm targets.tar - - name: Download target directories (2.12.18, rootNative) + - name: Download target directories (2.12.19, rootNative) uses: actions/download-artifact@v3 with: - name: target-${{ matrix.os }}-${{ matrix.java }}-2.12.18-rootNative + name: target-${{ matrix.os }}-${{ matrix.java }}-2.12.19-rootNative - - name: Inflate target directories (2.12.18, rootNative) + - name: Inflate target directories (2.12.19, rootNative) run: | tar xf targets.tar rm targets.tar diff --git a/build.sbt b/build.sbt index 7f344cb1..8febd2d2 100644 --- a/build.sbt +++ b/build.sbt @@ -1,4 +1,4 @@ -val Scala212 = "2.12.18" +val Scala212 = "2.12.19" val Scala213 = "2.13.12" val Scala3Version = "3.3.0" From 0e18906ec4bbc08914838406783e902b4de10bf7 Mon Sep 17 00:00:00 2001 From: "typelevel-steward[bot]" <106827141+typelevel-steward[bot]@users.noreply.github.com> Date: Thu, 18 Apr 2024 07:33:03 -1000 Subject: [PATCH 03/11] Update scalafmt-core to 3.8.1 (#613) Co-authored-by: typelevel-steward[bot] <106827141+typelevel-steward[bot]@users.noreply.github.com> Co-authored-by: P. Oscar Boykin --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index 7f5d60a7..1c5f36b5 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = "3.7.17" +version = "3.8.1" align.openParenCallSite = true align.openParenDefnSite = true maxColumn = 120 From 03192a81b689ad6cb7b26bcc5826c31a9787f8b9 Mon Sep 17 00:00:00 2001 From: "typelevel-steward[bot]" <106827141+typelevel-steward[bot]@users.noreply.github.com> Date: Thu, 18 Apr 2024 07:33:53 -1000 Subject: [PATCH 04/11] Update sbt-scalajs, scalajs-compiler, ... to 1.16.0 (#614) Co-authored-by: typelevel-steward[bot] <106827141+typelevel-steward[bot]@users.noreply.github.com> Co-authored-by: P. Oscar Boykin --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 44304f29..e3e6486a 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,5 +1,5 @@ addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.2") -addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.14.0") +addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.16.0") addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.16") addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.3.8") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2") From 32d0004d242c7bc8c8f3771b98a771cadd1fbb4c Mon Sep 17 00:00:00 2001 From: "typelevel-steward[bot]" <106827141+typelevel-steward[bot]@users.noreply.github.com> Date: Thu, 18 Apr 2024 08:47:03 -1000 Subject: [PATCH 05/11] Update nscplugin, sbt-scala-native, ... to 0.4.17 (#602) Co-authored-by: typelevel-steward[bot] <106827141+typelevel-steward[bot]@users.noreply.github.com> Co-authored-by: P. Oscar Boykin --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index e3e6486a..2e53ed2c 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,6 +1,6 @@ addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.2") addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.16.0") -addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.16") +addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.17") addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.3.8") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2") addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.9") From 2ee7b480ed1e1ffade71b9557d9bc64c2b7702f6 Mon Sep 17 00:00:00 2001 From: "typelevel-steward[bot]" <106827141+typelevel-steward[bot]@users.noreply.github.com> Date: Thu, 18 Apr 2024 08:52:50 -1000 Subject: [PATCH 06/11] Update scalatest-funsuite to 3.2.18 (#603) Co-authored-by: typelevel-steward[bot] <106827141+typelevel-steward[bot]@users.noreply.github.com> Co-authored-by: P. Oscar Boykin --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 8febd2d2..6053f90c 100644 --- a/build.sbt +++ b/build.sbt @@ -43,7 +43,7 @@ lazy val core = crossProject(JSPlatform, JVMPlatform, NativePlatform) moduleName := "paiges-core", libraryDependencies ++= Seq( "org.scalatestplus" %%% "scalacheck-1-16" % "3.2.14.0" % Test, - "org.scalatest" %%% "scalatest-funsuite" % "3.2.17" % Test + "org.scalatest" %%% "scalatest-funsuite" % "3.2.18" % Test ), // TODO: 2.13 has warnings for using Stream, but scalacheck Shrink tlFatalWarningsInCi := scalaVersion.value.startsWith("2.12."), From c74831c3d45e1260197d14af0849da8fc8fafde4 Mon Sep 17 00:00:00 2001 From: "typelevel-steward[bot]" <106827141+typelevel-steward[bot]@users.noreply.github.com> Date: Thu, 18 Apr 2024 08:53:05 -1000 Subject: [PATCH 07/11] Update sbt-scoverage to 2.0.11 (#608) Co-authored-by: typelevel-steward[bot] <106827141+typelevel-steward[bot]@users.noreply.github.com> Co-authored-by: P. Oscar Boykin --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 2e53ed2c..c34927e0 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -3,7 +3,7 @@ addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.16.0") addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.17") addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.3.8") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2") -addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.9") +addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.11") addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.4.22") addSbtPlugin("org.typelevel" % "sbt-typelevel-site" % "0.4.22") addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.7") From a0ebf79a4873db7c9e104109f95abd043296c8b9 Mon Sep 17 00:00:00 2001 From: Eric K Richardson Date: Thu, 18 Apr 2024 08:31:10 -0700 Subject: [PATCH 08/11] Update Scala Native to 0.5.1 and add to .gitignore --- .gitignore | 6 ++++++ project/plugins.sbt | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 1a2c8c88..190b49a5 100644 --- a/.gitignore +++ b/.gitignore @@ -21,5 +21,11 @@ docs/_site *.sublime-project *.sublime-workspace +# VSCode +/.vscode/ + +# Metals +/.bsp/ + # emacs TAGS diff --git a/project/plugins.sbt b/project/plugins.sbt index c34927e0..dfe5aaef 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,6 +1,6 @@ addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.2") addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.16.0") -addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.17") +addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.5.1") addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.3.8") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2") addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.11") From 37bcb4156f4b9668a95a7f24d64da91d9210f64c Mon Sep 17 00:00:00 2001 From: Eric K Richardson Date: Wed, 24 Apr 2024 06:42:56 -0700 Subject: [PATCH 09/11] Upgrade scalatest, scalatestplus, and Scala.js --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 6053f90c..b68aff53 100644 --- a/build.sbt +++ b/build.sbt @@ -42,7 +42,7 @@ lazy val core = crossProject(JSPlatform, JVMPlatform, NativePlatform) name := "paiges-core", moduleName := "paiges-core", libraryDependencies ++= Seq( - "org.scalatestplus" %%% "scalacheck-1-16" % "3.2.14.0" % Test, + "org.scalatestplus" %%% "scalacheck-1-18" % "3.2.18.0" % Test, "org.scalatest" %%% "scalatest-funsuite" % "3.2.18" % Test ), // TODO: 2.13 has warnings for using Stream, but scalacheck Shrink From c69a9b108b72fac70626965fe61ccc3e8fae4157 Mon Sep 17 00:00:00 2001 From: Eric K Richardson Date: Wed, 5 Jun 2024 11:01:09 -0700 Subject: [PATCH 10/11] Update cats 2.12.0 and discipline-scalatest 2.3.0 --- .gitignore | 1 + build.sbt | 6 +++--- project/plugins.sbt | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 190b49a5..bd8960a8 100644 --- a/.gitignore +++ b/.gitignore @@ -26,6 +26,7 @@ docs/_site # Metals /.bsp/ +/project/**/metals.sbt # emacs TAGS diff --git a/build.sbt b/build.sbt index b68aff53..8631017a 100644 --- a/build.sbt +++ b/build.sbt @@ -74,9 +74,9 @@ lazy val cats = crossProject(JSPlatform, JVMPlatform, NativePlatform) name := "paiges-cats", moduleName := "paiges-cats", libraryDependencies ++= Seq( - "org.typelevel" %%% "cats-core" % "2.10.0", - "org.typelevel" %%% "cats-laws" % "2.10.0" % Test, - "org.typelevel" %%% "discipline-scalatest" % "2.2.0" % Test + "org.typelevel" %%% "cats-core" % "2.12.0", + "org.typelevel" %%% "cats-laws" % "2.12.0" % Test, + "org.typelevel" %%% "discipline-scalatest" % "2.3.0" % Test ) ) .disablePlugins(JmhPlugin) diff --git a/project/plugins.sbt b/project/plugins.sbt index dfe5aaef..205de45e 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,6 +1,6 @@ addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.2") addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.16.0") -addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.5.1") +addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.5.3") addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.3.8") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2") addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.11") From bb04d41dcab4c34bfe2628b147d51faf1a29e5a1 Mon Sep 17 00:00:00 2001 From: Eric K Richardson Date: Wed, 5 Jun 2024 11:23:59 -0700 Subject: [PATCH 11/11] Fix tlVersionIntroduced for Scala Native 0.5.x --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 8631017a..d505660e 100644 --- a/build.sbt +++ b/build.sbt @@ -131,6 +131,6 @@ lazy val commonJsSettings = Seq( lazy val commonNativeSettings = Seq( // Remove when native is published for the default previous versions - tlVersionIntroduced := List("2.12", "2.13").map(_ -> "0.4.1").toMap + ("3" -> "0.4.3"), + tlVersionIntroduced := List("2.12", "2.13", "3").map(_ -> "0.5.0").toMap, coverageEnabled := false )