Skip to content

Commit 7b79b49

Browse files
SethTisueSethTisue
authored
Merge pull request #34 from SethTisue/modern-syntax
use modern scala-cli syntax everywhere
2 parents 758c63e + 08ee2c0 commit 7b79b49

13 files changed

+34
-34
lines changed

‎Toolkit.js.scala

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
//> using scala "2.13", "3"
2-
//> using publish.name "toolkit"
3-
//> using lib "com.softwaremill.sttp.client4::core::4.0.0-M1"
4-
//> using lib "com.softwaremill.sttp.client4::upickle::4.0.0-M1"
5-
//> using lib "com.lihaoyi::upickle::3.1.0"
1+
//> using scala 2.13, 3
2+
//> using publish.name toolkit
3+
//> using dep com.softwaremill.sttp.client4::core::4.0.0-M1
4+
//> using dep com.softwaremill.sttp.client4::upickle::4.0.0-M1
5+
//> using dep com.lihaoyi::upickle::3.1.0

‎Toolkit.scala

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
//> using scala "2.13", "3"
2-
//> using publish.name "toolkit"
3-
//> using lib "com.softwaremill.sttp.client4::core::4.0.0-M1"
4-
//> using lib "com.softwaremill.sttp.client4::upickle::4.0.0-M1"
5-
//> using lib "com.lihaoyi::upickle::3.1.0"
6-
//> using lib "com.lihaoyi::os-lib::0.9.1"
1+
//> using scala 2.13, 3
2+
//> using publish.name toolkit
3+
//> using dep com.softwaremill.sttp.client4::core::4.0.0-M1
4+
//> using dep com.softwaremill.sttp.client4::upickle::4.0.0-M1
5+
//> using dep com.lihaoyi::upickle::3.1.0
6+
//> using dep com.lihaoyi::os-lib::0.9.1

‎ToolkitTest.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
//> using scala "2.13", "3"
2-
//> using publish.name "toolkit-test"
3-
//> using lib "org.scalameta::munit::1.0.0-M7"
1+
//> using scala 2.13, 3
2+
//> using publish.name toolkit-test
3+
//> using dep org.scalameta::munit::1.0.0-M7

‎checks/Changelog.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ private def publish(flag: Option[String]) =
2323
val moduleDep = s"${Config.organization}::$dep::${Config.developmentVersion}"
2424
os.write.append(copy, s"\n//> using dep ${moduleDep}")
2525
copy.toString
26-
os.proc("scala-cli", "--power", "publish", "local", "--cross", flag.map(f => s"--$f").toList, "--organization", Config.organization, "--version", Config.developmentVersion.toString, file).call()
26+
os.proc("scala-cli", "--power", "publish", "local", "--cross", flag.map(f => s"--$f").toList, "--organization", Config.organization, "--project-version", Config.developmentVersion.toString, file).call()
2727

2828
@main
2929
def main(args: String*) =

‎checks/test/ChangelogTest.scala

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -245,10 +245,10 @@ object ChangelogTest:
245245
// scala-cli config file write
246246
os.temp(s"""
247247
|//> using scala 2.13, 3
248-
|//> using publish.name "$id"
249-
|${deps.map(d => s"//> using lib $d").mkString("\n")}
250-
|//> using publish.version "$version"
251-
|//> using publish.organization "com.example"
248+
|//> using publish.name $id
249+
|${deps.map(d => s"//> using dep $d").mkString("\n")}
250+
|//> using publish.version $version
251+
|//> using publish.organization com.example
252252
| """.stripMargin, suffix = ".scala")
253253

254254
private def publish(id: String, version: String, deps: List[String], skip: List[String] = Nil) =

‎examples/DirGetTotalSize.sc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//> using toolkit "latest"
1+
//> using toolkit latest
22

33
val totalSize = os.walk.stream.attrs(os.pwd)
44
.collect { case (path, attrs) if attrs.isFile => attrs.size }

‎examples/FileReadText.sc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//> using toolkit "latest"
1+
//> using toolkit latest
22

33
val text = os.read(os.pwd / "resources" / "File.txt")
44
println(text)

‎examples/JsonReading.sc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//> using toolkit "latest"
1+
//> using toolkit latest
22

33
import upickle.default._
44

‎examples/JsonWriting.sc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//> using toolkit "latest"
1+
//> using toolkit latest
22

33
import upickle.default._
44

‎examples/RequestGet.sc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//> using toolkit "latest"
1+
//> using toolkit latest
22

33
import sttp.client4.quick.*
44

‎examples/RequestPost.sc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//> using toolkit "latest"
1+
//> using toolkit latest
22

33
import sttp.client4.quick.*
44

‎examples/SimpleTest.test.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
//> using toolkit "latest"
2-
//> using dep "org.scala-lang::toolkit-test:latest.stable"
1+
//> using toolkit latest
2+
//> using dep org.scala-lang::toolkit-test:latest.stable
33
// ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ TODO: remove when scala-cli supports toolkit-test
44

55
class MathSuite extends munit.FunSuite {

‎publish-conf.scala

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
//> using publish.organization "org.scala-lang"
2-
//> using publish.computeVersion "git:tag"
3-
//> using publish.url "https://github.com/scala/toolkit"
4-
//> using publish.vcs "github:scala/toolkit"
5-
//> using publish.license "Apache-2.0"
6-
//> using publish.repository "central"
1+
//> using publish.organization org.scala-lang
2+
//> using publish.computeVersion git:tag
3+
//> using publish.url https://github.com/scala/toolkit
4+
//> using publish.vcs github:scala/toolkit
5+
//> using publish.license Apache-2.0
6+
//> using publish.repository central
77
//> using publish.developer "szymon-rd|Simon R|https://github.com/szymon-rd"
88
//> using publish.developer "adpi2|Adrien Piquerez|https://github.com/adpi2"
9-
//> using repository "sonatype:public"
9+
//> using repository sonatype:public

0 commit comments

Comments
 (0)