From e6df9f75be5285e25ff28e8817a4f74a6d5d986c Mon Sep 17 00:00:00 2001 From: "typelevel-steward[bot]" <106827141+typelevel-steward[bot]@users.noreply.github.com> Date: Wed, 21 Aug 2024 22:25:56 +0300 Subject: [PATCH] Update nscplugin, sbt-scala-native to 0.5.5 (#679) * Update nscplugin, sbt-scala-native to 0.5.5 * Update cats and shapeless --------- Co-authored-by: typelevel-steward[bot] <106827141+typelevel-steward[bot]@users.noreply.github.com> Co-authored-by: Georgi Krastev --- .jvmopts | 5 +++-- build.sbt | 13 ++++++------- project/plugins.sbt | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.jvmopts b/.jvmopts index 07cedad6..174f1468 100644 --- a/.jvmopts +++ b/.jvmopts @@ -1,2 +1,3 @@ --Xms2048m --Xmx2048m +-Xms1g +-Xmx2g +-Xss2m diff --git a/build.sbt b/build.sbt index 40e996e8..af2a8c74 100644 --- a/build.sbt +++ b/build.sbt @@ -6,15 +6,15 @@ val scala3 = "3.3.3" ThisBuild / crossScalaVersions := Seq(scala212, scala213, scala3) ThisBuild / scalaVersion := scala3 -ThisBuild / tlBaseVersion := "3.3" +ThisBuild / tlBaseVersion := "3.4" ThisBuild / organization := "org.typelevel" -val catsVersion = "2.11.0" +val catsVersion = "2.12.0" val munitVersion = "1.0.0" -val disciplineMunitVersion = "2.0.0-M3" +val disciplineMunitVersion = "2.0.0" val kindProjectorVersion = "0.13.3" -val shapeless2Version = "2.3.11" -val shapeless3Version = "3.4.1" +val shapeless2Version = "2.3.12" +val shapeless3Version = "3.4.3" lazy val commonSettings = Seq( scalacOptions ++= Seq( @@ -60,8 +60,7 @@ lazy val core = crossProject(JVMPlatform, JSPlatform, NativePlatform) .crossType(CrossType.Pure) .settings(moduleName := "kittens") .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) + .nativeSettings(tlVersionIntroduced := List("2.12", "2.13", "3").map(_ -> "3.4.0").toMap) lazy val coreJVM = core.jvm lazy val coreJS = core.js diff --git a/project/plugins.sbt b/project/plugins.sbt index 59a2addb..39d4a34c 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,5 +1,5 @@ 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.5") addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.2") addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.2") addSbtPlugin("com.thoughtworks.sbt-api-mappings" % "sbt-api-mappings" % "3.0.2")