diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5c71d3647..457caad2e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -150,7 +150,7 @@ jobs: run: | # ./sbt -v "repoOverrideTest:scripted dependency-management/*" ./sbt -v "scripted source-dependencies/*" - # ./sbt -v "scripted project/*" + ./sbt -v "scripted project/*" - name: Build and test (5) if: ${{ matrix.jobtype == 5 }} shell: bash diff --git a/sbt-app/src/sbt-test/nio/clean-symlinks/build.sbt b/sbt-app/src/sbt-test/nio/clean-symlinks/build.sbt index b7ad34a81..019aa7e78 100644 --- a/sbt-app/src/sbt-test/nio/clean-symlinks/build.sbt +++ b/sbt-app/src/sbt-test/nio/clean-symlinks/build.sbt @@ -1,5 +1,10 @@ import java.nio.file.Files +name := "clean-symlinks-test" + +scalaVersion := "3.7.3" + TaskKey[Unit]("createSymlinkedDirectory") := { + IO.createDirectory(target.value) Files.createSymbolicLink(target.value.toPath / "foo", baseDirectory.value.toPath / "foo") } diff --git a/sbt-app/src/sbt-test/nio/clean-symlinks/pending b/sbt-app/src/sbt-test/nio/clean-symlinks/pending deleted file mode 100644 index 48dfcb255..000000000 --- a/sbt-app/src/sbt-test/nio/clean-symlinks/pending +++ /dev/null @@ -1,9 +0,0 @@ -> createSymlinkedDirectory - -$ exists target/foo/bar -$ exists foo/bar - -> clean - -$ absent target/foo -$ exists foo/bar diff --git a/sbt-app/src/sbt-test/nio/clean-symlinks/test b/sbt-app/src/sbt-test/nio/clean-symlinks/test new file mode 100644 index 000000000..1f5f2141c --- /dev/null +++ b/sbt-app/src/sbt-test/nio/clean-symlinks/test @@ -0,0 +1,9 @@ +> createSymlinkedDirectory + +$ exists target/out/jvm/scala-3.7.3/clean-symlinks-test/foo/bar +$ exists foo/bar + +> clean + +$ absent target/out/jvm/scala-3.7.3/clean-symlinks-test/foo +$ exists foo/bar diff --git a/sbt-app/src/sbt-test/nio/dynamic-outputs/build.sbt b/sbt-app/src/sbt-test/nio/dynamic-outputs/build.sbt index 1f7ffcb64..15a9903d5 100644 --- a/sbt-app/src/sbt-test/nio/dynamic-outputs/build.sbt +++ b/sbt-app/src/sbt-test/nio/dynamic-outputs/build.sbt @@ -1,4 +1,5 @@ import java.nio.file.{ Path, Paths } +import sbt.internal.FileChangesMacro.inputFiles val foo = taskKey[Seq[Path]]("Copy files") foo / fileInputs += baseDirectory.value.toGlob / "base" / "*.txt" diff --git a/sbt-app/src/sbt-test/nio/dynamic-outputs/pending b/sbt-app/src/sbt-test/nio/dynamic-outputs/test similarity index 100% rename from sbt-app/src/sbt-test/nio/dynamic-outputs/pending rename to sbt-app/src/sbt-test/nio/dynamic-outputs/test diff --git a/sbt-app/src/sbt-test/nio/external-hooks/build.sbt b/sbt-app/src/sbt-test/nio/external-hooks/build.sbt index c01dc8321..de60232cb 100644 --- a/sbt-app/src/sbt-test/nio/external-hooks/build.sbt +++ b/sbt-app/src/sbt-test/nio/external-hooks/build.sbt @@ -1,3 +1,4 @@ +scalaVersion := "2.12.20" val generateSourceFile = taskKey[Unit]("generate source file") generateSourceFile := { val testDir = ((Test / scalaSource).value.toPath / "Foo.scala").toString diff --git a/sbt-app/src/sbt-test/nio/external-hooks/pending b/sbt-app/src/sbt-test/nio/external-hooks/test similarity index 100% rename from sbt-app/src/sbt-test/nio/external-hooks/pending rename to sbt-app/src/sbt-test/nio/external-hooks/test diff --git a/sbt-app/src/sbt-test/nio/glob-dsl/build.sbt b/sbt-app/src/sbt-test/nio/glob-dsl/build.sbt index 2a235473a..d8728a4dd 100644 --- a/sbt-app/src/sbt-test/nio/glob-dsl/build.sbt +++ b/sbt-app/src/sbt-test/nio/glob-dsl/build.sbt @@ -1,3 +1,4 @@ +import sbt.internal.FileChangesMacro.inputFiles // The project contains two files: { Foo.txt, Bar.md } in the subdirector base/subdir/nested-subdir // Check that we can correctly extract Foo.txt with a recursive source diff --git a/sbt-app/src/sbt-test/nio/glob-dsl/pending b/sbt-app/src/sbt-test/nio/glob-dsl/test similarity index 100% rename from sbt-app/src/sbt-test/nio/glob-dsl/pending rename to sbt-app/src/sbt-test/nio/glob-dsl/test diff --git a/sbt-app/src/sbt-test/nio/input-filters/build.sbt b/sbt-app/src/sbt-test/nio/input-filters/build.sbt index 767fbf612..affc827a6 100644 --- a/sbt-app/src/sbt-test/nio/input-filters/build.sbt +++ b/sbt-app/src/sbt-test/nio/input-filters/build.sbt @@ -1,4 +1,6 @@ import java.nio.file.{ Files, Path } +import sbt.internal.FileChangesMacro.inputFiles +import sbt.internal.FileChangesMacro.outputFiles val copyPaths = taskKey[Seq[Path]]("Copy paths") copyPaths / fileInputs += baseDirectory.value.toGlob / "inputs" / * @@ -25,7 +27,7 @@ newFilter := HiddenFileFilter.toNio || "**/bar.txt" val fooFilter = settingKey[PathFilter]("A filter for the bar.txt file") fooFilter := ** / ".foo.txt" -Global / onLoad := { s: State => +Global / onLoad := { (s: State) => if (scala.util.Properties.isWin) { val path = s.baseDir.toPath / "inputs" / ".foo.txt" Files.setAttribute(path, "dos:hidden", true) diff --git a/sbt-app/src/sbt-test/nio/input-filters/pending b/sbt-app/src/sbt-test/nio/input-filters/test similarity index 100% rename from sbt-app/src/sbt-test/nio/input-filters/pending rename to sbt-app/src/sbt-test/nio/input-filters/test diff --git a/sbt-app/src/sbt-test/nio/intraproject-inputs/project/Build.scala b/sbt-app/src/sbt-test/nio/intraproject-inputs/project/Build.scala index 1f36f1640..6630b916a 100644 --- a/sbt-app/src/sbt-test/nio/intraproject-inputs/project/Build.scala +++ b/sbt-app/src/sbt-test/nio/intraproject-inputs/project/Build.scala @@ -12,8 +12,11 @@ object Build { val cached = settingKey[Unit]("") val newInputs = settingKey[Unit]("") + @transient val checkCompile = taskKey[Unit]("check compile inputs") + @transient val checkRun = taskKey[Unit]("check runtime inputs") + @transient val checkTest = taskKey[Unit]("check test inputs") val root = (project in file(".")).settings( diff --git a/sbt-app/src/sbt-test/nio/intraproject-inputs/pending b/sbt-app/src/sbt-test/nio/intraproject-inputs/test similarity index 100% rename from sbt-app/src/sbt-test/nio/intraproject-inputs/pending rename to sbt-app/src/sbt-test/nio/intraproject-inputs/test diff --git a/sbt-app/src/sbt-test/project/skip/test b/sbt-app/src/sbt-test/project/skip/pending similarity index 100% rename from sbt-app/src/sbt-test/project/skip/test rename to sbt-app/src/sbt-test/project/skip/pending