Skip to content

Commit

Permalink
Merge pull request #577 from lolgab/scala-native-05
Browse files Browse the repository at this point in the history
Update Scala Native to 0.5.4
  • Loading branch information
armanbilge authored Aug 5, 2024
2 parents 579cdbe + 7047917 commit 09fbce3
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,7 @@ jobs:
- name: Submit Dependencies
uses: scalacenter/sbt-dependency-submission@v2
with:
modules-ignore: rootjs_3 rootjs_2.12 rootjs_2.13 docs_3 docs_2.12 docs_2.13 cats-mtl-tests_sjs1_3 cats-mtl-tests_sjs1_2.12 cats-mtl-tests_sjs1_2.13 rootjvm_3 rootjvm_2.12 rootjvm_2.13 rootnative_3 rootnative_2.12 rootnative_2.13 cats-mtl-tests_3 cats-mtl-tests_2.12 cats-mtl-tests_2.13 cats-mtl-tests_native0.4_3 cats-mtl-tests_native0.4_2.12 cats-mtl-tests_native0.4_2.13
modules-ignore: rootjs_3 rootjs_2.12 rootjs_2.13 docs_3 docs_2.12 docs_2.13 cats-mtl-tests_sjs1_3 cats-mtl-tests_sjs1_2.12 cats-mtl-tests_sjs1_2.13 rootjvm_3 rootjvm_2.12 rootjvm_2.13 rootnative_3 rootnative_2.12 rootnative_2.13 cats-mtl-tests_3 cats-mtl-tests_2.12 cats-mtl-tests_2.13 cats-mtl-tests_native0.5_3 cats-mtl-tests_native0.5_2.12 cats-mtl-tests_native0.5_2.13
configs-ignore: test scala-tool scala-doc-tool test-internal

site:
Expand Down
12 changes: 8 additions & 4 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ThisBuild / tlBaseVersion := "1.4"
ThisBuild / tlBaseVersion := "1.5"
ThisBuild / startYear := Some(2021)
ThisBuild / developers := List(
tlGitHubDev("SystemFw", "Fabio Labella"),
Expand All @@ -22,12 +22,16 @@ lazy val commonJsSettings = Seq(
doctestGenTests := Seq.empty
)

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

lazy val commonNativeSettings = Seq(
doctestGenTests := Seq.empty,
tlVersionIntroduced := List("2.12", "2.13", "3").map(_ -> "1.3.0").toMap
tlVersionIntroduced := commonNativeTlVersionIntroduced
)

val CatsVersion = "2.11.0"
val CatsVersion = "2.12.0"

lazy val root = tlCrossRootProject.aggregate(core, laws, tests, unidocs)

Expand Down Expand Up @@ -58,7 +62,7 @@ lazy val tests = crossProject(JSPlatform, JVMPlatform, NativePlatform)
libraryDependencies ++= Seq(
"org.typelevel" %%% "cats-testkit" % CatsVersion,
"org.scalameta" %%% "munit" % "1.0.0",
"org.typelevel" %%% "discipline-munit" % "2.0.0-M3"))
"org.typelevel" %%% "discipline-munit" % "2.0.0"))
.jsSettings(commonJsSettings)
.jvmSettings(commonJvmSettings)
.nativeSettings(commonNativeSettings)
Expand Down
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.16.0")
addSbtPlugin("com.github.tkawachi" % "sbt-doctest" % "0.10.0")
addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.7.2")
addSbtPlugin("org.typelevel" % "sbt-typelevel-site" % "0.7.2")
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.17")
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.5.4")
addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.2")

0 comments on commit 09fbce3

Please sign in to comment.