From cb8e6326619c873f523f96eec358f8e11514da98 Mon Sep 17 00:00:00 2001 From: Li Haoyi Date: Mon, 15 Apr 2024 11:26:57 +0800 Subject: [PATCH 1/5] . --- os/{src-jvm => src}/ProcessOps.scala | 0 os/{src-jvm => src}/SubProcess.scala | 0 os/test/{src-jvm => src}/SubprocessTests.scala | 9 +++------ os/test/{src-jvm => src}/TestUtil.scala | 0 4 files changed, 3 insertions(+), 6 deletions(-) rename os/{src-jvm => src}/ProcessOps.scala (100%) rename os/{src-jvm => src}/SubProcess.scala (100%) rename os/test/{src-jvm => src}/SubprocessTests.scala (99%) rename os/test/{src-jvm => src}/TestUtil.scala (100%) diff --git a/os/src-jvm/ProcessOps.scala b/os/src/ProcessOps.scala similarity index 100% rename from os/src-jvm/ProcessOps.scala rename to os/src/ProcessOps.scala diff --git a/os/src-jvm/SubProcess.scala b/os/src/SubProcess.scala similarity index 100% rename from os/src-jvm/SubProcess.scala rename to os/src/SubProcess.scala diff --git a/os/test/src-jvm/SubprocessTests.scala b/os/test/src/SubprocessTests.scala similarity index 99% rename from os/test/src-jvm/SubprocessTests.scala rename to os/test/src/SubprocessTests.scala index 16eefe93..7fbba6be 100644 --- a/os/test/src-jvm/SubprocessTests.scala +++ b/os/test/src/SubprocessTests.scala @@ -1,12 +1,9 @@ package test.os - -import java.io._ -import java.nio.charset.StandardCharsets - +import test.os.{TestUtil, Unix} import os._ import utest._ - -import scala.collection.mutable +import java.io._ +import java.nio.charset.StandardCharsets object SubprocessTests extends TestSuite { val scriptFolder = pwd / "os" / "test" / "resources" / "test" diff --git a/os/test/src-jvm/TestUtil.scala b/os/test/src/TestUtil.scala similarity index 100% rename from os/test/src-jvm/TestUtil.scala rename to os/test/src/TestUtil.scala From 95dbc50944e353c1486022b32a3ebe5d0859892e Mon Sep 17 00:00:00 2001 From: Li Haoyi Date: Mon, 15 Apr 2024 11:28:16 +0800 Subject: [PATCH 2/5] . --- os/test/src/SubprocessTests.scala | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/os/test/src/SubprocessTests.scala b/os/test/src/SubprocessTests.scala index 7fbba6be..16eefe93 100644 --- a/os/test/src/SubprocessTests.scala +++ b/os/test/src/SubprocessTests.scala @@ -1,10 +1,13 @@ package test.os -import test.os.{TestUtil, Unix} -import os._ -import utest._ + import java.io._ import java.nio.charset.StandardCharsets +import os._ +import utest._ + +import scala.collection.mutable + object SubprocessTests extends TestSuite { val scriptFolder = pwd / "os" / "test" / "resources" / "test" From 8fa91c978a219042611aa04fb2ec3091b7e2c69f Mon Sep 17 00:00:00 2001 From: Li Haoyi Date: Wed, 17 Apr 2024 15:33:36 +0800 Subject: [PATCH 3/5] . --- os/test/{src-jvm => src}/ListingWalkingTests.scala | 0 os/test/src/TestUtil.scala | 2 ++ 2 files changed, 2 insertions(+) rename os/test/{src-jvm => src}/ListingWalkingTests.scala (100%) diff --git a/os/test/src-jvm/ListingWalkingTests.scala b/os/test/src/ListingWalkingTests.scala similarity index 100% rename from os/test/src-jvm/ListingWalkingTests.scala rename to os/test/src/ListingWalkingTests.scala diff --git a/os/test/src/TestUtil.scala b/os/test/src/TestUtil.scala index 49eec2f7..15ab2ed3 100644 --- a/os/test/src/TestUtil.scala +++ b/os/test/src/TestUtil.scala @@ -46,11 +46,13 @@ object TestUtil { directory, new SimpleFileVisitor[Path]() { override def visitFile(file: Path, attrs: BasicFileAttributes) = { + println("visitFile " + file) Files.delete(file) FileVisitResult.CONTINUE } override def postVisitDirectory(dir: Path, exc: IOException) = { + println("postVisitDirectory " + dir) Files.delete(dir) FileVisitResult.CONTINUE } From d84a8cf55dd9550b4ee7e392eb06c504f474d00b Mon Sep 17 00:00:00 2001 From: Lorenzo Gabriele Date: Wed, 29 May 2024 18:31:31 +0200 Subject: [PATCH 4/5] Update Scala Native to 0.5.2 --- build.sc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sc b/build.sc index be1afbe0..21834e14 100644 --- a/build.sc +++ b/build.sc @@ -130,7 +130,7 @@ object os extends Module { object native extends Cross[OsNativeModule](scalaVersions) trait OsNativeModule extends OsModule with ScalaNativeModule { - def scalaNativeVersion = "0.5.0" + def scalaNativeVersion = "0.5.2" object test extends ScalaNativeTests with OsLibTestModule { def nativeLinkStubs = true } From 13ecbff611881da0e980576eea47b20c832db1a3 Mon Sep 17 00:00:00 2001 From: Lorenzo Gabriele Date: Wed, 29 May 2024 18:35:54 +0200 Subject: [PATCH 5/5] Remove `println`s --- os/test/src/TestUtil.scala | 2 -- 1 file changed, 2 deletions(-) diff --git a/os/test/src/TestUtil.scala b/os/test/src/TestUtil.scala index 15ab2ed3..49eec2f7 100644 --- a/os/test/src/TestUtil.scala +++ b/os/test/src/TestUtil.scala @@ -46,13 +46,11 @@ object TestUtil { directory, new SimpleFileVisitor[Path]() { override def visitFile(file: Path, attrs: BasicFileAttributes) = { - println("visitFile " + file) Files.delete(file) FileVisitResult.CONTINUE } override def postVisitDirectory(dir: Path, exc: IOException) = { - println("postVisitDirectory " + dir) Files.delete(dir) FileVisitResult.CONTINUE }