Skip to content

Commit e054531

Browse files
committed
Simplifying the pinning
1 parent 437a12f commit e054531

File tree

5 files changed

+14
-43
lines changed

5 files changed

+14
-43
lines changed

build.sbt

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ lazy val tests = crossProject(JVMPlatform, JSPlatform, NativePlatform)
5656
"org.virtuslab.scala-cli" %% "cli" % "1.3.0" cross (CrossVersion.for2_13Use3)
5757
),
5858
buildInfoKeys += scalaBinaryVersion,
59+
buildInfoKeys += "nativeVersion" -> nativeVersion,
5960
buildInfoKeys += BuildInfoKey.map(Compile / dependencyClasspath) {
6061
case (_, v) =>
6162
"classPath" -> v.seq
@@ -91,11 +92,7 @@ lazy val tests = crossProject(JVMPlatform, JSPlatform, NativePlatform)
9192
toolkitTest.native / publishLocal
9293
)
9394
.value,
94-
buildInfoKeys ++= List(
95-
"platform" -> "native",
96-
// Remember to remove it once the whole stack is ported to SN 0.5.x
97-
"nativeVersion" -> "0.4.17"
98-
)
95+
buildInfoKeys += "platform" -> "native"
9996
)
10097
.enablePlugins(BuildInfoPlugin, NoPublishPlugin)
10198

tests/js/src/test/scala/org/typelevel/toolkit/PlatformSpecific.scala

Lines changed: 0 additions & 11 deletions
This file was deleted.

tests/jvm/src/test/scala/org/typelevel/toolkit/PlatformSpecific.scala

Lines changed: 0 additions & 11 deletions
This file was deleted.

tests/native/src/test/scala/org/typelevel/toolkit/PlatformSpecific.scala

Lines changed: 0 additions & 12 deletions
This file was deleted.

tests/shared/src/test/scala/org/typelevel/toolkit/ScalaCliProcess.scala

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import fs2.io.file.Files
2525
import fs2.io.process.ProcessBuilder
2626
import munit.Assertions.fail
2727

28-
object ScalaCliProcess extends PlatformSpecific {
28+
object ScalaCliProcess {
2929

3030
private val ClassPath: String = BuildInfo.classPath
3131
private val JavaHome: String = BuildInfo.javaHome
@@ -67,10 +67,18 @@ object ScalaCliProcess extends PlatformSpecific {
6767
None
6868
)
6969
.evalTap { path =>
70-
val header = List(
70+
val commonHeader = List(
7171
s"//> using scala ${BuildInfo.scalaBinaryVersion}",
72-
s"//> using toolkit typelevel:${BuildInfo.version}"
73-
) ::: platformSpecificDirectives
72+
s"//> using toolkit typelevel:${BuildInfo.version}",
73+
s"//> using platform ${BuildInfo.platform}"
74+
)
75+
val header = BuildInfo.platform match {
76+
case "jvm" => commonHeader
77+
case "js" => commonHeader
78+
case "native" =>
79+
commonHeader :+
80+
s"//> using nativeVersion ${BuildInfo.nativeVersion}"
81+
}
7482
Stream(header.mkString("", "\n", "\n"), scriptBody.stripMargin)
7583
.through(Files[IO].writeUtf8(path))
7684
.compile

0 commit comments

Comments
 (0)