From 516b62aed2c09281e2b9dc70dceacf38f2feeb4e Mon Sep 17 00:00:00 2001 From: mpilquist Date: Mon, 13 May 2024 14:50:40 -0400 Subject: [PATCH 1/5] Update to scala-native 0.5.1 --- build.sbt | 5 ++++- project/plugins.sbt | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/build.sbt b/build.sbt index 7a490bd..893c03b 100644 --- a/build.sbt +++ b/build.sbt @@ -2,7 +2,7 @@ import com.typesafe.tools.mima.core._ Global / onChangedBuildSource := ReloadOnSourceChanges -ThisBuild / tlBaseVersion := "0.8" +ThisBuild / tlBaseVersion := "0.9" ThisBuild / organization := "org.typelevel" ThisBuild / organizationName := "Typelevel" @@ -66,6 +66,9 @@ lazy val coreJS = core.js lazy val coreNative = core.native .enablePlugins(ScalaNativeBrewedConfigPlugin) .disablePlugins(DoctestPlugin) + .settings( + tlVersionIntroduced := List("2.12", "2.13", "3").map(_ -> "0.9.0").toMap + ) lazy val docs = project .in(file("docs")) diff --git a/project/plugins.sbt b/project/plugins.sbt index 33191aa..448a0c8 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,7 +1,7 @@ val sbtTypelevelVersion = "0.7.1" addSbtPlugin("org.typelevel" % "sbt-typelevel" % sbtTypelevelVersion) 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.portable-scala" % "sbt-scala-native-crossproject" % "1.3.2") addSbtPlugin("com.armanbilge" % "sbt-scala-native-config-brew-github-actions" % "0.3.0") addSbtPlugin("com.github.tkawachi" % "sbt-doctest" % "0.10.0") From 3292112147b9a73e3198bdca9d2ff8f0f2a3a385 Mon Sep 17 00:00:00 2001 From: mpilquist Date: Mon, 13 May 2024 16:37:59 -0400 Subject: [PATCH 2/5] Update to cats 2.11 and shapeless 2.4.0-M1 --- build.sbt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.sbt b/build.sbt index 893c03b..dad3b58 100644 --- a/build.sbt +++ b/build.sbt @@ -36,10 +36,10 @@ lazy val core = crossProject(JVMPlatform, JSPlatform, NativePlatform) .settings( name := "twiddles-core", libraryDependencies ++= Seq( - "org.typelevel" %%% "cats-core" % "2.10.0", + "org.typelevel" %%% "cats-core" % "2.11.0", "org.typelevel" %%% "munit-cats-effect" % "2.0.0-RC1" % Test, "org.typelevel" %%% "scalacheck-effect-munit" % "2.0.0-M2" % Test - ) ++ (if (scalaVersion.value.startsWith("2.")) Seq("com.chuusai" %%% "shapeless" % "2.3.10") + ) ++ (if (scalaVersion.value.startsWith("2.")) Seq("com.chuusai" %%% "shapeless" % "2.4.0-M1") else Nil), scalacOptions := scalacOptions.value.filterNot(_.startsWith("-source:")) ) From bf740c3a30d5eb7dcb537e7c7a47969f59d412e3 Mon Sep 17 00:00:00 2001 From: Michael Pilquist Date: Mon, 27 May 2024 14:37:10 -0400 Subject: [PATCH 3/5] Update to latest cats and shapeless --- build.sbt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.sbt b/build.sbt index 9f904fa..cdee270 100644 --- a/build.sbt +++ b/build.sbt @@ -36,10 +36,10 @@ lazy val core = crossProject(JVMPlatform, JSPlatform, NativePlatform) .settings( name := "twiddles-core", libraryDependencies ++= Seq( - "org.typelevel" %%% "cats-core" % "2.11.0", + "org.typelevel" %%% "cats-core" % "2.12.0", "org.typelevel" %%% "munit-cats-effect" % "2.0.0" % Test, "org.typelevel" %%% "scalacheck-effect-munit" % "2.0.0" % Test - ) ++ (if (scalaVersion.value.startsWith("2.")) Seq("com.chuusai" %%% "shapeless" % "2.3.11") + ) ++ (if (scalaVersion.value.startsWith("2.")) Seq("com.chuusai" %%% "shapeless" % "2.3.12") else Nil), scalacOptions := scalacOptions.value.filterNot(_.startsWith("-source:")) ) From 385392a4ae15165c915c9d525e86d1b2a20d87b5 Mon Sep 17 00:00:00 2001 From: mpilquist Date: Tue, 28 May 2024 15:25:43 -0400 Subject: [PATCH 4/5] Remove unused dependencies --- build.sbt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/build.sbt b/build.sbt index cdee270..b6eb1cd 100644 --- a/build.sbt +++ b/build.sbt @@ -37,8 +37,7 @@ lazy val core = crossProject(JVMPlatform, JSPlatform, NativePlatform) name := "twiddles-core", libraryDependencies ++= Seq( "org.typelevel" %%% "cats-core" % "2.12.0", - "org.typelevel" %%% "munit-cats-effect" % "2.0.0" % Test, - "org.typelevel" %%% "scalacheck-effect-munit" % "2.0.0" % Test + "org.scalameta" %%% "munit" % "1.0.0", ) ++ (if (scalaVersion.value.startsWith("2.")) Seq("com.chuusai" %%% "shapeless" % "2.3.12") else Nil), scalacOptions := scalacOptions.value.filterNot(_.startsWith("-source:")) From 0757682a960bc515c14a6f6a41f235d35eff2c01 Mon Sep 17 00:00:00 2001 From: mpilquist Date: Tue, 28 May 2024 15:28:49 -0400 Subject: [PATCH 5/5] Scalafmt --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index b6eb1cd..53eb27b 100644 --- a/build.sbt +++ b/build.sbt @@ -37,7 +37,7 @@ lazy val core = crossProject(JVMPlatform, JSPlatform, NativePlatform) name := "twiddles-core", libraryDependencies ++= Seq( "org.typelevel" %%% "cats-core" % "2.12.0", - "org.scalameta" %%% "munit" % "1.0.0", + "org.scalameta" %%% "munit" % "1.0.0" ) ++ (if (scalaVersion.value.startsWith("2.")) Seq("com.chuusai" %%% "shapeless" % "2.3.12") else Nil), scalacOptions := scalacOptions.value.filterNot(_.startsWith("-source:"))