Skip to content

Commit

Permalink
Merge pull request #35 from typelevel/topic/native-0.5
Browse files Browse the repository at this point in the history
Update to scala-native 0.5.1
  • Loading branch information
mpilquist authored May 28, 2024
2 parents 1486412 + 0757682 commit 3984990
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 6 deletions.
12 changes: 7 additions & 5 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -36,10 +36,9 @@ lazy val core = crossProject(JVMPlatform, JSPlatform, NativePlatform)
.settings(
name := "twiddles-core",
libraryDependencies ++= Seq(
"org.typelevel" %%% "cats-core" % "2.11.0",
"org.typelevel" %%% "munit-cats-effect" % "2.0.0" % Test,
"org.typelevel" %%% "scalacheck-effect-munit" % "2.0.0-M2" % Test
) ++ (if (scalaVersion.value.startsWith("2.")) Seq("com.chuusai" %%% "shapeless" % "2.3.11")
"org.typelevel" %%% "cats-core" % "2.12.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:"))
)
Expand All @@ -66,6 +65,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"))
Expand Down
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -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")
Expand Down

0 comments on commit 3984990

Please sign in to comment.