Skip to content

Commit 4025c2d

Browse files
authored
Merge pull request #176 from typelevel/update/cli-1.3.0
Update cli to 1.3.0
2 parents 2b09fff + 947b575 commit 4025c2d

File tree

4 files changed

+21
-4
lines changed

4 files changed

+21
-4
lines changed

README.md

+3
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@ To get started, you can use the accompanying [template](https://github.com/typel
1717
scala-cli --power new typelevel/toolkit.g8
1818
```
1919

20+
> [!IMPORTANT]
21+
> The toolkit does not yet support Scala Native 0.5.x series.
22+
2023
# Libraries included
2124

2225
* [Cats] and [Cats Effect]

build.sbt

+2-1
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,10 @@ lazy val tests = crossProject(JVMPlatform, JSPlatform, NativePlatform)
5353
libraryDependencies ++= Seq(
5454
"org.typelevel" %%% "munit-cats-effect" % "2.0.0-M5" % Test,
5555
"co.fs2" %%% "fs2-io" % "3.10.2" % Test,
56-
"org.virtuslab.scala-cli" %% "cli" % "1.2.2" cross (CrossVersion.for2_13Use3)
56+
"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

docs/index.md

+6
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,12 @@ A toolkit of **great libraries** to start building **Typelevel** apps on JVM, No
44

55
Our very own flavour of the [Scala Toolkit].
66

7+
@:callout(info)
8+
9+
The toolkit does not yet support Scala Native 0.5.x series.
10+
11+
@:@
12+
713
## Overview
814

915
Typelevel toolkit is a meta library that currently includes these libraries:

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

+10-3
Original file line numberDiff line numberDiff line change
@@ -67,12 +67,19 @@ object ScalaCliProcess {
6767
None
6868
)
6969
.evalTap { path =>
70-
val header = List(
70+
val commonHeader = List(
7171
s"//> using scala ${BuildInfo.scalaBinaryVersion}",
7272
s"//> using toolkit typelevel:${BuildInfo.version}",
7373
s"//> using platform ${BuildInfo.platform}"
74-
).mkString("", "\n", "\n")
75-
Stream(header, scriptBody.stripMargin)
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+
}
82+
Stream(header.mkString("", "\n", "\n"), scriptBody.stripMargin)
7683
.through(Files[IO].writeUtf8(path))
7784
.compile
7885
.drain

0 commit comments

Comments
 (0)