From 9388c140faea25fc20513fada1b784bb7226d9b5 Mon Sep 17 00:00:00 2001 From: eugene yokota Date: Sat, 31 Jan 2026 17:41:45 -0500 Subject: [PATCH] [2.x] test: Move back the project scripted tests (#8660) **Problem** "project" scripted tests are commented out into "project1" directory. **Solution** This brings them back, while some remain pending. --- .github/workflows/ci.yml | 4 +- .../app/src/main/scala/app/Main.scala | 0 .../scala-js-scala3-sandwich}/build.sbt | 0 .../scala-js-scala3-sandwich/disabled} | 0 .../project/plugins.sbt | 0 .../src/main/scala/mylib/MyLib.scala | 0 .../Class.forName/build.sbt | 5 +- .../Class.forName/changes/build2.sbt | 0 .../Class.forName/src/main/scala/Test.scala | 0 .../{project1 => project}/Class.forName/test | 2 +- .../{project1 => project}/aggregate/build.sbt | 0 .../aggregate/projA/A.scala | 0 .../aggregate/projA/build.sbt | 0 sbt-app/src/sbt-test/project/aggregate/test | 2 + .../{project1 => project}/append/build.sbt | 0 .../{project1 => project}/append/test | 0 .../auto-import/changes/build.sbt | 0 .../auto-import/project/P.scala | 0 .../{project1 => project}/auto-import/test | 0 .../build.sbt | 0 .../project/TestP.scala | 0 .../test | 0 .../auto-plugins-ivy-disabled/build.sbt | 0 .../auto-plugins-ivy-disabled/disabled} | 0 .../auto-plugins-nested/pending | 0 .../auto-plugins-nested/project/Q.scala | 0 .../auto-plugins/build.sbt | 0 .../test => project/auto-plugins/pending} | 0 .../auto-plugins/projD/build.sbt | 0 .../auto-plugins/projF/a.sbt | 0 .../auto-plugins/projF/b.sbt | 0 .../auto-plugins/project/A.scala | 0 .../auto-plugins/project/Q.scala | 0 .../base-sources/A.scala | 0 .../{project1 => project}/base-sources/test | 0 .../binary-plugin/changes/define/A.scala | 0 .../binary-plugin/changes/define/D.scala | 0 .../binary-plugin/changes/define/build.sbt | 0 .../binary-plugin/changes/use/plugins.sbt | 0 .../binary-plugin/common.sbt | 0 .../{project1 => project}/binary-plugin/test | 0 .../bsp-internal-dependency-configs/build.sbt | 0 .../bsp-internal-dependency-configs/test | 0 .../build-deps/a/A.scala | 0 .../build-deps/b/B.scala | 0 .../build-deps/build.sbt | 0 .../build-deps/changes/b.sbt | 0 .../{project1 => project}/build-deps/test | 0 .../build-level-keys/test | 0 .../{project1 => project}/circular/B.scala | 0 .../{project1 => project}/circular/build.sbt | 0 .../circular/sub/A.scala | 0 .../{project1 => project}/circular/test | 0 .../consoleProject}/build.sbt | 0 .../test => project/consoleProject/pending} | 0 .../continuations/build.sbt | 0 .../continuations/pending | 0 .../src/main/scala/Example.scala | 0 .../src/test/scala/ContinuationsTest.scala | 0 .../cross-scala-versions-default/build.sbt | 0 .../cross-scala-versions-default/test | 0 .../cross-source/build.sbt | 0 .../p1/src/main/scala-2.10/B.scala | 0 .../cross-source/p1/src/main/scala/A.scala | 0 .../p2/src/main/scala-2.10/B.scala | 0 .../cross-source/p2/src/main/scala/A.scala | 0 .../p3/src/main/scala-2.10/B.scala | 0 .../cross-source/p3/src/main/scala/A.scala | 0 .../p4/src/main/scala-2.10/B.scala | 0 .../cross-source/p4/src/main/scala/A.scala | 0 .../{project1 => project}/cross-source/test | 0 .../default-auto-plugins/build.sbt | 0 .../default-auto-plugins/test | 0 .../default-settings/build.sbt | 4 +- .../default-settings/test | 0 .../{project1 => project}/defs/build.sbt | 4 +- .../project/defs/changes/visibility.sbt | 1 + .../sbt-test/{project1 => project}/defs/test | 0 .../{project1 => project}/derived/build.sbt | 17 +++++++ .../derived/test => project/derived/pending} | 0 .../project/DatabasePlugin.scala | 0 .../project/ExtraProjectPluginExample.scala | 0 .../project/ExtraProjectPluginExample2.scala | 0 .../{project1 => project}/extra-projects/test | 0 .../{project1 => project}/extra/build.sbt | 0 .../{project1 => project}/extra/disabled | 0 .../{project1 => project}/flatten/build.sbt | 9 ++-- .../flatten/test => project/flatten/pending} | 0 .../flatten/src/JavaA.java | 0 .../flatten/src/ScalaA.scala | 0 .../flatten/src/a/JavaB.java | 0 .../flatten/src/a/ScalaB.scala | 0 .../flatten/src/a/main-resource-a | 0 .../flatten/src/main-resource | 0 .../flatten/test-src/SimpleTest.scala | 0 .../flatten/test-src/c/ResourcesTest.scala | 0 .../flatten/test-src/c/test-resource-c | 0 .../flatten/test-src/test-resource | 0 .../generated-root-no-publish/build.sbt | 6 +-- .../changes/bare.sbt | 3 +- .../project/generated-root-no-publish/test | 10 ++++ .../giter8-plugin/build.sbt | 0 .../giter8-plugin/pending | 0 .../giter8-plugin/project/p.sbt | 0 .../changes/invalid-build.sbt | 0 .../ignore-hidden-build-files/test | 0 .../in-this-build/build.sbt | 2 +- .../{project1 => project}/in-this-build/test | 0 .../{project1 => project}/inside-ci/build.sbt | 0 .../{project1 => project}/inside-ci/test | 0 .../a/A.scala | 0 .../b/B.scala | 0 .../build.sbt | 7 ++- .../c/C.scala | 0 .../d/D.scala | 0 .../internal-dependency-configurations/test | 0 .../internal-tracking/a/A.scala | 0 .../internal-tracking/b/B.scala | 0 .../internal-tracking/build.sbt | 0 .../internal-tracking/c/C.scala | 0 .../internal-tracking/d/D.scala | 0 .../internal-tracking/pending} | 0 .../isolated-build-definitions/build.sbt | 0 .../generator/build.sbt | 0 .../isolated-build-definitions/test | 0 .../{project1 => project}/lint/build.sbt | 1 + .../sbt-test/{project1 => project}/lint/test | 0 .../literal-defs/build.sbt | 0 .../{project1 => project}/literal-defs/test | 0 .../load-hooks/build.sbt | 0 .../{project1 => project}/load-hooks/test | 0 .../old-ops/changes/settingAppend1/build.sbt | 0 .../old-ops/changes/settingAppendN/build.sbt | 0 .../old-ops/changes/settingAssign/build.sbt | 0 .../old-ops/changes/taskAppend1/build.sbt | 0 .../old-ops/changes/taskAppendN/build.sbt | 0 .../old-ops/changes/taskAssign/build.sbt | 0 .../{project1 => project}/old-ops/test | 0 .../project/Plugin.scala | 3 ++ .../plugin-scala-compiler-dependency/test | 0 .../{project1 => project}/plugins/build.sbt | 0 .../plugins/project/p.sbt | 0 .../{project1 => project}/plugins/test | 0 .../{project1 => project}/provided/build.sbt | 18 ++++--- .../sub/src/test/scala/ProvidedTest.scala | 0 .../{project1 => project}/provided/test | 0 .../sbt-composite-projects/build.sbt | 4 +- .../sbt-composite-projects/changes/basic.sbt | 0 .../sbt-composite-projects/changes/shadow.sbt | 0 .../changes/shadowLazy.sbt | 0 .../sbt-composite-projects/js/build.sbt | 0 .../sbt-composite-projects/jvm/A.scala | 0 .../sbt-composite-projects/jvm/a.sbt | 0 .../sbt-composite-projects/other.sbt | 0 .../sbt-composite-projects/pending} | 0 .../sbt-file-projects/a/A.scala | 0 .../sbt-file-projects/a/a.sbt | 0 .../sbt-file-projects/b/build.sbt | 0 .../sbt-file-projects/build.sbt | 0 .../sbt-file-projects/changes/basic.sbt | 0 .../sbt-file-projects/other.sbt | 0 .../sbt-file-projects/test | 0 .../sbt-plugin/build.sbt | 0 .../sbt-plugin/changes/oldSbtPlugin.sbt | 0 .../src/main/scala/myplugin/MyPlugin.scala | 0 .../{project1 => project}/sbt-plugin/test | 0 .../sbt-version-change/build.sbt | 0 .../changes/build.properties | 0 .../sbt-version-change/test | 0 .../scala-loader/build.sbt | 2 +- .../{project1 => project}/scala-loader/test | 0 .../scala3-binary-version/build.sbt | 0 .../scala3-binary-version/test | 0 .../scala3-console-project/build.sbt | 0 .../scala3-console-project/pending} | 0 .../scala3-cross-target/build.sbt | 0 .../src/main/scala/Foo.scala | 0 .../sbt-test/project/scala3-cross-target/test | 7 +++ .../scala3-example-project/LICENSE | 0 .../scala3-example-project/README.md | 0 .../project/scala3-example-project/build.sbt | 1 + .../src/main/scala-3/Main.scala | 0 .../src/main/scala-3/TraitParams.scala | 0 .../scala3-example-project/test | 0 .../scala3-instance-loader/build.sbt | 2 +- .../scala3-instance-loader/test | 0 .../scala3-sandwich/bar-app/D.scala | 0 .../scala3-sandwich/bar-core/C.scala | 0 .../scala3-sandwich/build.sbt | 0 .../scala3-sandwich/foo-app/B.scala | 0 .../scala3-sandwich/foo-core/A.scala | 0 .../scala3-sandwich/test | 0 .../scala3-semanticdb/LICENSE | 0 .../scala3-semanticdb/README.md | 0 .../scala3-semanticdb/build.sbt | 0 .../src/main/scala/Main.scala | 0 .../src/test/scala/Test.scala | 0 .../scala3-semanticdb/test | 0 .../scripted-bad-def/bad.sbt.disabled | 0 .../scripted-bad-def/test | 0 .../scripted-dependencies/build.sbt | 0 .../scripted-dependencies/project/plugins.sbt | 0 .../scripted-dependencies/test | 0 .../scripted-dependencies/test-files}/test | 0 .../scripted-java-home/build.sbt | 0 .../scripted-java-home/changes/build.sbt | 0 .../scripted-java-home/changes/test | 0 .../scripted-java-home/disabled} | 0 .../scripted-plugin/build.sbt | 0 .../scripted-plugin/changes/Fail.scala | 0 .../scripted-plugin/changes/Success.scala | 0 .../scripted-plugin/changes/fail | 0 .../scripted-plugin/changes/test | 0 .../scripted-plugin/project/plugins.sbt | 0 .../scripted-plugin/test | 0 .../scripted-skip-incompatible/build.sbt | 0 .../changes/Fail.scala | 0 .../changes/build.properties | 0 .../scripted-skip-incompatible/changes/test | 0 .../scripted-skip-incompatible/test | 0 .../semanticdb-version/build.sbt | 0 .../src/main/scala/foo/Test.scala | 0 .../semanticdb-version/test | 0 .../sequential/build.sbt | 2 +- .../{project1 => project}/sequential/test | 0 .../session-save/build.check.1 | 0 .../session-save/build.check.2 | 0 .../session-save/build.check.3 | 0 .../session-save/build.check.4 | 0 .../session-save/build.check.5 | 0 .../session-save/build.sbt | 0 .../session-save/disabled | 0 .../session-update-from-cmd/build.check.1 | 0 .../session-update-from-cmd/build.check.2 | 0 .../session-update-from-cmd/build.sbt | 0 .../project/Common.scala | 10 ++-- .../session-update-from-cmd/test | 0 .../setting-macro/build.sbt | 13 ++--- .../test => project/setting-macro/disabled} | 0 .../project/PureExpressionPlugin.scala | 3 +- .../setting-macro/project/plugins.sbt | 0 .../{project1 => project}/setting-order/a.sbt | 0 .../{project1 => project}/setting-order/b.sbt | 0 .../setting-order/build.sbt | 0 .../{project1 => project}/setting-order/c.sbt | 0 .../test => project/setting-order/pending} | 0 .../project/settings-definition/build.sbt | 23 +++++++++ .../settings-definition/test | 0 .../{project1 => project}/settings/build.sbt | 0 .../settings/changes/Global.scala | 0 .../settings/changes/global.sbt | 0 .../settings/changes/settings.sbt | 0 .../test => project/settings/pending} | 2 +- .../source-plugins/build.sbt | 0 .../source-plugins/pending | 0 .../source-plugins/project/plugin.sbt | 0 .../test => project/src-plugins/pending} | 0 .../src-plugins/plugin/JavaTest.java | 0 .../src-plugins/plugin/TestPlugin.scala | 2 +- .../src-plugins/plugin/build.sbt | 0 .../src-plugins/project/p.sbt | 0 .../src-scala-binary-version/b/build.sbt | 0 .../src-scala-binary-version/build.sbt | 9 ++-- .../src-scala-binary-version/test | 0 .../project/subproject-dependson/build.sbt | 17 +++++++ .../subproject-dependson/projA/build.sbt | 0 .../subproject-dependson/projB/build.sbt | 3 ++ .../subproject-dependson/test | 0 .../test-script-file/build.sbt | 0 .../test-script-file/test.script | 0 .../sbt-test/project/thisProject/build.sbt | 10 ++++ .../project/thisProject/proj2/build.sbt | 1 + .../{project1 => project}/thisProject/test | 0 .../transitive-plugins/build.sbt | 12 ++--- .../transitive-plugins/test | 0 .../{project1 => project}/unified/build.sbt | 1 - .../unified/test => project/unified/pending} | 0 .../src/test/scala/example/HelloTests.scala | 0 .../unique-settings-computation/build.sbt | 0 .../unique-settings-computation/disabled | 0 .../project/A.scala | 0 .../update-classifiers/build.sbt | 0 .../update-classifiers/test | 0 .../{project1 => project}/val-order/build.sbt | 1 - .../test => project/val-order/pending} | 0 sbt-app/src/sbt-test/project1/aggregate/test | 2 - .../project1/cross-plugins-defaults/build.sbt | 48 ------------------- .../project1/cross-plugins-defaults/test | 5 -- .../project1/cross-plugins-source/build.sbt | 6 --- .../src/main/scala-sbt-0.13.x/B.scala | 2 - .../src/main/scala-sbt-0.13/A.scala | 1 - .../src/main/scala-sbt-0.13/B.scala | 1 - .../src/main/scala/Test.scala | 1 - .../src/test/scala/TestFile.scala | 3 -- .../project1/cross-plugins-source/test | 3 -- .../project1/defs/changes/visibility.sbt | 1 - .../project1/generated-root-no-publish/test | 10 ---- .../project1/global-plugin/changes/build.sbt | 7 ++- .../global-plugin/global/plugins/A.scala | 2 +- .../project1/global-plugin/{test => pending} | 0 .../project1/global-plugin/project/Test.scala | 2 +- .../project1/overlap-target/build.sbt | 3 -- .../project1/overlap-target/changes/xdir | 1 - .../src/sbt-test/project1/overlap-target/test | 4 -- .../src/sbt-test/project1/overlap-target/ydir | 1 - .../project/Plugin.scala | 3 -- .../sbt-test/project1/plusequals/build.sbt | 6 --- .../plusequals/project/XBuildInfoPlugin.scala | 32 ------------- .../project1/scala3-cross-target/test | 7 --- .../project1/scala3-example-project/build.sbt | 1 - .../scripted-dependencies/test-files/test | 1 - .../sbt-test/project1/scripted13/build.sbt | 1 - .../project1/scripted13/changes/A.scala | 1 - .../project1/scripted13/changes/Fail.scala | 1 - .../project1/scripted13/project/plugins.sbt | 1 - .../project1/scripted13/src/sbt-test/a/b/test | 1 - sbt-app/src/sbt-test/project1/scripted13/test | 8 ---- .../project1/settings-compat/build.sbt | 14 ------ .../sbt-test/project1/settings-compat/test | 2 - .../project1/settings-definition/build.sbt | 39 --------------- .../project1/subproject-dependson/build.sbt | 11 ----- .../subproject-dependson/projB/build.sbt | 3 -- .../sbt-test/project1/thisProject/build.sbt | 10 ---- .../project1/thisProject/proj2/build.sbt | 1 - 324 files changed, 167 insertions(+), 302 deletions(-) rename sbt-app/src/sbt-test/{project1/scala3-sandwich-sjs => plugins/scala-js-scala3-sandwich}/app/src/main/scala/app/Main.scala (100%) rename sbt-app/src/sbt-test/{project1/scala3-sandwich-sjs => plugins/scala-js-scala3-sandwich}/build.sbt (100%) rename sbt-app/src/sbt-test/{project1/scala3-sandwich-sjs/test => plugins/scala-js-scala3-sandwich/disabled} (100%) rename sbt-app/src/sbt-test/{project1/scala3-sandwich-sjs => plugins/scala-js-scala3-sandwich}/project/plugins.sbt (100%) rename sbt-app/src/sbt-test/{project1/scala3-sandwich-sjs => plugins/scala-js-scala3-sandwich}/scala3code/src/main/scala/mylib/MyLib.scala (100%) rename sbt-app/src/sbt-test/{project1 => project}/Class.forName/build.sbt (58%) rename sbt-app/src/sbt-test/{project1 => project}/Class.forName/changes/build2.sbt (100%) rename sbt-app/src/sbt-test/{project1 => project}/Class.forName/src/main/scala/Test.scala (100%) rename sbt-app/src/sbt-test/{project1 => project}/Class.forName/test (80%) rename sbt-app/src/sbt-test/{project1 => project}/aggregate/build.sbt (100%) rename sbt-app/src/sbt-test/{project1 => project}/aggregate/projA/A.scala (100%) rename sbt-app/src/sbt-test/{project1 => project}/aggregate/projA/build.sbt (100%) create mode 100644 sbt-app/src/sbt-test/project/aggregate/test rename sbt-app/src/sbt-test/{project1 => project}/append/build.sbt (100%) rename sbt-app/src/sbt-test/{project1 => project}/append/test (100%) rename sbt-app/src/sbt-test/{project1 => project}/auto-import/changes/build.sbt (100%) rename sbt-app/src/sbt-test/{project1 => project}/auto-import/project/P.scala (100%) rename sbt-app/src/sbt-test/{project1 => project}/auto-import/test (100%) rename sbt-app/src/sbt-test/{project1 => project}/auto-plugins-default-requires-jvmplugin/build.sbt (100%) rename sbt-app/src/sbt-test/{project1 => project}/auto-plugins-default-requires-jvmplugin/project/TestP.scala (100%) rename sbt-app/src/sbt-test/{project1 => project}/auto-plugins-default-requires-jvmplugin/test (100%) rename sbt-app/src/sbt-test/{project1 => project}/auto-plugins-ivy-disabled/build.sbt (100%) rename sbt-app/src/sbt-test/{project1/auto-plugins-ivy-disabled/test => project/auto-plugins-ivy-disabled/disabled} (100%) rename sbt-app/src/sbt-test/{project1 => project}/auto-plugins-nested/pending (100%) rename sbt-app/src/sbt-test/{project1 => project}/auto-plugins-nested/project/Q.scala (100%) rename sbt-app/src/sbt-test/{project1 => project}/auto-plugins/build.sbt (100%) rename sbt-app/src/sbt-test/{project1/auto-plugins/test => project/auto-plugins/pending} (100%) rename sbt-app/src/sbt-test/{project1 => project}/auto-plugins/projD/build.sbt (100%) rename sbt-app/src/sbt-test/{project1 => project}/auto-plugins/projF/a.sbt (100%) rename sbt-app/src/sbt-test/{project1 => project}/auto-plugins/projF/b.sbt (100%) rename sbt-app/src/sbt-test/{project1 => project}/auto-plugins/project/A.scala (100%) rename sbt-app/src/sbt-test/{project1 => project}/auto-plugins/project/Q.scala (100%) rename sbt-app/src/sbt-test/{project1 => project}/base-sources/A.scala (100%) rename sbt-app/src/sbt-test/{project1 => project}/base-sources/test (100%) rename sbt-app/src/sbt-test/{project1 => project}/binary-plugin/changes/define/A.scala (100%) rename sbt-app/src/sbt-test/{project1 => project}/binary-plugin/changes/define/D.scala (100%) rename sbt-app/src/sbt-test/{project1 => project}/binary-plugin/changes/define/build.sbt (100%) rename sbt-app/src/sbt-test/{project1 => project}/binary-plugin/changes/use/plugins.sbt (100%) rename sbt-app/src/sbt-test/{project1 => project}/binary-plugin/common.sbt (100%) rename sbt-app/src/sbt-test/{project1 => project}/binary-plugin/test (100%) rename sbt-app/src/sbt-test/{project1 => project}/bsp-internal-dependency-configs/build.sbt (100%) rename sbt-app/src/sbt-test/{project1 => project}/bsp-internal-dependency-configs/test (100%) rename sbt-app/src/sbt-test/{project1 => project}/build-deps/a/A.scala (100%) rename sbt-app/src/sbt-test/{project1 => project}/build-deps/b/B.scala (100%) rename sbt-app/src/sbt-test/{project1 => project}/build-deps/build.sbt (100%) rename sbt-app/src/sbt-test/{project1 => project}/build-deps/changes/b.sbt (100%) rename sbt-app/src/sbt-test/{project1 => project}/build-deps/test (100%) rename sbt-app/src/sbt-test/{project1 => project}/build-level-keys/test (100%) rename sbt-app/src/sbt-test/{project1 => project}/circular/B.scala (100%) rename sbt-app/src/sbt-test/{project1 => project}/circular/build.sbt (100%) rename sbt-app/src/sbt-test/{project1 => project}/circular/sub/A.scala (100%) rename sbt-app/src/sbt-test/{project1 => project}/circular/test (100%) rename sbt-app/src/sbt-test/{project1/console => project/consoleProject}/build.sbt (100%) rename sbt-app/src/sbt-test/{project1/console/test => project/consoleProject/pending} (100%) rename sbt-app/src/sbt-test/{project1 => project}/continuations/build.sbt (100%) rename sbt-app/src/sbt-test/{project1 => project}/continuations/pending (100%) rename sbt-app/src/sbt-test/{project1 => project}/continuations/src/main/scala/Example.scala (100%) rename sbt-app/src/sbt-test/{project1 => project}/continuations/src/test/scala/ContinuationsTest.scala (100%) rename sbt-app/src/sbt-test/{project1 => project}/cross-scala-versions-default/build.sbt (100%) rename sbt-app/src/sbt-test/{project1 => project}/cross-scala-versions-default/test (100%) rename sbt-app/src/sbt-test/{project1 => project}/cross-source/build.sbt (100%) rename sbt-app/src/sbt-test/{project1 => project}/cross-source/p1/src/main/scala-2.10/B.scala (100%) rename sbt-app/src/sbt-test/{project1 => project}/cross-source/p1/src/main/scala/A.scala (100%) rename sbt-app/src/sbt-test/{project1 => project}/cross-source/p2/src/main/scala-2.10/B.scala (100%) rename sbt-app/src/sbt-test/{project1 => project}/cross-source/p2/src/main/scala/A.scala (100%) rename sbt-app/src/sbt-test/{project1 => project}/cross-source/p3/src/main/scala-2.10/B.scala (100%) rename sbt-app/src/sbt-test/{project1 => project}/cross-source/p3/src/main/scala/A.scala (100%) rename sbt-app/src/sbt-test/{project1 => project}/cross-source/p4/src/main/scala-2.10/B.scala (100%) rename sbt-app/src/sbt-test/{project1 => project}/cross-source/p4/src/main/scala/A.scala (100%) rename sbt-app/src/sbt-test/{project1 => project}/cross-source/test (100%) rename sbt-app/src/sbt-test/{project1 => project}/default-auto-plugins/build.sbt (100%) rename sbt-app/src/sbt-test/{project1 => project}/default-auto-plugins/test (100%) rename sbt-app/src/sbt-test/{project1 => project}/default-settings/build.sbt (64%) rename sbt-app/src/sbt-test/{project1 => project}/default-settings/test (100%) rename sbt-app/src/sbt-test/{project1 => project}/defs/build.sbt (74%) create mode 100644 sbt-app/src/sbt-test/project/defs/changes/visibility.sbt rename sbt-app/src/sbt-test/{project1 => project}/defs/test (100%) rename sbt-app/src/sbt-test/{project1 => project}/derived/build.sbt (96%) rename sbt-app/src/sbt-test/{project1/derived/test => project/derived/pending} (100%) rename sbt-app/src/sbt-test/{project1 => project}/extra-projects/project/DatabasePlugin.scala (100%) rename sbt-app/src/sbt-test/{project1 => project}/extra-projects/project/ExtraProjectPluginExample.scala (100%) rename sbt-app/src/sbt-test/{project1 => project}/extra-projects/project/ExtraProjectPluginExample2.scala (100%) rename sbt-app/src/sbt-test/{project1 => project}/extra-projects/test (100%) rename sbt-app/src/sbt-test/{project1 => project}/extra/build.sbt (100%) rename sbt-app/src/sbt-test/{project1 => project}/extra/disabled (100%) rename sbt-app/src/sbt-test/{project1 => project}/flatten/build.sbt (71%) rename sbt-app/src/sbt-test/{project1/flatten/test => project/flatten/pending} (100%) rename sbt-app/src/sbt-test/{project1 => project}/flatten/src/JavaA.java (100%) rename sbt-app/src/sbt-test/{project1 => project}/flatten/src/ScalaA.scala (100%) rename sbt-app/src/sbt-test/{project1 => project}/flatten/src/a/JavaB.java (100%) rename sbt-app/src/sbt-test/{project1 => project}/flatten/src/a/ScalaB.scala (100%) rename sbt-app/src/sbt-test/{project1 => project}/flatten/src/a/main-resource-a (100%) rename sbt-app/src/sbt-test/{project1 => project}/flatten/src/main-resource (100%) rename sbt-app/src/sbt-test/{project1 => project}/flatten/test-src/SimpleTest.scala (100%) rename sbt-app/src/sbt-test/{project1 => project}/flatten/test-src/c/ResourcesTest.scala (100%) rename sbt-app/src/sbt-test/{project1 => project}/flatten/test-src/c/test-resource-c (100%) rename sbt-app/src/sbt-test/{project1 => project}/flatten/test-src/test-resource (100%) rename sbt-app/src/sbt-test/{project1 => project}/generated-root-no-publish/build.sbt (60%) rename sbt-app/src/sbt-test/{project1 => project}/generated-root-no-publish/changes/bare.sbt (66%) create mode 100644 sbt-app/src/sbt-test/project/generated-root-no-publish/test rename sbt-app/src/sbt-test/{project1 => project}/giter8-plugin/build.sbt (100%) rename sbt-app/src/sbt-test/{project1 => project}/giter8-plugin/pending (100%) rename sbt-app/src/sbt-test/{project1 => project}/giter8-plugin/project/p.sbt (100%) rename sbt-app/src/sbt-test/{project1 => project}/ignore-hidden-build-files/changes/invalid-build.sbt (100%) rename sbt-app/src/sbt-test/{project1 => project}/ignore-hidden-build-files/test (100%) rename sbt-app/src/sbt-test/{project1 => project}/in-this-build/build.sbt (52%) rename sbt-app/src/sbt-test/{project1 => project}/in-this-build/test (100%) rename sbt-app/src/sbt-test/{project1 => project}/inside-ci/build.sbt (100%) rename sbt-app/src/sbt-test/{project1 => project}/inside-ci/test (100%) rename sbt-app/src/sbt-test/{project1 => project}/internal-dependency-configurations/a/A.scala (100%) rename sbt-app/src/sbt-test/{project1 => project}/internal-dependency-configurations/b/B.scala (100%) rename sbt-app/src/sbt-test/{project1 => project}/internal-dependency-configurations/build.sbt (94%) rename sbt-app/src/sbt-test/{project1 => project}/internal-dependency-configurations/c/C.scala (100%) rename sbt-app/src/sbt-test/{project1 => project}/internal-dependency-configurations/d/D.scala (100%) rename sbt-app/src/sbt-test/{project1 => project}/internal-dependency-configurations/test (100%) rename sbt-app/src/sbt-test/{project1 => project}/internal-tracking/a/A.scala (100%) rename sbt-app/src/sbt-test/{project1 => project}/internal-tracking/b/B.scala (100%) rename sbt-app/src/sbt-test/{project1 => project}/internal-tracking/build.sbt (100%) rename sbt-app/src/sbt-test/{project1 => project}/internal-tracking/c/C.scala (100%) rename sbt-app/src/sbt-test/{project1 => project}/internal-tracking/d/D.scala (100%) rename sbt-app/src/sbt-test/{project1/internal-tracking/test => project/internal-tracking/pending} (100%) rename sbt-app/src/sbt-test/{project1 => project}/isolated-build-definitions/build.sbt (100%) rename sbt-app/src/sbt-test/{project1 => project}/isolated-build-definitions/generator/build.sbt (100%) rename sbt-app/src/sbt-test/{project1 => project}/isolated-build-definitions/test (100%) rename sbt-app/src/sbt-test/{project1 => project}/lint/build.sbt (98%) rename sbt-app/src/sbt-test/{project1 => project}/lint/test (100%) rename sbt-app/src/sbt-test/{project1 => project}/literal-defs/build.sbt (100%) rename sbt-app/src/sbt-test/{project1 => project}/literal-defs/test (100%) rename sbt-app/src/sbt-test/{project1 => project}/load-hooks/build.sbt (100%) rename sbt-app/src/sbt-test/{project1 => project}/load-hooks/test (100%) rename sbt-app/src/sbt-test/{project1 => project}/old-ops/changes/settingAppend1/build.sbt (100%) rename sbt-app/src/sbt-test/{project1 => project}/old-ops/changes/settingAppendN/build.sbt (100%) rename sbt-app/src/sbt-test/{project1 => project}/old-ops/changes/settingAssign/build.sbt (100%) rename sbt-app/src/sbt-test/{project1 => project}/old-ops/changes/taskAppend1/build.sbt (100%) rename sbt-app/src/sbt-test/{project1 => project}/old-ops/changes/taskAppendN/build.sbt (100%) rename sbt-app/src/sbt-test/{project1 => project}/old-ops/changes/taskAssign/build.sbt (100%) rename sbt-app/src/sbt-test/{project1 => project}/old-ops/test (100%) create mode 100644 sbt-app/src/sbt-test/project/plugin-scala-compiler-dependency/project/Plugin.scala rename sbt-app/src/sbt-test/{project1 => project}/plugin-scala-compiler-dependency/test (100%) rename sbt-app/src/sbt-test/{project1 => project}/plugins/build.sbt (100%) rename sbt-app/src/sbt-test/{project1 => project}/plugins/project/p.sbt (100%) rename sbt-app/src/sbt-test/{project1 => project}/plugins/test (100%) rename sbt-app/src/sbt-test/{project1 => project}/provided/build.sbt (73%) rename sbt-app/src/sbt-test/{project1 => project}/provided/sub/src/test/scala/ProvidedTest.scala (100%) rename sbt-app/src/sbt-test/{project1 => project}/provided/test (100%) rename sbt-app/src/sbt-test/{project1 => project}/sbt-composite-projects/build.sbt (95%) rename sbt-app/src/sbt-test/{project1 => project}/sbt-composite-projects/changes/basic.sbt (100%) rename sbt-app/src/sbt-test/{project1 => project}/sbt-composite-projects/changes/shadow.sbt (100%) rename sbt-app/src/sbt-test/{project1 => project}/sbt-composite-projects/changes/shadowLazy.sbt (100%) rename sbt-app/src/sbt-test/{project1 => project}/sbt-composite-projects/js/build.sbt (100%) rename sbt-app/src/sbt-test/{project1 => project}/sbt-composite-projects/jvm/A.scala (100%) rename sbt-app/src/sbt-test/{project1 => project}/sbt-composite-projects/jvm/a.sbt (100%) rename sbt-app/src/sbt-test/{project1 => project}/sbt-composite-projects/other.sbt (100%) rename sbt-app/src/sbt-test/{project1/sbt-composite-projects/test => project/sbt-composite-projects/pending} (100%) rename sbt-app/src/sbt-test/{project1 => project}/sbt-file-projects/a/A.scala (100%) rename sbt-app/src/sbt-test/{project1 => project}/sbt-file-projects/a/a.sbt (100%) rename sbt-app/src/sbt-test/{project1 => project}/sbt-file-projects/b/build.sbt (100%) rename sbt-app/src/sbt-test/{project1 => project}/sbt-file-projects/build.sbt (100%) rename sbt-app/src/sbt-test/{project1 => project}/sbt-file-projects/changes/basic.sbt (100%) rename sbt-app/src/sbt-test/{project1 => project}/sbt-file-projects/other.sbt (100%) rename sbt-app/src/sbt-test/{project1 => project}/sbt-file-projects/test (100%) rename sbt-app/src/sbt-test/{project1 => project}/sbt-plugin/build.sbt (100%) rename sbt-app/src/sbt-test/{project1 => project}/sbt-plugin/changes/oldSbtPlugin.sbt (100%) rename sbt-app/src/sbt-test/{project1 => project}/sbt-plugin/src/main/scala/myplugin/MyPlugin.scala (100%) rename sbt-app/src/sbt-test/{project1 => project}/sbt-plugin/test (100%) rename sbt-app/src/sbt-test/{project1 => project}/sbt-version-change/build.sbt (100%) rename sbt-app/src/sbt-test/{project1 => project}/sbt-version-change/changes/build.properties (100%) rename sbt-app/src/sbt-test/{project1 => project}/sbt-version-change/test (100%) rename sbt-app/src/sbt-test/{project1 => project}/scala-loader/build.sbt (93%) rename sbt-app/src/sbt-test/{project1 => project}/scala-loader/test (100%) rename sbt-app/src/sbt-test/{project1 => project}/scala3-binary-version/build.sbt (100%) rename sbt-app/src/sbt-test/{project1 => project}/scala3-binary-version/test (100%) rename sbt-app/src/sbt-test/{project1 => project}/scala3-console-project/build.sbt (100%) rename sbt-app/src/sbt-test/{project1/scala3-console-project/test => project/scala3-console-project/pending} (100%) rename sbt-app/src/sbt-test/{project1 => project}/scala3-cross-target/build.sbt (100%) rename sbt-app/src/sbt-test/{project1 => project}/scala3-cross-target/src/main/scala/Foo.scala (100%) create mode 100644 sbt-app/src/sbt-test/project/scala3-cross-target/test rename sbt-app/src/sbt-test/{project1 => project}/scala3-example-project/LICENSE (100%) rename sbt-app/src/sbt-test/{project1 => project}/scala3-example-project/README.md (100%) create mode 100644 sbt-app/src/sbt-test/project/scala3-example-project/build.sbt rename sbt-app/src/sbt-test/{project1 => project}/scala3-example-project/src/main/scala-3/Main.scala (100%) rename sbt-app/src/sbt-test/{project1 => project}/scala3-example-project/src/main/scala-3/TraitParams.scala (100%) rename sbt-app/src/sbt-test/{project1 => project}/scala3-example-project/test (100%) rename sbt-app/src/sbt-test/{project1 => project}/scala3-instance-loader/build.sbt (90%) rename sbt-app/src/sbt-test/{project1 => project}/scala3-instance-loader/test (100%) rename sbt-app/src/sbt-test/{project1 => project}/scala3-sandwich/bar-app/D.scala (100%) rename sbt-app/src/sbt-test/{project1 => project}/scala3-sandwich/bar-core/C.scala (100%) rename sbt-app/src/sbt-test/{project1 => project}/scala3-sandwich/build.sbt (100%) rename sbt-app/src/sbt-test/{project1 => project}/scala3-sandwich/foo-app/B.scala (100%) rename sbt-app/src/sbt-test/{project1 => project}/scala3-sandwich/foo-core/A.scala (100%) rename sbt-app/src/sbt-test/{project1 => project}/scala3-sandwich/test (100%) rename sbt-app/src/sbt-test/{project1 => project}/scala3-semanticdb/LICENSE (100%) rename sbt-app/src/sbt-test/{project1 => project}/scala3-semanticdb/README.md (100%) rename sbt-app/src/sbt-test/{project1 => project}/scala3-semanticdb/build.sbt (100%) rename sbt-app/src/sbt-test/{project1 => project}/scala3-semanticdb/src/main/scala/Main.scala (100%) rename sbt-app/src/sbt-test/{project1 => project}/scala3-semanticdb/src/test/scala/Test.scala (100%) rename sbt-app/src/sbt-test/{project1 => project}/scala3-semanticdb/test (100%) rename sbt-app/src/sbt-test/{project1 => project}/scripted-bad-def/bad.sbt.disabled (100%) rename sbt-app/src/sbt-test/{project1 => project}/scripted-bad-def/test (100%) rename sbt-app/src/sbt-test/{project1 => project}/scripted-dependencies/build.sbt (100%) rename sbt-app/src/sbt-test/{project1 => project}/scripted-dependencies/project/plugins.sbt (100%) rename sbt-app/src/sbt-test/{project1 => project}/scripted-dependencies/test (100%) rename sbt-app/src/sbt-test/{project1/plusequals => project/scripted-dependencies/test-files}/test (100%) rename sbt-app/src/sbt-test/{project1 => project}/scripted-java-home/build.sbt (100%) rename sbt-app/src/sbt-test/{project1 => project}/scripted-java-home/changes/build.sbt (100%) rename sbt-app/src/sbt-test/{project1 => project}/scripted-java-home/changes/test (100%) rename sbt-app/src/sbt-test/{project1/scripted-java-home/test => project/scripted-java-home/disabled} (100%) rename sbt-app/src/sbt-test/{project1 => project}/scripted-plugin/build.sbt (100%) rename sbt-app/src/sbt-test/{project1 => project}/scripted-plugin/changes/Fail.scala (100%) rename sbt-app/src/sbt-test/{project1 => project}/scripted-plugin/changes/Success.scala (100%) rename sbt-app/src/sbt-test/{project1 => project}/scripted-plugin/changes/fail (100%) rename sbt-app/src/sbt-test/{project1 => project}/scripted-plugin/changes/test (100%) rename sbt-app/src/sbt-test/{project1 => project}/scripted-plugin/project/plugins.sbt (100%) rename sbt-app/src/sbt-test/{project1 => project}/scripted-plugin/test (100%) rename sbt-app/src/sbt-test/{project1 => project}/scripted-skip-incompatible/build.sbt (100%) rename sbt-app/src/sbt-test/{project1 => project}/scripted-skip-incompatible/changes/Fail.scala (100%) rename sbt-app/src/sbt-test/{project1 => project}/scripted-skip-incompatible/changes/build.properties (100%) rename sbt-app/src/sbt-test/{project1 => project}/scripted-skip-incompatible/changes/test (100%) rename sbt-app/src/sbt-test/{project1 => project}/scripted-skip-incompatible/test (100%) rename sbt-app/src/sbt-test/{project1 => project}/semanticdb-version/build.sbt (100%) rename sbt-app/src/sbt-test/{project1 => project}/semanticdb-version/src/main/scala/foo/Test.scala (100%) rename sbt-app/src/sbt-test/{project1 => project}/semanticdb-version/test (100%) rename sbt-app/src/sbt-test/{project1 => project}/sequential/build.sbt (95%) rename sbt-app/src/sbt-test/{project1 => project}/sequential/test (100%) rename sbt-app/src/sbt-test/{project1 => project}/session-save/build.check.1 (100%) rename sbt-app/src/sbt-test/{project1 => project}/session-save/build.check.2 (100%) rename sbt-app/src/sbt-test/{project1 => project}/session-save/build.check.3 (100%) rename sbt-app/src/sbt-test/{project1 => project}/session-save/build.check.4 (100%) rename sbt-app/src/sbt-test/{project1 => project}/session-save/build.check.5 (100%) rename sbt-app/src/sbt-test/{project1 => project}/session-save/build.sbt (100%) rename sbt-app/src/sbt-test/{project1 => project}/session-save/disabled (100%) rename sbt-app/src/sbt-test/{project1 => project}/session-update-from-cmd/build.check.1 (100%) rename sbt-app/src/sbt-test/{project1 => project}/session-update-from-cmd/build.check.2 (100%) rename sbt-app/src/sbt-test/{project1 => project}/session-update-from-cmd/build.sbt (100%) rename sbt-app/src/sbt-test/{project1 => project}/session-update-from-cmd/project/Common.scala (86%) rename sbt-app/src/sbt-test/{project1 => project}/session-update-from-cmd/test (100%) rename sbt-app/src/sbt-test/{project1 => project}/setting-macro/build.sbt (76%) rename sbt-app/src/sbt-test/{project1/setting-macro/test => project/setting-macro/disabled} (100%) rename sbt-app/src/sbt-test/{project1 => project}/setting-macro/project/PureExpressionPlugin.scala (82%) rename sbt-app/src/sbt-test/{project1 => project}/setting-macro/project/plugins.sbt (100%) rename sbt-app/src/sbt-test/{project1 => project}/setting-order/a.sbt (100%) rename sbt-app/src/sbt-test/{project1 => project}/setting-order/b.sbt (100%) rename sbt-app/src/sbt-test/{project1 => project}/setting-order/build.sbt (100%) rename sbt-app/src/sbt-test/{project1 => project}/setting-order/c.sbt (100%) rename sbt-app/src/sbt-test/{project1/setting-order/test => project/setting-order/pending} (100%) create mode 100644 sbt-app/src/sbt-test/project/settings-definition/build.sbt rename sbt-app/src/sbt-test/{project1 => project}/settings-definition/test (100%) rename sbt-app/src/sbt-test/{project1 => project}/settings/build.sbt (100%) rename sbt-app/src/sbt-test/{project1 => project}/settings/changes/Global.scala (100%) rename sbt-app/src/sbt-test/{project1 => project}/settings/changes/global.sbt (100%) rename sbt-app/src/sbt-test/{project1 => project}/settings/changes/settings.sbt (100%) rename sbt-app/src/sbt-test/{project1/settings/test => project/settings/pending} (89%) rename sbt-app/src/sbt-test/{project1 => project}/source-plugins/build.sbt (100%) rename sbt-app/src/sbt-test/{project1 => project}/source-plugins/pending (100%) rename sbt-app/src/sbt-test/{project1 => project}/source-plugins/project/plugin.sbt (100%) rename sbt-app/src/sbt-test/{project1/src-plugins/test => project/src-plugins/pending} (100%) rename sbt-app/src/sbt-test/{project1 => project}/src-plugins/plugin/JavaTest.java (100%) rename sbt-app/src/sbt-test/{project1 => project}/src-plugins/plugin/TestPlugin.scala (95%) rename sbt-app/src/sbt-test/{project1 => project}/src-plugins/plugin/build.sbt (100%) rename sbt-app/src/sbt-test/{project1 => project}/src-plugins/project/p.sbt (100%) rename sbt-app/src/sbt-test/{project1 => project}/src-scala-binary-version/b/build.sbt (100%) rename sbt-app/src/sbt-test/{project1 => project}/src-scala-binary-version/build.sbt (62%) rename sbt-app/src/sbt-test/{project1 => project}/src-scala-binary-version/test (100%) create mode 100644 sbt-app/src/sbt-test/project/subproject-dependson/build.sbt rename sbt-app/src/sbt-test/{project1 => project}/subproject-dependson/projA/build.sbt (100%) create mode 100644 sbt-app/src/sbt-test/project/subproject-dependson/projB/build.sbt rename sbt-app/src/sbt-test/{project1 => project}/subproject-dependson/test (100%) rename sbt-app/src/sbt-test/{project1 => project}/test-script-file/build.sbt (100%) rename sbt-app/src/sbt-test/{project1 => project}/test-script-file/test.script (100%) create mode 100644 sbt-app/src/sbt-test/project/thisProject/build.sbt create mode 100644 sbt-app/src/sbt-test/project/thisProject/proj2/build.sbt rename sbt-app/src/sbt-test/{project1 => project}/thisProject/test (100%) rename sbt-app/src/sbt-test/{project1 => project}/transitive-plugins/build.sbt (75%) rename sbt-app/src/sbt-test/{project1 => project}/transitive-plugins/test (100%) rename sbt-app/src/sbt-test/{project1 => project}/unified/build.sbt (98%) rename sbt-app/src/sbt-test/{project1/unified/test => project/unified/pending} (100%) rename sbt-app/src/sbt-test/{project1 => project}/unified/src/test/scala/example/HelloTests.scala (100%) rename sbt-app/src/sbt-test/{project1 => project}/unique-settings-computation/build.sbt (100%) rename sbt-app/src/sbt-test/{project1 => project}/unique-settings-computation/disabled (100%) rename sbt-app/src/sbt-test/{project1 => project}/unique-settings-computation/project/A.scala (100%) rename sbt-app/src/sbt-test/{project1 => project}/update-classifiers/build.sbt (100%) rename sbt-app/src/sbt-test/{project1 => project}/update-classifiers/test (100%) rename sbt-app/src/sbt-test/{project1 => project}/val-order/build.sbt (99%) rename sbt-app/src/sbt-test/{project1/val-order/test => project/val-order/pending} (100%) delete mode 100644 sbt-app/src/sbt-test/project1/aggregate/test delete mode 100644 sbt-app/src/sbt-test/project1/cross-plugins-defaults/build.sbt delete mode 100644 sbt-app/src/sbt-test/project1/cross-plugins-defaults/test delete mode 100644 sbt-app/src/sbt-test/project1/cross-plugins-source/build.sbt delete mode 100644 sbt-app/src/sbt-test/project1/cross-plugins-source/src/main/scala-sbt-0.13.x/B.scala delete mode 100644 sbt-app/src/sbt-test/project1/cross-plugins-source/src/main/scala-sbt-0.13/A.scala delete mode 100644 sbt-app/src/sbt-test/project1/cross-plugins-source/src/main/scala-sbt-0.13/B.scala delete mode 100644 sbt-app/src/sbt-test/project1/cross-plugins-source/src/main/scala/Test.scala delete mode 100644 sbt-app/src/sbt-test/project1/cross-plugins-source/src/test/scala/TestFile.scala delete mode 100644 sbt-app/src/sbt-test/project1/cross-plugins-source/test delete mode 100644 sbt-app/src/sbt-test/project1/defs/changes/visibility.sbt delete mode 100644 sbt-app/src/sbt-test/project1/generated-root-no-publish/test rename sbt-app/src/sbt-test/project1/global-plugin/{test => pending} (100%) delete mode 100644 sbt-app/src/sbt-test/project1/overlap-target/build.sbt delete mode 100644 sbt-app/src/sbt-test/project1/overlap-target/changes/xdir delete mode 100644 sbt-app/src/sbt-test/project1/overlap-target/test delete mode 100644 sbt-app/src/sbt-test/project1/overlap-target/ydir delete mode 100644 sbt-app/src/sbt-test/project1/plugin-scala-compiler-dependency/project/Plugin.scala delete mode 100644 sbt-app/src/sbt-test/project1/plusequals/build.sbt delete mode 100644 sbt-app/src/sbt-test/project1/plusequals/project/XBuildInfoPlugin.scala delete mode 100644 sbt-app/src/sbt-test/project1/scala3-cross-target/test delete mode 100644 sbt-app/src/sbt-test/project1/scala3-example-project/build.sbt delete mode 100644 sbt-app/src/sbt-test/project1/scripted-dependencies/test-files/test delete mode 100644 sbt-app/src/sbt-test/project1/scripted13/build.sbt delete mode 100644 sbt-app/src/sbt-test/project1/scripted13/changes/A.scala delete mode 100644 sbt-app/src/sbt-test/project1/scripted13/changes/Fail.scala delete mode 100644 sbt-app/src/sbt-test/project1/scripted13/project/plugins.sbt delete mode 100644 sbt-app/src/sbt-test/project1/scripted13/src/sbt-test/a/b/test delete mode 100644 sbt-app/src/sbt-test/project1/scripted13/test delete mode 100644 sbt-app/src/sbt-test/project1/settings-compat/build.sbt delete mode 100644 sbt-app/src/sbt-test/project1/settings-compat/test delete mode 100644 sbt-app/src/sbt-test/project1/settings-definition/build.sbt delete mode 100644 sbt-app/src/sbt-test/project1/subproject-dependson/build.sbt delete mode 100644 sbt-app/src/sbt-test/project1/subproject-dependson/projB/build.sbt delete mode 100644 sbt-app/src/sbt-test/project1/thisProject/build.sbt delete mode 100644 sbt-app/src/sbt-test/project1/thisProject/proj2/build.sbt diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e65246569..1197e1aa6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -162,12 +162,12 @@ jobs: run: | # ./sbt -v "repoOverrideTest:scripted dependency-management/*" ./sbt -v "scripted source-dependencies/*" - ./sbt -v "scripted project/*" - name: Build and test (5) if: ${{ matrix.jobtype == 5 }} shell: bash run: | - ./sbt -v --client test + ./sbt -v "scripted project/*" + ./sbt -v "scripted project1/*" # - name: Build and test (6) # if: ${{ matrix.jobtype == 6 }} # shell: bash diff --git a/sbt-app/src/sbt-test/project1/scala3-sandwich-sjs/app/src/main/scala/app/Main.scala b/sbt-app/src/sbt-test/plugins/scala-js-scala3-sandwich/app/src/main/scala/app/Main.scala similarity index 100% rename from sbt-app/src/sbt-test/project1/scala3-sandwich-sjs/app/src/main/scala/app/Main.scala rename to sbt-app/src/sbt-test/plugins/scala-js-scala3-sandwich/app/src/main/scala/app/Main.scala diff --git a/sbt-app/src/sbt-test/project1/scala3-sandwich-sjs/build.sbt b/sbt-app/src/sbt-test/plugins/scala-js-scala3-sandwich/build.sbt similarity index 100% rename from sbt-app/src/sbt-test/project1/scala3-sandwich-sjs/build.sbt rename to sbt-app/src/sbt-test/plugins/scala-js-scala3-sandwich/build.sbt diff --git a/sbt-app/src/sbt-test/project1/scala3-sandwich-sjs/test b/sbt-app/src/sbt-test/plugins/scala-js-scala3-sandwich/disabled similarity index 100% rename from sbt-app/src/sbt-test/project1/scala3-sandwich-sjs/test rename to sbt-app/src/sbt-test/plugins/scala-js-scala3-sandwich/disabled diff --git a/sbt-app/src/sbt-test/project1/scala3-sandwich-sjs/project/plugins.sbt b/sbt-app/src/sbt-test/plugins/scala-js-scala3-sandwich/project/plugins.sbt similarity index 100% rename from sbt-app/src/sbt-test/project1/scala3-sandwich-sjs/project/plugins.sbt rename to sbt-app/src/sbt-test/plugins/scala-js-scala3-sandwich/project/plugins.sbt diff --git a/sbt-app/src/sbt-test/project1/scala3-sandwich-sjs/scala3code/src/main/scala/mylib/MyLib.scala b/sbt-app/src/sbt-test/plugins/scala-js-scala3-sandwich/scala3code/src/main/scala/mylib/MyLib.scala similarity index 100% rename from sbt-app/src/sbt-test/project1/scala3-sandwich-sjs/scala3code/src/main/scala/mylib/MyLib.scala rename to sbt-app/src/sbt-test/plugins/scala-js-scala3-sandwich/scala3code/src/main/scala/mylib/MyLib.scala diff --git a/sbt-app/src/sbt-test/project1/Class.forName/build.sbt b/sbt-app/src/sbt-test/project/Class.forName/build.sbt similarity index 58% rename from sbt-app/src/sbt-test/project1/Class.forName/build.sbt rename to sbt-app/src/sbt-test/project/Class.forName/build.sbt index b5cd77f09..1e913abe3 100644 --- a/sbt-app/src/sbt-test/project1/Class.forName/build.sbt +++ b/sbt-app/src/sbt-test/project/Class.forName/build.sbt @@ -1,5 +1,4 @@ +scalaVersion := "3.8.1" crossPaths := false - name := "definition-lib-forname-test" - -version := "1.0" \ No newline at end of file +version := "1.0" diff --git a/sbt-app/src/sbt-test/project1/Class.forName/changes/build2.sbt b/sbt-app/src/sbt-test/project/Class.forName/changes/build2.sbt similarity index 100% rename from sbt-app/src/sbt-test/project1/Class.forName/changes/build2.sbt rename to sbt-app/src/sbt-test/project/Class.forName/changes/build2.sbt diff --git a/sbt-app/src/sbt-test/project1/Class.forName/src/main/scala/Test.scala b/sbt-app/src/sbt-test/project/Class.forName/src/main/scala/Test.scala similarity index 100% rename from sbt-app/src/sbt-test/project1/Class.forName/src/main/scala/Test.scala rename to sbt-app/src/sbt-test/project/Class.forName/src/main/scala/Test.scala diff --git a/sbt-app/src/sbt-test/project1/Class.forName/test b/sbt-app/src/sbt-test/project/Class.forName/test similarity index 80% rename from sbt-app/src/sbt-test/project1/Class.forName/test rename to sbt-app/src/sbt-test/project/Class.forName/test index 9d10c6e28..581bd520f 100644 --- a/sbt-app/src/sbt-test/project1/Class.forName/test +++ b/sbt-app/src/sbt-test/project/Class.forName/test @@ -2,7 +2,7 @@ > package $ delete build.sbt -$ copy-file target/definition-lib-forname-test-1.0.jar project/lib/test.jar +$ copy-file target/out/jvm/u/definition-lib-forname-test/definition-lib-forname-test-1.0.jar project/lib/test.jar $ copy-file changes/build2.sbt build.sbt # the copied project definition depends on the Test module in test.jar and will diff --git a/sbt-app/src/sbt-test/project1/aggregate/build.sbt b/sbt-app/src/sbt-test/project/aggregate/build.sbt similarity index 100% rename from sbt-app/src/sbt-test/project1/aggregate/build.sbt rename to sbt-app/src/sbt-test/project/aggregate/build.sbt diff --git a/sbt-app/src/sbt-test/project1/aggregate/projA/A.scala b/sbt-app/src/sbt-test/project/aggregate/projA/A.scala similarity index 100% rename from sbt-app/src/sbt-test/project1/aggregate/projA/A.scala rename to sbt-app/src/sbt-test/project/aggregate/projA/A.scala diff --git a/sbt-app/src/sbt-test/project1/aggregate/projA/build.sbt b/sbt-app/src/sbt-test/project/aggregate/projA/build.sbt similarity index 100% rename from sbt-app/src/sbt-test/project1/aggregate/projA/build.sbt rename to sbt-app/src/sbt-test/project/aggregate/projA/build.sbt diff --git a/sbt-app/src/sbt-test/project/aggregate/test b/sbt-app/src/sbt-test/project/aggregate/test new file mode 100644 index 000000000..f68001e28 --- /dev/null +++ b/sbt-app/src/sbt-test/project/aggregate/test @@ -0,0 +1,2 @@ +> compile +$ exists target/**/classes/A.class diff --git a/sbt-app/src/sbt-test/project1/append/build.sbt b/sbt-app/src/sbt-test/project/append/build.sbt similarity index 100% rename from sbt-app/src/sbt-test/project1/append/build.sbt rename to sbt-app/src/sbt-test/project/append/build.sbt diff --git a/sbt-app/src/sbt-test/project1/append/test b/sbt-app/src/sbt-test/project/append/test similarity index 100% rename from sbt-app/src/sbt-test/project1/append/test rename to sbt-app/src/sbt-test/project/append/test diff --git a/sbt-app/src/sbt-test/project1/auto-import/changes/build.sbt b/sbt-app/src/sbt-test/project/auto-import/changes/build.sbt similarity index 100% rename from sbt-app/src/sbt-test/project1/auto-import/changes/build.sbt rename to sbt-app/src/sbt-test/project/auto-import/changes/build.sbt diff --git a/sbt-app/src/sbt-test/project1/auto-import/project/P.scala b/sbt-app/src/sbt-test/project/auto-import/project/P.scala similarity index 100% rename from sbt-app/src/sbt-test/project1/auto-import/project/P.scala rename to sbt-app/src/sbt-test/project/auto-import/project/P.scala diff --git a/sbt-app/src/sbt-test/project1/auto-import/test b/sbt-app/src/sbt-test/project/auto-import/test similarity index 100% rename from sbt-app/src/sbt-test/project1/auto-import/test rename to sbt-app/src/sbt-test/project/auto-import/test diff --git a/sbt-app/src/sbt-test/project1/auto-plugins-default-requires-jvmplugin/build.sbt b/sbt-app/src/sbt-test/project/auto-plugins-default-requires-jvmplugin/build.sbt similarity index 100% rename from sbt-app/src/sbt-test/project1/auto-plugins-default-requires-jvmplugin/build.sbt rename to sbt-app/src/sbt-test/project/auto-plugins-default-requires-jvmplugin/build.sbt diff --git a/sbt-app/src/sbt-test/project1/auto-plugins-default-requires-jvmplugin/project/TestP.scala b/sbt-app/src/sbt-test/project/auto-plugins-default-requires-jvmplugin/project/TestP.scala similarity index 100% rename from sbt-app/src/sbt-test/project1/auto-plugins-default-requires-jvmplugin/project/TestP.scala rename to sbt-app/src/sbt-test/project/auto-plugins-default-requires-jvmplugin/project/TestP.scala diff --git a/sbt-app/src/sbt-test/project1/auto-plugins-default-requires-jvmplugin/test b/sbt-app/src/sbt-test/project/auto-plugins-default-requires-jvmplugin/test similarity index 100% rename from sbt-app/src/sbt-test/project1/auto-plugins-default-requires-jvmplugin/test rename to sbt-app/src/sbt-test/project/auto-plugins-default-requires-jvmplugin/test diff --git a/sbt-app/src/sbt-test/project1/auto-plugins-ivy-disabled/build.sbt b/sbt-app/src/sbt-test/project/auto-plugins-ivy-disabled/build.sbt similarity index 100% rename from sbt-app/src/sbt-test/project1/auto-plugins-ivy-disabled/build.sbt rename to sbt-app/src/sbt-test/project/auto-plugins-ivy-disabled/build.sbt diff --git a/sbt-app/src/sbt-test/project1/auto-plugins-ivy-disabled/test b/sbt-app/src/sbt-test/project/auto-plugins-ivy-disabled/disabled similarity index 100% rename from sbt-app/src/sbt-test/project1/auto-plugins-ivy-disabled/test rename to sbt-app/src/sbt-test/project/auto-plugins-ivy-disabled/disabled diff --git a/sbt-app/src/sbt-test/project1/auto-plugins-nested/pending b/sbt-app/src/sbt-test/project/auto-plugins-nested/pending similarity index 100% rename from sbt-app/src/sbt-test/project1/auto-plugins-nested/pending rename to sbt-app/src/sbt-test/project/auto-plugins-nested/pending diff --git a/sbt-app/src/sbt-test/project1/auto-plugins-nested/project/Q.scala b/sbt-app/src/sbt-test/project/auto-plugins-nested/project/Q.scala similarity index 100% rename from sbt-app/src/sbt-test/project1/auto-plugins-nested/project/Q.scala rename to sbt-app/src/sbt-test/project/auto-plugins-nested/project/Q.scala diff --git a/sbt-app/src/sbt-test/project1/auto-plugins/build.sbt b/sbt-app/src/sbt-test/project/auto-plugins/build.sbt similarity index 100% rename from sbt-app/src/sbt-test/project1/auto-plugins/build.sbt rename to sbt-app/src/sbt-test/project/auto-plugins/build.sbt diff --git a/sbt-app/src/sbt-test/project1/auto-plugins/test b/sbt-app/src/sbt-test/project/auto-plugins/pending similarity index 100% rename from sbt-app/src/sbt-test/project1/auto-plugins/test rename to sbt-app/src/sbt-test/project/auto-plugins/pending diff --git a/sbt-app/src/sbt-test/project1/auto-plugins/projD/build.sbt b/sbt-app/src/sbt-test/project/auto-plugins/projD/build.sbt similarity index 100% rename from sbt-app/src/sbt-test/project1/auto-plugins/projD/build.sbt rename to sbt-app/src/sbt-test/project/auto-plugins/projD/build.sbt diff --git a/sbt-app/src/sbt-test/project1/auto-plugins/projF/a.sbt b/sbt-app/src/sbt-test/project/auto-plugins/projF/a.sbt similarity index 100% rename from sbt-app/src/sbt-test/project1/auto-plugins/projF/a.sbt rename to sbt-app/src/sbt-test/project/auto-plugins/projF/a.sbt diff --git a/sbt-app/src/sbt-test/project1/auto-plugins/projF/b.sbt b/sbt-app/src/sbt-test/project/auto-plugins/projF/b.sbt similarity index 100% rename from sbt-app/src/sbt-test/project1/auto-plugins/projF/b.sbt rename to sbt-app/src/sbt-test/project/auto-plugins/projF/b.sbt diff --git a/sbt-app/src/sbt-test/project1/auto-plugins/project/A.scala b/sbt-app/src/sbt-test/project/auto-plugins/project/A.scala similarity index 100% rename from sbt-app/src/sbt-test/project1/auto-plugins/project/A.scala rename to sbt-app/src/sbt-test/project/auto-plugins/project/A.scala diff --git a/sbt-app/src/sbt-test/project1/auto-plugins/project/Q.scala b/sbt-app/src/sbt-test/project/auto-plugins/project/Q.scala similarity index 100% rename from sbt-app/src/sbt-test/project1/auto-plugins/project/Q.scala rename to sbt-app/src/sbt-test/project/auto-plugins/project/Q.scala diff --git a/sbt-app/src/sbt-test/project1/base-sources/A.scala b/sbt-app/src/sbt-test/project/base-sources/A.scala similarity index 100% rename from sbt-app/src/sbt-test/project1/base-sources/A.scala rename to sbt-app/src/sbt-test/project/base-sources/A.scala diff --git a/sbt-app/src/sbt-test/project1/base-sources/test b/sbt-app/src/sbt-test/project/base-sources/test similarity index 100% rename from sbt-app/src/sbt-test/project1/base-sources/test rename to sbt-app/src/sbt-test/project/base-sources/test diff --git a/sbt-app/src/sbt-test/project1/binary-plugin/changes/define/A.scala b/sbt-app/src/sbt-test/project/binary-plugin/changes/define/A.scala similarity index 100% rename from sbt-app/src/sbt-test/project1/binary-plugin/changes/define/A.scala rename to sbt-app/src/sbt-test/project/binary-plugin/changes/define/A.scala diff --git a/sbt-app/src/sbt-test/project1/binary-plugin/changes/define/D.scala b/sbt-app/src/sbt-test/project/binary-plugin/changes/define/D.scala similarity index 100% rename from sbt-app/src/sbt-test/project1/binary-plugin/changes/define/D.scala rename to sbt-app/src/sbt-test/project/binary-plugin/changes/define/D.scala diff --git a/sbt-app/src/sbt-test/project1/binary-plugin/changes/define/build.sbt b/sbt-app/src/sbt-test/project/binary-plugin/changes/define/build.sbt similarity index 100% rename from sbt-app/src/sbt-test/project1/binary-plugin/changes/define/build.sbt rename to sbt-app/src/sbt-test/project/binary-plugin/changes/define/build.sbt diff --git a/sbt-app/src/sbt-test/project1/binary-plugin/changes/use/plugins.sbt b/sbt-app/src/sbt-test/project/binary-plugin/changes/use/plugins.sbt similarity index 100% rename from sbt-app/src/sbt-test/project1/binary-plugin/changes/use/plugins.sbt rename to sbt-app/src/sbt-test/project/binary-plugin/changes/use/plugins.sbt diff --git a/sbt-app/src/sbt-test/project1/binary-plugin/common.sbt b/sbt-app/src/sbt-test/project/binary-plugin/common.sbt similarity index 100% rename from sbt-app/src/sbt-test/project1/binary-plugin/common.sbt rename to sbt-app/src/sbt-test/project/binary-plugin/common.sbt diff --git a/sbt-app/src/sbt-test/project1/binary-plugin/test b/sbt-app/src/sbt-test/project/binary-plugin/test similarity index 100% rename from sbt-app/src/sbt-test/project1/binary-plugin/test rename to sbt-app/src/sbt-test/project/binary-plugin/test diff --git a/sbt-app/src/sbt-test/project1/bsp-internal-dependency-configs/build.sbt b/sbt-app/src/sbt-test/project/bsp-internal-dependency-configs/build.sbt similarity index 100% rename from sbt-app/src/sbt-test/project1/bsp-internal-dependency-configs/build.sbt rename to sbt-app/src/sbt-test/project/bsp-internal-dependency-configs/build.sbt diff --git a/sbt-app/src/sbt-test/project1/bsp-internal-dependency-configs/test b/sbt-app/src/sbt-test/project/bsp-internal-dependency-configs/test similarity index 100% rename from sbt-app/src/sbt-test/project1/bsp-internal-dependency-configs/test rename to sbt-app/src/sbt-test/project/bsp-internal-dependency-configs/test diff --git a/sbt-app/src/sbt-test/project1/build-deps/a/A.scala b/sbt-app/src/sbt-test/project/build-deps/a/A.scala similarity index 100% rename from sbt-app/src/sbt-test/project1/build-deps/a/A.scala rename to sbt-app/src/sbt-test/project/build-deps/a/A.scala diff --git a/sbt-app/src/sbt-test/project1/build-deps/b/B.scala b/sbt-app/src/sbt-test/project/build-deps/b/B.scala similarity index 100% rename from sbt-app/src/sbt-test/project1/build-deps/b/B.scala rename to sbt-app/src/sbt-test/project/build-deps/b/B.scala diff --git a/sbt-app/src/sbt-test/project1/build-deps/build.sbt b/sbt-app/src/sbt-test/project/build-deps/build.sbt similarity index 100% rename from sbt-app/src/sbt-test/project1/build-deps/build.sbt rename to sbt-app/src/sbt-test/project/build-deps/build.sbt diff --git a/sbt-app/src/sbt-test/project1/build-deps/changes/b.sbt b/sbt-app/src/sbt-test/project/build-deps/changes/b.sbt similarity index 100% rename from sbt-app/src/sbt-test/project1/build-deps/changes/b.sbt rename to sbt-app/src/sbt-test/project/build-deps/changes/b.sbt diff --git a/sbt-app/src/sbt-test/project1/build-deps/test b/sbt-app/src/sbt-test/project/build-deps/test similarity index 100% rename from sbt-app/src/sbt-test/project1/build-deps/test rename to sbt-app/src/sbt-test/project/build-deps/test diff --git a/sbt-app/src/sbt-test/project1/build-level-keys/test b/sbt-app/src/sbt-test/project/build-level-keys/test similarity index 100% rename from sbt-app/src/sbt-test/project1/build-level-keys/test rename to sbt-app/src/sbt-test/project/build-level-keys/test diff --git a/sbt-app/src/sbt-test/project1/circular/B.scala b/sbt-app/src/sbt-test/project/circular/B.scala similarity index 100% rename from sbt-app/src/sbt-test/project1/circular/B.scala rename to sbt-app/src/sbt-test/project/circular/B.scala diff --git a/sbt-app/src/sbt-test/project1/circular/build.sbt b/sbt-app/src/sbt-test/project/circular/build.sbt similarity index 100% rename from sbt-app/src/sbt-test/project1/circular/build.sbt rename to sbt-app/src/sbt-test/project/circular/build.sbt diff --git a/sbt-app/src/sbt-test/project1/circular/sub/A.scala b/sbt-app/src/sbt-test/project/circular/sub/A.scala similarity index 100% rename from sbt-app/src/sbt-test/project1/circular/sub/A.scala rename to sbt-app/src/sbt-test/project/circular/sub/A.scala diff --git a/sbt-app/src/sbt-test/project1/circular/test b/sbt-app/src/sbt-test/project/circular/test similarity index 100% rename from sbt-app/src/sbt-test/project1/circular/test rename to sbt-app/src/sbt-test/project/circular/test diff --git a/sbt-app/src/sbt-test/project1/console/build.sbt b/sbt-app/src/sbt-test/project/consoleProject/build.sbt similarity index 100% rename from sbt-app/src/sbt-test/project1/console/build.sbt rename to sbt-app/src/sbt-test/project/consoleProject/build.sbt diff --git a/sbt-app/src/sbt-test/project1/console/test b/sbt-app/src/sbt-test/project/consoleProject/pending similarity index 100% rename from sbt-app/src/sbt-test/project1/console/test rename to sbt-app/src/sbt-test/project/consoleProject/pending diff --git a/sbt-app/src/sbt-test/project1/continuations/build.sbt b/sbt-app/src/sbt-test/project/continuations/build.sbt similarity index 100% rename from sbt-app/src/sbt-test/project1/continuations/build.sbt rename to sbt-app/src/sbt-test/project/continuations/build.sbt diff --git a/sbt-app/src/sbt-test/project1/continuations/pending b/sbt-app/src/sbt-test/project/continuations/pending similarity index 100% rename from sbt-app/src/sbt-test/project1/continuations/pending rename to sbt-app/src/sbt-test/project/continuations/pending diff --git a/sbt-app/src/sbt-test/project1/continuations/src/main/scala/Example.scala b/sbt-app/src/sbt-test/project/continuations/src/main/scala/Example.scala similarity index 100% rename from sbt-app/src/sbt-test/project1/continuations/src/main/scala/Example.scala rename to sbt-app/src/sbt-test/project/continuations/src/main/scala/Example.scala diff --git a/sbt-app/src/sbt-test/project1/continuations/src/test/scala/ContinuationsTest.scala b/sbt-app/src/sbt-test/project/continuations/src/test/scala/ContinuationsTest.scala similarity index 100% rename from sbt-app/src/sbt-test/project1/continuations/src/test/scala/ContinuationsTest.scala rename to sbt-app/src/sbt-test/project/continuations/src/test/scala/ContinuationsTest.scala diff --git a/sbt-app/src/sbt-test/project1/cross-scala-versions-default/build.sbt b/sbt-app/src/sbt-test/project/cross-scala-versions-default/build.sbt similarity index 100% rename from sbt-app/src/sbt-test/project1/cross-scala-versions-default/build.sbt rename to sbt-app/src/sbt-test/project/cross-scala-versions-default/build.sbt diff --git a/sbt-app/src/sbt-test/project1/cross-scala-versions-default/test b/sbt-app/src/sbt-test/project/cross-scala-versions-default/test similarity index 100% rename from sbt-app/src/sbt-test/project1/cross-scala-versions-default/test rename to sbt-app/src/sbt-test/project/cross-scala-versions-default/test diff --git a/sbt-app/src/sbt-test/project1/cross-source/build.sbt b/sbt-app/src/sbt-test/project/cross-source/build.sbt similarity index 100% rename from sbt-app/src/sbt-test/project1/cross-source/build.sbt rename to sbt-app/src/sbt-test/project/cross-source/build.sbt diff --git a/sbt-app/src/sbt-test/project1/cross-source/p1/src/main/scala-2.10/B.scala b/sbt-app/src/sbt-test/project/cross-source/p1/src/main/scala-2.10/B.scala similarity index 100% rename from sbt-app/src/sbt-test/project1/cross-source/p1/src/main/scala-2.10/B.scala rename to sbt-app/src/sbt-test/project/cross-source/p1/src/main/scala-2.10/B.scala diff --git a/sbt-app/src/sbt-test/project1/cross-source/p1/src/main/scala/A.scala b/sbt-app/src/sbt-test/project/cross-source/p1/src/main/scala/A.scala similarity index 100% rename from sbt-app/src/sbt-test/project1/cross-source/p1/src/main/scala/A.scala rename to sbt-app/src/sbt-test/project/cross-source/p1/src/main/scala/A.scala diff --git a/sbt-app/src/sbt-test/project1/cross-source/p2/src/main/scala-2.10/B.scala b/sbt-app/src/sbt-test/project/cross-source/p2/src/main/scala-2.10/B.scala similarity index 100% rename from sbt-app/src/sbt-test/project1/cross-source/p2/src/main/scala-2.10/B.scala rename to sbt-app/src/sbt-test/project/cross-source/p2/src/main/scala-2.10/B.scala diff --git a/sbt-app/src/sbt-test/project1/cross-source/p2/src/main/scala/A.scala b/sbt-app/src/sbt-test/project/cross-source/p2/src/main/scala/A.scala similarity index 100% rename from sbt-app/src/sbt-test/project1/cross-source/p2/src/main/scala/A.scala rename to sbt-app/src/sbt-test/project/cross-source/p2/src/main/scala/A.scala diff --git a/sbt-app/src/sbt-test/project1/cross-source/p3/src/main/scala-2.10/B.scala b/sbt-app/src/sbt-test/project/cross-source/p3/src/main/scala-2.10/B.scala similarity index 100% rename from sbt-app/src/sbt-test/project1/cross-source/p3/src/main/scala-2.10/B.scala rename to sbt-app/src/sbt-test/project/cross-source/p3/src/main/scala-2.10/B.scala diff --git a/sbt-app/src/sbt-test/project1/cross-source/p3/src/main/scala/A.scala b/sbt-app/src/sbt-test/project/cross-source/p3/src/main/scala/A.scala similarity index 100% rename from sbt-app/src/sbt-test/project1/cross-source/p3/src/main/scala/A.scala rename to sbt-app/src/sbt-test/project/cross-source/p3/src/main/scala/A.scala diff --git a/sbt-app/src/sbt-test/project1/cross-source/p4/src/main/scala-2.10/B.scala b/sbt-app/src/sbt-test/project/cross-source/p4/src/main/scala-2.10/B.scala similarity index 100% rename from sbt-app/src/sbt-test/project1/cross-source/p4/src/main/scala-2.10/B.scala rename to sbt-app/src/sbt-test/project/cross-source/p4/src/main/scala-2.10/B.scala diff --git a/sbt-app/src/sbt-test/project1/cross-source/p4/src/main/scala/A.scala b/sbt-app/src/sbt-test/project/cross-source/p4/src/main/scala/A.scala similarity index 100% rename from sbt-app/src/sbt-test/project1/cross-source/p4/src/main/scala/A.scala rename to sbt-app/src/sbt-test/project/cross-source/p4/src/main/scala/A.scala diff --git a/sbt-app/src/sbt-test/project1/cross-source/test b/sbt-app/src/sbt-test/project/cross-source/test similarity index 100% rename from sbt-app/src/sbt-test/project1/cross-source/test rename to sbt-app/src/sbt-test/project/cross-source/test diff --git a/sbt-app/src/sbt-test/project1/default-auto-plugins/build.sbt b/sbt-app/src/sbt-test/project/default-auto-plugins/build.sbt similarity index 100% rename from sbt-app/src/sbt-test/project1/default-auto-plugins/build.sbt rename to sbt-app/src/sbt-test/project/default-auto-plugins/build.sbt diff --git a/sbt-app/src/sbt-test/project1/default-auto-plugins/test b/sbt-app/src/sbt-test/project/default-auto-plugins/test similarity index 100% rename from sbt-app/src/sbt-test/project1/default-auto-plugins/test rename to sbt-app/src/sbt-test/project/default-auto-plugins/test diff --git a/sbt-app/src/sbt-test/project1/default-settings/build.sbt b/sbt-app/src/sbt-test/project/default-settings/build.sbt similarity index 64% rename from sbt-app/src/sbt-test/project1/default-settings/build.sbt rename to sbt-app/src/sbt-test/project/default-settings/build.sbt index f96e904fd..8ffb5bcd4 100644 --- a/sbt-app/src/sbt-test/project1/default-settings/build.sbt +++ b/sbt-app/src/sbt-test/project/default-settings/build.sbt @@ -1,11 +1,11 @@ val root = (project in file(".")) -TaskKey[Unit]("checkScalaVersion", "test") := { +TaskKey[Unit]("checkScalaVersion", "test") := Def.uncached { val sv = scalaVersion.value assert(sv startsWith "3.", s"Found $sv!") } -TaskKey[Unit]("checkArtifacts", "test") := { +TaskKey[Unit]("checkArtifacts", "test") := Def.uncached { val arts = packagedArtifacts.value assert(arts.nonEmpty, "Packaged artifacts must not be empty!") } diff --git a/sbt-app/src/sbt-test/project1/default-settings/test b/sbt-app/src/sbt-test/project/default-settings/test similarity index 100% rename from sbt-app/src/sbt-test/project1/default-settings/test rename to sbt-app/src/sbt-test/project/default-settings/test diff --git a/sbt-app/src/sbt-test/project1/defs/build.sbt b/sbt-app/src/sbt-test/project/defs/build.sbt similarity index 74% rename from sbt-app/src/sbt-test/project1/defs/build.sbt rename to sbt-app/src/sbt-test/project/defs/build.sbt index 94be70893..60017414d 100644 --- a/sbt-app/src/sbt-test/project1/defs/build.sbt +++ b/sbt-app/src/sbt-test/project/defs/build.sbt @@ -10,8 +10,8 @@ lazy val x = now + 1 val n = "Demo" val descr = "Description" -name := n +LocalRootProject / name := n -version := v +LocalRootProject / version := v diff --git a/sbt-app/src/sbt-test/project/defs/changes/visibility.sbt b/sbt-app/src/sbt-test/project/defs/changes/visibility.sbt new file mode 100644 index 000000000..431e3b2af --- /dev/null +++ b/sbt-app/src/sbt-test/project/defs/changes/visibility.sbt @@ -0,0 +1 @@ +LocalRootProject / description := descr diff --git a/sbt-app/src/sbt-test/project1/defs/test b/sbt-app/src/sbt-test/project/defs/test similarity index 100% rename from sbt-app/src/sbt-test/project1/defs/test rename to sbt-app/src/sbt-test/project/defs/test diff --git a/sbt-app/src/sbt-test/project1/derived/build.sbt b/sbt-app/src/sbt-test/project/derived/build.sbt similarity index 96% rename from sbt-app/src/sbt-test/project1/derived/build.sbt rename to sbt-app/src/sbt-test/project/derived/build.sbt index 2525f9568..d411f8800 100644 --- a/sbt-app/src/sbt-test/project1/derived/build.sbt +++ b/sbt-app/src/sbt-test/project/derived/build.sbt @@ -1,13 +1,30 @@ lazy val explicit = "explicit" +@transient lazy val check = taskKey[Unit]("check") + +@transient lazy val checkEvery = taskKey[Unit]("check every") + +@transient lazy val customA = taskKey[String]("custom A") + +@transient lazy val customB = taskKey[String]("custom B") + +@transient lazy val customC = taskKey[String]("custom C") + +@transient lazy val customD = taskKey[String]("custom D") + +@transient lazy val customE = taskKey[String]("custom E") + +@transient lazy val globalDepE = taskKey[String]("globally defined dependency of E") + +@transient lazy val projectDepE = taskKey[String]("per-project dependency of E") (Global / organization) := "org.example" diff --git a/sbt-app/src/sbt-test/project1/derived/test b/sbt-app/src/sbt-test/project/derived/pending similarity index 100% rename from sbt-app/src/sbt-test/project1/derived/test rename to sbt-app/src/sbt-test/project/derived/pending diff --git a/sbt-app/src/sbt-test/project1/extra-projects/project/DatabasePlugin.scala b/sbt-app/src/sbt-test/project/extra-projects/project/DatabasePlugin.scala similarity index 100% rename from sbt-app/src/sbt-test/project1/extra-projects/project/DatabasePlugin.scala rename to sbt-app/src/sbt-test/project/extra-projects/project/DatabasePlugin.scala diff --git a/sbt-app/src/sbt-test/project1/extra-projects/project/ExtraProjectPluginExample.scala b/sbt-app/src/sbt-test/project/extra-projects/project/ExtraProjectPluginExample.scala similarity index 100% rename from sbt-app/src/sbt-test/project1/extra-projects/project/ExtraProjectPluginExample.scala rename to sbt-app/src/sbt-test/project/extra-projects/project/ExtraProjectPluginExample.scala diff --git a/sbt-app/src/sbt-test/project1/extra-projects/project/ExtraProjectPluginExample2.scala b/sbt-app/src/sbt-test/project/extra-projects/project/ExtraProjectPluginExample2.scala similarity index 100% rename from sbt-app/src/sbt-test/project1/extra-projects/project/ExtraProjectPluginExample2.scala rename to sbt-app/src/sbt-test/project/extra-projects/project/ExtraProjectPluginExample2.scala diff --git a/sbt-app/src/sbt-test/project1/extra-projects/test b/sbt-app/src/sbt-test/project/extra-projects/test similarity index 100% rename from sbt-app/src/sbt-test/project1/extra-projects/test rename to sbt-app/src/sbt-test/project/extra-projects/test diff --git a/sbt-app/src/sbt-test/project1/extra/build.sbt b/sbt-app/src/sbt-test/project/extra/build.sbt similarity index 100% rename from sbt-app/src/sbt-test/project1/extra/build.sbt rename to sbt-app/src/sbt-test/project/extra/build.sbt diff --git a/sbt-app/src/sbt-test/project1/extra/disabled b/sbt-app/src/sbt-test/project/extra/disabled similarity index 100% rename from sbt-app/src/sbt-test/project1/extra/disabled rename to sbt-app/src/sbt-test/project/extra/disabled diff --git a/sbt-app/src/sbt-test/project1/flatten/build.sbt b/sbt-app/src/sbt-test/project/flatten/build.sbt similarity index 71% rename from sbt-app/src/sbt-test/project1/flatten/build.sbt rename to sbt-app/src/sbt-test/project/flatten/build.sbt index 439a50c2a..575706e2c 100644 --- a/sbt-app/src/sbt-test/project1/flatten/build.sbt +++ b/sbt-app/src/sbt-test/project/flatten/build.sbt @@ -10,14 +10,17 @@ lazy val root = (project in file(".")) unmanagedSources / includeFilter := "*.java" | "*.scala" ) -def forConfig(conf: Configuration, name: String) = inConfig(conf)( unpackageSettings(name) ) +def forConfig(conf: Configuration, name: String) = + inConfig(conf)( unpackageSettings(name) ) def unpackageSettings(name: String) = Seq( unmanagedSourceDirectories := (baseDirectory.value / name) :: Nil, unmanagedResources / excludeFilter := (unmanagedSources / includeFilter).value, unmanagedResourceDirectories := unmanagedSourceDirectories.value, - unpackage := { - IO.unzip((packageSrc / artifactPath).value, baseDirectory.value / name) + unpackage := Def.uncached { + val conv = fileConverter.value + IO.unzip(conv.toPath((packageSrc / artifactPath).value).toFile(), + baseDirectory.value / name) IO.delete(baseDirectory.value / name / "META-INF") } ) diff --git a/sbt-app/src/sbt-test/project1/flatten/test b/sbt-app/src/sbt-test/project/flatten/pending similarity index 100% rename from sbt-app/src/sbt-test/project1/flatten/test rename to sbt-app/src/sbt-test/project/flatten/pending diff --git a/sbt-app/src/sbt-test/project1/flatten/src/JavaA.java b/sbt-app/src/sbt-test/project/flatten/src/JavaA.java similarity index 100% rename from sbt-app/src/sbt-test/project1/flatten/src/JavaA.java rename to sbt-app/src/sbt-test/project/flatten/src/JavaA.java diff --git a/sbt-app/src/sbt-test/project1/flatten/src/ScalaA.scala b/sbt-app/src/sbt-test/project/flatten/src/ScalaA.scala similarity index 100% rename from sbt-app/src/sbt-test/project1/flatten/src/ScalaA.scala rename to sbt-app/src/sbt-test/project/flatten/src/ScalaA.scala diff --git a/sbt-app/src/sbt-test/project1/flatten/src/a/JavaB.java b/sbt-app/src/sbt-test/project/flatten/src/a/JavaB.java similarity index 100% rename from sbt-app/src/sbt-test/project1/flatten/src/a/JavaB.java rename to sbt-app/src/sbt-test/project/flatten/src/a/JavaB.java diff --git a/sbt-app/src/sbt-test/project1/flatten/src/a/ScalaB.scala b/sbt-app/src/sbt-test/project/flatten/src/a/ScalaB.scala similarity index 100% rename from sbt-app/src/sbt-test/project1/flatten/src/a/ScalaB.scala rename to sbt-app/src/sbt-test/project/flatten/src/a/ScalaB.scala diff --git a/sbt-app/src/sbt-test/project1/flatten/src/a/main-resource-a b/sbt-app/src/sbt-test/project/flatten/src/a/main-resource-a similarity index 100% rename from sbt-app/src/sbt-test/project1/flatten/src/a/main-resource-a rename to sbt-app/src/sbt-test/project/flatten/src/a/main-resource-a diff --git a/sbt-app/src/sbt-test/project1/flatten/src/main-resource b/sbt-app/src/sbt-test/project/flatten/src/main-resource similarity index 100% rename from sbt-app/src/sbt-test/project1/flatten/src/main-resource rename to sbt-app/src/sbt-test/project/flatten/src/main-resource diff --git a/sbt-app/src/sbt-test/project1/flatten/test-src/SimpleTest.scala b/sbt-app/src/sbt-test/project/flatten/test-src/SimpleTest.scala similarity index 100% rename from sbt-app/src/sbt-test/project1/flatten/test-src/SimpleTest.scala rename to sbt-app/src/sbt-test/project/flatten/test-src/SimpleTest.scala diff --git a/sbt-app/src/sbt-test/project1/flatten/test-src/c/ResourcesTest.scala b/sbt-app/src/sbt-test/project/flatten/test-src/c/ResourcesTest.scala similarity index 100% rename from sbt-app/src/sbt-test/project1/flatten/test-src/c/ResourcesTest.scala rename to sbt-app/src/sbt-test/project/flatten/test-src/c/ResourcesTest.scala diff --git a/sbt-app/src/sbt-test/project1/flatten/test-src/c/test-resource-c b/sbt-app/src/sbt-test/project/flatten/test-src/c/test-resource-c similarity index 100% rename from sbt-app/src/sbt-test/project1/flatten/test-src/c/test-resource-c rename to sbt-app/src/sbt-test/project/flatten/test-src/c/test-resource-c diff --git a/sbt-app/src/sbt-test/project1/flatten/test-src/test-resource b/sbt-app/src/sbt-test/project/flatten/test-src/test-resource similarity index 100% rename from sbt-app/src/sbt-test/project1/flatten/test-src/test-resource rename to sbt-app/src/sbt-test/project/flatten/test-src/test-resource diff --git a/sbt-app/src/sbt-test/project1/generated-root-no-publish/build.sbt b/sbt-app/src/sbt-test/project/generated-root-no-publish/build.sbt similarity index 60% rename from sbt-app/src/sbt-test/project1/generated-root-no-publish/build.sbt rename to sbt-app/src/sbt-test/project/generated-root-no-publish/build.sbt index c79f0945b..cc0bb04ef 100644 --- a/sbt-app/src/sbt-test/project1/generated-root-no-publish/build.sbt +++ b/sbt-app/src/sbt-test/project/generated-root-no-publish/build.sbt @@ -6,11 +6,11 @@ val commonSettings = Seq( version := "0.1.0", ivyPaths := IvyPaths( (LocalRootProject / baseDirectory).value.toString, - Some(((LocalRootProject / target).value / "ivy-cache").toString) + Some(((LocalRootProject / baseDirectory).value / "ivy-cache").toString) ) ) -lazy val app = (project in file("app")).settings(commonSettings: _*) +lazy val app = (project in file("app")).settings(commonSettings*) -name := "generated-root-no-publish" +LocalRootProject / name := "generated-root-no-publish" commonSettings diff --git a/sbt-app/src/sbt-test/project1/generated-root-no-publish/changes/bare.sbt b/sbt-app/src/sbt-test/project/generated-root-no-publish/changes/bare.sbt similarity index 66% rename from sbt-app/src/sbt-test/project1/generated-root-no-publish/changes/bare.sbt rename to sbt-app/src/sbt-test/project/generated-root-no-publish/changes/bare.sbt index aab063433..1b250be4d 100644 --- a/sbt-app/src/sbt-test/project1/generated-root-no-publish/changes/bare.sbt +++ b/sbt-app/src/sbt-test/project/generated-root-no-publish/changes/bare.sbt @@ -5,5 +5,6 @@ organization := "com.example" version := "0.1.0" ivyPaths := IvyPaths( (LocalRootProject / baseDirectory).value.toString, - Some(((LocalRootProject / target).value / "ivy-cache").toString) + Some(((LocalRootProject / baseDirectory).value / "ivy-cache").toString) ) +LocalRootProject / name := "generated-root-no-publish" diff --git a/sbt-app/src/sbt-test/project/generated-root-no-publish/test b/sbt-app/src/sbt-test/project/generated-root-no-publish/test new file mode 100644 index 000000000..2b9b69771 --- /dev/null +++ b/sbt-app/src/sbt-test/project/generated-root-no-publish/test @@ -0,0 +1,10 @@ +> publishLocal +$ exists ivy-cache/local/com.example/app_2.12/0.1.0/poms/app_2.12.pom +$ exists ivy-cache/local/com.example/app_2.12/0.1.0/jars/app_2.12.jar +$ absent ivy-cache/local/com.example/default-root_2.12/0.1.0/ivys/ivy.xml + +$ copy-file changes/bare.sbt build.sbt +> reload +> publishLocal +$ exists ivy-cache/local/com.example/generated-root-no-publish_2.12/0.1.0/poms/generated-root-no-publish_2.12.pom +$ exists ivy-cache/local/com.example/generated-root-no-publish_2.12/0.1.0/jars/generated-root-no-publish_2.12.jar diff --git a/sbt-app/src/sbt-test/project1/giter8-plugin/build.sbt b/sbt-app/src/sbt-test/project/giter8-plugin/build.sbt similarity index 100% rename from sbt-app/src/sbt-test/project1/giter8-plugin/build.sbt rename to sbt-app/src/sbt-test/project/giter8-plugin/build.sbt diff --git a/sbt-app/src/sbt-test/project1/giter8-plugin/pending b/sbt-app/src/sbt-test/project/giter8-plugin/pending similarity index 100% rename from sbt-app/src/sbt-test/project1/giter8-plugin/pending rename to sbt-app/src/sbt-test/project/giter8-plugin/pending diff --git a/sbt-app/src/sbt-test/project1/giter8-plugin/project/p.sbt b/sbt-app/src/sbt-test/project/giter8-plugin/project/p.sbt similarity index 100% rename from sbt-app/src/sbt-test/project1/giter8-plugin/project/p.sbt rename to sbt-app/src/sbt-test/project/giter8-plugin/project/p.sbt diff --git a/sbt-app/src/sbt-test/project1/ignore-hidden-build-files/changes/invalid-build.sbt b/sbt-app/src/sbt-test/project/ignore-hidden-build-files/changes/invalid-build.sbt similarity index 100% rename from sbt-app/src/sbt-test/project1/ignore-hidden-build-files/changes/invalid-build.sbt rename to sbt-app/src/sbt-test/project/ignore-hidden-build-files/changes/invalid-build.sbt diff --git a/sbt-app/src/sbt-test/project1/ignore-hidden-build-files/test b/sbt-app/src/sbt-test/project/ignore-hidden-build-files/test similarity index 100% rename from sbt-app/src/sbt-test/project1/ignore-hidden-build-files/test rename to sbt-app/src/sbt-test/project/ignore-hidden-build-files/test diff --git a/sbt-app/src/sbt-test/project1/in-this-build/build.sbt b/sbt-app/src/sbt-test/project/in-this-build/build.sbt similarity index 52% rename from sbt-app/src/sbt-test/project1/in-this-build/build.sbt rename to sbt-app/src/sbt-test/project/in-this-build/build.sbt index eeb4b8b72..aa827f991 100644 --- a/sbt-app/src/sbt-test/project1/in-this-build/build.sbt +++ b/sbt-app/src/sbt-test/project/in-this-build/build.sbt @@ -7,5 +7,5 @@ inThisBuild ( val p = project TaskKey[Unit]("check") := { - assert((a in p).?.value == Option(1), s"a in p should be Some(1) but is ${(a in p).?.value}") + assert((p / a).?.value == Option(1), s"a in p should be Some(1) but is ${(p / a).?.value}") } diff --git a/sbt-app/src/sbt-test/project1/in-this-build/test b/sbt-app/src/sbt-test/project/in-this-build/test similarity index 100% rename from sbt-app/src/sbt-test/project1/in-this-build/test rename to sbt-app/src/sbt-test/project/in-this-build/test diff --git a/sbt-app/src/sbt-test/project1/inside-ci/build.sbt b/sbt-app/src/sbt-test/project/inside-ci/build.sbt similarity index 100% rename from sbt-app/src/sbt-test/project1/inside-ci/build.sbt rename to sbt-app/src/sbt-test/project/inside-ci/build.sbt diff --git a/sbt-app/src/sbt-test/project1/inside-ci/test b/sbt-app/src/sbt-test/project/inside-ci/test similarity index 100% rename from sbt-app/src/sbt-test/project1/inside-ci/test rename to sbt-app/src/sbt-test/project/inside-ci/test diff --git a/sbt-app/src/sbt-test/project1/internal-dependency-configurations/a/A.scala b/sbt-app/src/sbt-test/project/internal-dependency-configurations/a/A.scala similarity index 100% rename from sbt-app/src/sbt-test/project1/internal-dependency-configurations/a/A.scala rename to sbt-app/src/sbt-test/project/internal-dependency-configurations/a/A.scala diff --git a/sbt-app/src/sbt-test/project1/internal-dependency-configurations/b/B.scala b/sbt-app/src/sbt-test/project/internal-dependency-configurations/b/B.scala similarity index 100% rename from sbt-app/src/sbt-test/project1/internal-dependency-configurations/b/B.scala rename to sbt-app/src/sbt-test/project/internal-dependency-configurations/b/B.scala diff --git a/sbt-app/src/sbt-test/project1/internal-dependency-configurations/build.sbt b/sbt-app/src/sbt-test/project/internal-dependency-configurations/build.sbt similarity index 94% rename from sbt-app/src/sbt-test/project1/internal-dependency-configurations/build.sbt rename to sbt-app/src/sbt-test/project/internal-dependency-configurations/build.sbt index f65b34710..e5db1ac68 100644 --- a/sbt-app/src/sbt-test/project1/internal-dependency-configurations/build.sbt +++ b/sbt-app/src/sbt-test/project/internal-dependency-configurations/build.sbt @@ -9,9 +9,11 @@ lazy val root = (project in file(".")). lazy val a = project in file("a") -lazy val b = (project in file("b")).dependsOn(a % "*->compile") +lazy val b = (project in file("b")) + .dependsOn(a % "*->compile") -lazy val c = (project in file("c")).settings(exportToInternal := TrackLevel.NoTracking) +lazy val c = (project in file("c")) + .settings(exportToInternal := TrackLevel.NoTracking) lazy val d = (project in file("d")) .dependsOn(c % "test->test;compile->compile") @@ -20,6 +22,7 @@ lazy val d = (project in file("d")) def getConfigs(key: SettingKey[Seq[(ProjectRef, Set[String])]]): Def.Initialize[Map[String, Set[String]]] = Def.setting(key.value.map { case (p, c) => p.project -> c }.toMap) + val checkA = taskKey[Unit]("Verify that project a's internal dependencies are as expected") checkA := { val compileDeps = getConfigs(a / Compile / internalDependencyConfigurations).value diff --git a/sbt-app/src/sbt-test/project1/internal-dependency-configurations/c/C.scala b/sbt-app/src/sbt-test/project/internal-dependency-configurations/c/C.scala similarity index 100% rename from sbt-app/src/sbt-test/project1/internal-dependency-configurations/c/C.scala rename to sbt-app/src/sbt-test/project/internal-dependency-configurations/c/C.scala diff --git a/sbt-app/src/sbt-test/project1/internal-dependency-configurations/d/D.scala b/sbt-app/src/sbt-test/project/internal-dependency-configurations/d/D.scala similarity index 100% rename from sbt-app/src/sbt-test/project1/internal-dependency-configurations/d/D.scala rename to sbt-app/src/sbt-test/project/internal-dependency-configurations/d/D.scala diff --git a/sbt-app/src/sbt-test/project1/internal-dependency-configurations/test b/sbt-app/src/sbt-test/project/internal-dependency-configurations/test similarity index 100% rename from sbt-app/src/sbt-test/project1/internal-dependency-configurations/test rename to sbt-app/src/sbt-test/project/internal-dependency-configurations/test diff --git a/sbt-app/src/sbt-test/project1/internal-tracking/a/A.scala b/sbt-app/src/sbt-test/project/internal-tracking/a/A.scala similarity index 100% rename from sbt-app/src/sbt-test/project1/internal-tracking/a/A.scala rename to sbt-app/src/sbt-test/project/internal-tracking/a/A.scala diff --git a/sbt-app/src/sbt-test/project1/internal-tracking/b/B.scala b/sbt-app/src/sbt-test/project/internal-tracking/b/B.scala similarity index 100% rename from sbt-app/src/sbt-test/project1/internal-tracking/b/B.scala rename to sbt-app/src/sbt-test/project/internal-tracking/b/B.scala diff --git a/sbt-app/src/sbt-test/project1/internal-tracking/build.sbt b/sbt-app/src/sbt-test/project/internal-tracking/build.sbt similarity index 100% rename from sbt-app/src/sbt-test/project1/internal-tracking/build.sbt rename to sbt-app/src/sbt-test/project/internal-tracking/build.sbt diff --git a/sbt-app/src/sbt-test/project1/internal-tracking/c/C.scala b/sbt-app/src/sbt-test/project/internal-tracking/c/C.scala similarity index 100% rename from sbt-app/src/sbt-test/project1/internal-tracking/c/C.scala rename to sbt-app/src/sbt-test/project/internal-tracking/c/C.scala diff --git a/sbt-app/src/sbt-test/project1/internal-tracking/d/D.scala b/sbt-app/src/sbt-test/project/internal-tracking/d/D.scala similarity index 100% rename from sbt-app/src/sbt-test/project1/internal-tracking/d/D.scala rename to sbt-app/src/sbt-test/project/internal-tracking/d/D.scala diff --git a/sbt-app/src/sbt-test/project1/internal-tracking/test b/sbt-app/src/sbt-test/project/internal-tracking/pending similarity index 100% rename from sbt-app/src/sbt-test/project1/internal-tracking/test rename to sbt-app/src/sbt-test/project/internal-tracking/pending diff --git a/sbt-app/src/sbt-test/project1/isolated-build-definitions/build.sbt b/sbt-app/src/sbt-test/project/isolated-build-definitions/build.sbt similarity index 100% rename from sbt-app/src/sbt-test/project1/isolated-build-definitions/build.sbt rename to sbt-app/src/sbt-test/project/isolated-build-definitions/build.sbt diff --git a/sbt-app/src/sbt-test/project1/isolated-build-definitions/generator/build.sbt b/sbt-app/src/sbt-test/project/isolated-build-definitions/generator/build.sbt similarity index 100% rename from sbt-app/src/sbt-test/project1/isolated-build-definitions/generator/build.sbt rename to sbt-app/src/sbt-test/project/isolated-build-definitions/generator/build.sbt diff --git a/sbt-app/src/sbt-test/project1/isolated-build-definitions/test b/sbt-app/src/sbt-test/project/isolated-build-definitions/test similarity index 100% rename from sbt-app/src/sbt-test/project1/isolated-build-definitions/test rename to sbt-app/src/sbt-test/project/isolated-build-definitions/test diff --git a/sbt-app/src/sbt-test/project1/lint/build.sbt b/sbt-app/src/sbt-test/project/lint/build.sbt similarity index 98% rename from sbt-app/src/sbt-test/project1/lint/build.sbt rename to sbt-app/src/sbt-test/project/lint/build.sbt index bdf757b50..e55622851 100644 --- a/sbt-app/src/sbt-test/project1/lint/build.sbt +++ b/sbt-app/src/sbt-test/project/lint/build.sbt @@ -6,6 +6,7 @@ ThisBuild / shellPrompt := { state => "sbt> " } ThisBuild / sbt.nio.Keys.watchTriggers := Seq() ThisBuild / sbt.nio.Keys.watchPersistFileStamps := true +@transient lazy val lintBuildTest = taskKey[Unit]("") lazy val root = (project in file(".")) diff --git a/sbt-app/src/sbt-test/project1/lint/test b/sbt-app/src/sbt-test/project/lint/test similarity index 100% rename from sbt-app/src/sbt-test/project1/lint/test rename to sbt-app/src/sbt-test/project/lint/test diff --git a/sbt-app/src/sbt-test/project1/literal-defs/build.sbt b/sbt-app/src/sbt-test/project/literal-defs/build.sbt similarity index 100% rename from sbt-app/src/sbt-test/project1/literal-defs/build.sbt rename to sbt-app/src/sbt-test/project/literal-defs/build.sbt diff --git a/sbt-app/src/sbt-test/project1/literal-defs/test b/sbt-app/src/sbt-test/project/literal-defs/test similarity index 100% rename from sbt-app/src/sbt-test/project1/literal-defs/test rename to sbt-app/src/sbt-test/project/literal-defs/test diff --git a/sbt-app/src/sbt-test/project1/load-hooks/build.sbt b/sbt-app/src/sbt-test/project/load-hooks/build.sbt similarity index 100% rename from sbt-app/src/sbt-test/project1/load-hooks/build.sbt rename to sbt-app/src/sbt-test/project/load-hooks/build.sbt diff --git a/sbt-app/src/sbt-test/project1/load-hooks/test b/sbt-app/src/sbt-test/project/load-hooks/test similarity index 100% rename from sbt-app/src/sbt-test/project1/load-hooks/test rename to sbt-app/src/sbt-test/project/load-hooks/test diff --git a/sbt-app/src/sbt-test/project1/old-ops/changes/settingAppend1/build.sbt b/sbt-app/src/sbt-test/project/old-ops/changes/settingAppend1/build.sbt similarity index 100% rename from sbt-app/src/sbt-test/project1/old-ops/changes/settingAppend1/build.sbt rename to sbt-app/src/sbt-test/project/old-ops/changes/settingAppend1/build.sbt diff --git a/sbt-app/src/sbt-test/project1/old-ops/changes/settingAppendN/build.sbt b/sbt-app/src/sbt-test/project/old-ops/changes/settingAppendN/build.sbt similarity index 100% rename from sbt-app/src/sbt-test/project1/old-ops/changes/settingAppendN/build.sbt rename to sbt-app/src/sbt-test/project/old-ops/changes/settingAppendN/build.sbt diff --git a/sbt-app/src/sbt-test/project1/old-ops/changes/settingAssign/build.sbt b/sbt-app/src/sbt-test/project/old-ops/changes/settingAssign/build.sbt similarity index 100% rename from sbt-app/src/sbt-test/project1/old-ops/changes/settingAssign/build.sbt rename to sbt-app/src/sbt-test/project/old-ops/changes/settingAssign/build.sbt diff --git a/sbt-app/src/sbt-test/project1/old-ops/changes/taskAppend1/build.sbt b/sbt-app/src/sbt-test/project/old-ops/changes/taskAppend1/build.sbt similarity index 100% rename from sbt-app/src/sbt-test/project1/old-ops/changes/taskAppend1/build.sbt rename to sbt-app/src/sbt-test/project/old-ops/changes/taskAppend1/build.sbt diff --git a/sbt-app/src/sbt-test/project1/old-ops/changes/taskAppendN/build.sbt b/sbt-app/src/sbt-test/project/old-ops/changes/taskAppendN/build.sbt similarity index 100% rename from sbt-app/src/sbt-test/project1/old-ops/changes/taskAppendN/build.sbt rename to sbt-app/src/sbt-test/project/old-ops/changes/taskAppendN/build.sbt diff --git a/sbt-app/src/sbt-test/project1/old-ops/changes/taskAssign/build.sbt b/sbt-app/src/sbt-test/project/old-ops/changes/taskAssign/build.sbt similarity index 100% rename from sbt-app/src/sbt-test/project1/old-ops/changes/taskAssign/build.sbt rename to sbt-app/src/sbt-test/project/old-ops/changes/taskAssign/build.sbt diff --git a/sbt-app/src/sbt-test/project1/old-ops/test b/sbt-app/src/sbt-test/project/old-ops/test similarity index 100% rename from sbt-app/src/sbt-test/project1/old-ops/test rename to sbt-app/src/sbt-test/project/old-ops/test diff --git a/sbt-app/src/sbt-test/project/plugin-scala-compiler-dependency/project/Plugin.scala b/sbt-app/src/sbt-test/project/plugin-scala-compiler-dependency/project/Plugin.scala new file mode 100644 index 000000000..b00f9ffcf --- /dev/null +++ b/sbt-app/src/sbt-test/project/plugin-scala-compiler-dependency/project/Plugin.scala @@ -0,0 +1,3 @@ +import dotty.tools.dotc + +object Plugin diff --git a/sbt-app/src/sbt-test/project1/plugin-scala-compiler-dependency/test b/sbt-app/src/sbt-test/project/plugin-scala-compiler-dependency/test similarity index 100% rename from sbt-app/src/sbt-test/project1/plugin-scala-compiler-dependency/test rename to sbt-app/src/sbt-test/project/plugin-scala-compiler-dependency/test diff --git a/sbt-app/src/sbt-test/project1/plugins/build.sbt b/sbt-app/src/sbt-test/project/plugins/build.sbt similarity index 100% rename from sbt-app/src/sbt-test/project1/plugins/build.sbt rename to sbt-app/src/sbt-test/project/plugins/build.sbt diff --git a/sbt-app/src/sbt-test/project1/plugins/project/p.sbt b/sbt-app/src/sbt-test/project/plugins/project/p.sbt similarity index 100% rename from sbt-app/src/sbt-test/project1/plugins/project/p.sbt rename to sbt-app/src/sbt-test/project/plugins/project/p.sbt diff --git a/sbt-app/src/sbt-test/project1/plugins/test b/sbt-app/src/sbt-test/project/plugins/test similarity index 100% rename from sbt-app/src/sbt-test/project1/plugins/test rename to sbt-app/src/sbt-test/project/plugins/test diff --git a/sbt-app/src/sbt-test/project1/provided/build.sbt b/sbt-app/src/sbt-test/project/provided/build.sbt similarity index 73% rename from sbt-app/src/sbt-test/project1/provided/build.sbt rename to sbt-app/src/sbt-test/project/provided/build.sbt index f40f3a81d..89bc21c96 100644 --- a/sbt-app/src/sbt-test/project1/provided/build.sbt +++ b/sbt-app/src/sbt-test/project/provided/build.sbt @@ -6,17 +6,21 @@ lazy val root = (project in file(".")) .dependsOn(sub % "provided->test") .settings( TaskKey[Unit]("check") := { - check0((sub / Test / fullClasspath).value, "sub test", true) - check0((superRoot / Compile / fullClasspath).value, "superRoot main", false) - check0((rootRef / Compile / fullClasspath).value, "root main", true) - check0((rootRef / Runtime / fullClasspath).value, "root runtime", false) - check0((rootRef / Test / fullClasspath).value, "root test", true) + val conv = fileConverter.value + check0((sub / Test / fullClasspath).value, "sub test", true, conv) + check0((superRoot / Compile / fullClasspath).value, "superRoot main", false, conv) + check0((rootRef / Compile / fullClasspath).value, "root main", true, conv) + check0((rootRef / Runtime / fullClasspath).value, "root runtime", false, conv) + check0((rootRef / Test / fullClasspath).value, "root test", true, conv) } ) -def check0(cp: Seq[Attributed[File]], label: String, shouldSucceed: Boolean): Unit = +def check0(cp: Seq[Attributed[HashedVirtualFileRef]], + label: String, shouldSucceed: Boolean, conv: FileConverter): Unit = import sbt.internal.inc.classpath.ClasspathUtilities - val loader = ClasspathUtilities.toLoader(cp.files) + val cp1 = cp.map: a => + conv.toPath(a.data).toFile() + val loader = ClasspathUtilities.toLoader(cp1) println("Checking " + label) val err = try { Class.forName("org.example.ProvidedTest", false, loader); None } diff --git a/sbt-app/src/sbt-test/project1/provided/sub/src/test/scala/ProvidedTest.scala b/sbt-app/src/sbt-test/project/provided/sub/src/test/scala/ProvidedTest.scala similarity index 100% rename from sbt-app/src/sbt-test/project1/provided/sub/src/test/scala/ProvidedTest.scala rename to sbt-app/src/sbt-test/project/provided/sub/src/test/scala/ProvidedTest.scala diff --git a/sbt-app/src/sbt-test/project1/provided/test b/sbt-app/src/sbt-test/project/provided/test similarity index 100% rename from sbt-app/src/sbt-test/project1/provided/test rename to sbt-app/src/sbt-test/project/provided/test diff --git a/sbt-app/src/sbt-test/project1/sbt-composite-projects/build.sbt b/sbt-app/src/sbt-test/project/sbt-composite-projects/build.sbt similarity index 95% rename from sbt-app/src/sbt-test/project1/sbt-composite-projects/build.sbt rename to sbt-app/src/sbt-test/project/sbt-composite-projects/build.sbt index 1537b2610..e39b3e270 100644 --- a/sbt-app/src/sbt-test/project1/sbt-composite-projects/build.sbt +++ b/sbt-app/src/sbt-test/project/sbt-composite-projects/build.sbt @@ -4,12 +4,10 @@ import sbt.CompositeProject lazy val check = taskKey[Unit]("check") // Based on sbt-file-projects test -lazy val foo = new CompositeProject -{ +lazy val foo = new CompositeProject: val jvm = Project.apply("jvm", new File("jvm")).settings(version := "0.1.0") // this one needs to win val js = Project.apply("js", new File("js")).settings(version := "0.1.0") // this one needs to win def componentProjects: Seq[Project] = Seq(jvm, js) -} lazy val fooJS = foo.js lazy val fooJVM = foo.jvm diff --git a/sbt-app/src/sbt-test/project1/sbt-composite-projects/changes/basic.sbt b/sbt-app/src/sbt-test/project/sbt-composite-projects/changes/basic.sbt similarity index 100% rename from sbt-app/src/sbt-test/project1/sbt-composite-projects/changes/basic.sbt rename to sbt-app/src/sbt-test/project/sbt-composite-projects/changes/basic.sbt diff --git a/sbt-app/src/sbt-test/project1/sbt-composite-projects/changes/shadow.sbt b/sbt-app/src/sbt-test/project/sbt-composite-projects/changes/shadow.sbt similarity index 100% rename from sbt-app/src/sbt-test/project1/sbt-composite-projects/changes/shadow.sbt rename to sbt-app/src/sbt-test/project/sbt-composite-projects/changes/shadow.sbt diff --git a/sbt-app/src/sbt-test/project1/sbt-composite-projects/changes/shadowLazy.sbt b/sbt-app/src/sbt-test/project/sbt-composite-projects/changes/shadowLazy.sbt similarity index 100% rename from sbt-app/src/sbt-test/project1/sbt-composite-projects/changes/shadowLazy.sbt rename to sbt-app/src/sbt-test/project/sbt-composite-projects/changes/shadowLazy.sbt diff --git a/sbt-app/src/sbt-test/project1/sbt-composite-projects/js/build.sbt b/sbt-app/src/sbt-test/project/sbt-composite-projects/js/build.sbt similarity index 100% rename from sbt-app/src/sbt-test/project1/sbt-composite-projects/js/build.sbt rename to sbt-app/src/sbt-test/project/sbt-composite-projects/js/build.sbt diff --git a/sbt-app/src/sbt-test/project1/sbt-composite-projects/jvm/A.scala b/sbt-app/src/sbt-test/project/sbt-composite-projects/jvm/A.scala similarity index 100% rename from sbt-app/src/sbt-test/project1/sbt-composite-projects/jvm/A.scala rename to sbt-app/src/sbt-test/project/sbt-composite-projects/jvm/A.scala diff --git a/sbt-app/src/sbt-test/project1/sbt-composite-projects/jvm/a.sbt b/sbt-app/src/sbt-test/project/sbt-composite-projects/jvm/a.sbt similarity index 100% rename from sbt-app/src/sbt-test/project1/sbt-composite-projects/jvm/a.sbt rename to sbt-app/src/sbt-test/project/sbt-composite-projects/jvm/a.sbt diff --git a/sbt-app/src/sbt-test/project1/sbt-composite-projects/other.sbt b/sbt-app/src/sbt-test/project/sbt-composite-projects/other.sbt similarity index 100% rename from sbt-app/src/sbt-test/project1/sbt-composite-projects/other.sbt rename to sbt-app/src/sbt-test/project/sbt-composite-projects/other.sbt diff --git a/sbt-app/src/sbt-test/project1/sbt-composite-projects/test b/sbt-app/src/sbt-test/project/sbt-composite-projects/pending similarity index 100% rename from sbt-app/src/sbt-test/project1/sbt-composite-projects/test rename to sbt-app/src/sbt-test/project/sbt-composite-projects/pending diff --git a/sbt-app/src/sbt-test/project1/sbt-file-projects/a/A.scala b/sbt-app/src/sbt-test/project/sbt-file-projects/a/A.scala similarity index 100% rename from sbt-app/src/sbt-test/project1/sbt-file-projects/a/A.scala rename to sbt-app/src/sbt-test/project/sbt-file-projects/a/A.scala diff --git a/sbt-app/src/sbt-test/project1/sbt-file-projects/a/a.sbt b/sbt-app/src/sbt-test/project/sbt-file-projects/a/a.sbt similarity index 100% rename from sbt-app/src/sbt-test/project1/sbt-file-projects/a/a.sbt rename to sbt-app/src/sbt-test/project/sbt-file-projects/a/a.sbt diff --git a/sbt-app/src/sbt-test/project1/sbt-file-projects/b/build.sbt b/sbt-app/src/sbt-test/project/sbt-file-projects/b/build.sbt similarity index 100% rename from sbt-app/src/sbt-test/project1/sbt-file-projects/b/build.sbt rename to sbt-app/src/sbt-test/project/sbt-file-projects/b/build.sbt diff --git a/sbt-app/src/sbt-test/project1/sbt-file-projects/build.sbt b/sbt-app/src/sbt-test/project/sbt-file-projects/build.sbt similarity index 100% rename from sbt-app/src/sbt-test/project1/sbt-file-projects/build.sbt rename to sbt-app/src/sbt-test/project/sbt-file-projects/build.sbt diff --git a/sbt-app/src/sbt-test/project1/sbt-file-projects/changes/basic.sbt b/sbt-app/src/sbt-test/project/sbt-file-projects/changes/basic.sbt similarity index 100% rename from sbt-app/src/sbt-test/project1/sbt-file-projects/changes/basic.sbt rename to sbt-app/src/sbt-test/project/sbt-file-projects/changes/basic.sbt diff --git a/sbt-app/src/sbt-test/project1/sbt-file-projects/other.sbt b/sbt-app/src/sbt-test/project/sbt-file-projects/other.sbt similarity index 100% rename from sbt-app/src/sbt-test/project1/sbt-file-projects/other.sbt rename to sbt-app/src/sbt-test/project/sbt-file-projects/other.sbt diff --git a/sbt-app/src/sbt-test/project1/sbt-file-projects/test b/sbt-app/src/sbt-test/project/sbt-file-projects/test similarity index 100% rename from sbt-app/src/sbt-test/project1/sbt-file-projects/test rename to sbt-app/src/sbt-test/project/sbt-file-projects/test diff --git a/sbt-app/src/sbt-test/project1/sbt-plugin/build.sbt b/sbt-app/src/sbt-test/project/sbt-plugin/build.sbt similarity index 100% rename from sbt-app/src/sbt-test/project1/sbt-plugin/build.sbt rename to sbt-app/src/sbt-test/project/sbt-plugin/build.sbt diff --git a/sbt-app/src/sbt-test/project1/sbt-plugin/changes/oldSbtPlugin.sbt b/sbt-app/src/sbt-test/project/sbt-plugin/changes/oldSbtPlugin.sbt similarity index 100% rename from sbt-app/src/sbt-test/project1/sbt-plugin/changes/oldSbtPlugin.sbt rename to sbt-app/src/sbt-test/project/sbt-plugin/changes/oldSbtPlugin.sbt diff --git a/sbt-app/src/sbt-test/project1/sbt-plugin/src/main/scala/myplugin/MyPlugin.scala b/sbt-app/src/sbt-test/project/sbt-plugin/src/main/scala/myplugin/MyPlugin.scala similarity index 100% rename from sbt-app/src/sbt-test/project1/sbt-plugin/src/main/scala/myplugin/MyPlugin.scala rename to sbt-app/src/sbt-test/project/sbt-plugin/src/main/scala/myplugin/MyPlugin.scala diff --git a/sbt-app/src/sbt-test/project1/sbt-plugin/test b/sbt-app/src/sbt-test/project/sbt-plugin/test similarity index 100% rename from sbt-app/src/sbt-test/project1/sbt-plugin/test rename to sbt-app/src/sbt-test/project/sbt-plugin/test diff --git a/sbt-app/src/sbt-test/project1/sbt-version-change/build.sbt b/sbt-app/src/sbt-test/project/sbt-version-change/build.sbt similarity index 100% rename from sbt-app/src/sbt-test/project1/sbt-version-change/build.sbt rename to sbt-app/src/sbt-test/project/sbt-version-change/build.sbt diff --git a/sbt-app/src/sbt-test/project1/sbt-version-change/changes/build.properties b/sbt-app/src/sbt-test/project/sbt-version-change/changes/build.properties similarity index 100% rename from sbt-app/src/sbt-test/project1/sbt-version-change/changes/build.properties rename to sbt-app/src/sbt-test/project/sbt-version-change/changes/build.properties diff --git a/sbt-app/src/sbt-test/project1/sbt-version-change/test b/sbt-app/src/sbt-test/project/sbt-version-change/test similarity index 100% rename from sbt-app/src/sbt-test/project1/sbt-version-change/test rename to sbt-app/src/sbt-test/project/sbt-version-change/test diff --git a/sbt-app/src/sbt-test/project1/scala-loader/build.sbt b/sbt-app/src/sbt-test/project/scala-loader/build.sbt similarity index 93% rename from sbt-app/src/sbt-test/project1/scala-loader/build.sbt rename to sbt-app/src/sbt-test/project/scala-loader/build.sbt index 4f5209d51..89a913b11 100644 --- a/sbt-app/src/sbt-test/project1/scala-loader/build.sbt +++ b/sbt-app/src/sbt-test/project/scala-loader/build.sbt @@ -1,6 +1,6 @@ lazy val checkLoaders = taskKey[Unit]("") -def checkTask = subs.map(sub => scalaInstance in LocalProject(sub.id)).join.map { sis => +def checkTask = subs.map(sub => LocalProject(sub.id) / scalaInstance).join.map { sis => assert(sis.sliding(2).forall{ case Seq(x,y) => x.loader == y.loader }, "Not all ScalaInstances had the same class loader.") } diff --git a/sbt-app/src/sbt-test/project1/scala-loader/test b/sbt-app/src/sbt-test/project/scala-loader/test similarity index 100% rename from sbt-app/src/sbt-test/project1/scala-loader/test rename to sbt-app/src/sbt-test/project/scala-loader/test diff --git a/sbt-app/src/sbt-test/project1/scala3-binary-version/build.sbt b/sbt-app/src/sbt-test/project/scala3-binary-version/build.sbt similarity index 100% rename from sbt-app/src/sbt-test/project1/scala3-binary-version/build.sbt rename to sbt-app/src/sbt-test/project/scala3-binary-version/build.sbt diff --git a/sbt-app/src/sbt-test/project1/scala3-binary-version/test b/sbt-app/src/sbt-test/project/scala3-binary-version/test similarity index 100% rename from sbt-app/src/sbt-test/project1/scala3-binary-version/test rename to sbt-app/src/sbt-test/project/scala3-binary-version/test diff --git a/sbt-app/src/sbt-test/project1/scala3-console-project/build.sbt b/sbt-app/src/sbt-test/project/scala3-console-project/build.sbt similarity index 100% rename from sbt-app/src/sbt-test/project1/scala3-console-project/build.sbt rename to sbt-app/src/sbt-test/project/scala3-console-project/build.sbt diff --git a/sbt-app/src/sbt-test/project1/scala3-console-project/test b/sbt-app/src/sbt-test/project/scala3-console-project/pending similarity index 100% rename from sbt-app/src/sbt-test/project1/scala3-console-project/test rename to sbt-app/src/sbt-test/project/scala3-console-project/pending diff --git a/sbt-app/src/sbt-test/project1/scala3-cross-target/build.sbt b/sbt-app/src/sbt-test/project/scala3-cross-target/build.sbt similarity index 100% rename from sbt-app/src/sbt-test/project1/scala3-cross-target/build.sbt rename to sbt-app/src/sbt-test/project/scala3-cross-target/build.sbt diff --git a/sbt-app/src/sbt-test/project1/scala3-cross-target/src/main/scala/Foo.scala b/sbt-app/src/sbt-test/project/scala3-cross-target/src/main/scala/Foo.scala similarity index 100% rename from sbt-app/src/sbt-test/project1/scala3-cross-target/src/main/scala/Foo.scala rename to sbt-app/src/sbt-test/project/scala3-cross-target/src/main/scala/Foo.scala diff --git a/sbt-app/src/sbt-test/project/scala3-cross-target/test b/sbt-app/src/sbt-test/project/scala3-cross-target/test new file mode 100644 index 000000000..3dcfcff3d --- /dev/null +++ b/sbt-app/src/sbt-test/project/scala3-cross-target/test @@ -0,0 +1,7 @@ +> compile + +$ exists target/**/classes/Foo$.class + +> package + +$ exists target/**/foo_3-1.0.0.jar diff --git a/sbt-app/src/sbt-test/project1/scala3-example-project/LICENSE b/sbt-app/src/sbt-test/project/scala3-example-project/LICENSE similarity index 100% rename from sbt-app/src/sbt-test/project1/scala3-example-project/LICENSE rename to sbt-app/src/sbt-test/project/scala3-example-project/LICENSE diff --git a/sbt-app/src/sbt-test/project1/scala3-example-project/README.md b/sbt-app/src/sbt-test/project/scala3-example-project/README.md similarity index 100% rename from sbt-app/src/sbt-test/project1/scala3-example-project/README.md rename to sbt-app/src/sbt-test/project/scala3-example-project/README.md diff --git a/sbt-app/src/sbt-test/project/scala3-example-project/build.sbt b/sbt-app/src/sbt-test/project/scala3-example-project/build.sbt new file mode 100644 index 000000000..7debf2abb --- /dev/null +++ b/sbt-app/src/sbt-test/project/scala3-example-project/build.sbt @@ -0,0 +1 @@ +ThisBuild / scalaVersion := "3.7.4" diff --git a/sbt-app/src/sbt-test/project1/scala3-example-project/src/main/scala-3/Main.scala b/sbt-app/src/sbt-test/project/scala3-example-project/src/main/scala-3/Main.scala similarity index 100% rename from sbt-app/src/sbt-test/project1/scala3-example-project/src/main/scala-3/Main.scala rename to sbt-app/src/sbt-test/project/scala3-example-project/src/main/scala-3/Main.scala diff --git a/sbt-app/src/sbt-test/project1/scala3-example-project/src/main/scala-3/TraitParams.scala b/sbt-app/src/sbt-test/project/scala3-example-project/src/main/scala-3/TraitParams.scala similarity index 100% rename from sbt-app/src/sbt-test/project1/scala3-example-project/src/main/scala-3/TraitParams.scala rename to sbt-app/src/sbt-test/project/scala3-example-project/src/main/scala-3/TraitParams.scala diff --git a/sbt-app/src/sbt-test/project1/scala3-example-project/test b/sbt-app/src/sbt-test/project/scala3-example-project/test similarity index 100% rename from sbt-app/src/sbt-test/project1/scala3-example-project/test rename to sbt-app/src/sbt-test/project/scala3-example-project/test diff --git a/sbt-app/src/sbt-test/project1/scala3-instance-loader/build.sbt b/sbt-app/src/sbt-test/project/scala3-instance-loader/build.sbt similarity index 90% rename from sbt-app/src/sbt-test/project1/scala3-instance-loader/build.sbt rename to sbt-app/src/sbt-test/project/scala3-instance-loader/build.sbt index 53bf8a0d3..0c0e3655a 100644 --- a/sbt-app/src/sbt-test/project1/scala3-instance-loader/build.sbt +++ b/sbt-app/src/sbt-test/project/scala3-instance-loader/build.sbt @@ -1,4 +1,4 @@ -ThisBuild / scalaVersion := "3.0.0-M3" +ThisBuild / scalaVersion := "3.7.4" lazy val check = taskKey[Unit]("check the Scala 3 instance class loader") diff --git a/sbt-app/src/sbt-test/project1/scala3-instance-loader/test b/sbt-app/src/sbt-test/project/scala3-instance-loader/test similarity index 100% rename from sbt-app/src/sbt-test/project1/scala3-instance-loader/test rename to sbt-app/src/sbt-test/project/scala3-instance-loader/test diff --git a/sbt-app/src/sbt-test/project1/scala3-sandwich/bar-app/D.scala b/sbt-app/src/sbt-test/project/scala3-sandwich/bar-app/D.scala similarity index 100% rename from sbt-app/src/sbt-test/project1/scala3-sandwich/bar-app/D.scala rename to sbt-app/src/sbt-test/project/scala3-sandwich/bar-app/D.scala diff --git a/sbt-app/src/sbt-test/project1/scala3-sandwich/bar-core/C.scala b/sbt-app/src/sbt-test/project/scala3-sandwich/bar-core/C.scala similarity index 100% rename from sbt-app/src/sbt-test/project1/scala3-sandwich/bar-core/C.scala rename to sbt-app/src/sbt-test/project/scala3-sandwich/bar-core/C.scala diff --git a/sbt-app/src/sbt-test/project1/scala3-sandwich/build.sbt b/sbt-app/src/sbt-test/project/scala3-sandwich/build.sbt similarity index 100% rename from sbt-app/src/sbt-test/project1/scala3-sandwich/build.sbt rename to sbt-app/src/sbt-test/project/scala3-sandwich/build.sbt diff --git a/sbt-app/src/sbt-test/project1/scala3-sandwich/foo-app/B.scala b/sbt-app/src/sbt-test/project/scala3-sandwich/foo-app/B.scala similarity index 100% rename from sbt-app/src/sbt-test/project1/scala3-sandwich/foo-app/B.scala rename to sbt-app/src/sbt-test/project/scala3-sandwich/foo-app/B.scala diff --git a/sbt-app/src/sbt-test/project1/scala3-sandwich/foo-core/A.scala b/sbt-app/src/sbt-test/project/scala3-sandwich/foo-core/A.scala similarity index 100% rename from sbt-app/src/sbt-test/project1/scala3-sandwich/foo-core/A.scala rename to sbt-app/src/sbt-test/project/scala3-sandwich/foo-core/A.scala diff --git a/sbt-app/src/sbt-test/project1/scala3-sandwich/test b/sbt-app/src/sbt-test/project/scala3-sandwich/test similarity index 100% rename from sbt-app/src/sbt-test/project1/scala3-sandwich/test rename to sbt-app/src/sbt-test/project/scala3-sandwich/test diff --git a/sbt-app/src/sbt-test/project1/scala3-semanticdb/LICENSE b/sbt-app/src/sbt-test/project/scala3-semanticdb/LICENSE similarity index 100% rename from sbt-app/src/sbt-test/project1/scala3-semanticdb/LICENSE rename to sbt-app/src/sbt-test/project/scala3-semanticdb/LICENSE diff --git a/sbt-app/src/sbt-test/project1/scala3-semanticdb/README.md b/sbt-app/src/sbt-test/project/scala3-semanticdb/README.md similarity index 100% rename from sbt-app/src/sbt-test/project1/scala3-semanticdb/README.md rename to sbt-app/src/sbt-test/project/scala3-semanticdb/README.md diff --git a/sbt-app/src/sbt-test/project1/scala3-semanticdb/build.sbt b/sbt-app/src/sbt-test/project/scala3-semanticdb/build.sbt similarity index 100% rename from sbt-app/src/sbt-test/project1/scala3-semanticdb/build.sbt rename to sbt-app/src/sbt-test/project/scala3-semanticdb/build.sbt diff --git a/sbt-app/src/sbt-test/project1/scala3-semanticdb/src/main/scala/Main.scala b/sbt-app/src/sbt-test/project/scala3-semanticdb/src/main/scala/Main.scala similarity index 100% rename from sbt-app/src/sbt-test/project1/scala3-semanticdb/src/main/scala/Main.scala rename to sbt-app/src/sbt-test/project/scala3-semanticdb/src/main/scala/Main.scala diff --git a/sbt-app/src/sbt-test/project1/scala3-semanticdb/src/test/scala/Test.scala b/sbt-app/src/sbt-test/project/scala3-semanticdb/src/test/scala/Test.scala similarity index 100% rename from sbt-app/src/sbt-test/project1/scala3-semanticdb/src/test/scala/Test.scala rename to sbt-app/src/sbt-test/project/scala3-semanticdb/src/test/scala/Test.scala diff --git a/sbt-app/src/sbt-test/project1/scala3-semanticdb/test b/sbt-app/src/sbt-test/project/scala3-semanticdb/test similarity index 100% rename from sbt-app/src/sbt-test/project1/scala3-semanticdb/test rename to sbt-app/src/sbt-test/project/scala3-semanticdb/test diff --git a/sbt-app/src/sbt-test/project1/scripted-bad-def/bad.sbt.disabled b/sbt-app/src/sbt-test/project/scripted-bad-def/bad.sbt.disabled similarity index 100% rename from sbt-app/src/sbt-test/project1/scripted-bad-def/bad.sbt.disabled rename to sbt-app/src/sbt-test/project/scripted-bad-def/bad.sbt.disabled diff --git a/sbt-app/src/sbt-test/project1/scripted-bad-def/test b/sbt-app/src/sbt-test/project/scripted-bad-def/test similarity index 100% rename from sbt-app/src/sbt-test/project1/scripted-bad-def/test rename to sbt-app/src/sbt-test/project/scripted-bad-def/test diff --git a/sbt-app/src/sbt-test/project1/scripted-dependencies/build.sbt b/sbt-app/src/sbt-test/project/scripted-dependencies/build.sbt similarity index 100% rename from sbt-app/src/sbt-test/project1/scripted-dependencies/build.sbt rename to sbt-app/src/sbt-test/project/scripted-dependencies/build.sbt diff --git a/sbt-app/src/sbt-test/project1/scripted-dependencies/project/plugins.sbt b/sbt-app/src/sbt-test/project/scripted-dependencies/project/plugins.sbt similarity index 100% rename from sbt-app/src/sbt-test/project1/scripted-dependencies/project/plugins.sbt rename to sbt-app/src/sbt-test/project/scripted-dependencies/project/plugins.sbt diff --git a/sbt-app/src/sbt-test/project1/scripted-dependencies/test b/sbt-app/src/sbt-test/project/scripted-dependencies/test similarity index 100% rename from sbt-app/src/sbt-test/project1/scripted-dependencies/test rename to sbt-app/src/sbt-test/project/scripted-dependencies/test diff --git a/sbt-app/src/sbt-test/project1/plusequals/test b/sbt-app/src/sbt-test/project/scripted-dependencies/test-files/test similarity index 100% rename from sbt-app/src/sbt-test/project1/plusequals/test rename to sbt-app/src/sbt-test/project/scripted-dependencies/test-files/test diff --git a/sbt-app/src/sbt-test/project1/scripted-java-home/build.sbt b/sbt-app/src/sbt-test/project/scripted-java-home/build.sbt similarity index 100% rename from sbt-app/src/sbt-test/project1/scripted-java-home/build.sbt rename to sbt-app/src/sbt-test/project/scripted-java-home/build.sbt diff --git a/sbt-app/src/sbt-test/project1/scripted-java-home/changes/build.sbt b/sbt-app/src/sbt-test/project/scripted-java-home/changes/build.sbt similarity index 100% rename from sbt-app/src/sbt-test/project1/scripted-java-home/changes/build.sbt rename to sbt-app/src/sbt-test/project/scripted-java-home/changes/build.sbt diff --git a/sbt-app/src/sbt-test/project1/scripted-java-home/changes/test b/sbt-app/src/sbt-test/project/scripted-java-home/changes/test similarity index 100% rename from sbt-app/src/sbt-test/project1/scripted-java-home/changes/test rename to sbt-app/src/sbt-test/project/scripted-java-home/changes/test diff --git a/sbt-app/src/sbt-test/project1/scripted-java-home/test b/sbt-app/src/sbt-test/project/scripted-java-home/disabled similarity index 100% rename from sbt-app/src/sbt-test/project1/scripted-java-home/test rename to sbt-app/src/sbt-test/project/scripted-java-home/disabled diff --git a/sbt-app/src/sbt-test/project1/scripted-plugin/build.sbt b/sbt-app/src/sbt-test/project/scripted-plugin/build.sbt similarity index 100% rename from sbt-app/src/sbt-test/project1/scripted-plugin/build.sbt rename to sbt-app/src/sbt-test/project/scripted-plugin/build.sbt diff --git a/sbt-app/src/sbt-test/project1/scripted-plugin/changes/Fail.scala b/sbt-app/src/sbt-test/project/scripted-plugin/changes/Fail.scala similarity index 100% rename from sbt-app/src/sbt-test/project1/scripted-plugin/changes/Fail.scala rename to sbt-app/src/sbt-test/project/scripted-plugin/changes/Fail.scala diff --git a/sbt-app/src/sbt-test/project1/scripted-plugin/changes/Success.scala b/sbt-app/src/sbt-test/project/scripted-plugin/changes/Success.scala similarity index 100% rename from sbt-app/src/sbt-test/project1/scripted-plugin/changes/Success.scala rename to sbt-app/src/sbt-test/project/scripted-plugin/changes/Success.scala diff --git a/sbt-app/src/sbt-test/project1/scripted-plugin/changes/fail b/sbt-app/src/sbt-test/project/scripted-plugin/changes/fail similarity index 100% rename from sbt-app/src/sbt-test/project1/scripted-plugin/changes/fail rename to sbt-app/src/sbt-test/project/scripted-plugin/changes/fail diff --git a/sbt-app/src/sbt-test/project1/scripted-plugin/changes/test b/sbt-app/src/sbt-test/project/scripted-plugin/changes/test similarity index 100% rename from sbt-app/src/sbt-test/project1/scripted-plugin/changes/test rename to sbt-app/src/sbt-test/project/scripted-plugin/changes/test diff --git a/sbt-app/src/sbt-test/project1/scripted-plugin/project/plugins.sbt b/sbt-app/src/sbt-test/project/scripted-plugin/project/plugins.sbt similarity index 100% rename from sbt-app/src/sbt-test/project1/scripted-plugin/project/plugins.sbt rename to sbt-app/src/sbt-test/project/scripted-plugin/project/plugins.sbt diff --git a/sbt-app/src/sbt-test/project1/scripted-plugin/test b/sbt-app/src/sbt-test/project/scripted-plugin/test similarity index 100% rename from sbt-app/src/sbt-test/project1/scripted-plugin/test rename to sbt-app/src/sbt-test/project/scripted-plugin/test diff --git a/sbt-app/src/sbt-test/project1/scripted-skip-incompatible/build.sbt b/sbt-app/src/sbt-test/project/scripted-skip-incompatible/build.sbt similarity index 100% rename from sbt-app/src/sbt-test/project1/scripted-skip-incompatible/build.sbt rename to sbt-app/src/sbt-test/project/scripted-skip-incompatible/build.sbt diff --git a/sbt-app/src/sbt-test/project1/scripted-skip-incompatible/changes/Fail.scala b/sbt-app/src/sbt-test/project/scripted-skip-incompatible/changes/Fail.scala similarity index 100% rename from sbt-app/src/sbt-test/project1/scripted-skip-incompatible/changes/Fail.scala rename to sbt-app/src/sbt-test/project/scripted-skip-incompatible/changes/Fail.scala diff --git a/sbt-app/src/sbt-test/project1/scripted-skip-incompatible/changes/build.properties b/sbt-app/src/sbt-test/project/scripted-skip-incompatible/changes/build.properties similarity index 100% rename from sbt-app/src/sbt-test/project1/scripted-skip-incompatible/changes/build.properties rename to sbt-app/src/sbt-test/project/scripted-skip-incompatible/changes/build.properties diff --git a/sbt-app/src/sbt-test/project1/scripted-skip-incompatible/changes/test b/sbt-app/src/sbt-test/project/scripted-skip-incompatible/changes/test similarity index 100% rename from sbt-app/src/sbt-test/project1/scripted-skip-incompatible/changes/test rename to sbt-app/src/sbt-test/project/scripted-skip-incompatible/changes/test diff --git a/sbt-app/src/sbt-test/project1/scripted-skip-incompatible/test b/sbt-app/src/sbt-test/project/scripted-skip-incompatible/test similarity index 100% rename from sbt-app/src/sbt-test/project1/scripted-skip-incompatible/test rename to sbt-app/src/sbt-test/project/scripted-skip-incompatible/test diff --git a/sbt-app/src/sbt-test/project1/semanticdb-version/build.sbt b/sbt-app/src/sbt-test/project/semanticdb-version/build.sbt similarity index 100% rename from sbt-app/src/sbt-test/project1/semanticdb-version/build.sbt rename to sbt-app/src/sbt-test/project/semanticdb-version/build.sbt diff --git a/sbt-app/src/sbt-test/project1/semanticdb-version/src/main/scala/foo/Test.scala b/sbt-app/src/sbt-test/project/semanticdb-version/src/main/scala/foo/Test.scala similarity index 100% rename from sbt-app/src/sbt-test/project1/semanticdb-version/src/main/scala/foo/Test.scala rename to sbt-app/src/sbt-test/project/semanticdb-version/src/main/scala/foo/Test.scala diff --git a/sbt-app/src/sbt-test/project1/semanticdb-version/test b/sbt-app/src/sbt-test/project/semanticdb-version/test similarity index 100% rename from sbt-app/src/sbt-test/project1/semanticdb-version/test rename to sbt-app/src/sbt-test/project/semanticdb-version/test diff --git a/sbt-app/src/sbt-test/project1/sequential/build.sbt b/sbt-app/src/sbt-test/project/sequential/build.sbt similarity index 95% rename from sbt-app/src/sbt-test/project1/sequential/build.sbt rename to sbt-app/src/sbt-test/project/sequential/build.sbt index f4ff7fa42..c6d3b931f 100644 --- a/sbt-app/src/sbt-test/project1/sequential/build.sbt +++ b/sbt-app/src/sbt-test/project/sequential/build.sbt @@ -34,6 +34,6 @@ lazy val root = project. val t = testFile.value IO.append(t, "2") }, - foo := Def.sequential(Compile / compile, sideEffect0, sideEffect1, sideEffect2, Test / test, bar).value, + foo := Def.sequential(Compile / compile, sideEffect0, sideEffect1, sideEffect2, (Test / test).toTask(""), bar).value, bar := 1 ) diff --git a/sbt-app/src/sbt-test/project1/sequential/test b/sbt-app/src/sbt-test/project/sequential/test similarity index 100% rename from sbt-app/src/sbt-test/project1/sequential/test rename to sbt-app/src/sbt-test/project/sequential/test diff --git a/sbt-app/src/sbt-test/project1/session-save/build.check.1 b/sbt-app/src/sbt-test/project/session-save/build.check.1 similarity index 100% rename from sbt-app/src/sbt-test/project1/session-save/build.check.1 rename to sbt-app/src/sbt-test/project/session-save/build.check.1 diff --git a/sbt-app/src/sbt-test/project1/session-save/build.check.2 b/sbt-app/src/sbt-test/project/session-save/build.check.2 similarity index 100% rename from sbt-app/src/sbt-test/project1/session-save/build.check.2 rename to sbt-app/src/sbt-test/project/session-save/build.check.2 diff --git a/sbt-app/src/sbt-test/project1/session-save/build.check.3 b/sbt-app/src/sbt-test/project/session-save/build.check.3 similarity index 100% rename from sbt-app/src/sbt-test/project1/session-save/build.check.3 rename to sbt-app/src/sbt-test/project/session-save/build.check.3 diff --git a/sbt-app/src/sbt-test/project1/session-save/build.check.4 b/sbt-app/src/sbt-test/project/session-save/build.check.4 similarity index 100% rename from sbt-app/src/sbt-test/project1/session-save/build.check.4 rename to sbt-app/src/sbt-test/project/session-save/build.check.4 diff --git a/sbt-app/src/sbt-test/project1/session-save/build.check.5 b/sbt-app/src/sbt-test/project/session-save/build.check.5 similarity index 100% rename from sbt-app/src/sbt-test/project1/session-save/build.check.5 rename to sbt-app/src/sbt-test/project/session-save/build.check.5 diff --git a/sbt-app/src/sbt-test/project1/session-save/build.sbt b/sbt-app/src/sbt-test/project/session-save/build.sbt similarity index 100% rename from sbt-app/src/sbt-test/project1/session-save/build.sbt rename to sbt-app/src/sbt-test/project/session-save/build.sbt diff --git a/sbt-app/src/sbt-test/project1/session-save/disabled b/sbt-app/src/sbt-test/project/session-save/disabled similarity index 100% rename from sbt-app/src/sbt-test/project1/session-save/disabled rename to sbt-app/src/sbt-test/project/session-save/disabled diff --git a/sbt-app/src/sbt-test/project1/session-update-from-cmd/build.check.1 b/sbt-app/src/sbt-test/project/session-update-from-cmd/build.check.1 similarity index 100% rename from sbt-app/src/sbt-test/project1/session-update-from-cmd/build.check.1 rename to sbt-app/src/sbt-test/project/session-update-from-cmd/build.check.1 diff --git a/sbt-app/src/sbt-test/project1/session-update-from-cmd/build.check.2 b/sbt-app/src/sbt-test/project/session-update-from-cmd/build.check.2 similarity index 100% rename from sbt-app/src/sbt-test/project1/session-update-from-cmd/build.check.2 rename to sbt-app/src/sbt-test/project/session-update-from-cmd/build.check.2 diff --git a/sbt-app/src/sbt-test/project1/session-update-from-cmd/build.sbt b/sbt-app/src/sbt-test/project/session-update-from-cmd/build.sbt similarity index 100% rename from sbt-app/src/sbt-test/project1/session-update-from-cmd/build.sbt rename to sbt-app/src/sbt-test/project/session-update-from-cmd/build.sbt diff --git a/sbt-app/src/sbt-test/project1/session-update-from-cmd/project/Common.scala b/sbt-app/src/sbt-test/project/session-update-from-cmd/project/Common.scala similarity index 86% rename from sbt-app/src/sbt-test/project1/session-update-from-cmd/project/Common.scala rename to sbt-app/src/sbt-test/project/session-update-from-cmd/project/Common.scala index 423d628f6..57772a073 100644 --- a/sbt-app/src/sbt-test/project1/session-update-from-cmd/project/Common.scala +++ b/sbt-app/src/sbt-test/project/session-update-from-cmd/project/Common.scala @@ -1,4 +1,4 @@ -import sbt._, Keys._ +import sbt.*, Keys.* import sbt.internal.SessionSettings @@ -8,8 +8,8 @@ object Common { lazy val k3 = taskKey[Unit]("") lazy val k4 = taskKey[Unit]("") - val UpdateK1 = Command.command("UpdateK1") { st: State => - val ex = Project extract st + val UpdateK1 = Command.command("UpdateK1"): (st: State) => + val ex = Project.extract(st) import ex._ val session2 = BuiltinCommands.setThis(ex, Seq(k1 := {}), """k1 := { |// @@ -18,10 +18,9 @@ object Common { val st1 = BuiltinCommands.reapply(session2, structure, st) // SessionSettings.writeSettings(ex.currentRef, session2, ex.session.original, ex.structure) SessionSettings.saveAllSettings(st1) - } - val UpdateK3 = Command.command("UpdateK3") { st: State => + val UpdateK3 = Command.command("UpdateK3"): (st: State) => val ex = Project extract st import ex._ val session2 = BuiltinCommands.setThis(ex, Seq(k3 := {}), """k3 := { @@ -31,7 +30,6 @@ object Common { val st1 = BuiltinCommands.reapply(session2, structure, st) // SessionSettings.writeSettings(ex.currentRef, session2, ex.session.original, ex.structure) SessionSettings.saveAllSettings(st1) - } } // vim: set ts=4 sw=4 et: diff --git a/sbt-app/src/sbt-test/project1/session-update-from-cmd/test b/sbt-app/src/sbt-test/project/session-update-from-cmd/test similarity index 100% rename from sbt-app/src/sbt-test/project1/session-update-from-cmd/test rename to sbt-app/src/sbt-test/project/session-update-from-cmd/test diff --git a/sbt-app/src/sbt-test/project1/setting-macro/build.sbt b/sbt-app/src/sbt-test/project/setting-macro/build.sbt similarity index 76% rename from sbt-app/src/sbt-test/project1/setting-macro/build.sbt rename to sbt-app/src/sbt-test/project/setting-macro/build.sbt index c07c3c0ad..c8dbe61c8 100644 --- a/sbt-app/src/sbt-test/project1/setting-macro/build.sbt +++ b/sbt-app/src/sbt-test/project/setting-macro/build.sbt @@ -1,8 +1,8 @@ - import complete.DefaultParsers._ +import complete.DefaultParsers._ name := { // verify lazy vals are handled (#952) - lazy val x = "sdf" + lazy val x = "sdf" x } @@ -18,13 +18,14 @@ demo := { // Tests for correct Symbol owner structure in the lifted qualifiers of // the `.value` macro within a task macro. (#1150) +@transient val key1 = taskKey[Unit]("") key1 := { - val foo = (sourceDirectory in Compile).apply(base => base).value.get - testFrameworks.value.flatMap(f => - None.map(_ => f) - ) + val foo = (Compile / sourceDirectory).apply(base => base).value.get() + testFrameworks.value.flatMap(f => + None.map(_ => f) + ) () } diff --git a/sbt-app/src/sbt-test/project1/setting-macro/test b/sbt-app/src/sbt-test/project/setting-macro/disabled similarity index 100% rename from sbt-app/src/sbt-test/project1/setting-macro/test rename to sbt-app/src/sbt-test/project/setting-macro/disabled diff --git a/sbt-app/src/sbt-test/project1/setting-macro/project/PureExpressionPlugin.scala b/sbt-app/src/sbt-test/project/setting-macro/project/PureExpressionPlugin.scala similarity index 82% rename from sbt-app/src/sbt-test/project1/setting-macro/project/PureExpressionPlugin.scala rename to sbt-app/src/sbt-test/project/setting-macro/project/PureExpressionPlugin.scala index f0eea984b..069620334 100644 --- a/sbt-app/src/sbt-test/project1/setting-macro/project/PureExpressionPlugin.scala +++ b/sbt-app/src/sbt-test/project/setting-macro/project/PureExpressionPlugin.scala @@ -4,8 +4,9 @@ import sbt._, Keys._ // https://github.com/scala/bug/issues/12112 object PureExpressionPlugin extends AutoPlugin { + @transient lazy val testPureExpression = taskKey[Unit]("") - override def projectSettings: Seq[Setting[_]] = { + override def projectSettings: Seq[Setting[?]] = { testPureExpression := { updateFull.value (Compile / compile).value diff --git a/sbt-app/src/sbt-test/project1/setting-macro/project/plugins.sbt b/sbt-app/src/sbt-test/project/setting-macro/project/plugins.sbt similarity index 100% rename from sbt-app/src/sbt-test/project1/setting-macro/project/plugins.sbt rename to sbt-app/src/sbt-test/project/setting-macro/project/plugins.sbt diff --git a/sbt-app/src/sbt-test/project1/setting-order/a.sbt b/sbt-app/src/sbt-test/project/setting-order/a.sbt similarity index 100% rename from sbt-app/src/sbt-test/project1/setting-order/a.sbt rename to sbt-app/src/sbt-test/project/setting-order/a.sbt diff --git a/sbt-app/src/sbt-test/project1/setting-order/b.sbt b/sbt-app/src/sbt-test/project/setting-order/b.sbt similarity index 100% rename from sbt-app/src/sbt-test/project1/setting-order/b.sbt rename to sbt-app/src/sbt-test/project/setting-order/b.sbt diff --git a/sbt-app/src/sbt-test/project1/setting-order/build.sbt b/sbt-app/src/sbt-test/project/setting-order/build.sbt similarity index 100% rename from sbt-app/src/sbt-test/project1/setting-order/build.sbt rename to sbt-app/src/sbt-test/project/setting-order/build.sbt diff --git a/sbt-app/src/sbt-test/project1/setting-order/c.sbt b/sbt-app/src/sbt-test/project/setting-order/c.sbt similarity index 100% rename from sbt-app/src/sbt-test/project1/setting-order/c.sbt rename to sbt-app/src/sbt-test/project/setting-order/c.sbt diff --git a/sbt-app/src/sbt-test/project1/setting-order/test b/sbt-app/src/sbt-test/project/setting-order/pending similarity index 100% rename from sbt-app/src/sbt-test/project1/setting-order/test rename to sbt-app/src/sbt-test/project/setting-order/pending diff --git a/sbt-app/src/sbt-test/project/settings-definition/build.sbt b/sbt-app/src/sbt-test/project/settings-definition/build.sbt new file mode 100644 index 000000000..0a768c403 --- /dev/null +++ b/sbt-app/src/sbt-test/project/settings-definition/build.sbt @@ -0,0 +1,23 @@ +// Just checking that existing ways of +// setting up projects typechecks + +val sharedSettings1 = Seq( + name := "sharedSettings1" +) + +val sharedSettings2 = Seq[Setting[?]]( + name := "sharedSettings2" +) + +lazy val root = (project in file(".")) + +lazy val foo = project + .settings(sharedSettings1) + .settings(sharedSettings2) + .settings ( + name := "pre seq settings", + sharedSettings1, + name := "mid seq settings", + sharedSettings2, + name := "post seq settings" + ) diff --git a/sbt-app/src/sbt-test/project1/settings-definition/test b/sbt-app/src/sbt-test/project/settings-definition/test similarity index 100% rename from sbt-app/src/sbt-test/project1/settings-definition/test rename to sbt-app/src/sbt-test/project/settings-definition/test diff --git a/sbt-app/src/sbt-test/project1/settings/build.sbt b/sbt-app/src/sbt-test/project/settings/build.sbt similarity index 100% rename from sbt-app/src/sbt-test/project1/settings/build.sbt rename to sbt-app/src/sbt-test/project/settings/build.sbt diff --git a/sbt-app/src/sbt-test/project1/settings/changes/Global.scala b/sbt-app/src/sbt-test/project/settings/changes/Global.scala similarity index 100% rename from sbt-app/src/sbt-test/project1/settings/changes/Global.scala rename to sbt-app/src/sbt-test/project/settings/changes/Global.scala diff --git a/sbt-app/src/sbt-test/project1/settings/changes/global.sbt b/sbt-app/src/sbt-test/project/settings/changes/global.sbt similarity index 100% rename from sbt-app/src/sbt-test/project1/settings/changes/global.sbt rename to sbt-app/src/sbt-test/project/settings/changes/global.sbt diff --git a/sbt-app/src/sbt-test/project1/settings/changes/settings.sbt b/sbt-app/src/sbt-test/project/settings/changes/settings.sbt similarity index 100% rename from sbt-app/src/sbt-test/project1/settings/changes/settings.sbt rename to sbt-app/src/sbt-test/project/settings/changes/settings.sbt diff --git a/sbt-app/src/sbt-test/project1/settings/test b/sbt-app/src/sbt-test/project/settings/pending similarity index 89% rename from sbt-app/src/sbt-test/project1/settings/test rename to sbt-app/src/sbt-test/project/settings/pending index aa1b59357..67ea0e4ba 100644 --- a/sbt-app/src/sbt-test/project1/settings/test +++ b/sbt-app/src/sbt-test/project/settings/pending @@ -10,7 +10,7 @@ $ copy-file changes/global.sbt global/settings.sbt > check 4 # add 3 -$ copy-file changes/local.sbt local.sbt +$ copy-file changes/settings.sbt settings.sbt > reload > check 7 diff --git a/sbt-app/src/sbt-test/project1/source-plugins/build.sbt b/sbt-app/src/sbt-test/project/source-plugins/build.sbt similarity index 100% rename from sbt-app/src/sbt-test/project1/source-plugins/build.sbt rename to sbt-app/src/sbt-test/project/source-plugins/build.sbt diff --git a/sbt-app/src/sbt-test/project1/source-plugins/pending b/sbt-app/src/sbt-test/project/source-plugins/pending similarity index 100% rename from sbt-app/src/sbt-test/project1/source-plugins/pending rename to sbt-app/src/sbt-test/project/source-plugins/pending diff --git a/sbt-app/src/sbt-test/project1/source-plugins/project/plugin.sbt b/sbt-app/src/sbt-test/project/source-plugins/project/plugin.sbt similarity index 100% rename from sbt-app/src/sbt-test/project1/source-plugins/project/plugin.sbt rename to sbt-app/src/sbt-test/project/source-plugins/project/plugin.sbt diff --git a/sbt-app/src/sbt-test/project1/src-plugins/test b/sbt-app/src/sbt-test/project/src-plugins/pending similarity index 100% rename from sbt-app/src/sbt-test/project1/src-plugins/test rename to sbt-app/src/sbt-test/project/src-plugins/pending diff --git a/sbt-app/src/sbt-test/project1/src-plugins/plugin/JavaTest.java b/sbt-app/src/sbt-test/project/src-plugins/plugin/JavaTest.java similarity index 100% rename from sbt-app/src/sbt-test/project1/src-plugins/plugin/JavaTest.java rename to sbt-app/src/sbt-test/project/src-plugins/plugin/JavaTest.java diff --git a/sbt-app/src/sbt-test/project1/src-plugins/plugin/TestPlugin.scala b/sbt-app/src/sbt-test/project/src-plugins/plugin/TestPlugin.scala similarity index 95% rename from sbt-app/src/sbt-test/project1/src-plugins/plugin/TestPlugin.scala rename to sbt-app/src/sbt-test/project/src-plugins/plugin/TestPlugin.scala index 681cfe86f..0596d2669 100644 --- a/sbt-app/src/sbt-test/project1/src-plugins/plugin/TestPlugin.scala +++ b/sbt-app/src/sbt-test/project/src-plugins/plugin/TestPlugin.scala @@ -1,4 +1,4 @@ -import sbt._ +import sbt.* object TestPlugin extends AutoPlugin { override val requires = plugins.JvmPlugin diff --git a/sbt-app/src/sbt-test/project1/src-plugins/plugin/build.sbt b/sbt-app/src/sbt-test/project/src-plugins/plugin/build.sbt similarity index 100% rename from sbt-app/src/sbt-test/project1/src-plugins/plugin/build.sbt rename to sbt-app/src/sbt-test/project/src-plugins/plugin/build.sbt diff --git a/sbt-app/src/sbt-test/project1/src-plugins/project/p.sbt b/sbt-app/src/sbt-test/project/src-plugins/project/p.sbt similarity index 100% rename from sbt-app/src/sbt-test/project1/src-plugins/project/p.sbt rename to sbt-app/src/sbt-test/project/src-plugins/project/p.sbt diff --git a/sbt-app/src/sbt-test/project1/src-scala-binary-version/b/build.sbt b/sbt-app/src/sbt-test/project/src-scala-binary-version/b/build.sbt similarity index 100% rename from sbt-app/src/sbt-test/project1/src-scala-binary-version/b/build.sbt rename to sbt-app/src/sbt-test/project/src-scala-binary-version/b/build.sbt diff --git a/sbt-app/src/sbt-test/project1/src-scala-binary-version/build.sbt b/sbt-app/src/sbt-test/project/src-scala-binary-version/build.sbt similarity index 62% rename from sbt-app/src/sbt-test/project1/src-scala-binary-version/build.sbt rename to sbt-app/src/sbt-test/project/src-scala-binary-version/build.sbt index 818e3f8e2..2130c9902 100644 --- a/sbt-app/src/sbt-test/project1/src-scala-binary-version/build.sbt +++ b/sbt-app/src/sbt-test/project/src-scala-binary-version/build.sbt @@ -1,11 +1,12 @@ -lazy val a = project.dependsOn(b).settings(scalaVersion := "2.8.2") +lazy val a = project.dependsOn(b) + .settings(scalaVersion := "2.9.3") lazy val b = RootProject(uri("b")) lazy val check = taskKey[Unit]("Checks the configured scalaBinaryVersion") check := { - val av = (scalaBinaryVersion in a).value - val bv = (scalaBinaryVersion in b).value - same(av, "2.8.2") + val av = (a / scalaBinaryVersion).value + val bv = (b / scalaBinaryVersion).value + same(av, "2.9.3") same(bv, "2.10") } diff --git a/sbt-app/src/sbt-test/project1/src-scala-binary-version/test b/sbt-app/src/sbt-test/project/src-scala-binary-version/test similarity index 100% rename from sbt-app/src/sbt-test/project1/src-scala-binary-version/test rename to sbt-app/src/sbt-test/project/src-scala-binary-version/test diff --git a/sbt-app/src/sbt-test/project/subproject-dependson/build.sbt b/sbt-app/src/sbt-test/project/subproject-dependson/build.sbt new file mode 100644 index 000000000..6d6b14a4d --- /dev/null +++ b/sbt-app/src/sbt-test/project/subproject-dependson/build.sbt @@ -0,0 +1,17 @@ +val projA = (project in file("projA")) + +val projB = (project in file("projB")) + +lazy val check = taskKey[Unit]("Verifies expected build behavior") + +LocalRootProject / check := { + val conv = fileConverter.value + val projBDeps = (projB / Compile / dependencyClasspath).value + .map(_.data) + val assertion = (projBDeps.filter: x => + conv.toPath(x).toString().contains("proja") + ).nonEmpty + assert(assertion, + s"Unable to find projA classes in projB's dependency list ${projBDeps}" + ) +} diff --git a/sbt-app/src/sbt-test/project1/subproject-dependson/projA/build.sbt b/sbt-app/src/sbt-test/project/subproject-dependson/projA/build.sbt similarity index 100% rename from sbt-app/src/sbt-test/project1/subproject-dependson/projA/build.sbt rename to sbt-app/src/sbt-test/project/subproject-dependson/projA/build.sbt diff --git a/sbt-app/src/sbt-test/project/subproject-dependson/projB/build.sbt b/sbt-app/src/sbt-test/project/subproject-dependson/projB/build.sbt new file mode 100644 index 000000000..5b5b8c984 --- /dev/null +++ b/sbt-app/src/sbt-test/project/subproject-dependson/projB/build.sbt @@ -0,0 +1,3 @@ +name := "projB" + +sbt.BareBuildSyntax.dependsOn(LocalProject("projA")) diff --git a/sbt-app/src/sbt-test/project1/subproject-dependson/test b/sbt-app/src/sbt-test/project/subproject-dependson/test similarity index 100% rename from sbt-app/src/sbt-test/project1/subproject-dependson/test rename to sbt-app/src/sbt-test/project/subproject-dependson/test diff --git a/sbt-app/src/sbt-test/project1/test-script-file/build.sbt b/sbt-app/src/sbt-test/project/test-script-file/build.sbt similarity index 100% rename from sbt-app/src/sbt-test/project1/test-script-file/build.sbt rename to sbt-app/src/sbt-test/project/test-script-file/build.sbt diff --git a/sbt-app/src/sbt-test/project1/test-script-file/test.script b/sbt-app/src/sbt-test/project/test-script-file/test.script similarity index 100% rename from sbt-app/src/sbt-test/project1/test-script-file/test.script rename to sbt-app/src/sbt-test/project/test-script-file/test.script diff --git a/sbt-app/src/sbt-test/project/thisProject/build.sbt b/sbt-app/src/sbt-test/project/thisProject/build.sbt new file mode 100644 index 000000000..88a1552bf --- /dev/null +++ b/sbt-app/src/sbt-test/project/thisProject/build.sbt @@ -0,0 +1,10 @@ +val proj2 = project + +LocalRootProject / name := "proj1" + +val check = taskKey[Unit]("Ensure each project is named appropriately") + +LocalRootProject / check := { + assert((LocalRootProject / name).value == "proj1", s"${(LocalRootProject / name).value} == \"proj1\"") + assert((proj2 / name).value == "boo", s"${(proj2 / name).value} == \"boo\"") +} diff --git a/sbt-app/src/sbt-test/project/thisProject/proj2/build.sbt b/sbt-app/src/sbt-test/project/thisProject/proj2/build.sbt new file mode 100644 index 000000000..bc8dd3e38 --- /dev/null +++ b/sbt-app/src/sbt-test/project/thisProject/proj2/build.sbt @@ -0,0 +1 @@ +ThisProject / name := "boo" diff --git a/sbt-app/src/sbt-test/project1/thisProject/test b/sbt-app/src/sbt-test/project/thisProject/test similarity index 100% rename from sbt-app/src/sbt-test/project1/thisProject/test rename to sbt-app/src/sbt-test/project/thisProject/test diff --git a/sbt-app/src/sbt-test/project1/transitive-plugins/build.sbt b/sbt-app/src/sbt-test/project/transitive-plugins/build.sbt similarity index 75% rename from sbt-app/src/sbt-test/project1/transitive-plugins/build.sbt rename to sbt-app/src/sbt-test/project/transitive-plugins/build.sbt index ecbe2e0c2..0dd0cad82 100644 --- a/sbt-app/src/sbt-test/project1/transitive-plugins/build.sbt +++ b/sbt-app/src/sbt-test/project/transitive-plugins/build.sbt @@ -2,16 +2,14 @@ ThisBuild / organization := "org.example" ThisBuild / csrCacheDirectory := (ThisBuild / baseDirectory).value / "coursier-cache" lazy val root = (project in file(".")) - .settings( - commonSettings - ) + .settings(commonSettings) lazy val commonSettings = Seq( ivyPaths := IvyPaths( - (baseDirectory in ThisBuild).value.toString, - Some(((target in LocalRootProject).value / "ivy-cache").toString) + (ThisBuild / baseDirectory).value.toString, + Some(((LocalRootProject / target).value / "ivy-cache").toString) ), - publishTo := Some(Resolver.file("test-publish", (baseDirectory in ThisBuild).value / "repo/")), + publishTo := Some(Resolver.file("test-publish", (ThisBuild / baseDirectory).value / "repo/")), // to get sbt artifacts resolvers += { val ivyHome = Classpaths.bootIvyHome(appConfiguration.value) getOrElse sys.error( @@ -20,7 +18,7 @@ lazy val commonSettings = Seq( Resolver.file("real-local", ivyHome / "local")(Resolver.ivyStylePatterns) }, resolvers += Resolver.mavenLocal, - resolvers += ("test-repo" at ((baseDirectory in ThisBuild).value / "repo/").asURL.toString) + resolvers += ("test-repo" at ((ThisBuild / baseDirectory).value / "repo/").asURL.toString) ) lazy val a = (project in file("a")) diff --git a/sbt-app/src/sbt-test/project1/transitive-plugins/test b/sbt-app/src/sbt-test/project/transitive-plugins/test similarity index 100% rename from sbt-app/src/sbt-test/project1/transitive-plugins/test rename to sbt-app/src/sbt-test/project/transitive-plugins/test diff --git a/sbt-app/src/sbt-test/project1/unified/build.sbt b/sbt-app/src/sbt-test/project/unified/build.sbt similarity index 98% rename from sbt-app/src/sbt-test/project1/unified/build.sbt rename to sbt-app/src/sbt-test/project/unified/build.sbt index dae9c4338..ddf8bf56c 100644 --- a/sbt-app/src/sbt-test/project1/unified/build.sbt +++ b/sbt-app/src/sbt-test/project/unified/build.sbt @@ -2,7 +2,6 @@ ThisBuild / scalaVersion := "2.12.21" import sbt.internal.CommandStrings.{ inspectBrief, inspectDetailed } import sbt.internal.Inspect -import sjsonnew._, BasicJsonProtocol._ val uTest = "com.lihaoyi" %% "utest" % "0.5.3" diff --git a/sbt-app/src/sbt-test/project1/unified/test b/sbt-app/src/sbt-test/project/unified/pending similarity index 100% rename from sbt-app/src/sbt-test/project1/unified/test rename to sbt-app/src/sbt-test/project/unified/pending diff --git a/sbt-app/src/sbt-test/project1/unified/src/test/scala/example/HelloTests.scala b/sbt-app/src/sbt-test/project/unified/src/test/scala/example/HelloTests.scala similarity index 100% rename from sbt-app/src/sbt-test/project1/unified/src/test/scala/example/HelloTests.scala rename to sbt-app/src/sbt-test/project/unified/src/test/scala/example/HelloTests.scala diff --git a/sbt-app/src/sbt-test/project1/unique-settings-computation/build.sbt b/sbt-app/src/sbt-test/project/unique-settings-computation/build.sbt similarity index 100% rename from sbt-app/src/sbt-test/project1/unique-settings-computation/build.sbt rename to sbt-app/src/sbt-test/project/unique-settings-computation/build.sbt diff --git a/sbt-app/src/sbt-test/project1/unique-settings-computation/disabled b/sbt-app/src/sbt-test/project/unique-settings-computation/disabled similarity index 100% rename from sbt-app/src/sbt-test/project1/unique-settings-computation/disabled rename to sbt-app/src/sbt-test/project/unique-settings-computation/disabled diff --git a/sbt-app/src/sbt-test/project1/unique-settings-computation/project/A.scala b/sbt-app/src/sbt-test/project/unique-settings-computation/project/A.scala similarity index 100% rename from sbt-app/src/sbt-test/project1/unique-settings-computation/project/A.scala rename to sbt-app/src/sbt-test/project/unique-settings-computation/project/A.scala diff --git a/sbt-app/src/sbt-test/project1/update-classifiers/build.sbt b/sbt-app/src/sbt-test/project/update-classifiers/build.sbt similarity index 100% rename from sbt-app/src/sbt-test/project1/update-classifiers/build.sbt rename to sbt-app/src/sbt-test/project/update-classifiers/build.sbt diff --git a/sbt-app/src/sbt-test/project1/update-classifiers/test b/sbt-app/src/sbt-test/project/update-classifiers/test similarity index 100% rename from sbt-app/src/sbt-test/project1/update-classifiers/test rename to sbt-app/src/sbt-test/project/update-classifiers/test diff --git a/sbt-app/src/sbt-test/project1/val-order/build.sbt b/sbt-app/src/sbt-test/project/val-order/build.sbt similarity index 99% rename from sbt-app/src/sbt-test/project1/val-order/build.sbt rename to sbt-app/src/sbt-test/project/val-order/build.sbt index 683c645b6..d2cb9c79a 100644 --- a/sbt-app/src/sbt-test/project1/val-order/build.sbt +++ b/sbt-app/src/sbt-test/project/val-order/build.sbt @@ -13,7 +13,6 @@ lazy val root = (project in file(".")) assert(o == "root.api.database.web", s"$o") val x = (api / intTask).value assert(x == 1, x.toString) - }, ) diff --git a/sbt-app/src/sbt-test/project1/val-order/test b/sbt-app/src/sbt-test/project/val-order/pending similarity index 100% rename from sbt-app/src/sbt-test/project1/val-order/test rename to sbt-app/src/sbt-test/project/val-order/pending diff --git a/sbt-app/src/sbt-test/project1/aggregate/test b/sbt-app/src/sbt-test/project1/aggregate/test deleted file mode 100644 index e7243130f..000000000 --- a/sbt-app/src/sbt-test/project1/aggregate/test +++ /dev/null @@ -1,2 +0,0 @@ -> compile -$ exists projA/target/scala-2.12/classes/A.class diff --git a/sbt-app/src/sbt-test/project1/cross-plugins-defaults/build.sbt b/sbt-app/src/sbt-test/project1/cross-plugins-defaults/build.sbt deleted file mode 100644 index ad6555575..000000000 --- a/sbt-app/src/sbt-test/project1/cross-plugins-defaults/build.sbt +++ /dev/null @@ -1,48 +0,0 @@ -val baseSbt = "1." - -val buildCrossList = List("2.10.7", "2.11.12", "2.12.21") -(ThisBuild / scalaVersion) := "2.12.21" -(ThisBuild / crossScalaVersions) := buildCrossList - -addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.7.0") - -lazy val root = (project in file(".")) - .enablePlugins(SbtPlugin) - .settings( - TaskKey[Unit]("check") := mkCheck("2.12", "1.0", "1.").value, - TaskKey[Unit]("check2") := mkCheck("2.10", "0.13", "0.13").value, - ) - -lazy val app = (project in file("app")) - -def mkCheck(scalaBinV: String, sbtBinVer: String, sbtVerPrefix: String) = Def.task { - val crossV = (pluginCrossBuild / sbtVersion).value - val crossBinV = (pluginCrossBuild / sbtBinaryVersion).value - val sv = projectID.value.extraAttributes("e:scalaVersion") - assert(sbtVersion.value startsWith baseSbt, s"Wrong sbt version: ${sbtVersion.value}") - assert(sv == scalaBinV, s"Wrong e:scalaVersion: $sv") - assert( - scalaBinaryVersion.value == scalaBinV, - s"Wrong Scala binary version: ${scalaBinaryVersion.value}" - ) - assert(crossV startsWith sbtVerPrefix, s"Wrong `pluginCrossBuild / sbtVersion`: $crossV") - - val ur = update.value - val cr = ur.configuration(Compile).get - val mr = cr.modules - .find(mr => mr.module.organization == "com.eed3si9n" && mr.module.name == "sbt-buildinfo") - .get - val plugSv = mr.module.extraAttributes("scalaVersion") - val plugSbtV = mr.module.extraAttributes("sbtVersion") - assert(plugSv == scalaBinV, s"Wrong plugin scalaVersion: $plugSv") - assert(plugSbtV == sbtBinVer, s"Wrong plugin sbtVersion: $plugSbtV") - - // crossScalaVersions in app should not be affected, per se or after ^^ - val appCrossScalaVersions = (app / crossScalaVersions).value.toList - val appScalaVersion = (app / scalaVersion).value - assert( - appCrossScalaVersions == buildCrossList, - s"Wrong `crossScalaVersions in app`: $appCrossScalaVersions" - ) - assert(appScalaVersion startsWith "2.12", s"Wrong `scalaVersion in app`: $appScalaVersion") -} diff --git a/sbt-app/src/sbt-test/project1/cross-plugins-defaults/test b/sbt-app/src/sbt-test/project1/cross-plugins-defaults/test deleted file mode 100644 index 15a55b859..000000000 --- a/sbt-app/src/sbt-test/project1/cross-plugins-defaults/test +++ /dev/null @@ -1,5 +0,0 @@ -> check - -> ^^0.13.15 - -> check2 diff --git a/sbt-app/src/sbt-test/project1/cross-plugins-source/build.sbt b/sbt-app/src/sbt-test/project1/cross-plugins-source/build.sbt deleted file mode 100644 index 5bb39c396..000000000 --- a/sbt-app/src/sbt-test/project1/cross-plugins-source/build.sbt +++ /dev/null @@ -1,6 +0,0 @@ -lazy val root = (project in file(".")) - .settings( - sbtPlugin := true, - pluginCrossBuild / sbtVersion := "0.13.15", - resolvers += Resolver.typesafeIvyRepo("releases") - ) diff --git a/sbt-app/src/sbt-test/project1/cross-plugins-source/src/main/scala-sbt-0.13.x/B.scala b/sbt-app/src/sbt-test/project1/cross-plugins-source/src/main/scala-sbt-0.13.x/B.scala deleted file mode 100644 index 0ed0a40b8..000000000 --- a/sbt-app/src/sbt-test/project1/cross-plugins-source/src/main/scala-sbt-0.13.x/B.scala +++ /dev/null @@ -1,2 +0,0 @@ -// folder mustn't be included -trait B diff --git a/sbt-app/src/sbt-test/project1/cross-plugins-source/src/main/scala-sbt-0.13/A.scala b/sbt-app/src/sbt-test/project1/cross-plugins-source/src/main/scala-sbt-0.13/A.scala deleted file mode 100644 index 16c5ea484..000000000 --- a/sbt-app/src/sbt-test/project1/cross-plugins-source/src/main/scala-sbt-0.13/A.scala +++ /dev/null @@ -1 +0,0 @@ -trait A \ No newline at end of file diff --git a/sbt-app/src/sbt-test/project1/cross-plugins-source/src/main/scala-sbt-0.13/B.scala b/sbt-app/src/sbt-test/project1/cross-plugins-source/src/main/scala-sbt-0.13/B.scala deleted file mode 100644 index 1e59c35e7..000000000 --- a/sbt-app/src/sbt-test/project1/cross-plugins-source/src/main/scala-sbt-0.13/B.scala +++ /dev/null @@ -1 +0,0 @@ -trait B diff --git a/sbt-app/src/sbt-test/project1/cross-plugins-source/src/main/scala/Test.scala b/sbt-app/src/sbt-test/project1/cross-plugins-source/src/main/scala/Test.scala deleted file mode 100644 index 3dc251c35..000000000 --- a/sbt-app/src/sbt-test/project1/cross-plugins-source/src/main/scala/Test.scala +++ /dev/null @@ -1 +0,0 @@ -object Test extends A with B \ No newline at end of file diff --git a/sbt-app/src/sbt-test/project1/cross-plugins-source/src/test/scala/TestFile.scala b/sbt-app/src/sbt-test/project1/cross-plugins-source/src/test/scala/TestFile.scala deleted file mode 100644 index e2d081a36..000000000 --- a/sbt-app/src/sbt-test/project1/cross-plugins-source/src/test/scala/TestFile.scala +++ /dev/null @@ -1,3 +0,0 @@ -// should fail because the project is building for -// 0.13.15 where E is not included -object ErrorTest extends E diff --git a/sbt-app/src/sbt-test/project1/cross-plugins-source/test b/sbt-app/src/sbt-test/project1/cross-plugins-source/test deleted file mode 100644 index 6b1226d2c..000000000 --- a/sbt-app/src/sbt-test/project1/cross-plugins-source/test +++ /dev/null @@ -1,3 +0,0 @@ -> show pluginCrossBuild::sbtDependency -> compile --> Test/compile diff --git a/sbt-app/src/sbt-test/project1/defs/changes/visibility.sbt b/sbt-app/src/sbt-test/project1/defs/changes/visibility.sbt deleted file mode 100644 index 3ac85493b..000000000 --- a/sbt-app/src/sbt-test/project1/defs/changes/visibility.sbt +++ /dev/null @@ -1 +0,0 @@ -description := descr diff --git a/sbt-app/src/sbt-test/project1/generated-root-no-publish/test b/sbt-app/src/sbt-test/project1/generated-root-no-publish/test deleted file mode 100644 index bbe00c95c..000000000 --- a/sbt-app/src/sbt-test/project1/generated-root-no-publish/test +++ /dev/null @@ -1,10 +0,0 @@ -> publishLocal -$ exists target/ivy-cache/local/com.example/app_2.12/0.1.0/poms/app_2.12.pom -$ exists target/ivy-cache/local/com.example/app_2.12/0.1.0/jars/app_2.12.jar -$ absent target/ivy-cache/local/com.example/default-root_2.12/0.1.0/ivys/ivy.xml - -$ copy-file changes/bare.sbt build.sbt -> reload -> publishLocal -$ exists target/ivy-cache/local/com.example/generated-root-no-publish_2.12/0.1.0/poms/generated-root-no-publish_2.12.pom -$ exists target/ivy-cache/local/com.example/generated-root-no-publish_2.12/0.1.0/jars/generated-root-no-publish_2.12.jar diff --git a/sbt-app/src/sbt-test/project1/global-plugin/changes/build.sbt b/sbt-app/src/sbt-test/project1/global-plugin/changes/build.sbt index 26bad9260..d0cefbe75 100644 --- a/sbt-app/src/sbt-test/project1/global-plugin/changes/build.sbt +++ b/sbt-app/src/sbt-test/project1/global-plugin/changes/build.sbt @@ -1,7 +1,7 @@ lazy val check = taskKey[Unit]("Verifies that the junit dependency has the newer version (4.8)") -lazy val proj = (project in file(".")). - settings( +lazy val proj = (project in file(".")) + .settings( name := "my-test-proj", organization := "com.example", check := (update map checkVersion).value, @@ -9,7 +9,6 @@ lazy val proj = (project in file(".")). ) def checkVersion(report: UpdateReport): Unit = { - for(mod <- report.allModules) { + for mod <- report.allModules do if(mod.name == "junit") assert(mod.revision == "4.8", s"JUnit version (${mod.revision}) does not have the correct version") - } } diff --git a/sbt-app/src/sbt-test/project1/global-plugin/global/plugins/A.scala b/sbt-app/src/sbt-test/project1/global-plugin/global/plugins/A.scala index 0ac7f6e66..e4eb5889f 100644 --- a/sbt-app/src/sbt-test/project1/global-plugin/global/plugins/A.scala +++ b/sbt-app/src/sbt-test/project1/global-plugin/global/plugins/A.scala @@ -1,6 +1,6 @@ package test -import sbt._, Keys._ +import sbt.*, Keys.* object Global { val x = 3 diff --git a/sbt-app/src/sbt-test/project1/global-plugin/test b/sbt-app/src/sbt-test/project1/global-plugin/pending similarity index 100% rename from sbt-app/src/sbt-test/project1/global-plugin/test rename to sbt-app/src/sbt-test/project1/global-plugin/pending diff --git a/sbt-app/src/sbt-test/project1/global-plugin/project/Test.scala b/sbt-app/src/sbt-test/project1/global-plugin/project/Test.scala index a597dc4bf..05af06b3a 100644 --- a/sbt-app/src/sbt-test/project1/global-plugin/project/Test.scala +++ b/sbt-app/src/sbt-test/project1/global-plugin/project/Test.scala @@ -1,4 +1,4 @@ -import sbt._ +import sbt.* object Test { assert(test.Global.x == 3); diff --git a/sbt-app/src/sbt-test/project1/overlap-target/build.sbt b/sbt-app/src/sbt-test/project1/overlap-target/build.sbt deleted file mode 100644 index e96ecc2af..000000000 --- a/sbt-app/src/sbt-test/project1/overlap-target/build.sbt +++ /dev/null @@ -1,3 +0,0 @@ -lazy val x = project in file("x") - -lazy val y = project in file(IO.read(file("ydir")).trim) diff --git a/sbt-app/src/sbt-test/project1/overlap-target/changes/xdir b/sbt-app/src/sbt-test/project1/overlap-target/changes/xdir deleted file mode 100644 index 587be6b4c..000000000 --- a/sbt-app/src/sbt-test/project1/overlap-target/changes/xdir +++ /dev/null @@ -1 +0,0 @@ -x diff --git a/sbt-app/src/sbt-test/project1/overlap-target/test b/sbt-app/src/sbt-test/project1/overlap-target/test deleted file mode 100644 index 03ae9258a..000000000 --- a/sbt-app/src/sbt-test/project1/overlap-target/test +++ /dev/null @@ -1,4 +0,0 @@ -$ copy-file changes/xdir ydir - -# should detect collision between x and y both having a target directory of 'x/target' --> reload diff --git a/sbt-app/src/sbt-test/project1/overlap-target/ydir b/sbt-app/src/sbt-test/project1/overlap-target/ydir deleted file mode 100644 index 975fbec82..000000000 --- a/sbt-app/src/sbt-test/project1/overlap-target/ydir +++ /dev/null @@ -1 +0,0 @@ -y diff --git a/sbt-app/src/sbt-test/project1/plugin-scala-compiler-dependency/project/Plugin.scala b/sbt-app/src/sbt-test/project1/plugin-scala-compiler-dependency/project/Plugin.scala deleted file mode 100644 index 56281e2a1..000000000 --- a/sbt-app/src/sbt-test/project1/plugin-scala-compiler-dependency/project/Plugin.scala +++ /dev/null @@ -1,3 +0,0 @@ -import scala.tools.nsc - -object Plugin diff --git a/sbt-app/src/sbt-test/project1/plusequals/build.sbt b/sbt-app/src/sbt-test/project1/plusequals/build.sbt deleted file mode 100644 index b584511d9..000000000 --- a/sbt-app/src/sbt-test/project1/plusequals/build.sbt +++ /dev/null @@ -1,6 +0,0 @@ -// https://github.com/sbt/sbt/issues/3132 -lazy val root = (project in file(".")). - enablePlugins(XBuildInfoPlugin). - settings( - buildInfoKeys += name - ) diff --git a/sbt-app/src/sbt-test/project1/plusequals/project/XBuildInfoPlugin.scala b/sbt-app/src/sbt-test/project1/plusequals/project/XBuildInfoPlugin.scala deleted file mode 100644 index b401e079b..000000000 --- a/sbt-app/src/sbt-test/project1/plusequals/project/XBuildInfoPlugin.scala +++ /dev/null @@ -1,32 +0,0 @@ -import sbt._ -import Keys._ - -object XBuildInfoPlugin extends sbt.AutoPlugin { - override def requires = plugins.JvmPlugin - - object autoImport { - lazy val buildInfoKeys = settingKey[Seq[BuildInfoKey.Entry[_]]]("Entries for build info.") - } - import autoImport._ - - override def projectSettings: Seq[Def.Setting[_]] = Seq( - buildInfoKeys := Seq(name, version, scalaVersion, sbtVersion), - ) -} - -object BuildInfoKey { - implicit def setting[A](key: SettingKey[A]): Entry[A] = Setting(key) - implicit def task[A](key: TaskKey[A]): Entry[A] = Task(key) - def apply[A](key: SettingKey[A]): Entry[A] = Setting(key) - def apply[A](key: TaskKey[A]): Entry[A] = Task(key) - - case class Setting[A](scoped: SettingKey[A]) extends Entry[A] { - def manifest = scoped.key.manifest - } - case class Task[A](scoped: TaskKey[A]) extends Entry[A] { - def manifest = scoped.key.manifest.typeArguments.head.asInstanceOf[Manifest[A]] - } - sealed trait Entry[A] { - def manifest: Manifest[A] - } -} diff --git a/sbt-app/src/sbt-test/project1/scala3-cross-target/test b/sbt-app/src/sbt-test/project1/scala3-cross-target/test deleted file mode 100644 index 5509f79c2..000000000 --- a/sbt-app/src/sbt-test/project1/scala3-cross-target/test +++ /dev/null @@ -1,7 +0,0 @@ -> compile - -$ exists target/scala-3.3.4/classes/Foo$.class - -> package - -$ exists target/scala-3.3.4/foo_3-1.0.0.jar diff --git a/sbt-app/src/sbt-test/project1/scala3-example-project/build.sbt b/sbt-app/src/sbt-test/project1/scala3-example-project/build.sbt deleted file mode 100644 index 14f3f6017..000000000 --- a/sbt-app/src/sbt-test/project1/scala3-example-project/build.sbt +++ /dev/null @@ -1 +0,0 @@ -ThisBuild / scalaVersion := "3.0.0-M3" diff --git a/sbt-app/src/sbt-test/project1/scripted-dependencies/test-files/test b/sbt-app/src/sbt-test/project1/scripted-dependencies/test-files/test deleted file mode 100644 index 5df2af1f3..000000000 --- a/sbt-app/src/sbt-test/project1/scripted-dependencies/test-files/test +++ /dev/null @@ -1 +0,0 @@ -> compile diff --git a/sbt-app/src/sbt-test/project1/scripted13/build.sbt b/sbt-app/src/sbt-test/project1/scripted13/build.sbt deleted file mode 100644 index fd2fa6ebe..000000000 --- a/sbt-app/src/sbt-test/project1/scripted13/build.sbt +++ /dev/null @@ -1 +0,0 @@ -enablePlugins(SbtPlugin) diff --git a/sbt-app/src/sbt-test/project1/scripted13/changes/A.scala b/sbt-app/src/sbt-test/project1/scripted13/changes/A.scala deleted file mode 100644 index 69c493db2..000000000 --- a/sbt-app/src/sbt-test/project1/scripted13/changes/A.scala +++ /dev/null @@ -1 +0,0 @@ -object A diff --git a/sbt-app/src/sbt-test/project1/scripted13/changes/Fail.scala b/sbt-app/src/sbt-test/project1/scripted13/changes/Fail.scala deleted file mode 100644 index 7acf37587..000000000 --- a/sbt-app/src/sbt-test/project1/scripted13/changes/Fail.scala +++ /dev/null @@ -1 +0,0 @@ -Fail diff --git a/sbt-app/src/sbt-test/project1/scripted13/project/plugins.sbt b/sbt-app/src/sbt-test/project1/scripted13/project/plugins.sbt deleted file mode 100644 index 217d3d1a5..000000000 --- a/sbt-app/src/sbt-test/project1/scripted13/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -offline := true diff --git a/sbt-app/src/sbt-test/project1/scripted13/src/sbt-test/a/b/test b/sbt-app/src/sbt-test/project1/scripted13/src/sbt-test/a/b/test deleted file mode 100644 index 5df2af1f3..000000000 --- a/sbt-app/src/sbt-test/project1/scripted13/src/sbt-test/a/b/test +++ /dev/null @@ -1 +0,0 @@ -> compile diff --git a/sbt-app/src/sbt-test/project1/scripted13/test b/sbt-app/src/sbt-test/project1/scripted13/test deleted file mode 100644 index 2fd6077fb..000000000 --- a/sbt-app/src/sbt-test/project1/scripted13/test +++ /dev/null @@ -1,8 +0,0 @@ -# This tests that this sbt scripted plugin can launch the previous one - -> ^^1.10.7 - -$ copy-file changes/A.scala src/sbt-test/a/b/A.scala -> scripted -$ copy-file changes/Fail.scala src/sbt-test/a/b/Fail.scala --> scripted diff --git a/sbt-app/src/sbt-test/project1/settings-compat/build.sbt b/sbt-app/src/sbt-test/project1/settings-compat/build.sbt deleted file mode 100644 index 6864a4d94..000000000 --- a/sbt-app/src/sbt-test/project1/settings-compat/build.sbt +++ /dev/null @@ -1,14 +0,0 @@ -// check that a plain File can be appended to Classpath -unmanagedJars in Compile += file("doesnotexist") - -unmanagedJars in Compile ++= Seq( file("doesnotexist1"), file("doesnotexist2") ) - -// check that an Attributed File can be appended to Classpath -unmanagedJars in Compile += Attributed.blank(file("doesnotexist")) - -unmanagedJars in Compile ++= Attributed.blankSeq( Seq( file("doesnotexist1"), file("doesnotexist2") ) ) - -maxErrors += 1 - -name += "-demo" - diff --git a/sbt-app/src/sbt-test/project1/settings-compat/test b/sbt-app/src/sbt-test/project1/settings-compat/test deleted file mode 100644 index ede6a2a59..000000000 --- a/sbt-app/src/sbt-test/project1/settings-compat/test +++ /dev/null @@ -1,2 +0,0 @@ -# this test contains source compatibility checks for settings -> test diff --git a/sbt-app/src/sbt-test/project1/settings-definition/build.sbt b/sbt-app/src/sbt-test/project1/settings-definition/build.sbt deleted file mode 100644 index 0b448e961..000000000 --- a/sbt-app/src/sbt-test/project1/settings-definition/build.sbt +++ /dev/null @@ -1,39 +0,0 @@ -// Just checking that existing ways of -// setting up projects typechecks - -val sharedSettings1 = Seq( - name := "sharedSettings1" -) - -val sharedSettings2 = Seq[Setting[_]]( - name := "sharedSettings2" -) - -lazy val root = project in file(".") - -lazy val oldSchool = (project - settings ((sharedSettings1 ++ sharedSettings2): _*) - settings ( - name := "pre seq settings" - ) - settings (sharedSettings1: _*) - settings ( - name := "mid seq settings" - ) - settings (sharedSettings2: _*) - settings ( - name := "post seq settings" - ) -) - -lazy val newSchool = (project - settings sharedSettings1 - settings sharedSettings2 - settings ( - name := "pre seq settings", - sharedSettings1, - name := "mid seq settings", - sharedSettings2, - name := "post seq settings" - ) -) diff --git a/sbt-app/src/sbt-test/project1/subproject-dependson/build.sbt b/sbt-app/src/sbt-test/project1/subproject-dependson/build.sbt deleted file mode 100644 index 9782f67c4..000000000 --- a/sbt-app/src/sbt-test/project1/subproject-dependson/build.sbt +++ /dev/null @@ -1,11 +0,0 @@ -val projA = project in file("projA") - -val projB = project in file("projB") - -lazy val check = taskKey[Unit]("Verifies expected build behavior") - -check := { - val projBDeps = (dependencyClasspath in (projB, Compile)).value.map(_.data) - val assertion = projBDeps.filter(_.getAbsolutePath.contains("projA")).nonEmpty - assert(assertion, "Unable to find projA classes in projB's dependency list") -} diff --git a/sbt-app/src/sbt-test/project1/subproject-dependson/projB/build.sbt b/sbt-app/src/sbt-test/project1/subproject-dependson/projB/build.sbt deleted file mode 100644 index 732b88063..000000000 --- a/sbt-app/src/sbt-test/project1/subproject-dependson/projB/build.sbt +++ /dev/null @@ -1,3 +0,0 @@ -name := "projB" - -dependsOn(LocalProject("projA")) diff --git a/sbt-app/src/sbt-test/project1/thisProject/build.sbt b/sbt-app/src/sbt-test/project1/thisProject/build.sbt deleted file mode 100644 index 6fc79c53d..000000000 --- a/sbt-app/src/sbt-test/project1/thisProject/build.sbt +++ /dev/null @@ -1,10 +0,0 @@ -val proj2 = project - -name := "proj1" - -val check = taskKey[Unit]("Ensure each project is named appropriately") - -check := { - require(name.value == "proj1") - require((name in proj2).value == "boo") -} diff --git a/sbt-app/src/sbt-test/project1/thisProject/proj2/build.sbt b/sbt-app/src/sbt-test/project1/thisProject/proj2/build.sbt deleted file mode 100644 index 7f48be956..000000000 --- a/sbt-app/src/sbt-test/project1/thisProject/proj2/build.sbt +++ /dev/null @@ -1 +0,0 @@ -name in ThisProject := "boo"