From 3a7d4e424e6dbcc9104ed21795a91102d21106a4 Mon Sep 17 00:00:00 2001 From: Arman Bilge Date: Tue, 3 Oct 2023 13:42:48 +0000 Subject: [PATCH] Use `scalaBinaryVersion` for running tests --- build.sbt | 3 ++- .../src/test/scala/org/typelevel/toolkit/ScalaCliProcess.scala | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/build.sbt b/build.sbt index 6f500a9..46df7a9 100644 --- a/build.sbt +++ b/build.sbt @@ -72,6 +72,7 @@ lazy val tests = crossProject(JVMPlatform, JSPlatform, NativePlatform) ExclusionRule("com.lihaoyi", "os-lib_2.13") ) ), + buildInfoKeys += scalaBinaryVersion, buildInfoKeys += BuildInfoKey.map(Compile / dependencyClasspath) { case (_, v) => "classPath" -> v.seq @@ -85,7 +86,7 @@ lazy val tests = crossProject(JVMPlatform, JSPlatform, NativePlatform) path.replace("/jre", "") } else path }, - buildInfoKeys += "scala3" -> (scalaVersion.value.head == '3') + buildInfoKeys += "scala3" -> (scalaBinaryVersion.value == "3") ) .jvmSettings( Test / test := (Test / test) diff --git a/tests/shared/src/test/scala/org/typelevel/toolkit/ScalaCliProcess.scala b/tests/shared/src/test/scala/org/typelevel/toolkit/ScalaCliProcess.scala index 47a87b2..31e7f45 100644 --- a/tests/shared/src/test/scala/org/typelevel/toolkit/ScalaCliProcess.scala +++ b/tests/shared/src/test/scala/org/typelevel/toolkit/ScalaCliProcess.scala @@ -61,7 +61,7 @@ object ScalaCliProcess { ) .evalTap { path => val header = List( - s"//> using scala ${BuildInfo.scalaVersion}", + s"//> using scala ${BuildInfo.scalaBinaryVersion}", s"//> using toolkit typelevel:${BuildInfo.version}", s"//> using platform ${BuildInfo.platform}" ).mkString("", "\n", "\n")