diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3e59ee86..cf7eaae7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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: diff --git a/build.sbt b/build.sbt index 4052498e..3df85412 100644 --- a/build.sbt +++ b/build.sbt @@ -1,4 +1,4 @@ -ThisBuild / tlBaseVersion := "1.4" +ThisBuild / tlBaseVersion := "1.5" ThisBuild / startYear := Some(2021) ThisBuild / developers := List( tlGitHubDev("SystemFw", "Fabio Labella"), @@ -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) @@ -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) diff --git a/project/plugins.sbt b/project/plugins.sbt index 12f3a80f..f7ca3fa7 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -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")