Skip to content

Commit 2f1710a

Browse files
committed
Pinned scala native to 0.4.17
1 parent 855bd8f commit 2f1710a

File tree

5 files changed

+43
-6
lines changed

5 files changed

+43
-6
lines changed

build.sbt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,11 @@ lazy val tests = crossProject(JVMPlatform, JSPlatform, NativePlatform)
9191
toolkitTest.native / publishLocal
9292
)
9393
.value,
94-
buildInfoKeys += "platform" -> "native"
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+
)
9599
)
96100
.enablePlugins(BuildInfoPlugin, NoPublishPlugin)
97101

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
package org.typelevel.toolkit
2+
3+
import buildinfo.BuildInfo
4+
5+
trait PlatformSpecific {
6+
7+
val platformSpecificDirectives: List[String] = List(
8+
s"//> using platform ${BuildInfo.platform}"
9+
)
10+
11+
}
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
package org.typelevel.toolkit
2+
3+
import buildinfo.BuildInfo
4+
5+
trait PlatformSpecific {
6+
7+
val platformSpecificDirectives: List[String] = List(
8+
s"//> using platform ${BuildInfo.platform}"
9+
)
10+
11+
}
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
package org.typelevel.toolkit
2+
3+
import buildinfo.BuildInfo
4+
5+
trait PlatformSpecific {
6+
7+
val platformSpecificDirectives: List[String] = List(
8+
s"//> using platform ${BuildInfo.platform}",
9+
s"//> using nativeVersion ${BuildInfo.nativeVersion}"
10+
)
11+
12+
}

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

Lines changed: 4 additions & 5 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 {
28+
object ScalaCliProcess extends PlatformSpecific {
2929

3030
private val ClassPath: String = BuildInfo.classPath
3131
private val JavaHome: String = BuildInfo.javaHome
@@ -69,10 +69,9 @@ object ScalaCliProcess {
6969
.evalTap { path =>
7070
val header = List(
7171
s"//> using scala ${BuildInfo.scalaBinaryVersion}",
72-
s"//> using toolkit typelevel:${BuildInfo.version}",
73-
s"//> using platform ${BuildInfo.platform}"
74-
).mkString("", "\n", "\n")
75-
Stream(header, scriptBody.stripMargin)
72+
s"//> using toolkit typelevel:${BuildInfo.version}"
73+
) ::: platformSpecificDirectives
74+
Stream(header.mkString("", "\n", "\n"), scriptBody.stripMargin)
7675
.through(Files[IO].writeUtf8(path))
7776
.compile
7877
.drain

0 commit comments

Comments
 (0)