Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update nscplugin, sbt-scala-native to 0.5.1 #4585

Merged
merged 9 commits into from
May 25, 2024
Merged

Update nscplugin, sbt-scala-native to 0.5.1 #4585

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
038772c
Update nscplugin, sbt-scala-native to 0.5.1
typelevel-steward[bot] Apr 16, 2024
9162bd8
Update discipline-munit to 2.0.0-M4
satorg May 1, 2024
f03a443
Update scalacheck to 1.18.0
satorg May 1, 2024
ac3d1b0
Update discipline-core to 1.7.0
satorg May 1, 2024
3660c1c
Apply sbt githubWorkflowGenerate
satorg May 1, 2024
a4068f4
fix `tlVersionIntroduced` for native cross-projects
satorg May 2, 2024
ea519d4
Remove special ExecutionContextExecutor
kapunga May 12, 2024
07dad69
Merge pull request #4601 from kapunga/update/cleanup-native
armanbilge May 13, 2024
5fd3703
Merge branch 'main' into update/nscplugin-0.5.1
mpilquist May 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
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
View file
Open in desktop
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"
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In the meantime there is a 2.0.0 release: https://github.com/typelevel/discipline-munit/releases/tag/v2.0.0

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's right. However, I think it wouldn't hurt if we address it in a separate PR to avoid stuffing up this one.

It would be perfect, if @typelevel-steward could wake up and create such a PR for us.


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
View file
Open in desktop
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")
0 ...c/test/scala/cats/tests/FutureSuite.scala → ...c/test/scala/cats/tests/FutureSuite.scala
View file
Open in desktop
File renamed without changes.
83 changes: 0 additions & 83 deletions tests/native/src/test/scala/cats/native/tests/FutureSuite.scala
View file
Open in desktop

This file was deleted.