Skip to content

Commit

Permalink
Merge pull request #4585 from typelevel/update/nscplugin-0.5.1
Browse files Browse the repository at this point in the history
Update nscplugin, sbt-scala-native to 0.5.1
  • Loading branch information
satorg authored May 25, 2024
2 parents 3c7474b + 5fd3703 commit 6529b30
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 92 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -360,7 +360,7 @@ jobs:
- name: Submit Dependencies
uses: scalacenter/sbt-dependency-submission@v2
with:
modules-ignore: rootjs_2.12 rootjs_2.13 rootjs_3 docs_2.12 docs_2.13 docs_3 cats-tests_sjs1_2.12 cats-tests_sjs1_2.13 cats-tests_sjs1_3 rootjvm_2.12 rootjvm_2.13 rootjvm_3 rootnative_2.12 rootnative_2.13 rootnative_3 cats-tests_2.12 cats-tests_2.13 cats-tests_3 bincompattest_2.12 bincompattest_2.13 bincompattest_3 cats-tests_native0.4_2.12 cats-tests_native0.4_2.13 cats-tests_native0.4_3 cats-bench_2.12 cats-bench_2.13 cats-bench_3
modules-ignore: rootjs_2.12 rootjs_2.13 rootjs_3 docs_2.12 docs_2.13 docs_3 cats-tests_sjs1_2.12 cats-tests_sjs1_2.13 cats-tests_sjs1_3 rootjvm_2.12 rootjvm_2.13 rootjvm_3 rootnative_2.12 rootnative_2.13 rootnative_3 cats-tests_2.12 cats-tests_2.13 cats-tests_3 bincompattest_2.12 bincompattest_2.13 bincompattest_3 cats-tests_native0.5_2.12 cats-tests_native0.5_2.13 cats-tests_native0.5_3 cats-bench_2.12 cats-bench_2.13 cats-bench_3
configs-ignore: test scala-tool scala-doc-tool test-internal

validate-steward:
Expand Down
21 changes: 14 additions & 7 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
ThisBuild / tlBaseVersion := "2.11"

val scalaCheckVersion = "1.17.1"
val scalaCheckVersion = "1.18.0"

val disciplineVersion = "1.6.0"
val disciplineVersion = "1.7.0"

val disciplineMunitVersion = "2.0.0-M3"
val disciplineMunitVersion = "2.0.0-M4"

val munitVersion = "1.0.0"

Expand Down Expand Up @@ -65,9 +65,14 @@ lazy val commonJsSettings = Seq(
)

Global / concurrentRestrictions += Tags.limit(NativeTags.Link, 1)
lazy val commonNativeSettings = Seq(

// Cats 2.11.0 switches to Scala Native 0.5.
// Therefore `tlVersionIntroduced` should be reset to 2.11.0 for all scala versions in all native cross-projects.
val commonNativeTlVersionIntroduced = List("2.12", "2.13", "3").map(_ -> "2.11.0").toMap

lazy val commonNativeSettings = Seq[Setting[?]](
doctestGenTests := Seq.empty,
tlVersionIntroduced ++= List("2.12", "2.13").map(_ -> "2.4.0").toMap + ("3" -> "2.8.0")
tlVersionIntroduced := commonNativeTlVersionIntroduced
)

lazy val disciplineDependencies = Seq(
Expand Down Expand Up @@ -127,8 +132,10 @@ lazy val algebraSettings = Seq[Setting[?]](
)

lazy val algebraNativeSettings = Seq[Setting[?]](
tlMimaPreviousVersions ~= (_ - "2.2.3"),
tlVersionIntroduced += ("3" -> "2.8.0")
// Reset to auto-populate from `tlVersionIntroduced` below.
tlMimaPreviousVersions := Set.empty,
// Should be reset to the common setting value, because `algebraSettings` re-defines it.
tlVersionIntroduced := commonNativeTlVersionIntroduced
)

lazy val algebra = crossProject(JSPlatform, JVMPlatform, NativePlatform)
Expand Down
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ addSbtPlugin("org.typelevel" % "sbt-typelevel-site" % sbtTypelevelVersion)
addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.7")
addSbtPlugin("com.github.tkawachi" % "sbt-doctest" % "0.10.0")
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("com.eed3si9n" % "sbt-buildinfo" % "0.12.0")
83 changes: 0 additions & 83 deletions tests/native/src/test/scala/cats/native/tests/FutureSuite.scala

This file was deleted.

0 comments on commit 6529b30

Please sign in to comment.