From 60a8927db0d469e8bc3b85ac5ff1f7ee0c926a38 Mon Sep 17 00:00:00 2001 From: Guillaume Martres Date: Sat, 27 May 2017 21:32:30 +0200 Subject: [PATCH] Fix scripted empty-package test This test started failing after we started emitting .tasty files by default in 1293e2f49b320873c58552ab86f49ef7999b91f8, because sbt will not by default delete these .tasty files when the corresponding .class file is deleted, which means that the directories containing these files are not deleted either. This is problematic because dotty creates package symbols based on the name of directories on the classpath, even if the directories contain no classfile. Thankfully, I already fixed this issue in sbt-dotty yesterday in 452bc5e9645021df496e99b824c7817af92a28ff, so all we need to do is make the scripted tests use the sbt-dotty plugin. This commit does this, and also move these tests to the sbt-dotty project since they depend on it now. --- .drone.yml | 4 +- .drone.yml.sig | 2 +- build.sbt | 1 - project/Build.scala | 43 ------------------ .../compilerReporter/simple/Source.scala | 0 .../compilerReporter/simple/build.sbt | 0 .../simple/project/DottyInjectedPlugin.scala | 4 +- .../simple/project/Reporter.scala | 3 +- .../simple/project/plugins.sbt | 1 + .../sbt-test/compilerReporter/simple/test | 0 .../discovery/test-discovery/build.sbt | 0 .../discovery/test-discovery/changes/A2.scala | 0 .../project/DottyInjectedPlugin.scala | 4 +- .../test-discovery/project/plugins.sbt | 1 + .../test-discovery/src/main/scala/A.scala | 0 .../test-discovery/src/test/scala/TestA.scala | 0 .../sbt-test/discovery/test-discovery/test | 0 .../abstract-override/A.scala | 0 .../abstract-override/B.scala | 0 .../abstract-override/C.scala | 0 .../abstract-override/D.scala | 0 .../abstract-override/changes/C2.scala | 0 .../project/DottyInjectedPlugin.scala | 4 +- .../abstract-override/project/plugins.sbt | 1 + .../abstract-override/test | 0 .../abstract-type-override/build.sbt | 0 .../abstract-type-override/changes/Bar1.scala | 0 .../project/DottyInjectedPlugin.scala | 4 +- .../project/plugins.sbt | 1 + .../src/main/scala/Bar.scala | 0 .../src/main/scala/Foo.scala | 0 .../src/main/scala/Impl.scala | 0 .../abstract-type-override/test | 0 .../source-dependencies/abstract-type/A.scala | 0 .../source-dependencies/abstract-type/B.scala | 0 .../abstract-type/changes/A.scala | 0 .../project/DottyInjectedPlugin.scala | 12 +++++ .../abstract-type/project/plugins.sbt | 1 + .../source-dependencies/abstract-type/test | 0 .../added/changes/A1.scala | 0 .../added/changes/A2.scala | 0 .../added/changes/A3.scala | 0 .../added/changes/B1.scala | 0 .../added/changes/B2.scala | 0 .../added/project/DottyInjectedPlugin.scala | 12 +++++ .../added/project/plugins.sbt | 1 + .../sbt-test/source-dependencies/added/test | 0 .../as-seen-from-a/A.scala | 0 .../as-seen-from-a/B.scala | 0 .../as-seen-from-a/C.scala | 0 .../as-seen-from-a/D.scala | 0 .../as-seen-from-a/changes/B2.scala | 0 .../project/DottyInjectedPlugin.scala | 12 +++++ .../as-seen-from-a/project/plugins.sbt | 1 + .../source-dependencies/as-seen-from-a/test | 0 .../as-seen-from-b/A.scala | 0 .../as-seen-from-b/B.scala | 0 .../as-seen-from-b/C.scala | 0 .../as-seen-from-b/D.scala | 0 .../as-seen-from-b/changes/B2.scala | 0 .../project/DottyInjectedPlugin.scala | 12 +++++ .../as-seen-from-b/project/plugins.sbt | 1 + .../source-dependencies/as-seen-from-b/test | 0 .../backtick-quoted-names/A.scala | 0 .../backtick-quoted-names/B.scala | 0 .../backtick-quoted-names/build.sbt | 0 .../backtick-quoted-names/changes/A.scala | 0 .../project/DottyInjectedPlugin.scala | 12 +++++ .../backtick-quoted-names/project/plugins.sbt | 1 + .../backtick-quoted-names/test | 0 .../binary/changes/Break.scala | 0 .../source-dependencies/binary/dep/A.scala | 0 .../binary/project/DottyInjectedPlugin.scala | 12 +++++ .../binary/project/P.scala | 0 .../binary/project/plugins.sbt | 1 + .../sbt-test/source-dependencies/binary/test | 0 .../source-dependencies/binary/use/B.scala | 0 .../source-dependencies/by-name/A.scala | 0 .../source-dependencies/by-name/B.scala | 0 .../by-name/changes/A.scala | 0 .../by-name/project/DottyInjectedPlugin.scala | 12 +++++ .../by-name/project/plugins.sbt | 1 + .../sbt-test/source-dependencies/by-name/test | 0 .../source-dependencies/canon/Use.scala | 0 .../source-dependencies/canon/actual/A.java | 0 .../source-dependencies/canon/actual/a.jar | Bin .../source-dependencies/canon/build.sbt | 0 .../source-dependencies/canon/lib/a.jar | 0 .../canon/project/DottyInjectedPlugin.scala | 12 +++++ .../canon/project/plugins.sbt | 1 + .../sbt-test/source-dependencies/canon/test | 0 .../source-dependencies/compactify/build.sbt | 0 .../project/DottyInjectedPlugin.scala | 12 +++++ .../compactify/project/plugins.sbt | 1 + .../compactify/src/main/scala/For.scala | 0 .../compactify/src/main/scala/Nested.scala | 0 .../source-dependencies/compactify/test | 0 .../constants/changes/A1.scala | 0 .../constants/changes/A2.scala | 0 .../constants/changes/B.scala | 0 .../project/DottyInjectedPlugin.scala | 12 +++++ .../constants/project/plugins.sbt | 1 + .../source-dependencies/constants/test | 0 .../default-params/A.scala | 0 .../default-params/B.scala | 0 .../default-params/changes/A.scala | 0 .../project/DottyInjectedPlugin.scala | 12 +++++ .../default-params/project/plugins.sbt | 1 + .../source-dependencies/default-params/test | 0 .../dup-class/changes/A.scala | 0 .../dup-class/changes/A2.scala | 0 .../dup-class/changes/B.scala | 0 .../project/DottyInjectedPlugin.scala | 12 +++++ .../dup-class/project/plugins.sbt | 1 + .../source-dependencies/dup-class/test | 0 .../empty-a/changes/A.scala | 0 .../empty-a/changes/A2.scala | 0 .../empty-a/changes/B.scala | 0 .../empty-a/project/DottyInjectedPlugin.scala | 12 +++++ .../empty-a/project/plugins.sbt | 1 + .../sbt-test/source-dependencies/empty-a/test | 0 .../empty-package/changes/Define1.scala | 0 .../empty-package/changes/Define2.scala | 0 .../empty-package/changes/Use.scala | 0 .../project/DottyInjectedPlugin.scala | 12 +++++ .../empty-package/project/plugins.sbt | 1 + .../source-dependencies/empty-package/test | 0 .../source-dependencies/erasure/A.scala | 0 .../source-dependencies/erasure/B.scala | 0 .../erasure/changes/A.scala | 0 .../erasure/project/DottyInjectedPlugin.scala | 12 +++++ .../erasure/project/plugins.sbt | 1 + .../sbt-test/source-dependencies/erasure/test | 0 .../export-jars/changes/A1.scala | 0 .../export-jars/changes/A2.scala | 0 .../export-jars/changes/A3.scala | 0 .../export-jars/changes/B.scala | 0 .../export-jars/changes/build2.sbt | 0 .../export-jars/project/Build.scala | 0 .../project/DottyInjectedPlugin.scala | 12 +++++ .../export-jars/project/plugins.sbt | 1 + .../source-dependencies/export-jars/test | 0 .../sbt-test/source-dependencies/ext/A.scala | 0 .../source-dependencies/ext/build.sbt | 0 .../ext/project/DottyInjectedPlugin.scala | 12 +++++ .../ext/project/plugins.sbt | 1 + .../sbt-test/source-dependencies/ext/test | 0 .../source-dependencies/false-error/A.scala | 0 .../source-dependencies/false-error/B.scala | 0 .../false-error/changes/A.scala | 0 .../source-dependencies/false-error/pending | 0 .../project/DottyInjectedPlugin.scala | 12 +++++ .../false-error/project/plugins.sbt | 1 + .../fbounded-existentials/fbounds.scala | 0 .../project/DottyInjectedPlugin.scala | 12 +++++ .../fbounded-existentials/project/plugins.sbt | 1 + .../fbounded-existentials/test | 0 .../implicit-params/A.scala | 0 .../implicit-params/B.scala | 0 .../implicit-params/changes/A.scala | 0 .../project/DottyInjectedPlugin.scala | 12 +++++ .../implicit-params/project/plugins.sbt | 1 + .../source-dependencies/implicit-params/test | 0 .../changes/A1.scala | 0 .../changes/A2.scala | 0 .../changes/B.scala | 0 .../changes/C.scala | 0 .../changes/M.scala | 0 .../project/DottyInjectedPlugin.scala | 12 +++++ .../project/plugins.sbt | 1 + .../implicit-search-companion-scope/test | 0 .../implicit-search/changes/A1.scala | 0 .../implicit-search/changes/A2.scala | 0 .../implicit-search/changes/B.scala | 0 .../implicit-search/changes/C.scala | 0 .../project/DottyInjectedPlugin.scala | 12 +++++ .../implicit-search/project/plugins.sbt | 1 + .../source-dependencies/implicit-search/test | 0 .../source-dependencies/implicit/A.scala | 0 .../source-dependencies/implicit/B.scala | 0 .../implicit/changes/A.scala | 0 .../project/DottyInjectedPlugin.scala | 12 +++++ .../implicit/project/plugins.sbt | 1 + .../source-dependencies/implicit/test | 0 .../source-dependencies/import-class/A.scala | 0 .../source-dependencies/import-class/B.scala | 0 .../import-class/changes/A.scala | 0 .../project/DottyInjectedPlugin.scala | 12 +++++ .../import-class/project/plugins.sbt | 1 + .../source-dependencies/import-class/test | 0 .../import-package/A.scala | 0 .../import-package/B.scala | 0 .../import-package/changes/A.scala | 0 .../import-package/pending | 0 .../project/DottyInjectedPlugin.scala | 12 +++++ .../import-package/project/plugins.sbt | 1 + .../inherited-deps-java/A.java | 0 .../inherited-deps-java/B.java | 0 .../inherited-deps-java/C.java | 0 .../inherited-deps-java/D.java | 0 .../inherited-deps-java/E.java | 0 .../inherited-deps-java/F.java | 0 .../inherited-deps-java/G.java | 0 .../inherited-deps-java/J.java | 0 .../inherited-deps-java/build.sbt | 0 .../project/DottyInjectedPlugin.scala | 12 +++++ .../inherited-deps-java/project/plugins.sbt | 1 + .../inherited-deps-java/test | 0 .../inherited_type_params/A.scala | 0 .../inherited_type_params/build.sbt | 0 .../project/DottyInjectedPlugin.scala | 12 +++++ .../inherited_type_params/project/plugins.sbt | 1 + .../inherited_type_params/test | 0 .../source-dependencies/inline/A.scala | 0 .../source-dependencies/inline/C.scala | 0 .../inline/changes/B1.scala | 0 .../inline/changes/B2.scala | 0 .../inline/changes/B3.scala | 0 .../inline/project/DottyInjectedPlugin.scala | 12 +++++ .../inline/project/plugins.sbt | 1 + .../sbt-test/source-dependencies/inline/test | 0 .../intermediate-error/A.scala | 0 .../intermediate-error/B.scala | 0 .../intermediate-error/changes/A2.scala | 0 .../intermediate-error/changes/A3.scala | 0 .../project/DottyInjectedPlugin.scala | 12 +++++ .../intermediate-error/project/plugins.sbt | 1 + .../intermediate-error/test | 0 .../Outer.java | 0 .../build.sbt | 0 .../project/DottyInjectedPlugin.scala | 12 +++++ .../project/plugins.sbt | 1 + .../java-analysis-serialization-error/test | 0 .../java-basic/changes/A.java | 0 .../java-basic/changes/A2.java | 0 .../java-basic/changes/B1.java | 0 .../java-basic/changes/B2.java | 0 .../java-basic/changes/B3.java | 0 .../project/DottyInjectedPlugin.scala | 12 +++++ .../java-basic/project/plugins.sbt | 1 + .../source-dependencies/java-basic/test | 0 .../java-generic-workaround/A.java | 0 .../DefaultTreeTableSorter.java | 0 .../TreeColumnModel.java | 0 .../TreeTableSorter.java | 0 .../project/DottyInjectedPlugin.scala | 12 +++++ .../project/plugins.sbt | 1 + .../java-generic-workaround/test | 0 .../source-dependencies/java-mixed/JJ.java | 0 .../source-dependencies/java-mixed/build.sbt | 0 .../java-mixed/changes/S1.scala | 0 .../java-mixed/changes/S2.scala | 0 .../java-mixed/changes/build.sbt | 0 .../project/DottyInjectedPlugin.scala | 12 +++++ .../java-mixed/project/plugins.sbt | 1 + .../source-dependencies/java-mixed/test | 0 .../java-static/changes/J1.java | 0 .../java-static/changes/J2.java | 0 .../java-static/changes/S.scala | 0 .../project/DottyInjectedPlugin.scala | 12 +++++ .../java-static/project/plugins.sbt | 1 + .../source-dependencies/java-static/test | 0 .../source-dependencies/lazy-val/A.scala | 0 .../source-dependencies/lazy-val/B.scala | 0 .../lazy-val/changes/A.scala | 0 .../project/DottyInjectedPlugin.scala | 12 +++++ .../lazy-val/project/plugins.sbt | 1 + .../source-dependencies/lazy-val/test | 0 .../less-inter-inv-java/A.java | 0 .../less-inter-inv-java/B.java | 0 .../less-inter-inv-java/C.java | 0 .../less-inter-inv-java/D.java | 0 .../less-inter-inv-java/E.java | 0 .../less-inter-inv-java/build.sbt | 0 .../less-inter-inv-java/changes/A2.java | 0 .../project/DottyInjectedPlugin.scala | 12 +++++ .../less-inter-inv-java/project/plugins.sbt | 1 + .../less-inter-inv-java/test | 0 .../less-inter-inv/A.scala | 0 .../less-inter-inv/B.scala | 0 .../less-inter-inv/C.scala | 0 .../less-inter-inv/D.scala | 0 .../less-inter-inv/E.scala | 0 .../less-inter-inv/build.sbt | 0 .../less-inter-inv/changes/A2.scala | 0 .../project/DottyInjectedPlugin.scala | 12 +++++ .../less-inter-inv/project/plugins.sbt | 1 + .../source-dependencies/less-inter-inv/test | 0 .../source-dependencies/linearization/A.scala | 0 .../source-dependencies/linearization/B.scala | 0 .../source-dependencies/linearization/C.scala | 0 .../source-dependencies/linearization/D.scala | 0 .../source-dependencies/linearization/E.scala | 0 .../source-dependencies/linearization/F.scala | 0 .../linearization/changes/D.scala | 0 .../project/DottyInjectedPlugin.scala | 12 +++++ .../linearization/project/plugins.sbt | 1 + .../source-dependencies/linearization/test | 0 .../source-dependencies/named/A.scala | 0 .../source-dependencies/named/B.scala | 0 .../source-dependencies/named/changes/A.scala | 0 .../named/project/DottyInjectedPlugin.scala | 12 +++++ .../named/project/plugins.sbt | 1 + .../sbt-test/source-dependencies/named/test | 0 .../nested-case-class/changes/A0.scala | 0 .../nested-case-class/changes/A1.scala | 0 .../project/DottyInjectedPlugin.scala | 12 +++++ .../nested-case-class/project/plugins.sbt | 1 + .../nested-case-class/test | 0 .../new-cyclic/changes/A2.scala | 0 .../source-dependencies/new-cyclic/pending | 0 .../project/DottyInjectedPlugin.scala | 12 +++++ .../new-cyclic/project/plugins.sbt | 1 + .../new-cyclic/src/main/scala/A.scala | 0 .../new-cyclic/src/main/scala/B.scala | 0 .../new-pkg-dep/changes/A1.java | 0 .../new-pkg-dep/changes/B0.scala | 0 .../new-pkg-dep/changes/B1.scala | 0 .../project/DottyInjectedPlugin.scala | 12 +++++ .../new-pkg-dep/project/plugins.sbt | 1 + .../source-dependencies/new-pkg-dep/test | 0 .../source-dependencies/override/A.scala | 0 .../source-dependencies/override/B.scala | 0 .../source-dependencies/override/C.scala | 0 .../source-dependencies/override/D.scala | 0 .../override/changes/B2.scala | 0 .../project/DottyInjectedPlugin.scala | 12 +++++ .../override/project/plugins.sbt | 1 + .../source-dependencies/override/test | 0 .../source-dependencies/parent-change/W.scala | 0 .../source-dependencies/parent-change/Y.scala | 0 .../source-dependencies/parent-change/Z.scala | 0 .../parent-change/changes/W.scala | 0 .../project/DottyInjectedPlugin.scala | 12 +++++ .../parent-change/project/plugins.sbt | 1 + .../source-dependencies/parent-change/test | 0 .../parent-member-change/A.scala | 0 .../parent-member-change/B.scala | 0 .../parent-member-change/C.scala | 0 .../parent-member-change/changes/A.scala | 0 .../project/DottyInjectedPlugin.scala | 12 +++++ .../parent-member-change/project/plugins.sbt | 1 + .../parent-member-change/test | 0 .../pkg-self/changes/A1.scala | 0 .../pkg-self/changes/A2.scala | 0 .../pkg-self/changes/B.scala | 0 .../pkg-self/changes/package.scala | 0 .../project/DottyInjectedPlugin.scala | 12 +++++ .../pkg-self/project/plugins.sbt | 1 + .../source-dependencies/pkg-self/test | 0 .../qualified-access/A.scala | 0 .../qualified-access/B.scala | 0 .../qualified-access/changes/A.scala | 0 .../project/DottyInjectedPlugin.scala | 12 +++++ .../qualified-access/project/plugins.sbt | 1 + .../source-dependencies/qualified-access/test | 0 .../changes/absolute.sbt | 0 .../changes/relative.sbt | 0 .../project/DottyInjectedPlugin.scala | 12 +++++ .../relative-source-error/project/plugins.sbt | 1 + .../relative-source-error/src/A.scala | 0 .../relative-source-error/test | 0 .../remove-test-a/changes/1.scala | 0 .../project/DottyInjectedPlugin.scala | 12 +++++ .../remove-test-a/project/plugins.sbt | 1 + .../source-dependencies/remove-test-a/test | 0 .../remove-test-b/changes/A2.scala | 0 .../remove-test-b/changes/B3.scala | 0 .../remove-test-b/changes/B4.scala | 0 .../remove-test-b/changes/B5.scala | 0 .../project/DottyInjectedPlugin.scala | 12 +++++ .../remove-test-b/project/plugins.sbt | 1 + .../remove-test-b/src/main/scala/A.scala | 0 .../remove-test-b/src/main/scala/B.scala | 0 .../source-dependencies/remove-test-b/test | 0 .../repeated-parameters/A.scala | 0 .../repeated-parameters/B.scala | 0 .../repeated-parameters/changes/A.scala | 0 .../project/DottyInjectedPlugin.scala | 12 +++++ .../repeated-parameters/project/plugins.sbt | 1 + .../repeated-parameters/test | 0 .../replace-test-a/changes/first.scala | 0 .../replace-test-a/changes/second.scala | 0 .../replace-test-a/project/Build.scala | 0 .../project/DottyInjectedPlugin.scala | 12 +++++ .../replace-test-a/project/plugins.sbt | 1 + .../source-dependencies/replace-test-a/test | 0 .../resident-java/build.sbt | 0 .../resident-java/changes/A1.java | 0 .../resident-java/changes/A2.java | 0 .../resident-java/changes/B0.scala | 0 .../resident-java/changes/B1.scala | 0 .../resident-java/changes/B2.scala | 0 .../project/DottyInjectedPlugin.scala | 12 +++++ .../resident-java/project/plugins.sbt | 1 + .../source-dependencies/resident-java/test | 0 .../resident-package-object/changes/A.scala | 0 .../changes/package.scala | 0 .../changes/package2.scala | 0 .../project/DottyInjectedPlugin.scala | 12 +++++ .../project/plugins.sbt | 1 + .../resident-package-object/test | 0 .../restore-classes/build.sbt | 0 .../restore-classes/changes/A1.scala | 0 .../restore-classes/changes/A2.scala | 0 .../restore-classes/changes/B.scala | 0 .../project/DottyInjectedPlugin.scala | 12 +++++ .../restore-classes/project/plugins.sbt | 1 + .../source-dependencies/restore-classes/test | 0 .../same-file-used-names/A.scala | 0 .../same-file-used-names/B.scala | 0 .../same-file-used-names/build.sbt | 0 .../same-file-used-names/changes/B.scala | 0 .../project/DottyInjectedPlugin.scala | 12 +++++ .../same-file-used-names/project/plugins.sbt | 1 + .../same-file-used-names/test | 0 .../source-dependencies/sealed/A.scala | 0 .../source-dependencies/sealed/D.scala | 0 .../sealed/changes/A.scala | 0 .../sealed/project/DottyInjectedPlugin.scala | 12 +++++ .../sealed/project/plugins.sbt | 1 + .../sbt-test/source-dependencies/sealed/test | 0 .../signature-change/B.scala | 0 .../signature-change/changes/A0.scala | 0 .../signature-change/changes/A1.scala | 0 .../signature-change/changes/A2.scala | 0 .../signature-change/changes/A3.scala | 0 .../project/DottyInjectedPlugin.scala | 12 +++++ .../signature-change/project/plugins.sbt | 1 + .../source-dependencies/signature-change/test | 0 .../source-dependencies/specialized/A.scala | 0 .../source-dependencies/specialized/B.scala | 0 .../specialized/changes/A.scala | 0 .../project/DottyInjectedPlugin.scala | 12 +++++ .../specialized/project/plugins.sbt | 1 + .../source-dependencies/specialized/test | 0 .../stability-change/A.scala | 0 .../stability-change/B.scala | 0 .../stability-change/C.scala | 0 .../stability-change/changes/A.scala | 0 .../project/DottyInjectedPlugin.scala | 12 +++++ .../stability-change/project/plugins.sbt | 1 + .../source-dependencies/stability-change/test | 0 .../synthetic-companion/A.scala | 0 .../synthetic-companion/B.scala | 0 .../synthetic-companion/changes/A2.scala | 0 .../synthetic-companion/dbg.sbt | 0 .../project/DottyInjectedPlugin.scala | 12 +++++ .../synthetic-companion/project/plugins.sbt | 1 + .../synthetic-companion/test | 0 .../trait-member-modified/build.sbt | 0 .../trait-member-modified/changes/A1.scala | 0 .../project/DottyInjectedPlugin.scala | 12 +++++ .../trait-member-modified/project/plugins.sbt | 1 + .../src/main/scala/A.scala | 0 .../src/main/scala/B.scala | 0 .../trait-member-modified/test | 0 .../trait-private-object/A.scala | 0 .../trait-private-object/B.scala | 0 .../trait-private-object/changes/A.scala | 0 .../project/DottyInjectedPlugin.scala | 12 +++++ .../trait-private-object/project/plugins.sbt | 1 + .../trait-private-object/test | 0 .../trait-private-var/B.scala | 0 .../trait-private-var/changes/A0.scala | 0 .../trait-private-var/changes/A1.scala | 0 .../trait-private-var/changes/A2.scala | 0 .../project/DottyInjectedPlugin.scala | 12 +++++ .../trait-private-var/project/plugins.sbt | 1 + .../trait-private-var/test | 0 .../source-dependencies/trait-super/A.scala | 0 .../source-dependencies/trait-super/B.scala | 0 .../trait-super/Main.scala | 0 .../trait-super/changes/B2.scala | 0 .../trait-super/changes/B3.scala | 0 .../project/DottyInjectedPlugin.scala | 12 +++++ .../trait-super/project/plugins.sbt | 1 + .../source-dependencies/trait-super/test | 0 .../transitive-a/changes/A2.scala | 0 .../project/DottyInjectedPlugin.scala | 12 +++++ .../transitive-a/project/plugins.sbt | 1 + .../transitive-a/src/main/scala/A.scala | 0 .../transitive-a/src/main/scala/B.scala | 0 .../transitive-a/src/main/scala/C.scala | 0 .../source-dependencies/transitive-a/test | 0 .../transitive-b/changes/A2.scala | 0 .../project/DottyInjectedPlugin.scala | 12 +++++ .../transitive-b/project/plugins.sbt | 1 + .../transitive-b/src/main/scala/A.scala | 0 .../transitive-b/src/main/scala/B.scala | 0 .../transitive-b/src/main/scala/C.scala | 0 .../source-dependencies/transitive-b/test | 0 .../transitive-inherit-java/A.java | 0 .../transitive-inherit-java/B.java | 0 .../transitive-inherit-java/C.java | 0 .../transitive-inherit-java/changes/A2.java | 0 .../project/DottyInjectedPlugin.scala | 12 +++++ .../project/plugins.sbt | 1 + .../transitive-inherit-java/test | 0 .../transitive-inherit/A.scala | 0 .../transitive-inherit/B.scala | 0 .../transitive-inherit/C.scala | 0 .../transitive-inherit/changes/A2.scala | 0 .../project/DottyInjectedPlugin.scala | 12 +++++ .../transitive-inherit/project/plugins.sbt | 1 + .../transitive-inherit/test | 0 .../transitive-memberRef/build.sbt | 0 .../transitive-memberRef/changes/A1.scala | 0 .../project/DottyInjectedPlugin.scala | 12 +++++ .../transitive-memberRef/project/plugins.sbt | 1 + .../src/main/scala/A.scala | 0 .../src/main/scala/B.scala | 0 .../src/main/scala/C.scala | 0 .../src/main/scala/D.scala | 0 .../src/main/scala/X.scala | 0 .../src/main/scala/Y.scala | 0 .../transitive-memberRef/test | 0 .../source-dependencies/type-alias/A.scala | 0 .../source-dependencies/type-alias/B.scala | 0 .../source-dependencies/type-alias/build.sbt | 0 .../type-alias/changes/A.scala | 0 .../project/DottyInjectedPlugin.scala | 12 +++++ .../type-alias/project/plugins.sbt | 1 + .../source-dependencies/type-alias/test | 0 .../type-parameter/A.scala | 0 .../type-parameter/B.scala | 0 .../type-parameter/C.scala | 0 .../type-parameter/D.scala | 0 .../type-parameter/changes/A.scala | 0 .../project/DottyInjectedPlugin.scala | 12 +++++ .../type-parameter/project/plugins.sbt | 1 + .../source-dependencies/type-parameter/test | 0 .../source-dependencies/typeref-only/A.scala | 0 .../source-dependencies/typeref-only/B.scala | 0 .../typeref-only/build.sbt | 0 .../project/DottyInjectedPlugin.scala | 12 +++++ .../typeref-only/project/plugins.sbt | 1 + .../source-dependencies/typeref-only/test | 0 .../typeref-return/A.scala | 0 .../typeref-return/B.scala | 0 .../typeref-return/changes/A.scala | 0 .../project/DottyInjectedPlugin.scala | 12 +++++ .../typeref-return/project/plugins.sbt | 1 + .../source-dependencies/typeref-return/test | 0 .../types-in-used-names-a/A.scala | 0 .../types-in-used-names-a/B.scala | 0 .../types-in-used-names-a/C.scala | 0 .../types-in-used-names-a/D.scala | 0 .../types-in-used-names-a/changes/B2.scala | 0 .../project/DottyInjectedPlugin.scala | 12 +++++ .../types-in-used-names-a/project/plugins.sbt | 1 + .../types-in-used-names-a/test | 0 .../types-in-used-names-b/A.scala | 0 .../types-in-used-names-b/B.scala | 0 .../types-in-used-names-b/changes/A2.scala | 0 .../project/DottyInjectedPlugin.scala | 12 +++++ .../types-in-used-names-b/project/plugins.sbt | 1 + .../types-in-used-names-b/test | 0 .../value-class-underlying/A.scala | 0 .../value-class-underlying/B.scala | 0 .../value-class-underlying/C.scala | 0 .../value-class-underlying/build.sbt | 0 .../value-class-underlying/changes/A2.scala | 0 .../value-class-underlying/test | 0 .../source-dependencies/value-class/build.sbt | 0 .../value-class/changes/A0.scala | 0 .../value-class/changes/A1.scala | 0 .../value-class/changes/B0.scala | 0 .../value-class/changes/B1.scala | 0 .../value-class/changes/B2.scala | 0 .../value-class/changes/C0.scala | 0 .../value-class/changes/C1.scala | 0 .../value-class/changes/C2.scala | 0 .../project/DottyInjectedPlugin.scala | 12 +++++ .../value-class/project/plugins.sbt | 1 + .../source-dependencies/value-class/test | 0 .../sbt-test/source-dependencies/var/A.scala | 0 .../sbt-test/source-dependencies/var/B.scala | 0 .../source-dependencies/var/changes/A.scala | 0 .../var/project/DottyInjectedPlugin.scala | 12 +++++ .../var/project/plugins.sbt | 1 + .../sbt-test/source-dependencies/var/test | 0 .../source-dependencies/variance/A.scala | 0 .../source-dependencies/variance/C.scala | 0 .../variance/changes/A.scala | 0 .../project/DottyInjectedPlugin.scala | 12 +++++ .../variance/project/plugins.sbt | 1 + .../source-dependencies/variance/test | 0 .../project/DottyInjectedPlugin.scala | 14 ------ .../added/project/DottyInjectedPlugin.scala | 14 ------ .../project/DottyInjectedPlugin.scala | 14 ------ .../project/DottyInjectedPlugin.scala | 14 ------ .../project/DottyInjectedPlugin.scala | 14 ------ .../binary/project/DottyInjectedPlugin.scala | 14 ------ .../by-name/project/DottyInjectedPlugin.scala | 14 ------ .../canon/project/DottyInjectedPlugin.scala | 14 ------ .../project/DottyInjectedPlugin.scala | 14 ------ .../project/DottyInjectedPlugin.scala | 14 ------ .../project/DottyInjectedPlugin.scala | 14 ------ .../project/DottyInjectedPlugin.scala | 14 ------ .../empty-a/project/DottyInjectedPlugin.scala | 14 ------ .../project/DottyInjectedPlugin.scala | 14 ------ .../erasure/project/DottyInjectedPlugin.scala | 14 ------ .../project/DottyInjectedPlugin.scala | 14 ------ .../ext/project/DottyInjectedPlugin.scala | 14 ------ .../project/DottyInjectedPlugin.scala | 14 ------ .../project/DottyInjectedPlugin.scala | 14 ------ .../project/DottyInjectedPlugin.scala | 14 ------ .../project/DottyInjectedPlugin.scala | 14 ------ .../project/DottyInjectedPlugin.scala | 14 ------ .../project/DottyInjectedPlugin.scala | 14 ------ .../project/DottyInjectedPlugin.scala | 14 ------ .../project/DottyInjectedPlugin.scala | 14 ------ .../project/DottyInjectedPlugin.scala | 14 ------ .../project/DottyInjectedPlugin.scala | 14 ------ .../inline/project/DottyInjectedPlugin.scala | 14 ------ .../project/DottyInjectedPlugin.scala | 14 ------ .../project/DottyInjectedPlugin.scala | 14 ------ .../project/DottyInjectedPlugin.scala | 14 ------ .../project/DottyInjectedPlugin.scala | 14 ------ .../project/DottyInjectedPlugin.scala | 14 ------ .../project/DottyInjectedPlugin.scala | 14 ------ .../project/DottyInjectedPlugin.scala | 14 ------ .../project/DottyInjectedPlugin.scala | 14 ------ .../project/DottyInjectedPlugin.scala | 14 ------ .../project/DottyInjectedPlugin.scala | 14 ------ .../named/project/DottyInjectedPlugin.scala | 14 ------ .../project/DottyInjectedPlugin.scala | 14 ------ .../project/DottyInjectedPlugin.scala | 14 ------ .../project/DottyInjectedPlugin.scala | 14 ------ .../project/DottyInjectedPlugin.scala | 14 ------ .../project/DottyInjectedPlugin.scala | 14 ------ .../project/DottyInjectedPlugin.scala | 14 ------ .../project/DottyInjectedPlugin.scala | 14 ------ .../project/DottyInjectedPlugin.scala | 14 ------ .../project/DottyInjectedPlugin.scala | 14 ------ .../project/DottyInjectedPlugin.scala | 14 ------ .../project/DottyInjectedPlugin.scala | 14 ------ .../project/DottyInjectedPlugin.scala | 14 ------ .../project/DottyInjectedPlugin.scala | 14 ------ .../project/DottyInjectedPlugin.scala | 14 ------ .../project/DottyInjectedPlugin.scala | 14 ------ .../project/DottyInjectedPlugin.scala | 14 ------ .../project/DottyInjectedPlugin.scala | 14 ------ .../sealed/project/DottyInjectedPlugin.scala | 14 ------ .../project/DottyInjectedPlugin.scala | 14 ------ .../project/DottyInjectedPlugin.scala | 14 ------ .../project/DottyInjectedPlugin.scala | 14 ------ .../project/DottyInjectedPlugin.scala | 14 ------ .../project/DottyInjectedPlugin.scala | 14 ------ .../project/DottyInjectedPlugin.scala | 14 ------ .../project/DottyInjectedPlugin.scala | 14 ------ .../project/DottyInjectedPlugin.scala | 14 ------ .../project/DottyInjectedPlugin.scala | 14 ------ .../project/DottyInjectedPlugin.scala | 14 ------ .../project/DottyInjectedPlugin.scala | 14 ------ .../project/DottyInjectedPlugin.scala | 14 ------ .../project/DottyInjectedPlugin.scala | 14 ------ .../project/DottyInjectedPlugin.scala | 14 ------ .../project/DottyInjectedPlugin.scala | 14 ------ .../project/DottyInjectedPlugin.scala | 14 ------ .../project/DottyInjectedPlugin.scala | 14 ------ .../project/DottyInjectedPlugin.scala | 14 ------ .../project/DottyInjectedPlugin.scala | 14 ------ .../project/DottyInjectedPlugin.scala | 14 ------ .../var/project/DottyInjectedPlugin.scala | 14 ------ .../project/DottyInjectedPlugin.scala | 14 ------ 667 files changed, 1039 insertions(+), 1167 deletions(-) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/compilerReporter/simple/Source.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/compilerReporter/simple/build.sbt (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/compilerReporter/simple/project/DottyInjectedPlugin.scala (68%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/compilerReporter/simple/project/Reporter.scala (91%) create mode 100644 sbt-dotty/sbt-test/compilerReporter/simple/project/plugins.sbt rename {sbt-scripted-tests => sbt-dotty}/sbt-test/compilerReporter/simple/test (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/discovery/test-discovery/build.sbt (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/discovery/test-discovery/changes/A2.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/discovery/test-discovery/project/DottyInjectedPlugin.scala (68%) create mode 100644 sbt-dotty/sbt-test/discovery/test-discovery/project/plugins.sbt rename {sbt-scripted-tests => sbt-dotty}/sbt-test/discovery/test-discovery/src/main/scala/A.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/discovery/test-discovery/src/test/scala/TestA.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/discovery/test-discovery/test (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/abstract-override/A.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/abstract-override/B.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/abstract-override/C.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/abstract-override/D.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/abstract-override/changes/C2.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/abstract-override/project/DottyInjectedPlugin.scala (68%) create mode 100644 sbt-dotty/sbt-test/source-dependencies/abstract-override/project/plugins.sbt rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/abstract-override/test (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/abstract-type-override/build.sbt (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/abstract-type-override/changes/Bar1.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/abstract-type-override/project/DottyInjectedPlugin.scala (68%) create mode 100644 sbt-dotty/sbt-test/source-dependencies/abstract-type-override/project/plugins.sbt rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/abstract-type-override/src/main/scala/Bar.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/abstract-type-override/src/main/scala/Foo.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/abstract-type-override/src/main/scala/Impl.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/abstract-type-override/test (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/abstract-type/A.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/abstract-type/B.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/abstract-type/changes/A.scala (100%) create mode 100644 sbt-dotty/sbt-test/source-dependencies/abstract-type/project/DottyInjectedPlugin.scala create mode 100644 sbt-dotty/sbt-test/source-dependencies/abstract-type/project/plugins.sbt rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/abstract-type/test (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/added/changes/A1.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/added/changes/A2.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/added/changes/A3.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/added/changes/B1.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/added/changes/B2.scala (100%) create mode 100644 sbt-dotty/sbt-test/source-dependencies/added/project/DottyInjectedPlugin.scala create mode 100644 sbt-dotty/sbt-test/source-dependencies/added/project/plugins.sbt rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/added/test (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/as-seen-from-a/A.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/as-seen-from-a/B.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/as-seen-from-a/C.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/as-seen-from-a/D.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/as-seen-from-a/changes/B2.scala (100%) create mode 100644 sbt-dotty/sbt-test/source-dependencies/as-seen-from-a/project/DottyInjectedPlugin.scala create mode 100644 sbt-dotty/sbt-test/source-dependencies/as-seen-from-a/project/plugins.sbt rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/as-seen-from-a/test (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/as-seen-from-b/A.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/as-seen-from-b/B.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/as-seen-from-b/C.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/as-seen-from-b/D.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/as-seen-from-b/changes/B2.scala (100%) create mode 100644 sbt-dotty/sbt-test/source-dependencies/as-seen-from-b/project/DottyInjectedPlugin.scala create mode 100644 sbt-dotty/sbt-test/source-dependencies/as-seen-from-b/project/plugins.sbt rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/as-seen-from-b/test (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/backtick-quoted-names/A.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/backtick-quoted-names/B.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/backtick-quoted-names/build.sbt (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/backtick-quoted-names/changes/A.scala (100%) create mode 100644 sbt-dotty/sbt-test/source-dependencies/backtick-quoted-names/project/DottyInjectedPlugin.scala create mode 100644 sbt-dotty/sbt-test/source-dependencies/backtick-quoted-names/project/plugins.sbt rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/backtick-quoted-names/test (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/binary/changes/Break.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/binary/dep/A.scala (100%) create mode 100644 sbt-dotty/sbt-test/source-dependencies/binary/project/DottyInjectedPlugin.scala rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/binary/project/P.scala (100%) create mode 100644 sbt-dotty/sbt-test/source-dependencies/binary/project/plugins.sbt rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/binary/test (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/binary/use/B.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/by-name/A.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/by-name/B.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/by-name/changes/A.scala (100%) create mode 100644 sbt-dotty/sbt-test/source-dependencies/by-name/project/DottyInjectedPlugin.scala create mode 100644 sbt-dotty/sbt-test/source-dependencies/by-name/project/plugins.sbt rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/by-name/test (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/canon/Use.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/canon/actual/A.java (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/canon/actual/a.jar (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/canon/build.sbt (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/canon/lib/a.jar (100%) create mode 100644 sbt-dotty/sbt-test/source-dependencies/canon/project/DottyInjectedPlugin.scala create mode 100644 sbt-dotty/sbt-test/source-dependencies/canon/project/plugins.sbt rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/canon/test (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/compactify/build.sbt (100%) create mode 100644 sbt-dotty/sbt-test/source-dependencies/compactify/project/DottyInjectedPlugin.scala create mode 100644 sbt-dotty/sbt-test/source-dependencies/compactify/project/plugins.sbt rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/compactify/src/main/scala/For.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/compactify/src/main/scala/Nested.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/compactify/test (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/constants/changes/A1.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/constants/changes/A2.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/constants/changes/B.scala (100%) create mode 100644 sbt-dotty/sbt-test/source-dependencies/constants/project/DottyInjectedPlugin.scala create mode 100644 sbt-dotty/sbt-test/source-dependencies/constants/project/plugins.sbt rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/constants/test (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/default-params/A.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/default-params/B.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/default-params/changes/A.scala (100%) create mode 100644 sbt-dotty/sbt-test/source-dependencies/default-params/project/DottyInjectedPlugin.scala create mode 100644 sbt-dotty/sbt-test/source-dependencies/default-params/project/plugins.sbt rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/default-params/test (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/dup-class/changes/A.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/dup-class/changes/A2.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/dup-class/changes/B.scala (100%) create mode 100644 sbt-dotty/sbt-test/source-dependencies/dup-class/project/DottyInjectedPlugin.scala create mode 100644 sbt-dotty/sbt-test/source-dependencies/dup-class/project/plugins.sbt rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/dup-class/test (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/empty-a/changes/A.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/empty-a/changes/A2.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/empty-a/changes/B.scala (100%) create mode 100644 sbt-dotty/sbt-test/source-dependencies/empty-a/project/DottyInjectedPlugin.scala create mode 100644 sbt-dotty/sbt-test/source-dependencies/empty-a/project/plugins.sbt rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/empty-a/test (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/empty-package/changes/Define1.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/empty-package/changes/Define2.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/empty-package/changes/Use.scala (100%) create mode 100644 sbt-dotty/sbt-test/source-dependencies/empty-package/project/DottyInjectedPlugin.scala create mode 100644 sbt-dotty/sbt-test/source-dependencies/empty-package/project/plugins.sbt rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/empty-package/test (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/erasure/A.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/erasure/B.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/erasure/changes/A.scala (100%) create mode 100644 sbt-dotty/sbt-test/source-dependencies/erasure/project/DottyInjectedPlugin.scala create mode 100644 sbt-dotty/sbt-test/source-dependencies/erasure/project/plugins.sbt rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/erasure/test (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/export-jars/changes/A1.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/export-jars/changes/A2.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/export-jars/changes/A3.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/export-jars/changes/B.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/export-jars/changes/build2.sbt (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/export-jars/project/Build.scala (100%) create mode 100644 sbt-dotty/sbt-test/source-dependencies/export-jars/project/DottyInjectedPlugin.scala create mode 100644 sbt-dotty/sbt-test/source-dependencies/export-jars/project/plugins.sbt rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/export-jars/test (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/ext/A.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/ext/build.sbt (100%) create mode 100644 sbt-dotty/sbt-test/source-dependencies/ext/project/DottyInjectedPlugin.scala create mode 100644 sbt-dotty/sbt-test/source-dependencies/ext/project/plugins.sbt rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/ext/test (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/false-error/A.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/false-error/B.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/false-error/changes/A.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/false-error/pending (100%) create mode 100644 sbt-dotty/sbt-test/source-dependencies/false-error/project/DottyInjectedPlugin.scala create mode 100644 sbt-dotty/sbt-test/source-dependencies/false-error/project/plugins.sbt rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/fbounded-existentials/fbounds.scala (100%) create mode 100644 sbt-dotty/sbt-test/source-dependencies/fbounded-existentials/project/DottyInjectedPlugin.scala create mode 100644 sbt-dotty/sbt-test/source-dependencies/fbounded-existentials/project/plugins.sbt rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/fbounded-existentials/test (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/implicit-params/A.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/implicit-params/B.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/implicit-params/changes/A.scala (100%) create mode 100644 sbt-dotty/sbt-test/source-dependencies/implicit-params/project/DottyInjectedPlugin.scala create mode 100644 sbt-dotty/sbt-test/source-dependencies/implicit-params/project/plugins.sbt rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/implicit-params/test (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/implicit-search-companion-scope/changes/A1.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/implicit-search-companion-scope/changes/A2.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/implicit-search-companion-scope/changes/B.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/implicit-search-companion-scope/changes/C.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/implicit-search-companion-scope/changes/M.scala (100%) create mode 100644 sbt-dotty/sbt-test/source-dependencies/implicit-search-companion-scope/project/DottyInjectedPlugin.scala create mode 100644 sbt-dotty/sbt-test/source-dependencies/implicit-search-companion-scope/project/plugins.sbt rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/implicit-search-companion-scope/test (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/implicit-search/changes/A1.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/implicit-search/changes/A2.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/implicit-search/changes/B.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/implicit-search/changes/C.scala (100%) create mode 100644 sbt-dotty/sbt-test/source-dependencies/implicit-search/project/DottyInjectedPlugin.scala create mode 100644 sbt-dotty/sbt-test/source-dependencies/implicit-search/project/plugins.sbt rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/implicit-search/test (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/implicit/A.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/implicit/B.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/implicit/changes/A.scala (100%) create mode 100644 sbt-dotty/sbt-test/source-dependencies/implicit/project/DottyInjectedPlugin.scala create mode 100644 sbt-dotty/sbt-test/source-dependencies/implicit/project/plugins.sbt rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/implicit/test (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/import-class/A.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/import-class/B.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/import-class/changes/A.scala (100%) create mode 100644 sbt-dotty/sbt-test/source-dependencies/import-class/project/DottyInjectedPlugin.scala create mode 100644 sbt-dotty/sbt-test/source-dependencies/import-class/project/plugins.sbt rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/import-class/test (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/import-package/A.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/import-package/B.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/import-package/changes/A.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/import-package/pending (100%) create mode 100644 sbt-dotty/sbt-test/source-dependencies/import-package/project/DottyInjectedPlugin.scala create mode 100644 sbt-dotty/sbt-test/source-dependencies/import-package/project/plugins.sbt rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/inherited-deps-java/A.java (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/inherited-deps-java/B.java (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/inherited-deps-java/C.java (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/inherited-deps-java/D.java (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/inherited-deps-java/E.java (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/inherited-deps-java/F.java (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/inherited-deps-java/G.java (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/inherited-deps-java/J.java (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/inherited-deps-java/build.sbt (100%) create mode 100644 sbt-dotty/sbt-test/source-dependencies/inherited-deps-java/project/DottyInjectedPlugin.scala create mode 100644 sbt-dotty/sbt-test/source-dependencies/inherited-deps-java/project/plugins.sbt rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/inherited-deps-java/test (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/inherited_type_params/A.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/inherited_type_params/build.sbt (100%) create mode 100644 sbt-dotty/sbt-test/source-dependencies/inherited_type_params/project/DottyInjectedPlugin.scala create mode 100644 sbt-dotty/sbt-test/source-dependencies/inherited_type_params/project/plugins.sbt rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/inherited_type_params/test (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/inline/A.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/inline/C.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/inline/changes/B1.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/inline/changes/B2.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/inline/changes/B3.scala (100%) create mode 100644 sbt-dotty/sbt-test/source-dependencies/inline/project/DottyInjectedPlugin.scala create mode 100644 sbt-dotty/sbt-test/source-dependencies/inline/project/plugins.sbt rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/inline/test (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/intermediate-error/A.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/intermediate-error/B.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/intermediate-error/changes/A2.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/intermediate-error/changes/A3.scala (100%) create mode 100644 sbt-dotty/sbt-test/source-dependencies/intermediate-error/project/DottyInjectedPlugin.scala create mode 100644 sbt-dotty/sbt-test/source-dependencies/intermediate-error/project/plugins.sbt rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/intermediate-error/test (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/java-analysis-serialization-error/Outer.java (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/java-analysis-serialization-error/build.sbt (100%) create mode 100644 sbt-dotty/sbt-test/source-dependencies/java-analysis-serialization-error/project/DottyInjectedPlugin.scala create mode 100644 sbt-dotty/sbt-test/source-dependencies/java-analysis-serialization-error/project/plugins.sbt rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/java-analysis-serialization-error/test (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/java-basic/changes/A.java (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/java-basic/changes/A2.java (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/java-basic/changes/B1.java (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/java-basic/changes/B2.java (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/java-basic/changes/B3.java (100%) create mode 100644 sbt-dotty/sbt-test/source-dependencies/java-basic/project/DottyInjectedPlugin.scala create mode 100644 sbt-dotty/sbt-test/source-dependencies/java-basic/project/plugins.sbt rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/java-basic/test (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/java-generic-workaround/A.java (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/java-generic-workaround/DefaultTreeTableSorter.java (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/java-generic-workaround/TreeColumnModel.java (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/java-generic-workaround/TreeTableSorter.java (100%) create mode 100644 sbt-dotty/sbt-test/source-dependencies/java-generic-workaround/project/DottyInjectedPlugin.scala create mode 100644 sbt-dotty/sbt-test/source-dependencies/java-generic-workaround/project/plugins.sbt rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/java-generic-workaround/test (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/java-mixed/JJ.java (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/java-mixed/build.sbt (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/java-mixed/changes/S1.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/java-mixed/changes/S2.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/java-mixed/changes/build.sbt (100%) create mode 100644 sbt-dotty/sbt-test/source-dependencies/java-mixed/project/DottyInjectedPlugin.scala create mode 100644 sbt-dotty/sbt-test/source-dependencies/java-mixed/project/plugins.sbt rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/java-mixed/test (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/java-static/changes/J1.java (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/java-static/changes/J2.java (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/java-static/changes/S.scala (100%) create mode 100644 sbt-dotty/sbt-test/source-dependencies/java-static/project/DottyInjectedPlugin.scala create mode 100644 sbt-dotty/sbt-test/source-dependencies/java-static/project/plugins.sbt rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/java-static/test (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/lazy-val/A.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/lazy-val/B.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/lazy-val/changes/A.scala (100%) create mode 100644 sbt-dotty/sbt-test/source-dependencies/lazy-val/project/DottyInjectedPlugin.scala create mode 100644 sbt-dotty/sbt-test/source-dependencies/lazy-val/project/plugins.sbt rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/lazy-val/test (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/less-inter-inv-java/A.java (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/less-inter-inv-java/B.java (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/less-inter-inv-java/C.java (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/less-inter-inv-java/D.java (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/less-inter-inv-java/E.java (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/less-inter-inv-java/build.sbt (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/less-inter-inv-java/changes/A2.java (100%) create mode 100644 sbt-dotty/sbt-test/source-dependencies/less-inter-inv-java/project/DottyInjectedPlugin.scala create mode 100644 sbt-dotty/sbt-test/source-dependencies/less-inter-inv-java/project/plugins.sbt rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/less-inter-inv-java/test (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/less-inter-inv/A.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/less-inter-inv/B.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/less-inter-inv/C.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/less-inter-inv/D.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/less-inter-inv/E.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/less-inter-inv/build.sbt (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/less-inter-inv/changes/A2.scala (100%) create mode 100644 sbt-dotty/sbt-test/source-dependencies/less-inter-inv/project/DottyInjectedPlugin.scala create mode 100644 sbt-dotty/sbt-test/source-dependencies/less-inter-inv/project/plugins.sbt rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/less-inter-inv/test (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/linearization/A.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/linearization/B.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/linearization/C.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/linearization/D.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/linearization/E.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/linearization/F.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/linearization/changes/D.scala (100%) create mode 100644 sbt-dotty/sbt-test/source-dependencies/linearization/project/DottyInjectedPlugin.scala create mode 100644 sbt-dotty/sbt-test/source-dependencies/linearization/project/plugins.sbt rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/linearization/test (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/named/A.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/named/B.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/named/changes/A.scala (100%) create mode 100644 sbt-dotty/sbt-test/source-dependencies/named/project/DottyInjectedPlugin.scala create mode 100644 sbt-dotty/sbt-test/source-dependencies/named/project/plugins.sbt rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/named/test (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/nested-case-class/changes/A0.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/nested-case-class/changes/A1.scala (100%) create mode 100644 sbt-dotty/sbt-test/source-dependencies/nested-case-class/project/DottyInjectedPlugin.scala create mode 100644 sbt-dotty/sbt-test/source-dependencies/nested-case-class/project/plugins.sbt rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/nested-case-class/test (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/new-cyclic/changes/A2.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/new-cyclic/pending (100%) create mode 100644 sbt-dotty/sbt-test/source-dependencies/new-cyclic/project/DottyInjectedPlugin.scala create mode 100644 sbt-dotty/sbt-test/source-dependencies/new-cyclic/project/plugins.sbt rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/new-cyclic/src/main/scala/A.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/new-cyclic/src/main/scala/B.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/new-pkg-dep/changes/A1.java (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/new-pkg-dep/changes/B0.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/new-pkg-dep/changes/B1.scala (100%) create mode 100644 sbt-dotty/sbt-test/source-dependencies/new-pkg-dep/project/DottyInjectedPlugin.scala create mode 100644 sbt-dotty/sbt-test/source-dependencies/new-pkg-dep/project/plugins.sbt rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/new-pkg-dep/test (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/override/A.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/override/B.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/override/C.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/override/D.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/override/changes/B2.scala (100%) create mode 100644 sbt-dotty/sbt-test/source-dependencies/override/project/DottyInjectedPlugin.scala create mode 100644 sbt-dotty/sbt-test/source-dependencies/override/project/plugins.sbt rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/override/test (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/parent-change/W.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/parent-change/Y.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/parent-change/Z.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/parent-change/changes/W.scala (100%) create mode 100644 sbt-dotty/sbt-test/source-dependencies/parent-change/project/DottyInjectedPlugin.scala create mode 100644 sbt-dotty/sbt-test/source-dependencies/parent-change/project/plugins.sbt rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/parent-change/test (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/parent-member-change/A.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/parent-member-change/B.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/parent-member-change/C.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/parent-member-change/changes/A.scala (100%) create mode 100644 sbt-dotty/sbt-test/source-dependencies/parent-member-change/project/DottyInjectedPlugin.scala create mode 100644 sbt-dotty/sbt-test/source-dependencies/parent-member-change/project/plugins.sbt rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/parent-member-change/test (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/pkg-self/changes/A1.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/pkg-self/changes/A2.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/pkg-self/changes/B.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/pkg-self/changes/package.scala (100%) create mode 100644 sbt-dotty/sbt-test/source-dependencies/pkg-self/project/DottyInjectedPlugin.scala create mode 100644 sbt-dotty/sbt-test/source-dependencies/pkg-self/project/plugins.sbt rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/pkg-self/test (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/qualified-access/A.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/qualified-access/B.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/qualified-access/changes/A.scala (100%) create mode 100644 sbt-dotty/sbt-test/source-dependencies/qualified-access/project/DottyInjectedPlugin.scala create mode 100644 sbt-dotty/sbt-test/source-dependencies/qualified-access/project/plugins.sbt rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/qualified-access/test (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/relative-source-error/changes/absolute.sbt (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/relative-source-error/changes/relative.sbt (100%) create mode 100644 sbt-dotty/sbt-test/source-dependencies/relative-source-error/project/DottyInjectedPlugin.scala create mode 100644 sbt-dotty/sbt-test/source-dependencies/relative-source-error/project/plugins.sbt rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/relative-source-error/src/A.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/relative-source-error/test (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/remove-test-a/changes/1.scala (100%) create mode 100644 sbt-dotty/sbt-test/source-dependencies/remove-test-a/project/DottyInjectedPlugin.scala create mode 100644 sbt-dotty/sbt-test/source-dependencies/remove-test-a/project/plugins.sbt rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/remove-test-a/test (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/remove-test-b/changes/A2.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/remove-test-b/changes/B3.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/remove-test-b/changes/B4.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/remove-test-b/changes/B5.scala (100%) create mode 100644 sbt-dotty/sbt-test/source-dependencies/remove-test-b/project/DottyInjectedPlugin.scala create mode 100644 sbt-dotty/sbt-test/source-dependencies/remove-test-b/project/plugins.sbt rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/remove-test-b/src/main/scala/A.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/remove-test-b/src/main/scala/B.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/remove-test-b/test (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/repeated-parameters/A.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/repeated-parameters/B.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/repeated-parameters/changes/A.scala (100%) create mode 100644 sbt-dotty/sbt-test/source-dependencies/repeated-parameters/project/DottyInjectedPlugin.scala create mode 100644 sbt-dotty/sbt-test/source-dependencies/repeated-parameters/project/plugins.sbt rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/repeated-parameters/test (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/replace-test-a/changes/first.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/replace-test-a/changes/second.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/replace-test-a/project/Build.scala (100%) create mode 100644 sbt-dotty/sbt-test/source-dependencies/replace-test-a/project/DottyInjectedPlugin.scala create mode 100644 sbt-dotty/sbt-test/source-dependencies/replace-test-a/project/plugins.sbt rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/replace-test-a/test (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/resident-java/build.sbt (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/resident-java/changes/A1.java (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/resident-java/changes/A2.java (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/resident-java/changes/B0.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/resident-java/changes/B1.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/resident-java/changes/B2.scala (100%) create mode 100644 sbt-dotty/sbt-test/source-dependencies/resident-java/project/DottyInjectedPlugin.scala create mode 100644 sbt-dotty/sbt-test/source-dependencies/resident-java/project/plugins.sbt rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/resident-java/test (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/resident-package-object/changes/A.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/resident-package-object/changes/package.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/resident-package-object/changes/package2.scala (100%) create mode 100644 sbt-dotty/sbt-test/source-dependencies/resident-package-object/project/DottyInjectedPlugin.scala create mode 100644 sbt-dotty/sbt-test/source-dependencies/resident-package-object/project/plugins.sbt rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/resident-package-object/test (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/restore-classes/build.sbt (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/restore-classes/changes/A1.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/restore-classes/changes/A2.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/restore-classes/changes/B.scala (100%) create mode 100644 sbt-dotty/sbt-test/source-dependencies/restore-classes/project/DottyInjectedPlugin.scala create mode 100644 sbt-dotty/sbt-test/source-dependencies/restore-classes/project/plugins.sbt rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/restore-classes/test (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/same-file-used-names/A.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/same-file-used-names/B.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/same-file-used-names/build.sbt (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/same-file-used-names/changes/B.scala (100%) create mode 100644 sbt-dotty/sbt-test/source-dependencies/same-file-used-names/project/DottyInjectedPlugin.scala create mode 100644 sbt-dotty/sbt-test/source-dependencies/same-file-used-names/project/plugins.sbt rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/same-file-used-names/test (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/sealed/A.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/sealed/D.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/sealed/changes/A.scala (100%) create mode 100644 sbt-dotty/sbt-test/source-dependencies/sealed/project/DottyInjectedPlugin.scala create mode 100644 sbt-dotty/sbt-test/source-dependencies/sealed/project/plugins.sbt rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/sealed/test (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/signature-change/B.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/signature-change/changes/A0.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/signature-change/changes/A1.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/signature-change/changes/A2.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/signature-change/changes/A3.scala (100%) create mode 100644 sbt-dotty/sbt-test/source-dependencies/signature-change/project/DottyInjectedPlugin.scala create mode 100644 sbt-dotty/sbt-test/source-dependencies/signature-change/project/plugins.sbt rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/signature-change/test (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/specialized/A.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/specialized/B.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/specialized/changes/A.scala (100%) create mode 100644 sbt-dotty/sbt-test/source-dependencies/specialized/project/DottyInjectedPlugin.scala create mode 100644 sbt-dotty/sbt-test/source-dependencies/specialized/project/plugins.sbt rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/specialized/test (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/stability-change/A.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/stability-change/B.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/stability-change/C.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/stability-change/changes/A.scala (100%) create mode 100644 sbt-dotty/sbt-test/source-dependencies/stability-change/project/DottyInjectedPlugin.scala create mode 100644 sbt-dotty/sbt-test/source-dependencies/stability-change/project/plugins.sbt rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/stability-change/test (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/synthetic-companion/A.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/synthetic-companion/B.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/synthetic-companion/changes/A2.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/synthetic-companion/dbg.sbt (100%) create mode 100644 sbt-dotty/sbt-test/source-dependencies/synthetic-companion/project/DottyInjectedPlugin.scala create mode 100644 sbt-dotty/sbt-test/source-dependencies/synthetic-companion/project/plugins.sbt rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/synthetic-companion/test (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/trait-member-modified/build.sbt (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/trait-member-modified/changes/A1.scala (100%) create mode 100644 sbt-dotty/sbt-test/source-dependencies/trait-member-modified/project/DottyInjectedPlugin.scala create mode 100644 sbt-dotty/sbt-test/source-dependencies/trait-member-modified/project/plugins.sbt rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/trait-member-modified/src/main/scala/A.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/trait-member-modified/src/main/scala/B.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/trait-member-modified/test (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/trait-private-object/A.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/trait-private-object/B.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/trait-private-object/changes/A.scala (100%) create mode 100644 sbt-dotty/sbt-test/source-dependencies/trait-private-object/project/DottyInjectedPlugin.scala create mode 100644 sbt-dotty/sbt-test/source-dependencies/trait-private-object/project/plugins.sbt rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/trait-private-object/test (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/trait-private-var/B.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/trait-private-var/changes/A0.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/trait-private-var/changes/A1.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/trait-private-var/changes/A2.scala (100%) create mode 100644 sbt-dotty/sbt-test/source-dependencies/trait-private-var/project/DottyInjectedPlugin.scala create mode 100644 sbt-dotty/sbt-test/source-dependencies/trait-private-var/project/plugins.sbt rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/trait-private-var/test (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/trait-super/A.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/trait-super/B.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/trait-super/Main.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/trait-super/changes/B2.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/trait-super/changes/B3.scala (100%) create mode 100644 sbt-dotty/sbt-test/source-dependencies/trait-super/project/DottyInjectedPlugin.scala create mode 100644 sbt-dotty/sbt-test/source-dependencies/trait-super/project/plugins.sbt rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/trait-super/test (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/transitive-a/changes/A2.scala (100%) create mode 100644 sbt-dotty/sbt-test/source-dependencies/transitive-a/project/DottyInjectedPlugin.scala create mode 100644 sbt-dotty/sbt-test/source-dependencies/transitive-a/project/plugins.sbt rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/transitive-a/src/main/scala/A.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/transitive-a/src/main/scala/B.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/transitive-a/src/main/scala/C.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/transitive-a/test (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/transitive-b/changes/A2.scala (100%) create mode 100644 sbt-dotty/sbt-test/source-dependencies/transitive-b/project/DottyInjectedPlugin.scala create mode 100644 sbt-dotty/sbt-test/source-dependencies/transitive-b/project/plugins.sbt rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/transitive-b/src/main/scala/A.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/transitive-b/src/main/scala/B.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/transitive-b/src/main/scala/C.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/transitive-b/test (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/transitive-inherit-java/A.java (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/transitive-inherit-java/B.java (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/transitive-inherit-java/C.java (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/transitive-inherit-java/changes/A2.java (100%) create mode 100644 sbt-dotty/sbt-test/source-dependencies/transitive-inherit-java/project/DottyInjectedPlugin.scala create mode 100644 sbt-dotty/sbt-test/source-dependencies/transitive-inherit-java/project/plugins.sbt rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/transitive-inherit-java/test (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/transitive-inherit/A.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/transitive-inherit/B.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/transitive-inherit/C.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/transitive-inherit/changes/A2.scala (100%) create mode 100644 sbt-dotty/sbt-test/source-dependencies/transitive-inherit/project/DottyInjectedPlugin.scala create mode 100644 sbt-dotty/sbt-test/source-dependencies/transitive-inherit/project/plugins.sbt rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/transitive-inherit/test (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/transitive-memberRef/build.sbt (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/transitive-memberRef/changes/A1.scala (100%) create mode 100644 sbt-dotty/sbt-test/source-dependencies/transitive-memberRef/project/DottyInjectedPlugin.scala create mode 100644 sbt-dotty/sbt-test/source-dependencies/transitive-memberRef/project/plugins.sbt rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/transitive-memberRef/src/main/scala/A.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/transitive-memberRef/src/main/scala/B.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/transitive-memberRef/src/main/scala/C.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/transitive-memberRef/src/main/scala/D.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/transitive-memberRef/src/main/scala/X.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/transitive-memberRef/src/main/scala/Y.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/transitive-memberRef/test (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/type-alias/A.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/type-alias/B.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/type-alias/build.sbt (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/type-alias/changes/A.scala (100%) create mode 100644 sbt-dotty/sbt-test/source-dependencies/type-alias/project/DottyInjectedPlugin.scala create mode 100644 sbt-dotty/sbt-test/source-dependencies/type-alias/project/plugins.sbt rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/type-alias/test (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/type-parameter/A.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/type-parameter/B.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/type-parameter/C.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/type-parameter/D.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/type-parameter/changes/A.scala (100%) create mode 100644 sbt-dotty/sbt-test/source-dependencies/type-parameter/project/DottyInjectedPlugin.scala create mode 100644 sbt-dotty/sbt-test/source-dependencies/type-parameter/project/plugins.sbt rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/type-parameter/test (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/typeref-only/A.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/typeref-only/B.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/typeref-only/build.sbt (100%) create mode 100644 sbt-dotty/sbt-test/source-dependencies/typeref-only/project/DottyInjectedPlugin.scala create mode 100644 sbt-dotty/sbt-test/source-dependencies/typeref-only/project/plugins.sbt rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/typeref-only/test (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/typeref-return/A.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/typeref-return/B.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/typeref-return/changes/A.scala (100%) create mode 100644 sbt-dotty/sbt-test/source-dependencies/typeref-return/project/DottyInjectedPlugin.scala create mode 100644 sbt-dotty/sbt-test/source-dependencies/typeref-return/project/plugins.sbt rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/typeref-return/test (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/types-in-used-names-a/A.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/types-in-used-names-a/B.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/types-in-used-names-a/C.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/types-in-used-names-a/D.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/types-in-used-names-a/changes/B2.scala (100%) create mode 100644 sbt-dotty/sbt-test/source-dependencies/types-in-used-names-a/project/DottyInjectedPlugin.scala create mode 100644 sbt-dotty/sbt-test/source-dependencies/types-in-used-names-a/project/plugins.sbt rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/types-in-used-names-a/test (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/types-in-used-names-b/A.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/types-in-used-names-b/B.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/types-in-used-names-b/changes/A2.scala (100%) create mode 100644 sbt-dotty/sbt-test/source-dependencies/types-in-used-names-b/project/DottyInjectedPlugin.scala create mode 100644 sbt-dotty/sbt-test/source-dependencies/types-in-used-names-b/project/plugins.sbt rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/types-in-used-names-b/test (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/value-class-underlying/A.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/value-class-underlying/B.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/value-class-underlying/C.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/value-class-underlying/build.sbt (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/value-class-underlying/changes/A2.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/value-class-underlying/test (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/value-class/build.sbt (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/value-class/changes/A0.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/value-class/changes/A1.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/value-class/changes/B0.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/value-class/changes/B1.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/value-class/changes/B2.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/value-class/changes/C0.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/value-class/changes/C1.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/value-class/changes/C2.scala (100%) create mode 100644 sbt-dotty/sbt-test/source-dependencies/value-class/project/DottyInjectedPlugin.scala create mode 100644 sbt-dotty/sbt-test/source-dependencies/value-class/project/plugins.sbt rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/value-class/test (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/var/A.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/var/B.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/var/changes/A.scala (100%) create mode 100644 sbt-dotty/sbt-test/source-dependencies/var/project/DottyInjectedPlugin.scala create mode 100644 sbt-dotty/sbt-test/source-dependencies/var/project/plugins.sbt rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/var/test (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/variance/A.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/variance/C.scala (100%) rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/variance/changes/A.scala (100%) create mode 100644 sbt-dotty/sbt-test/source-dependencies/variance/project/DottyInjectedPlugin.scala create mode 100644 sbt-dotty/sbt-test/source-dependencies/variance/project/plugins.sbt rename {sbt-scripted-tests => sbt-dotty}/sbt-test/source-dependencies/variance/test (100%) delete mode 100644 sbt-scripted-tests/sbt-test/source-dependencies/abstract-type/project/DottyInjectedPlugin.scala delete mode 100644 sbt-scripted-tests/sbt-test/source-dependencies/added/project/DottyInjectedPlugin.scala delete mode 100644 sbt-scripted-tests/sbt-test/source-dependencies/as-seen-from-a/project/DottyInjectedPlugin.scala delete mode 100644 sbt-scripted-tests/sbt-test/source-dependencies/as-seen-from-b/project/DottyInjectedPlugin.scala delete mode 100644 sbt-scripted-tests/sbt-test/source-dependencies/backtick-quoted-names/project/DottyInjectedPlugin.scala delete mode 100644 sbt-scripted-tests/sbt-test/source-dependencies/binary/project/DottyInjectedPlugin.scala delete mode 100644 sbt-scripted-tests/sbt-test/source-dependencies/by-name/project/DottyInjectedPlugin.scala delete mode 100644 sbt-scripted-tests/sbt-test/source-dependencies/canon/project/DottyInjectedPlugin.scala delete mode 100644 sbt-scripted-tests/sbt-test/source-dependencies/compactify/project/DottyInjectedPlugin.scala delete mode 100644 sbt-scripted-tests/sbt-test/source-dependencies/constants/project/DottyInjectedPlugin.scala delete mode 100644 sbt-scripted-tests/sbt-test/source-dependencies/default-params/project/DottyInjectedPlugin.scala delete mode 100644 sbt-scripted-tests/sbt-test/source-dependencies/dup-class/project/DottyInjectedPlugin.scala delete mode 100644 sbt-scripted-tests/sbt-test/source-dependencies/empty-a/project/DottyInjectedPlugin.scala delete mode 100644 sbt-scripted-tests/sbt-test/source-dependencies/empty-package/project/DottyInjectedPlugin.scala delete mode 100644 sbt-scripted-tests/sbt-test/source-dependencies/erasure/project/DottyInjectedPlugin.scala delete mode 100644 sbt-scripted-tests/sbt-test/source-dependencies/export-jars/project/DottyInjectedPlugin.scala delete mode 100644 sbt-scripted-tests/sbt-test/source-dependencies/ext/project/DottyInjectedPlugin.scala delete mode 100644 sbt-scripted-tests/sbt-test/source-dependencies/false-error/project/DottyInjectedPlugin.scala delete mode 100644 sbt-scripted-tests/sbt-test/source-dependencies/fbounded-existentials/project/DottyInjectedPlugin.scala delete mode 100644 sbt-scripted-tests/sbt-test/source-dependencies/implicit-params/project/DottyInjectedPlugin.scala delete mode 100644 sbt-scripted-tests/sbt-test/source-dependencies/implicit-search-companion-scope/project/DottyInjectedPlugin.scala delete mode 100644 sbt-scripted-tests/sbt-test/source-dependencies/implicit-search/project/DottyInjectedPlugin.scala delete mode 100644 sbt-scripted-tests/sbt-test/source-dependencies/implicit/project/DottyInjectedPlugin.scala delete mode 100644 sbt-scripted-tests/sbt-test/source-dependencies/import-class/project/DottyInjectedPlugin.scala delete mode 100644 sbt-scripted-tests/sbt-test/source-dependencies/import-package/project/DottyInjectedPlugin.scala delete mode 100644 sbt-scripted-tests/sbt-test/source-dependencies/inherited-deps-java/project/DottyInjectedPlugin.scala delete mode 100644 sbt-scripted-tests/sbt-test/source-dependencies/inherited_type_params/project/DottyInjectedPlugin.scala delete mode 100644 sbt-scripted-tests/sbt-test/source-dependencies/inline/project/DottyInjectedPlugin.scala delete mode 100644 sbt-scripted-tests/sbt-test/source-dependencies/intermediate-error/project/DottyInjectedPlugin.scala delete mode 100644 sbt-scripted-tests/sbt-test/source-dependencies/java-analysis-serialization-error/project/DottyInjectedPlugin.scala delete mode 100644 sbt-scripted-tests/sbt-test/source-dependencies/java-basic/project/DottyInjectedPlugin.scala delete mode 100644 sbt-scripted-tests/sbt-test/source-dependencies/java-generic-workaround/project/DottyInjectedPlugin.scala delete mode 100644 sbt-scripted-tests/sbt-test/source-dependencies/java-mixed/project/DottyInjectedPlugin.scala delete mode 100644 sbt-scripted-tests/sbt-test/source-dependencies/java-static/project/DottyInjectedPlugin.scala delete mode 100644 sbt-scripted-tests/sbt-test/source-dependencies/lazy-val/project/DottyInjectedPlugin.scala delete mode 100644 sbt-scripted-tests/sbt-test/source-dependencies/less-inter-inv-java/project/DottyInjectedPlugin.scala delete mode 100644 sbt-scripted-tests/sbt-test/source-dependencies/less-inter-inv/project/DottyInjectedPlugin.scala delete mode 100644 sbt-scripted-tests/sbt-test/source-dependencies/linearization/project/DottyInjectedPlugin.scala delete mode 100644 sbt-scripted-tests/sbt-test/source-dependencies/named/project/DottyInjectedPlugin.scala delete mode 100644 sbt-scripted-tests/sbt-test/source-dependencies/nested-case-class/project/DottyInjectedPlugin.scala delete mode 100644 sbt-scripted-tests/sbt-test/source-dependencies/new-cyclic/project/DottyInjectedPlugin.scala delete mode 100644 sbt-scripted-tests/sbt-test/source-dependencies/new-pkg-dep/project/DottyInjectedPlugin.scala delete mode 100644 sbt-scripted-tests/sbt-test/source-dependencies/override/project/DottyInjectedPlugin.scala delete mode 100644 sbt-scripted-tests/sbt-test/source-dependencies/parent-change/project/DottyInjectedPlugin.scala delete mode 100644 sbt-scripted-tests/sbt-test/source-dependencies/parent-member-change/project/DottyInjectedPlugin.scala delete mode 100644 sbt-scripted-tests/sbt-test/source-dependencies/pkg-self/project/DottyInjectedPlugin.scala delete mode 100644 sbt-scripted-tests/sbt-test/source-dependencies/qualified-access/project/DottyInjectedPlugin.scala delete mode 100644 sbt-scripted-tests/sbt-test/source-dependencies/relative-source-error/project/DottyInjectedPlugin.scala delete mode 100644 sbt-scripted-tests/sbt-test/source-dependencies/remove-test-a/project/DottyInjectedPlugin.scala delete mode 100644 sbt-scripted-tests/sbt-test/source-dependencies/remove-test-b/project/DottyInjectedPlugin.scala delete mode 100644 sbt-scripted-tests/sbt-test/source-dependencies/repeated-parameters/project/DottyInjectedPlugin.scala delete mode 100644 sbt-scripted-tests/sbt-test/source-dependencies/replace-test-a/project/DottyInjectedPlugin.scala delete mode 100644 sbt-scripted-tests/sbt-test/source-dependencies/resident-java/project/DottyInjectedPlugin.scala delete mode 100644 sbt-scripted-tests/sbt-test/source-dependencies/resident-package-object/project/DottyInjectedPlugin.scala delete mode 100644 sbt-scripted-tests/sbt-test/source-dependencies/restore-classes/project/DottyInjectedPlugin.scala delete mode 100644 sbt-scripted-tests/sbt-test/source-dependencies/same-file-used-names/project/DottyInjectedPlugin.scala delete mode 100644 sbt-scripted-tests/sbt-test/source-dependencies/sealed/project/DottyInjectedPlugin.scala delete mode 100644 sbt-scripted-tests/sbt-test/source-dependencies/signature-change/project/DottyInjectedPlugin.scala delete mode 100644 sbt-scripted-tests/sbt-test/source-dependencies/specialized/project/DottyInjectedPlugin.scala delete mode 100644 sbt-scripted-tests/sbt-test/source-dependencies/stability-change/project/DottyInjectedPlugin.scala delete mode 100644 sbt-scripted-tests/sbt-test/source-dependencies/synthetic-companion/project/DottyInjectedPlugin.scala delete mode 100644 sbt-scripted-tests/sbt-test/source-dependencies/trait-member-modified/project/DottyInjectedPlugin.scala delete mode 100644 sbt-scripted-tests/sbt-test/source-dependencies/trait-private-object/project/DottyInjectedPlugin.scala delete mode 100644 sbt-scripted-tests/sbt-test/source-dependencies/trait-private-var/project/DottyInjectedPlugin.scala delete mode 100644 sbt-scripted-tests/sbt-test/source-dependencies/trait-super/project/DottyInjectedPlugin.scala delete mode 100644 sbt-scripted-tests/sbt-test/source-dependencies/transitive-a/project/DottyInjectedPlugin.scala delete mode 100644 sbt-scripted-tests/sbt-test/source-dependencies/transitive-b/project/DottyInjectedPlugin.scala delete mode 100644 sbt-scripted-tests/sbt-test/source-dependencies/transitive-inherit-java/project/DottyInjectedPlugin.scala delete mode 100644 sbt-scripted-tests/sbt-test/source-dependencies/transitive-inherit/project/DottyInjectedPlugin.scala delete mode 100644 sbt-scripted-tests/sbt-test/source-dependencies/transitive-memberRef/project/DottyInjectedPlugin.scala delete mode 100644 sbt-scripted-tests/sbt-test/source-dependencies/type-alias/project/DottyInjectedPlugin.scala delete mode 100644 sbt-scripted-tests/sbt-test/source-dependencies/type-parameter/project/DottyInjectedPlugin.scala delete mode 100644 sbt-scripted-tests/sbt-test/source-dependencies/typeref-only/project/DottyInjectedPlugin.scala delete mode 100644 sbt-scripted-tests/sbt-test/source-dependencies/typeref-return/project/DottyInjectedPlugin.scala delete mode 100644 sbt-scripted-tests/sbt-test/source-dependencies/types-in-used-names-a/project/DottyInjectedPlugin.scala delete mode 100644 sbt-scripted-tests/sbt-test/source-dependencies/types-in-used-names-b/project/DottyInjectedPlugin.scala delete mode 100644 sbt-scripted-tests/sbt-test/source-dependencies/value-class/project/DottyInjectedPlugin.scala delete mode 100644 sbt-scripted-tests/sbt-test/source-dependencies/var/project/DottyInjectedPlugin.scala delete mode 100644 sbt-scripted-tests/sbt-test/source-dependencies/variance/project/DottyInjectedPlugin.scala diff --git a/.drone.yml b/.drone.yml index 6ccdb2fac372..67e35265f99d 100644 --- a/.drone.yml +++ b/.drone.yml @@ -21,7 +21,7 @@ pipeline: pull: true commands: - ./project/scripts/sbt ";clean ;publishLocal" "${CI_PUBLISH}" - - ./project/scripts/sbt "dotty-sbt-scripted-tests/scripted source-dependencies/*" "${CI_PUBLISH}" + - ./project/scripts/sbt "sbt-dotty/scripted source-dependencies/*" "${CI_PUBLISH}" - ./project/scripts/sbtPublish ${CI_PUBLISH} $SONATYPE_USER $SONATYPE_PW $PGP_PW volumes: - /home/drone/keys:/keys @@ -50,7 +50,7 @@ matrix: CI_PUBLISH: true - CI_TEST: legacyTests CI_PUBLISH: false - - CI_TEST: ;test;sbt-dotty/scripted + - CI_TEST: ;test;sbt-dotty/scripted compilerReporter/*;sbt-dotty/scripted discovery/*;sbt-dotty/scripted sbt-dotty/* CI_PUBLISH: false - CI_TEST: dotty-bootstrapped/test CI_PUBLISH: false diff --git a/.drone.yml.sig b/.drone.yml.sig index d719805b0d79..ae0852eb15d8 100644 --- a/.drone.yml.sig +++ b/.drone.yml.sig @@ -1 +1 @@ -eyJhbGciOiJIUzI1NiJ9.IyBBZnRlciB1cGRhdGluZyB0aGlzIGZpbGUsIHlvdSBuZWVkIHRvIHJlLXNpZ24gaXQ6CiMKIyAtIEluc3RhbGwgW2Ryb25lLWNsaV0oaHR0cDovL3JlYWRtZS5kcm9uZS5pby91c2FnZS9nZXR0aW5nLXN0YXJ0ZWQtY2xpLykKIyAtIENvcHkgeW91ciB0b2tlbiBmcm9tICBodHRwOi8vZG90dHktY2kuZXBmbC5jaC9hY2NvdW50IChDbGljayBTSE9XIFRPS0VOKQojIC0gKGV4cG9ydCBEUk9ORV9UT0tFTj15b3VyLXRva2VuOyBleHBvcnQgRFJPTkVfU0VSVkVSPWh0dHA6Ly9kb3R0eS1jaS5lcGZsLmNoOyBkcm9uZSBzaWduIGxhbXBlcGZsL2RvdHR5KQojCiMgUGxlYXNlIG5vdGUgdGhhdCB0aGUgc2lnbmluZyBjYW4gb25seSBiZSBkb25lIGJ5IGNvbGxhYm9yYXRvcnMuCgpwaXBlbGluZToKICB0ZXN0OgogICAgaW1hZ2U6IGxhbXBlcGZsL2RvdHR5OjI0LTA0LTIwMTcKICAgIHB1bGw6IHRydWUKICAgIGNvbW1hbmRzOgogICAgICAtIC4vcHJvamVjdC9zY3JpcHRzL3NidCAiJHtDSV9URVNUfSIKICAgIHdoZW46CiAgICAgIGJyYW5jaDoKICAgICAgICBleGNsdWRlOiBnaC1wYWdlcwoKICBwdWJsaXNoX25pZ2h0bHk6CiAgICBpbWFnZTogbGFtcGVwZmwvZG90dHk6MjQtMDQtMjAxNwogICAgcHVsbDogdHJ1ZQogICAgY29tbWFuZHM6CiAgICAgIC0gLi9wcm9qZWN0L3NjcmlwdHMvc2J0ICI7Y2xlYW4gO3B1Ymxpc2hMb2NhbCIgIiR7Q0lfUFVCTElTSH0iCiAgICAgIC0gLi9wcm9qZWN0L3NjcmlwdHMvc2J0ICJkb3R0eS1zYnQtc2NyaXB0ZWQtdGVzdHMvc2NyaXB0ZWQgc291cmNlLWRlcGVuZGVuY2llcy8qIiAiJHtDSV9QVUJMSVNIfSIKICAgICAgLSAuL3Byb2plY3Qvc2NyaXB0cy9zYnRQdWJsaXNoICR7Q0lfUFVCTElTSH0gJFNPTkFUWVBFX1VTRVIgJFNPTkFUWVBFX1BXICRQR1BfUFcKICAgIHZvbHVtZXM6CiAgICAgIC0gL2hvbWUvZHJvbmUva2V5czova2V5cwogICAgd2hlbjoKICAgICAgZXZlbnQ6IGRlcGxveW1lbnQKICAgICAgZW52aXJvbm1lbnQ6IG5pZ2h0bHkKCiAgZG9jdW1lbnRhdGlvbjoKICAgIGltYWdlOiBsYW1wZXBmbC9kb3R0eToyNC0wNC0yMDE3CiAgICBwdWxsOiB0cnVlCiAgICBjb21tYW5kczoKICAgICAgLSAuL3Byb2plY3Qvc2NyaXB0cy9nZW5Eb2NzICIke0NJX1BVQkxJU0h9IiAkQk9UX1BBU1MKICAgIHdoZW46CiAgICAgIGJyYW5jaDogbWFzdGVyCgogIHNsYWNrOgogICAgaW1hZ2U6IHBsdWdpbnMvc2xhY2sKICAgIGNoYW5uZWw6IGRvdHR5CiAgICB3aGVuOgogICAgICBicmFuY2g6IG1hc3RlcgogICAgICBzdGF0dXM6IGNoYW5nZWQKCm1hdHJpeDoKICBpbmNsdWRlOgogICAgLSBDSV9URVNUOiBkb3R0eS1iaW4tdGVzdHMvdGVzdAogICAgICBDSV9QVUJMSVNIOiB0cnVlCiAgICAtIENJX1RFU1Q6IGxlZ2FjeVRlc3RzCiAgICAgIENJX1BVQkxJU0g6IGZhbHNlCiAgICAtIENJX1RFU1Q6IDt0ZXN0O3NidC1kb3R0eS9zY3JpcHRlZAogICAgICBDSV9QVUJMSVNIOiBmYWxzZQogICAgLSBDSV9URVNUOiBkb3R0eS1ib290c3RyYXBwZWQvdGVzdAogICAgICBDSV9QVUJMSVNIOiBmYWxzZQo.A83lmQCwzpdgziEdBb3hlfSI1jnUd1hg6Peea01kqUU \ No newline at end of file +eyJhbGciOiJIUzI1NiJ9.IyBBZnRlciB1cGRhdGluZyB0aGlzIGZpbGUsIHlvdSBuZWVkIHRvIHJlLXNpZ24gaXQ6CiMKIyAtIEluc3RhbGwgW2Ryb25lLWNsaV0oaHR0cDovL3JlYWRtZS5kcm9uZS5pby91c2FnZS9nZXR0aW5nLXN0YXJ0ZWQtY2xpLykKIyAtIENvcHkgeW91ciB0b2tlbiBmcm9tICBodHRwOi8vZG90dHktY2kuZXBmbC5jaC9hY2NvdW50IChDbGljayBTSE9XIFRPS0VOKQojIC0gKGV4cG9ydCBEUk9ORV9UT0tFTj15b3VyLXRva2VuOyBleHBvcnQgRFJPTkVfU0VSVkVSPWh0dHA6Ly9kb3R0eS1jaS5lcGZsLmNoOyBkcm9uZSBzaWduIGxhbXBlcGZsL2RvdHR5KQojCiMgUGxlYXNlIG5vdGUgdGhhdCB0aGUgc2lnbmluZyBjYW4gb25seSBiZSBkb25lIGJ5IGNvbGxhYm9yYXRvcnMuCgpwaXBlbGluZToKICB0ZXN0OgogICAgaW1hZ2U6IGxhbXBlcGZsL2RvdHR5OjI0LTA0LTIwMTcKICAgIHB1bGw6IHRydWUKICAgIGNvbW1hbmRzOgogICAgICAtIC4vcHJvamVjdC9zY3JpcHRzL3NidCAiJHtDSV9URVNUfSIKICAgIHdoZW46CiAgICAgIGJyYW5jaDoKICAgICAgICBleGNsdWRlOiBnaC1wYWdlcwoKICBwdWJsaXNoX25pZ2h0bHk6CiAgICBpbWFnZTogbGFtcGVwZmwvZG90dHk6MjQtMDQtMjAxNwogICAgcHVsbDogdHJ1ZQogICAgY29tbWFuZHM6CiAgICAgIC0gLi9wcm9qZWN0L3NjcmlwdHMvc2J0ICI7Y2xlYW4gO3B1Ymxpc2hMb2NhbCIgIiR7Q0lfUFVCTElTSH0iCiAgICAgIC0gLi9wcm9qZWN0L3NjcmlwdHMvc2J0ICJzYnQtZG90dHkvc2NyaXB0ZWQgc291cmNlLWRlcGVuZGVuY2llcy8qIiAiJHtDSV9QVUJMSVNIfSIKICAgICAgLSAuL3Byb2plY3Qvc2NyaXB0cy9zYnRQdWJsaXNoICR7Q0lfUFVCTElTSH0gJFNPTkFUWVBFX1VTRVIgJFNPTkFUWVBFX1BXICRQR1BfUFcKICAgIHZvbHVtZXM6CiAgICAgIC0gL2hvbWUvZHJvbmUva2V5czova2V5cwogICAgd2hlbjoKICAgICAgZXZlbnQ6IGRlcGxveW1lbnQKICAgICAgZW52aXJvbm1lbnQ6IG5pZ2h0bHkKCiAgZG9jdW1lbnRhdGlvbjoKICAgIGltYWdlOiBsYW1wZXBmbC9kb3R0eToyNC0wNC0yMDE3CiAgICBwdWxsOiB0cnVlCiAgICBjb21tYW5kczoKICAgICAgLSAuL3Byb2plY3Qvc2NyaXB0cy9nZW5Eb2NzICIke0NJX1BVQkxJU0h9IiAkQk9UX1BBU1MKICAgIHdoZW46CiAgICAgIGJyYW5jaDogbWFzdGVyCgogIHNsYWNrOgogICAgaW1hZ2U6IHBsdWdpbnMvc2xhY2sKICAgIGNoYW5uZWw6IGRvdHR5CiAgICB3aGVuOgogICAgICBicmFuY2g6IG1hc3RlcgogICAgICBzdGF0dXM6IGNoYW5nZWQKCm1hdHJpeDoKICBpbmNsdWRlOgogICAgLSBDSV9URVNUOiBkb3R0eS1iaW4tdGVzdHMvdGVzdAogICAgICBDSV9QVUJMSVNIOiB0cnVlCiAgICAtIENJX1RFU1Q6IGxlZ2FjeVRlc3RzCiAgICAgIENJX1BVQkxJU0g6IGZhbHNlCiAgICAtIENJX1RFU1Q6IDt0ZXN0O3NidC1kb3R0eS9zY3JpcHRlZCBjb21waWxlclJlcG9ydGVyLyo7c2J0LWRvdHR5L3NjcmlwdGVkIGRpc2NvdmVyeS8qO3NidC1kb3R0eS9zY3JpcHRlZCBzYnQtZG90dHkvKgogICAgICBDSV9QVUJMSVNIOiBmYWxzZQogICAgLSBDSV9URVNUOiBkb3R0eS1ib290c3RyYXBwZWQvdGVzdAogICAgICBDSV9QVUJMSVNIOiBmYWxzZQo.jkK92hXwTlQ5DGTdeZfSCcyYC-cQT_5bYb6Qa0O-M5o \ No newline at end of file diff --git a/build.sbt b/build.sbt index 38b5e4f50c8b..2e88654bb590 100644 --- a/build.sbt +++ b/build.sbt @@ -11,7 +11,6 @@ val `dotty-library` = Build.`dotty-library` val `dotty-library-bootstrapped` = Build.`dotty-library-bootstrapped` val `dotty-sbt-bridge` = Build.`dotty-sbt-bridge` val `dotty-sbt-bridge-bootstrapped` = Build.`dotty-sbt-bridge-bootstrapped` -val `dotty-sbt-scripted-tests` = Build.`dotty-sbt-scripted-tests` val `dotty-language-server` = Build.`dotty-language-server` val sjsSandbox = Build.sjsSandbox val `dotty-bench` = Build.`dotty-bench` diff --git a/project/Build.scala b/project/Build.scala index 9893aabd93bf..a94353f7b728 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -730,49 +730,6 @@ object Build { sources in Test := Seq() ) - lazy val `dotty-sbt-scripted-tests` = project.in(file("sbt-scripted-tests")). - settings( - publishArtifact := false, - resolvers += Resolver.typesafeIvyRepo("releases") // For org.scala-sbt:scripted - ). - settings(ScriptedPlugin.scriptedSettings: _*). - settings( - ScriptedPlugin.sbtTestDirectory := baseDirectory.value / "sbt-test", - ScriptedPlugin.scriptedLaunchOpts := Seq("-Xmx1024m"), - ScriptedPlugin.scriptedBufferLog := false, - ScriptedPlugin.scripted := ScriptedPlugin.scripted.dependsOn(Def.task { - val x0 = (publishLocal in `dotty-sbt-bridge-bootstrapped`).value - val x1 = (publishLocal in `dotty-interfaces`).value - val x2 = (publishLocal in `dotty-compiler-bootstrapped`).value - val x3 = (publishLocal in `dotty-library-bootstrapped`).value - val x4 = (publishLocal in `scala-library`).value - val x5 = (publishLocal in `scala-reflect`).value - val x6 = (publishLocal in `dotty-bootstrapped`).value // Needed because sbt currently hardcodes the dotty artifact - }).evaluated - // TODO: Use this instead of manually copying DottyInjectedPlugin.scala - // everywhere once https://github.com/sbt/sbt/issues/2601 gets fixed. - /*, - ScriptedPlugin.scriptedPrescripted := { f => - IO.write(inj, """ -import sbt._ -import Keys._ - -object DottyInjectedPlugin extends AutoPlugin { - override def requires = plugins.JvmPlugin - override def trigger = allRequirements - - override val projectSettings = Seq( - scalaVersion := "0.1.1-bin-SNAPSHOT", - scalaOrganization := "ch.epfl.lamp", - scalacOptions += "-language:Scala2", - scalaBinaryVersion := "0.1" - ) -} -""") - } - */ - ) - lazy val `dotty-language-server` = project.in(file("language-server")). dependsOn(`dotty-compiler-bootstrapped`). settings(commonBootstrappedSettings). diff --git a/sbt-scripted-tests/sbt-test/compilerReporter/simple/Source.scala b/sbt-dotty/sbt-test/compilerReporter/simple/Source.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/compilerReporter/simple/Source.scala rename to sbt-dotty/sbt-test/compilerReporter/simple/Source.scala diff --git a/sbt-scripted-tests/sbt-test/compilerReporter/simple/build.sbt b/sbt-dotty/sbt-test/compilerReporter/simple/build.sbt similarity index 100% rename from sbt-scripted-tests/sbt-test/compilerReporter/simple/build.sbt rename to sbt-dotty/sbt-test/compilerReporter/simple/build.sbt diff --git a/sbt-scripted-tests/sbt-test/compilerReporter/simple/project/DottyInjectedPlugin.scala b/sbt-dotty/sbt-test/compilerReporter/simple/project/DottyInjectedPlugin.scala similarity index 68% rename from sbt-scripted-tests/sbt-test/compilerReporter/simple/project/DottyInjectedPlugin.scala rename to sbt-dotty/sbt-test/compilerReporter/simple/project/DottyInjectedPlugin.scala index 3170ad99c06c..f9e3265ab2b2 100644 --- a/sbt-scripted-tests/sbt-test/compilerReporter/simple/project/DottyInjectedPlugin.scala +++ b/sbt-dotty/sbt-test/compilerReporter/simple/project/DottyInjectedPlugin.scala @@ -7,8 +7,6 @@ object DottyInjectedPlugin extends AutoPlugin { override val projectSettings = Seq( scalaVersion := "0.1.1-bin-SNAPSHOT", - scalaOrganization := "ch.epfl.lamp", - scalacOptions += "-language:Scala2", - scalaBinaryVersion := "0.1" + scalacOptions += "-language:Scala2" ) } diff --git a/sbt-scripted-tests/sbt-test/compilerReporter/simple/project/Reporter.scala b/sbt-dotty/sbt-test/compilerReporter/simple/project/Reporter.scala similarity index 91% rename from sbt-scripted-tests/sbt-test/compilerReporter/simple/project/Reporter.scala rename to sbt-dotty/sbt-test/compilerReporter/simple/project/Reporter.scala index d5c814bf9052..d2dae1fc202a 100644 --- a/sbt-scripted-tests/sbt-test/compilerReporter/simple/project/Reporter.scala +++ b/sbt-dotty/sbt-test/compilerReporter/simple/project/Reporter.scala @@ -36,14 +36,13 @@ object Reporter { check <<= (compile in Compile).mapFailure( _ => { val problems = reporter.get.problems println(problems.toList) - assert(problems.size == 2) + assert(problems.size == 1) // Assert disabled because we don't currently pass positions to sbt // See https://github.com/lampepfl/dotty/pull/2107 // assert(problems.forall(_.position.offset.isDefined)) assert(problems.count(_.severity == Severity.Error) == 1) // not found: er1, - assert(problems.count(_.severity == Severity.Warn) == 1) // `with' as a type operator has been deprecated; use `&' instead, }) ) } diff --git a/sbt-dotty/sbt-test/compilerReporter/simple/project/plugins.sbt b/sbt-dotty/sbt-test/compilerReporter/simple/project/plugins.sbt new file mode 100644 index 000000000000..c17caab2d98c --- /dev/null +++ b/sbt-dotty/sbt-test/compilerReporter/simple/project/plugins.sbt @@ -0,0 +1 @@ +addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-scripted-tests/sbt-test/compilerReporter/simple/test b/sbt-dotty/sbt-test/compilerReporter/simple/test similarity index 100% rename from sbt-scripted-tests/sbt-test/compilerReporter/simple/test rename to sbt-dotty/sbt-test/compilerReporter/simple/test diff --git a/sbt-scripted-tests/sbt-test/discovery/test-discovery/build.sbt b/sbt-dotty/sbt-test/discovery/test-discovery/build.sbt similarity index 100% rename from sbt-scripted-tests/sbt-test/discovery/test-discovery/build.sbt rename to sbt-dotty/sbt-test/discovery/test-discovery/build.sbt diff --git a/sbt-scripted-tests/sbt-test/discovery/test-discovery/changes/A2.scala b/sbt-dotty/sbt-test/discovery/test-discovery/changes/A2.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/discovery/test-discovery/changes/A2.scala rename to sbt-dotty/sbt-test/discovery/test-discovery/changes/A2.scala diff --git a/sbt-scripted-tests/sbt-test/discovery/test-discovery/project/DottyInjectedPlugin.scala b/sbt-dotty/sbt-test/discovery/test-discovery/project/DottyInjectedPlugin.scala similarity index 68% rename from sbt-scripted-tests/sbt-test/discovery/test-discovery/project/DottyInjectedPlugin.scala rename to sbt-dotty/sbt-test/discovery/test-discovery/project/DottyInjectedPlugin.scala index 3170ad99c06c..f9e3265ab2b2 100644 --- a/sbt-scripted-tests/sbt-test/discovery/test-discovery/project/DottyInjectedPlugin.scala +++ b/sbt-dotty/sbt-test/discovery/test-discovery/project/DottyInjectedPlugin.scala @@ -7,8 +7,6 @@ object DottyInjectedPlugin extends AutoPlugin { override val projectSettings = Seq( scalaVersion := "0.1.1-bin-SNAPSHOT", - scalaOrganization := "ch.epfl.lamp", - scalacOptions += "-language:Scala2", - scalaBinaryVersion := "0.1" + scalacOptions += "-language:Scala2" ) } diff --git a/sbt-dotty/sbt-test/discovery/test-discovery/project/plugins.sbt b/sbt-dotty/sbt-test/discovery/test-discovery/project/plugins.sbt new file mode 100644 index 000000000000..c17caab2d98c --- /dev/null +++ b/sbt-dotty/sbt-test/discovery/test-discovery/project/plugins.sbt @@ -0,0 +1 @@ +addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-scripted-tests/sbt-test/discovery/test-discovery/src/main/scala/A.scala b/sbt-dotty/sbt-test/discovery/test-discovery/src/main/scala/A.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/discovery/test-discovery/src/main/scala/A.scala rename to sbt-dotty/sbt-test/discovery/test-discovery/src/main/scala/A.scala diff --git a/sbt-scripted-tests/sbt-test/discovery/test-discovery/src/test/scala/TestA.scala b/sbt-dotty/sbt-test/discovery/test-discovery/src/test/scala/TestA.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/discovery/test-discovery/src/test/scala/TestA.scala rename to sbt-dotty/sbt-test/discovery/test-discovery/src/test/scala/TestA.scala diff --git a/sbt-scripted-tests/sbt-test/discovery/test-discovery/test b/sbt-dotty/sbt-test/discovery/test-discovery/test similarity index 100% rename from sbt-scripted-tests/sbt-test/discovery/test-discovery/test rename to sbt-dotty/sbt-test/discovery/test-discovery/test diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/abstract-override/A.scala b/sbt-dotty/sbt-test/source-dependencies/abstract-override/A.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/abstract-override/A.scala rename to sbt-dotty/sbt-test/source-dependencies/abstract-override/A.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/abstract-override/B.scala b/sbt-dotty/sbt-test/source-dependencies/abstract-override/B.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/abstract-override/B.scala rename to sbt-dotty/sbt-test/source-dependencies/abstract-override/B.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/abstract-override/C.scala b/sbt-dotty/sbt-test/source-dependencies/abstract-override/C.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/abstract-override/C.scala rename to sbt-dotty/sbt-test/source-dependencies/abstract-override/C.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/abstract-override/D.scala b/sbt-dotty/sbt-test/source-dependencies/abstract-override/D.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/abstract-override/D.scala rename to sbt-dotty/sbt-test/source-dependencies/abstract-override/D.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/abstract-override/changes/C2.scala b/sbt-dotty/sbt-test/source-dependencies/abstract-override/changes/C2.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/abstract-override/changes/C2.scala rename to sbt-dotty/sbt-test/source-dependencies/abstract-override/changes/C2.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/abstract-override/project/DottyInjectedPlugin.scala b/sbt-dotty/sbt-test/source-dependencies/abstract-override/project/DottyInjectedPlugin.scala similarity index 68% rename from sbt-scripted-tests/sbt-test/source-dependencies/abstract-override/project/DottyInjectedPlugin.scala rename to sbt-dotty/sbt-test/source-dependencies/abstract-override/project/DottyInjectedPlugin.scala index 3170ad99c06c..f9e3265ab2b2 100644 --- a/sbt-scripted-tests/sbt-test/source-dependencies/abstract-override/project/DottyInjectedPlugin.scala +++ b/sbt-dotty/sbt-test/source-dependencies/abstract-override/project/DottyInjectedPlugin.scala @@ -7,8 +7,6 @@ object DottyInjectedPlugin extends AutoPlugin { override val projectSettings = Seq( scalaVersion := "0.1.1-bin-SNAPSHOT", - scalaOrganization := "ch.epfl.lamp", - scalacOptions += "-language:Scala2", - scalaBinaryVersion := "0.1" + scalacOptions += "-language:Scala2" ) } diff --git a/sbt-dotty/sbt-test/source-dependencies/abstract-override/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/abstract-override/project/plugins.sbt new file mode 100644 index 000000000000..c17caab2d98c --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/abstract-override/project/plugins.sbt @@ -0,0 +1 @@ +addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/abstract-override/test b/sbt-dotty/sbt-test/source-dependencies/abstract-override/test similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/abstract-override/test rename to sbt-dotty/sbt-test/source-dependencies/abstract-override/test diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/abstract-type-override/build.sbt b/sbt-dotty/sbt-test/source-dependencies/abstract-type-override/build.sbt similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/abstract-type-override/build.sbt rename to sbt-dotty/sbt-test/source-dependencies/abstract-type-override/build.sbt diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/abstract-type-override/changes/Bar1.scala b/sbt-dotty/sbt-test/source-dependencies/abstract-type-override/changes/Bar1.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/abstract-type-override/changes/Bar1.scala rename to sbt-dotty/sbt-test/source-dependencies/abstract-type-override/changes/Bar1.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/abstract-type-override/project/DottyInjectedPlugin.scala b/sbt-dotty/sbt-test/source-dependencies/abstract-type-override/project/DottyInjectedPlugin.scala similarity index 68% rename from sbt-scripted-tests/sbt-test/source-dependencies/abstract-type-override/project/DottyInjectedPlugin.scala rename to sbt-dotty/sbt-test/source-dependencies/abstract-type-override/project/DottyInjectedPlugin.scala index 3170ad99c06c..f9e3265ab2b2 100644 --- a/sbt-scripted-tests/sbt-test/source-dependencies/abstract-type-override/project/DottyInjectedPlugin.scala +++ b/sbt-dotty/sbt-test/source-dependencies/abstract-type-override/project/DottyInjectedPlugin.scala @@ -7,8 +7,6 @@ object DottyInjectedPlugin extends AutoPlugin { override val projectSettings = Seq( scalaVersion := "0.1.1-bin-SNAPSHOT", - scalaOrganization := "ch.epfl.lamp", - scalacOptions += "-language:Scala2", - scalaBinaryVersion := "0.1" + scalacOptions += "-language:Scala2" ) } diff --git a/sbt-dotty/sbt-test/source-dependencies/abstract-type-override/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/abstract-type-override/project/plugins.sbt new file mode 100644 index 000000000000..c17caab2d98c --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/abstract-type-override/project/plugins.sbt @@ -0,0 +1 @@ +addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/abstract-type-override/src/main/scala/Bar.scala b/sbt-dotty/sbt-test/source-dependencies/abstract-type-override/src/main/scala/Bar.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/abstract-type-override/src/main/scala/Bar.scala rename to sbt-dotty/sbt-test/source-dependencies/abstract-type-override/src/main/scala/Bar.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/abstract-type-override/src/main/scala/Foo.scala b/sbt-dotty/sbt-test/source-dependencies/abstract-type-override/src/main/scala/Foo.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/abstract-type-override/src/main/scala/Foo.scala rename to sbt-dotty/sbt-test/source-dependencies/abstract-type-override/src/main/scala/Foo.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/abstract-type-override/src/main/scala/Impl.scala b/sbt-dotty/sbt-test/source-dependencies/abstract-type-override/src/main/scala/Impl.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/abstract-type-override/src/main/scala/Impl.scala rename to sbt-dotty/sbt-test/source-dependencies/abstract-type-override/src/main/scala/Impl.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/abstract-type-override/test b/sbt-dotty/sbt-test/source-dependencies/abstract-type-override/test similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/abstract-type-override/test rename to sbt-dotty/sbt-test/source-dependencies/abstract-type-override/test diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/abstract-type/A.scala b/sbt-dotty/sbt-test/source-dependencies/abstract-type/A.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/abstract-type/A.scala rename to sbt-dotty/sbt-test/source-dependencies/abstract-type/A.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/abstract-type/B.scala b/sbt-dotty/sbt-test/source-dependencies/abstract-type/B.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/abstract-type/B.scala rename to sbt-dotty/sbt-test/source-dependencies/abstract-type/B.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/abstract-type/changes/A.scala b/sbt-dotty/sbt-test/source-dependencies/abstract-type/changes/A.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/abstract-type/changes/A.scala rename to sbt-dotty/sbt-test/source-dependencies/abstract-type/changes/A.scala diff --git a/sbt-dotty/sbt-test/source-dependencies/abstract-type/project/DottyInjectedPlugin.scala b/sbt-dotty/sbt-test/source-dependencies/abstract-type/project/DottyInjectedPlugin.scala new file mode 100644 index 000000000000..f9e3265ab2b2 --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/abstract-type/project/DottyInjectedPlugin.scala @@ -0,0 +1,12 @@ +import sbt._ +import Keys._ + +object DottyInjectedPlugin extends AutoPlugin { + override def requires = plugins.JvmPlugin + override def trigger = allRequirements + + override val projectSettings = Seq( + scalaVersion := "0.1.1-bin-SNAPSHOT", + scalacOptions += "-language:Scala2" + ) +} diff --git a/sbt-dotty/sbt-test/source-dependencies/abstract-type/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/abstract-type/project/plugins.sbt new file mode 100644 index 000000000000..c17caab2d98c --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/abstract-type/project/plugins.sbt @@ -0,0 +1 @@ +addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/abstract-type/test b/sbt-dotty/sbt-test/source-dependencies/abstract-type/test similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/abstract-type/test rename to sbt-dotty/sbt-test/source-dependencies/abstract-type/test diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/added/changes/A1.scala b/sbt-dotty/sbt-test/source-dependencies/added/changes/A1.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/added/changes/A1.scala rename to sbt-dotty/sbt-test/source-dependencies/added/changes/A1.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/added/changes/A2.scala b/sbt-dotty/sbt-test/source-dependencies/added/changes/A2.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/added/changes/A2.scala rename to sbt-dotty/sbt-test/source-dependencies/added/changes/A2.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/added/changes/A3.scala b/sbt-dotty/sbt-test/source-dependencies/added/changes/A3.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/added/changes/A3.scala rename to sbt-dotty/sbt-test/source-dependencies/added/changes/A3.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/added/changes/B1.scala b/sbt-dotty/sbt-test/source-dependencies/added/changes/B1.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/added/changes/B1.scala rename to sbt-dotty/sbt-test/source-dependencies/added/changes/B1.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/added/changes/B2.scala b/sbt-dotty/sbt-test/source-dependencies/added/changes/B2.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/added/changes/B2.scala rename to sbt-dotty/sbt-test/source-dependencies/added/changes/B2.scala diff --git a/sbt-dotty/sbt-test/source-dependencies/added/project/DottyInjectedPlugin.scala b/sbt-dotty/sbt-test/source-dependencies/added/project/DottyInjectedPlugin.scala new file mode 100644 index 000000000000..f9e3265ab2b2 --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/added/project/DottyInjectedPlugin.scala @@ -0,0 +1,12 @@ +import sbt._ +import Keys._ + +object DottyInjectedPlugin extends AutoPlugin { + override def requires = plugins.JvmPlugin + override def trigger = allRequirements + + override val projectSettings = Seq( + scalaVersion := "0.1.1-bin-SNAPSHOT", + scalacOptions += "-language:Scala2" + ) +} diff --git a/sbt-dotty/sbt-test/source-dependencies/added/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/added/project/plugins.sbt new file mode 100644 index 000000000000..c17caab2d98c --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/added/project/plugins.sbt @@ -0,0 +1 @@ +addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/added/test b/sbt-dotty/sbt-test/source-dependencies/added/test similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/added/test rename to sbt-dotty/sbt-test/source-dependencies/added/test diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/as-seen-from-a/A.scala b/sbt-dotty/sbt-test/source-dependencies/as-seen-from-a/A.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/as-seen-from-a/A.scala rename to sbt-dotty/sbt-test/source-dependencies/as-seen-from-a/A.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/as-seen-from-a/B.scala b/sbt-dotty/sbt-test/source-dependencies/as-seen-from-a/B.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/as-seen-from-a/B.scala rename to sbt-dotty/sbt-test/source-dependencies/as-seen-from-a/B.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/as-seen-from-a/C.scala b/sbt-dotty/sbt-test/source-dependencies/as-seen-from-a/C.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/as-seen-from-a/C.scala rename to sbt-dotty/sbt-test/source-dependencies/as-seen-from-a/C.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/as-seen-from-a/D.scala b/sbt-dotty/sbt-test/source-dependencies/as-seen-from-a/D.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/as-seen-from-a/D.scala rename to sbt-dotty/sbt-test/source-dependencies/as-seen-from-a/D.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/as-seen-from-a/changes/B2.scala b/sbt-dotty/sbt-test/source-dependencies/as-seen-from-a/changes/B2.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/as-seen-from-a/changes/B2.scala rename to sbt-dotty/sbt-test/source-dependencies/as-seen-from-a/changes/B2.scala diff --git a/sbt-dotty/sbt-test/source-dependencies/as-seen-from-a/project/DottyInjectedPlugin.scala b/sbt-dotty/sbt-test/source-dependencies/as-seen-from-a/project/DottyInjectedPlugin.scala new file mode 100644 index 000000000000..f9e3265ab2b2 --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/as-seen-from-a/project/DottyInjectedPlugin.scala @@ -0,0 +1,12 @@ +import sbt._ +import Keys._ + +object DottyInjectedPlugin extends AutoPlugin { + override def requires = plugins.JvmPlugin + override def trigger = allRequirements + + override val projectSettings = Seq( + scalaVersion := "0.1.1-bin-SNAPSHOT", + scalacOptions += "-language:Scala2" + ) +} diff --git a/sbt-dotty/sbt-test/source-dependencies/as-seen-from-a/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/as-seen-from-a/project/plugins.sbt new file mode 100644 index 000000000000..c17caab2d98c --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/as-seen-from-a/project/plugins.sbt @@ -0,0 +1 @@ +addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/as-seen-from-a/test b/sbt-dotty/sbt-test/source-dependencies/as-seen-from-a/test similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/as-seen-from-a/test rename to sbt-dotty/sbt-test/source-dependencies/as-seen-from-a/test diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/as-seen-from-b/A.scala b/sbt-dotty/sbt-test/source-dependencies/as-seen-from-b/A.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/as-seen-from-b/A.scala rename to sbt-dotty/sbt-test/source-dependencies/as-seen-from-b/A.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/as-seen-from-b/B.scala b/sbt-dotty/sbt-test/source-dependencies/as-seen-from-b/B.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/as-seen-from-b/B.scala rename to sbt-dotty/sbt-test/source-dependencies/as-seen-from-b/B.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/as-seen-from-b/C.scala b/sbt-dotty/sbt-test/source-dependencies/as-seen-from-b/C.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/as-seen-from-b/C.scala rename to sbt-dotty/sbt-test/source-dependencies/as-seen-from-b/C.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/as-seen-from-b/D.scala b/sbt-dotty/sbt-test/source-dependencies/as-seen-from-b/D.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/as-seen-from-b/D.scala rename to sbt-dotty/sbt-test/source-dependencies/as-seen-from-b/D.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/as-seen-from-b/changes/B2.scala b/sbt-dotty/sbt-test/source-dependencies/as-seen-from-b/changes/B2.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/as-seen-from-b/changes/B2.scala rename to sbt-dotty/sbt-test/source-dependencies/as-seen-from-b/changes/B2.scala diff --git a/sbt-dotty/sbt-test/source-dependencies/as-seen-from-b/project/DottyInjectedPlugin.scala b/sbt-dotty/sbt-test/source-dependencies/as-seen-from-b/project/DottyInjectedPlugin.scala new file mode 100644 index 000000000000..f9e3265ab2b2 --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/as-seen-from-b/project/DottyInjectedPlugin.scala @@ -0,0 +1,12 @@ +import sbt._ +import Keys._ + +object DottyInjectedPlugin extends AutoPlugin { + override def requires = plugins.JvmPlugin + override def trigger = allRequirements + + override val projectSettings = Seq( + scalaVersion := "0.1.1-bin-SNAPSHOT", + scalacOptions += "-language:Scala2" + ) +} diff --git a/sbt-dotty/sbt-test/source-dependencies/as-seen-from-b/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/as-seen-from-b/project/plugins.sbt new file mode 100644 index 000000000000..c17caab2d98c --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/as-seen-from-b/project/plugins.sbt @@ -0,0 +1 @@ +addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/as-seen-from-b/test b/sbt-dotty/sbt-test/source-dependencies/as-seen-from-b/test similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/as-seen-from-b/test rename to sbt-dotty/sbt-test/source-dependencies/as-seen-from-b/test diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/backtick-quoted-names/A.scala b/sbt-dotty/sbt-test/source-dependencies/backtick-quoted-names/A.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/backtick-quoted-names/A.scala rename to sbt-dotty/sbt-test/source-dependencies/backtick-quoted-names/A.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/backtick-quoted-names/B.scala b/sbt-dotty/sbt-test/source-dependencies/backtick-quoted-names/B.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/backtick-quoted-names/B.scala rename to sbt-dotty/sbt-test/source-dependencies/backtick-quoted-names/B.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/backtick-quoted-names/build.sbt b/sbt-dotty/sbt-test/source-dependencies/backtick-quoted-names/build.sbt similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/backtick-quoted-names/build.sbt rename to sbt-dotty/sbt-test/source-dependencies/backtick-quoted-names/build.sbt diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/backtick-quoted-names/changes/A.scala b/sbt-dotty/sbt-test/source-dependencies/backtick-quoted-names/changes/A.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/backtick-quoted-names/changes/A.scala rename to sbt-dotty/sbt-test/source-dependencies/backtick-quoted-names/changes/A.scala diff --git a/sbt-dotty/sbt-test/source-dependencies/backtick-quoted-names/project/DottyInjectedPlugin.scala b/sbt-dotty/sbt-test/source-dependencies/backtick-quoted-names/project/DottyInjectedPlugin.scala new file mode 100644 index 000000000000..f9e3265ab2b2 --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/backtick-quoted-names/project/DottyInjectedPlugin.scala @@ -0,0 +1,12 @@ +import sbt._ +import Keys._ + +object DottyInjectedPlugin extends AutoPlugin { + override def requires = plugins.JvmPlugin + override def trigger = allRequirements + + override val projectSettings = Seq( + scalaVersion := "0.1.1-bin-SNAPSHOT", + scalacOptions += "-language:Scala2" + ) +} diff --git a/sbt-dotty/sbt-test/source-dependencies/backtick-quoted-names/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/backtick-quoted-names/project/plugins.sbt new file mode 100644 index 000000000000..c17caab2d98c --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/backtick-quoted-names/project/plugins.sbt @@ -0,0 +1 @@ +addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/backtick-quoted-names/test b/sbt-dotty/sbt-test/source-dependencies/backtick-quoted-names/test similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/backtick-quoted-names/test rename to sbt-dotty/sbt-test/source-dependencies/backtick-quoted-names/test diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/binary/changes/Break.scala b/sbt-dotty/sbt-test/source-dependencies/binary/changes/Break.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/binary/changes/Break.scala rename to sbt-dotty/sbt-test/source-dependencies/binary/changes/Break.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/binary/dep/A.scala b/sbt-dotty/sbt-test/source-dependencies/binary/dep/A.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/binary/dep/A.scala rename to sbt-dotty/sbt-test/source-dependencies/binary/dep/A.scala diff --git a/sbt-dotty/sbt-test/source-dependencies/binary/project/DottyInjectedPlugin.scala b/sbt-dotty/sbt-test/source-dependencies/binary/project/DottyInjectedPlugin.scala new file mode 100644 index 000000000000..f9e3265ab2b2 --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/binary/project/DottyInjectedPlugin.scala @@ -0,0 +1,12 @@ +import sbt._ +import Keys._ + +object DottyInjectedPlugin extends AutoPlugin { + override def requires = plugins.JvmPlugin + override def trigger = allRequirements + + override val projectSettings = Seq( + scalaVersion := "0.1.1-bin-SNAPSHOT", + scalacOptions += "-language:Scala2" + ) +} diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/binary/project/P.scala b/sbt-dotty/sbt-test/source-dependencies/binary/project/P.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/binary/project/P.scala rename to sbt-dotty/sbt-test/source-dependencies/binary/project/P.scala diff --git a/sbt-dotty/sbt-test/source-dependencies/binary/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/binary/project/plugins.sbt new file mode 100644 index 000000000000..c17caab2d98c --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/binary/project/plugins.sbt @@ -0,0 +1 @@ +addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/binary/test b/sbt-dotty/sbt-test/source-dependencies/binary/test similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/binary/test rename to sbt-dotty/sbt-test/source-dependencies/binary/test diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/binary/use/B.scala b/sbt-dotty/sbt-test/source-dependencies/binary/use/B.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/binary/use/B.scala rename to sbt-dotty/sbt-test/source-dependencies/binary/use/B.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/by-name/A.scala b/sbt-dotty/sbt-test/source-dependencies/by-name/A.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/by-name/A.scala rename to sbt-dotty/sbt-test/source-dependencies/by-name/A.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/by-name/B.scala b/sbt-dotty/sbt-test/source-dependencies/by-name/B.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/by-name/B.scala rename to sbt-dotty/sbt-test/source-dependencies/by-name/B.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/by-name/changes/A.scala b/sbt-dotty/sbt-test/source-dependencies/by-name/changes/A.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/by-name/changes/A.scala rename to sbt-dotty/sbt-test/source-dependencies/by-name/changes/A.scala diff --git a/sbt-dotty/sbt-test/source-dependencies/by-name/project/DottyInjectedPlugin.scala b/sbt-dotty/sbt-test/source-dependencies/by-name/project/DottyInjectedPlugin.scala new file mode 100644 index 000000000000..f9e3265ab2b2 --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/by-name/project/DottyInjectedPlugin.scala @@ -0,0 +1,12 @@ +import sbt._ +import Keys._ + +object DottyInjectedPlugin extends AutoPlugin { + override def requires = plugins.JvmPlugin + override def trigger = allRequirements + + override val projectSettings = Seq( + scalaVersion := "0.1.1-bin-SNAPSHOT", + scalacOptions += "-language:Scala2" + ) +} diff --git a/sbt-dotty/sbt-test/source-dependencies/by-name/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/by-name/project/plugins.sbt new file mode 100644 index 000000000000..c17caab2d98c --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/by-name/project/plugins.sbt @@ -0,0 +1 @@ +addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/by-name/test b/sbt-dotty/sbt-test/source-dependencies/by-name/test similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/by-name/test rename to sbt-dotty/sbt-test/source-dependencies/by-name/test diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/canon/Use.scala b/sbt-dotty/sbt-test/source-dependencies/canon/Use.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/canon/Use.scala rename to sbt-dotty/sbt-test/source-dependencies/canon/Use.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/canon/actual/A.java b/sbt-dotty/sbt-test/source-dependencies/canon/actual/A.java similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/canon/actual/A.java rename to sbt-dotty/sbt-test/source-dependencies/canon/actual/A.java diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/canon/actual/a.jar b/sbt-dotty/sbt-test/source-dependencies/canon/actual/a.jar similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/canon/actual/a.jar rename to sbt-dotty/sbt-test/source-dependencies/canon/actual/a.jar diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/canon/build.sbt b/sbt-dotty/sbt-test/source-dependencies/canon/build.sbt similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/canon/build.sbt rename to sbt-dotty/sbt-test/source-dependencies/canon/build.sbt diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/canon/lib/a.jar b/sbt-dotty/sbt-test/source-dependencies/canon/lib/a.jar similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/canon/lib/a.jar rename to sbt-dotty/sbt-test/source-dependencies/canon/lib/a.jar diff --git a/sbt-dotty/sbt-test/source-dependencies/canon/project/DottyInjectedPlugin.scala b/sbt-dotty/sbt-test/source-dependencies/canon/project/DottyInjectedPlugin.scala new file mode 100644 index 000000000000..f9e3265ab2b2 --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/canon/project/DottyInjectedPlugin.scala @@ -0,0 +1,12 @@ +import sbt._ +import Keys._ + +object DottyInjectedPlugin extends AutoPlugin { + override def requires = plugins.JvmPlugin + override def trigger = allRequirements + + override val projectSettings = Seq( + scalaVersion := "0.1.1-bin-SNAPSHOT", + scalacOptions += "-language:Scala2" + ) +} diff --git a/sbt-dotty/sbt-test/source-dependencies/canon/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/canon/project/plugins.sbt new file mode 100644 index 000000000000..c17caab2d98c --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/canon/project/plugins.sbt @@ -0,0 +1 @@ +addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/canon/test b/sbt-dotty/sbt-test/source-dependencies/canon/test similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/canon/test rename to sbt-dotty/sbt-test/source-dependencies/canon/test diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/compactify/build.sbt b/sbt-dotty/sbt-test/source-dependencies/compactify/build.sbt similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/compactify/build.sbt rename to sbt-dotty/sbt-test/source-dependencies/compactify/build.sbt diff --git a/sbt-dotty/sbt-test/source-dependencies/compactify/project/DottyInjectedPlugin.scala b/sbt-dotty/sbt-test/source-dependencies/compactify/project/DottyInjectedPlugin.scala new file mode 100644 index 000000000000..f9e3265ab2b2 --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/compactify/project/DottyInjectedPlugin.scala @@ -0,0 +1,12 @@ +import sbt._ +import Keys._ + +object DottyInjectedPlugin extends AutoPlugin { + override def requires = plugins.JvmPlugin + override def trigger = allRequirements + + override val projectSettings = Seq( + scalaVersion := "0.1.1-bin-SNAPSHOT", + scalacOptions += "-language:Scala2" + ) +} diff --git a/sbt-dotty/sbt-test/source-dependencies/compactify/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/compactify/project/plugins.sbt new file mode 100644 index 000000000000..c17caab2d98c --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/compactify/project/plugins.sbt @@ -0,0 +1 @@ +addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/compactify/src/main/scala/For.scala b/sbt-dotty/sbt-test/source-dependencies/compactify/src/main/scala/For.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/compactify/src/main/scala/For.scala rename to sbt-dotty/sbt-test/source-dependencies/compactify/src/main/scala/For.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/compactify/src/main/scala/Nested.scala b/sbt-dotty/sbt-test/source-dependencies/compactify/src/main/scala/Nested.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/compactify/src/main/scala/Nested.scala rename to sbt-dotty/sbt-test/source-dependencies/compactify/src/main/scala/Nested.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/compactify/test b/sbt-dotty/sbt-test/source-dependencies/compactify/test similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/compactify/test rename to sbt-dotty/sbt-test/source-dependencies/compactify/test diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/constants/changes/A1.scala b/sbt-dotty/sbt-test/source-dependencies/constants/changes/A1.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/constants/changes/A1.scala rename to sbt-dotty/sbt-test/source-dependencies/constants/changes/A1.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/constants/changes/A2.scala b/sbt-dotty/sbt-test/source-dependencies/constants/changes/A2.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/constants/changes/A2.scala rename to sbt-dotty/sbt-test/source-dependencies/constants/changes/A2.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/constants/changes/B.scala b/sbt-dotty/sbt-test/source-dependencies/constants/changes/B.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/constants/changes/B.scala rename to sbt-dotty/sbt-test/source-dependencies/constants/changes/B.scala diff --git a/sbt-dotty/sbt-test/source-dependencies/constants/project/DottyInjectedPlugin.scala b/sbt-dotty/sbt-test/source-dependencies/constants/project/DottyInjectedPlugin.scala new file mode 100644 index 000000000000..f9e3265ab2b2 --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/constants/project/DottyInjectedPlugin.scala @@ -0,0 +1,12 @@ +import sbt._ +import Keys._ + +object DottyInjectedPlugin extends AutoPlugin { + override def requires = plugins.JvmPlugin + override def trigger = allRequirements + + override val projectSettings = Seq( + scalaVersion := "0.1.1-bin-SNAPSHOT", + scalacOptions += "-language:Scala2" + ) +} diff --git a/sbt-dotty/sbt-test/source-dependencies/constants/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/constants/project/plugins.sbt new file mode 100644 index 000000000000..c17caab2d98c --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/constants/project/plugins.sbt @@ -0,0 +1 @@ +addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/constants/test b/sbt-dotty/sbt-test/source-dependencies/constants/test similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/constants/test rename to sbt-dotty/sbt-test/source-dependencies/constants/test diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/default-params/A.scala b/sbt-dotty/sbt-test/source-dependencies/default-params/A.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/default-params/A.scala rename to sbt-dotty/sbt-test/source-dependencies/default-params/A.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/default-params/B.scala b/sbt-dotty/sbt-test/source-dependencies/default-params/B.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/default-params/B.scala rename to sbt-dotty/sbt-test/source-dependencies/default-params/B.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/default-params/changes/A.scala b/sbt-dotty/sbt-test/source-dependencies/default-params/changes/A.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/default-params/changes/A.scala rename to sbt-dotty/sbt-test/source-dependencies/default-params/changes/A.scala diff --git a/sbt-dotty/sbt-test/source-dependencies/default-params/project/DottyInjectedPlugin.scala b/sbt-dotty/sbt-test/source-dependencies/default-params/project/DottyInjectedPlugin.scala new file mode 100644 index 000000000000..f9e3265ab2b2 --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/default-params/project/DottyInjectedPlugin.scala @@ -0,0 +1,12 @@ +import sbt._ +import Keys._ + +object DottyInjectedPlugin extends AutoPlugin { + override def requires = plugins.JvmPlugin + override def trigger = allRequirements + + override val projectSettings = Seq( + scalaVersion := "0.1.1-bin-SNAPSHOT", + scalacOptions += "-language:Scala2" + ) +} diff --git a/sbt-dotty/sbt-test/source-dependencies/default-params/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/default-params/project/plugins.sbt new file mode 100644 index 000000000000..c17caab2d98c --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/default-params/project/plugins.sbt @@ -0,0 +1 @@ +addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/default-params/test b/sbt-dotty/sbt-test/source-dependencies/default-params/test similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/default-params/test rename to sbt-dotty/sbt-test/source-dependencies/default-params/test diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/dup-class/changes/A.scala b/sbt-dotty/sbt-test/source-dependencies/dup-class/changes/A.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/dup-class/changes/A.scala rename to sbt-dotty/sbt-test/source-dependencies/dup-class/changes/A.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/dup-class/changes/A2.scala b/sbt-dotty/sbt-test/source-dependencies/dup-class/changes/A2.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/dup-class/changes/A2.scala rename to sbt-dotty/sbt-test/source-dependencies/dup-class/changes/A2.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/dup-class/changes/B.scala b/sbt-dotty/sbt-test/source-dependencies/dup-class/changes/B.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/dup-class/changes/B.scala rename to sbt-dotty/sbt-test/source-dependencies/dup-class/changes/B.scala diff --git a/sbt-dotty/sbt-test/source-dependencies/dup-class/project/DottyInjectedPlugin.scala b/sbt-dotty/sbt-test/source-dependencies/dup-class/project/DottyInjectedPlugin.scala new file mode 100644 index 000000000000..f9e3265ab2b2 --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/dup-class/project/DottyInjectedPlugin.scala @@ -0,0 +1,12 @@ +import sbt._ +import Keys._ + +object DottyInjectedPlugin extends AutoPlugin { + override def requires = plugins.JvmPlugin + override def trigger = allRequirements + + override val projectSettings = Seq( + scalaVersion := "0.1.1-bin-SNAPSHOT", + scalacOptions += "-language:Scala2" + ) +} diff --git a/sbt-dotty/sbt-test/source-dependencies/dup-class/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/dup-class/project/plugins.sbt new file mode 100644 index 000000000000..c17caab2d98c --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/dup-class/project/plugins.sbt @@ -0,0 +1 @@ +addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/dup-class/test b/sbt-dotty/sbt-test/source-dependencies/dup-class/test similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/dup-class/test rename to sbt-dotty/sbt-test/source-dependencies/dup-class/test diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/empty-a/changes/A.scala b/sbt-dotty/sbt-test/source-dependencies/empty-a/changes/A.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/empty-a/changes/A.scala rename to sbt-dotty/sbt-test/source-dependencies/empty-a/changes/A.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/empty-a/changes/A2.scala b/sbt-dotty/sbt-test/source-dependencies/empty-a/changes/A2.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/empty-a/changes/A2.scala rename to sbt-dotty/sbt-test/source-dependencies/empty-a/changes/A2.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/empty-a/changes/B.scala b/sbt-dotty/sbt-test/source-dependencies/empty-a/changes/B.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/empty-a/changes/B.scala rename to sbt-dotty/sbt-test/source-dependencies/empty-a/changes/B.scala diff --git a/sbt-dotty/sbt-test/source-dependencies/empty-a/project/DottyInjectedPlugin.scala b/sbt-dotty/sbt-test/source-dependencies/empty-a/project/DottyInjectedPlugin.scala new file mode 100644 index 000000000000..f9e3265ab2b2 --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/empty-a/project/DottyInjectedPlugin.scala @@ -0,0 +1,12 @@ +import sbt._ +import Keys._ + +object DottyInjectedPlugin extends AutoPlugin { + override def requires = plugins.JvmPlugin + override def trigger = allRequirements + + override val projectSettings = Seq( + scalaVersion := "0.1.1-bin-SNAPSHOT", + scalacOptions += "-language:Scala2" + ) +} diff --git a/sbt-dotty/sbt-test/source-dependencies/empty-a/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/empty-a/project/plugins.sbt new file mode 100644 index 000000000000..c17caab2d98c --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/empty-a/project/plugins.sbt @@ -0,0 +1 @@ +addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/empty-a/test b/sbt-dotty/sbt-test/source-dependencies/empty-a/test similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/empty-a/test rename to sbt-dotty/sbt-test/source-dependencies/empty-a/test diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/empty-package/changes/Define1.scala b/sbt-dotty/sbt-test/source-dependencies/empty-package/changes/Define1.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/empty-package/changes/Define1.scala rename to sbt-dotty/sbt-test/source-dependencies/empty-package/changes/Define1.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/empty-package/changes/Define2.scala b/sbt-dotty/sbt-test/source-dependencies/empty-package/changes/Define2.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/empty-package/changes/Define2.scala rename to sbt-dotty/sbt-test/source-dependencies/empty-package/changes/Define2.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/empty-package/changes/Use.scala b/sbt-dotty/sbt-test/source-dependencies/empty-package/changes/Use.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/empty-package/changes/Use.scala rename to sbt-dotty/sbt-test/source-dependencies/empty-package/changes/Use.scala diff --git a/sbt-dotty/sbt-test/source-dependencies/empty-package/project/DottyInjectedPlugin.scala b/sbt-dotty/sbt-test/source-dependencies/empty-package/project/DottyInjectedPlugin.scala new file mode 100644 index 000000000000..f9e3265ab2b2 --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/empty-package/project/DottyInjectedPlugin.scala @@ -0,0 +1,12 @@ +import sbt._ +import Keys._ + +object DottyInjectedPlugin extends AutoPlugin { + override def requires = plugins.JvmPlugin + override def trigger = allRequirements + + override val projectSettings = Seq( + scalaVersion := "0.1.1-bin-SNAPSHOT", + scalacOptions += "-language:Scala2" + ) +} diff --git a/sbt-dotty/sbt-test/source-dependencies/empty-package/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/empty-package/project/plugins.sbt new file mode 100644 index 000000000000..c17caab2d98c --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/empty-package/project/plugins.sbt @@ -0,0 +1 @@ +addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/empty-package/test b/sbt-dotty/sbt-test/source-dependencies/empty-package/test similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/empty-package/test rename to sbt-dotty/sbt-test/source-dependencies/empty-package/test diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/erasure/A.scala b/sbt-dotty/sbt-test/source-dependencies/erasure/A.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/erasure/A.scala rename to sbt-dotty/sbt-test/source-dependencies/erasure/A.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/erasure/B.scala b/sbt-dotty/sbt-test/source-dependencies/erasure/B.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/erasure/B.scala rename to sbt-dotty/sbt-test/source-dependencies/erasure/B.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/erasure/changes/A.scala b/sbt-dotty/sbt-test/source-dependencies/erasure/changes/A.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/erasure/changes/A.scala rename to sbt-dotty/sbt-test/source-dependencies/erasure/changes/A.scala diff --git a/sbt-dotty/sbt-test/source-dependencies/erasure/project/DottyInjectedPlugin.scala b/sbt-dotty/sbt-test/source-dependencies/erasure/project/DottyInjectedPlugin.scala new file mode 100644 index 000000000000..f9e3265ab2b2 --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/erasure/project/DottyInjectedPlugin.scala @@ -0,0 +1,12 @@ +import sbt._ +import Keys._ + +object DottyInjectedPlugin extends AutoPlugin { + override def requires = plugins.JvmPlugin + override def trigger = allRequirements + + override val projectSettings = Seq( + scalaVersion := "0.1.1-bin-SNAPSHOT", + scalacOptions += "-language:Scala2" + ) +} diff --git a/sbt-dotty/sbt-test/source-dependencies/erasure/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/erasure/project/plugins.sbt new file mode 100644 index 000000000000..c17caab2d98c --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/erasure/project/plugins.sbt @@ -0,0 +1 @@ +addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/erasure/test b/sbt-dotty/sbt-test/source-dependencies/erasure/test similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/erasure/test rename to sbt-dotty/sbt-test/source-dependencies/erasure/test diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/export-jars/changes/A1.scala b/sbt-dotty/sbt-test/source-dependencies/export-jars/changes/A1.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/export-jars/changes/A1.scala rename to sbt-dotty/sbt-test/source-dependencies/export-jars/changes/A1.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/export-jars/changes/A2.scala b/sbt-dotty/sbt-test/source-dependencies/export-jars/changes/A2.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/export-jars/changes/A2.scala rename to sbt-dotty/sbt-test/source-dependencies/export-jars/changes/A2.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/export-jars/changes/A3.scala b/sbt-dotty/sbt-test/source-dependencies/export-jars/changes/A3.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/export-jars/changes/A3.scala rename to sbt-dotty/sbt-test/source-dependencies/export-jars/changes/A3.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/export-jars/changes/B.scala b/sbt-dotty/sbt-test/source-dependencies/export-jars/changes/B.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/export-jars/changes/B.scala rename to sbt-dotty/sbt-test/source-dependencies/export-jars/changes/B.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/export-jars/changes/build2.sbt b/sbt-dotty/sbt-test/source-dependencies/export-jars/changes/build2.sbt similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/export-jars/changes/build2.sbt rename to sbt-dotty/sbt-test/source-dependencies/export-jars/changes/build2.sbt diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/export-jars/project/Build.scala b/sbt-dotty/sbt-test/source-dependencies/export-jars/project/Build.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/export-jars/project/Build.scala rename to sbt-dotty/sbt-test/source-dependencies/export-jars/project/Build.scala diff --git a/sbt-dotty/sbt-test/source-dependencies/export-jars/project/DottyInjectedPlugin.scala b/sbt-dotty/sbt-test/source-dependencies/export-jars/project/DottyInjectedPlugin.scala new file mode 100644 index 000000000000..f9e3265ab2b2 --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/export-jars/project/DottyInjectedPlugin.scala @@ -0,0 +1,12 @@ +import sbt._ +import Keys._ + +object DottyInjectedPlugin extends AutoPlugin { + override def requires = plugins.JvmPlugin + override def trigger = allRequirements + + override val projectSettings = Seq( + scalaVersion := "0.1.1-bin-SNAPSHOT", + scalacOptions += "-language:Scala2" + ) +} diff --git a/sbt-dotty/sbt-test/source-dependencies/export-jars/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/export-jars/project/plugins.sbt new file mode 100644 index 000000000000..c17caab2d98c --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/export-jars/project/plugins.sbt @@ -0,0 +1 @@ +addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/export-jars/test b/sbt-dotty/sbt-test/source-dependencies/export-jars/test similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/export-jars/test rename to sbt-dotty/sbt-test/source-dependencies/export-jars/test diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/ext/A.scala b/sbt-dotty/sbt-test/source-dependencies/ext/A.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/ext/A.scala rename to sbt-dotty/sbt-test/source-dependencies/ext/A.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/ext/build.sbt b/sbt-dotty/sbt-test/source-dependencies/ext/build.sbt similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/ext/build.sbt rename to sbt-dotty/sbt-test/source-dependencies/ext/build.sbt diff --git a/sbt-dotty/sbt-test/source-dependencies/ext/project/DottyInjectedPlugin.scala b/sbt-dotty/sbt-test/source-dependencies/ext/project/DottyInjectedPlugin.scala new file mode 100644 index 000000000000..f9e3265ab2b2 --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/ext/project/DottyInjectedPlugin.scala @@ -0,0 +1,12 @@ +import sbt._ +import Keys._ + +object DottyInjectedPlugin extends AutoPlugin { + override def requires = plugins.JvmPlugin + override def trigger = allRequirements + + override val projectSettings = Seq( + scalaVersion := "0.1.1-bin-SNAPSHOT", + scalacOptions += "-language:Scala2" + ) +} diff --git a/sbt-dotty/sbt-test/source-dependencies/ext/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/ext/project/plugins.sbt new file mode 100644 index 000000000000..c17caab2d98c --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/ext/project/plugins.sbt @@ -0,0 +1 @@ +addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/ext/test b/sbt-dotty/sbt-test/source-dependencies/ext/test similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/ext/test rename to sbt-dotty/sbt-test/source-dependencies/ext/test diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/false-error/A.scala b/sbt-dotty/sbt-test/source-dependencies/false-error/A.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/false-error/A.scala rename to sbt-dotty/sbt-test/source-dependencies/false-error/A.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/false-error/B.scala b/sbt-dotty/sbt-test/source-dependencies/false-error/B.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/false-error/B.scala rename to sbt-dotty/sbt-test/source-dependencies/false-error/B.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/false-error/changes/A.scala b/sbt-dotty/sbt-test/source-dependencies/false-error/changes/A.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/false-error/changes/A.scala rename to sbt-dotty/sbt-test/source-dependencies/false-error/changes/A.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/false-error/pending b/sbt-dotty/sbt-test/source-dependencies/false-error/pending similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/false-error/pending rename to sbt-dotty/sbt-test/source-dependencies/false-error/pending diff --git a/sbt-dotty/sbt-test/source-dependencies/false-error/project/DottyInjectedPlugin.scala b/sbt-dotty/sbt-test/source-dependencies/false-error/project/DottyInjectedPlugin.scala new file mode 100644 index 000000000000..f9e3265ab2b2 --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/false-error/project/DottyInjectedPlugin.scala @@ -0,0 +1,12 @@ +import sbt._ +import Keys._ + +object DottyInjectedPlugin extends AutoPlugin { + override def requires = plugins.JvmPlugin + override def trigger = allRequirements + + override val projectSettings = Seq( + scalaVersion := "0.1.1-bin-SNAPSHOT", + scalacOptions += "-language:Scala2" + ) +} diff --git a/sbt-dotty/sbt-test/source-dependencies/false-error/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/false-error/project/plugins.sbt new file mode 100644 index 000000000000..c17caab2d98c --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/false-error/project/plugins.sbt @@ -0,0 +1 @@ +addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/fbounded-existentials/fbounds.scala b/sbt-dotty/sbt-test/source-dependencies/fbounded-existentials/fbounds.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/fbounded-existentials/fbounds.scala rename to sbt-dotty/sbt-test/source-dependencies/fbounded-existentials/fbounds.scala diff --git a/sbt-dotty/sbt-test/source-dependencies/fbounded-existentials/project/DottyInjectedPlugin.scala b/sbt-dotty/sbt-test/source-dependencies/fbounded-existentials/project/DottyInjectedPlugin.scala new file mode 100644 index 000000000000..f9e3265ab2b2 --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/fbounded-existentials/project/DottyInjectedPlugin.scala @@ -0,0 +1,12 @@ +import sbt._ +import Keys._ + +object DottyInjectedPlugin extends AutoPlugin { + override def requires = plugins.JvmPlugin + override def trigger = allRequirements + + override val projectSettings = Seq( + scalaVersion := "0.1.1-bin-SNAPSHOT", + scalacOptions += "-language:Scala2" + ) +} diff --git a/sbt-dotty/sbt-test/source-dependencies/fbounded-existentials/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/fbounded-existentials/project/plugins.sbt new file mode 100644 index 000000000000..c17caab2d98c --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/fbounded-existentials/project/plugins.sbt @@ -0,0 +1 @@ +addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/fbounded-existentials/test b/sbt-dotty/sbt-test/source-dependencies/fbounded-existentials/test similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/fbounded-existentials/test rename to sbt-dotty/sbt-test/source-dependencies/fbounded-existentials/test diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/implicit-params/A.scala b/sbt-dotty/sbt-test/source-dependencies/implicit-params/A.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/implicit-params/A.scala rename to sbt-dotty/sbt-test/source-dependencies/implicit-params/A.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/implicit-params/B.scala b/sbt-dotty/sbt-test/source-dependencies/implicit-params/B.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/implicit-params/B.scala rename to sbt-dotty/sbt-test/source-dependencies/implicit-params/B.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/implicit-params/changes/A.scala b/sbt-dotty/sbt-test/source-dependencies/implicit-params/changes/A.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/implicit-params/changes/A.scala rename to sbt-dotty/sbt-test/source-dependencies/implicit-params/changes/A.scala diff --git a/sbt-dotty/sbt-test/source-dependencies/implicit-params/project/DottyInjectedPlugin.scala b/sbt-dotty/sbt-test/source-dependencies/implicit-params/project/DottyInjectedPlugin.scala new file mode 100644 index 000000000000..f9e3265ab2b2 --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/implicit-params/project/DottyInjectedPlugin.scala @@ -0,0 +1,12 @@ +import sbt._ +import Keys._ + +object DottyInjectedPlugin extends AutoPlugin { + override def requires = plugins.JvmPlugin + override def trigger = allRequirements + + override val projectSettings = Seq( + scalaVersion := "0.1.1-bin-SNAPSHOT", + scalacOptions += "-language:Scala2" + ) +} diff --git a/sbt-dotty/sbt-test/source-dependencies/implicit-params/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/implicit-params/project/plugins.sbt new file mode 100644 index 000000000000..c17caab2d98c --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/implicit-params/project/plugins.sbt @@ -0,0 +1 @@ +addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/implicit-params/test b/sbt-dotty/sbt-test/source-dependencies/implicit-params/test similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/implicit-params/test rename to sbt-dotty/sbt-test/source-dependencies/implicit-params/test diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/implicit-search-companion-scope/changes/A1.scala b/sbt-dotty/sbt-test/source-dependencies/implicit-search-companion-scope/changes/A1.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/implicit-search-companion-scope/changes/A1.scala rename to sbt-dotty/sbt-test/source-dependencies/implicit-search-companion-scope/changes/A1.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/implicit-search-companion-scope/changes/A2.scala b/sbt-dotty/sbt-test/source-dependencies/implicit-search-companion-scope/changes/A2.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/implicit-search-companion-scope/changes/A2.scala rename to sbt-dotty/sbt-test/source-dependencies/implicit-search-companion-scope/changes/A2.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/implicit-search-companion-scope/changes/B.scala b/sbt-dotty/sbt-test/source-dependencies/implicit-search-companion-scope/changes/B.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/implicit-search-companion-scope/changes/B.scala rename to sbt-dotty/sbt-test/source-dependencies/implicit-search-companion-scope/changes/B.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/implicit-search-companion-scope/changes/C.scala b/sbt-dotty/sbt-test/source-dependencies/implicit-search-companion-scope/changes/C.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/implicit-search-companion-scope/changes/C.scala rename to sbt-dotty/sbt-test/source-dependencies/implicit-search-companion-scope/changes/C.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/implicit-search-companion-scope/changes/M.scala b/sbt-dotty/sbt-test/source-dependencies/implicit-search-companion-scope/changes/M.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/implicit-search-companion-scope/changes/M.scala rename to sbt-dotty/sbt-test/source-dependencies/implicit-search-companion-scope/changes/M.scala diff --git a/sbt-dotty/sbt-test/source-dependencies/implicit-search-companion-scope/project/DottyInjectedPlugin.scala b/sbt-dotty/sbt-test/source-dependencies/implicit-search-companion-scope/project/DottyInjectedPlugin.scala new file mode 100644 index 000000000000..f9e3265ab2b2 --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/implicit-search-companion-scope/project/DottyInjectedPlugin.scala @@ -0,0 +1,12 @@ +import sbt._ +import Keys._ + +object DottyInjectedPlugin extends AutoPlugin { + override def requires = plugins.JvmPlugin + override def trigger = allRequirements + + override val projectSettings = Seq( + scalaVersion := "0.1.1-bin-SNAPSHOT", + scalacOptions += "-language:Scala2" + ) +} diff --git a/sbt-dotty/sbt-test/source-dependencies/implicit-search-companion-scope/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/implicit-search-companion-scope/project/plugins.sbt new file mode 100644 index 000000000000..c17caab2d98c --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/implicit-search-companion-scope/project/plugins.sbt @@ -0,0 +1 @@ +addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/implicit-search-companion-scope/test b/sbt-dotty/sbt-test/source-dependencies/implicit-search-companion-scope/test similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/implicit-search-companion-scope/test rename to sbt-dotty/sbt-test/source-dependencies/implicit-search-companion-scope/test diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/implicit-search/changes/A1.scala b/sbt-dotty/sbt-test/source-dependencies/implicit-search/changes/A1.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/implicit-search/changes/A1.scala rename to sbt-dotty/sbt-test/source-dependencies/implicit-search/changes/A1.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/implicit-search/changes/A2.scala b/sbt-dotty/sbt-test/source-dependencies/implicit-search/changes/A2.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/implicit-search/changes/A2.scala rename to sbt-dotty/sbt-test/source-dependencies/implicit-search/changes/A2.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/implicit-search/changes/B.scala b/sbt-dotty/sbt-test/source-dependencies/implicit-search/changes/B.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/implicit-search/changes/B.scala rename to sbt-dotty/sbt-test/source-dependencies/implicit-search/changes/B.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/implicit-search/changes/C.scala b/sbt-dotty/sbt-test/source-dependencies/implicit-search/changes/C.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/implicit-search/changes/C.scala rename to sbt-dotty/sbt-test/source-dependencies/implicit-search/changes/C.scala diff --git a/sbt-dotty/sbt-test/source-dependencies/implicit-search/project/DottyInjectedPlugin.scala b/sbt-dotty/sbt-test/source-dependencies/implicit-search/project/DottyInjectedPlugin.scala new file mode 100644 index 000000000000..f9e3265ab2b2 --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/implicit-search/project/DottyInjectedPlugin.scala @@ -0,0 +1,12 @@ +import sbt._ +import Keys._ + +object DottyInjectedPlugin extends AutoPlugin { + override def requires = plugins.JvmPlugin + override def trigger = allRequirements + + override val projectSettings = Seq( + scalaVersion := "0.1.1-bin-SNAPSHOT", + scalacOptions += "-language:Scala2" + ) +} diff --git a/sbt-dotty/sbt-test/source-dependencies/implicit-search/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/implicit-search/project/plugins.sbt new file mode 100644 index 000000000000..c17caab2d98c --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/implicit-search/project/plugins.sbt @@ -0,0 +1 @@ +addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/implicit-search/test b/sbt-dotty/sbt-test/source-dependencies/implicit-search/test similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/implicit-search/test rename to sbt-dotty/sbt-test/source-dependencies/implicit-search/test diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/implicit/A.scala b/sbt-dotty/sbt-test/source-dependencies/implicit/A.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/implicit/A.scala rename to sbt-dotty/sbt-test/source-dependencies/implicit/A.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/implicit/B.scala b/sbt-dotty/sbt-test/source-dependencies/implicit/B.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/implicit/B.scala rename to sbt-dotty/sbt-test/source-dependencies/implicit/B.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/implicit/changes/A.scala b/sbt-dotty/sbt-test/source-dependencies/implicit/changes/A.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/implicit/changes/A.scala rename to sbt-dotty/sbt-test/source-dependencies/implicit/changes/A.scala diff --git a/sbt-dotty/sbt-test/source-dependencies/implicit/project/DottyInjectedPlugin.scala b/sbt-dotty/sbt-test/source-dependencies/implicit/project/DottyInjectedPlugin.scala new file mode 100644 index 000000000000..f9e3265ab2b2 --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/implicit/project/DottyInjectedPlugin.scala @@ -0,0 +1,12 @@ +import sbt._ +import Keys._ + +object DottyInjectedPlugin extends AutoPlugin { + override def requires = plugins.JvmPlugin + override def trigger = allRequirements + + override val projectSettings = Seq( + scalaVersion := "0.1.1-bin-SNAPSHOT", + scalacOptions += "-language:Scala2" + ) +} diff --git a/sbt-dotty/sbt-test/source-dependencies/implicit/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/implicit/project/plugins.sbt new file mode 100644 index 000000000000..c17caab2d98c --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/implicit/project/plugins.sbt @@ -0,0 +1 @@ +addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/implicit/test b/sbt-dotty/sbt-test/source-dependencies/implicit/test similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/implicit/test rename to sbt-dotty/sbt-test/source-dependencies/implicit/test diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/import-class/A.scala b/sbt-dotty/sbt-test/source-dependencies/import-class/A.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/import-class/A.scala rename to sbt-dotty/sbt-test/source-dependencies/import-class/A.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/import-class/B.scala b/sbt-dotty/sbt-test/source-dependencies/import-class/B.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/import-class/B.scala rename to sbt-dotty/sbt-test/source-dependencies/import-class/B.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/import-class/changes/A.scala b/sbt-dotty/sbt-test/source-dependencies/import-class/changes/A.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/import-class/changes/A.scala rename to sbt-dotty/sbt-test/source-dependencies/import-class/changes/A.scala diff --git a/sbt-dotty/sbt-test/source-dependencies/import-class/project/DottyInjectedPlugin.scala b/sbt-dotty/sbt-test/source-dependencies/import-class/project/DottyInjectedPlugin.scala new file mode 100644 index 000000000000..f9e3265ab2b2 --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/import-class/project/DottyInjectedPlugin.scala @@ -0,0 +1,12 @@ +import sbt._ +import Keys._ + +object DottyInjectedPlugin extends AutoPlugin { + override def requires = plugins.JvmPlugin + override def trigger = allRequirements + + override val projectSettings = Seq( + scalaVersion := "0.1.1-bin-SNAPSHOT", + scalacOptions += "-language:Scala2" + ) +} diff --git a/sbt-dotty/sbt-test/source-dependencies/import-class/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/import-class/project/plugins.sbt new file mode 100644 index 000000000000..c17caab2d98c --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/import-class/project/plugins.sbt @@ -0,0 +1 @@ +addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/import-class/test b/sbt-dotty/sbt-test/source-dependencies/import-class/test similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/import-class/test rename to sbt-dotty/sbt-test/source-dependencies/import-class/test diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/import-package/A.scala b/sbt-dotty/sbt-test/source-dependencies/import-package/A.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/import-package/A.scala rename to sbt-dotty/sbt-test/source-dependencies/import-package/A.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/import-package/B.scala b/sbt-dotty/sbt-test/source-dependencies/import-package/B.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/import-package/B.scala rename to sbt-dotty/sbt-test/source-dependencies/import-package/B.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/import-package/changes/A.scala b/sbt-dotty/sbt-test/source-dependencies/import-package/changes/A.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/import-package/changes/A.scala rename to sbt-dotty/sbt-test/source-dependencies/import-package/changes/A.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/import-package/pending b/sbt-dotty/sbt-test/source-dependencies/import-package/pending similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/import-package/pending rename to sbt-dotty/sbt-test/source-dependencies/import-package/pending diff --git a/sbt-dotty/sbt-test/source-dependencies/import-package/project/DottyInjectedPlugin.scala b/sbt-dotty/sbt-test/source-dependencies/import-package/project/DottyInjectedPlugin.scala new file mode 100644 index 000000000000..f9e3265ab2b2 --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/import-package/project/DottyInjectedPlugin.scala @@ -0,0 +1,12 @@ +import sbt._ +import Keys._ + +object DottyInjectedPlugin extends AutoPlugin { + override def requires = plugins.JvmPlugin + override def trigger = allRequirements + + override val projectSettings = Seq( + scalaVersion := "0.1.1-bin-SNAPSHOT", + scalacOptions += "-language:Scala2" + ) +} diff --git a/sbt-dotty/sbt-test/source-dependencies/import-package/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/import-package/project/plugins.sbt new file mode 100644 index 000000000000..c17caab2d98c --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/import-package/project/plugins.sbt @@ -0,0 +1 @@ +addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/inherited-deps-java/A.java b/sbt-dotty/sbt-test/source-dependencies/inherited-deps-java/A.java similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/inherited-deps-java/A.java rename to sbt-dotty/sbt-test/source-dependencies/inherited-deps-java/A.java diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/inherited-deps-java/B.java b/sbt-dotty/sbt-test/source-dependencies/inherited-deps-java/B.java similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/inherited-deps-java/B.java rename to sbt-dotty/sbt-test/source-dependencies/inherited-deps-java/B.java diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/inherited-deps-java/C.java b/sbt-dotty/sbt-test/source-dependencies/inherited-deps-java/C.java similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/inherited-deps-java/C.java rename to sbt-dotty/sbt-test/source-dependencies/inherited-deps-java/C.java diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/inherited-deps-java/D.java b/sbt-dotty/sbt-test/source-dependencies/inherited-deps-java/D.java similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/inherited-deps-java/D.java rename to sbt-dotty/sbt-test/source-dependencies/inherited-deps-java/D.java diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/inherited-deps-java/E.java b/sbt-dotty/sbt-test/source-dependencies/inherited-deps-java/E.java similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/inherited-deps-java/E.java rename to sbt-dotty/sbt-test/source-dependencies/inherited-deps-java/E.java diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/inherited-deps-java/F.java b/sbt-dotty/sbt-test/source-dependencies/inherited-deps-java/F.java similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/inherited-deps-java/F.java rename to sbt-dotty/sbt-test/source-dependencies/inherited-deps-java/F.java diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/inherited-deps-java/G.java b/sbt-dotty/sbt-test/source-dependencies/inherited-deps-java/G.java similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/inherited-deps-java/G.java rename to sbt-dotty/sbt-test/source-dependencies/inherited-deps-java/G.java diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/inherited-deps-java/J.java b/sbt-dotty/sbt-test/source-dependencies/inherited-deps-java/J.java similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/inherited-deps-java/J.java rename to sbt-dotty/sbt-test/source-dependencies/inherited-deps-java/J.java diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/inherited-deps-java/build.sbt b/sbt-dotty/sbt-test/source-dependencies/inherited-deps-java/build.sbt similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/inherited-deps-java/build.sbt rename to sbt-dotty/sbt-test/source-dependencies/inherited-deps-java/build.sbt diff --git a/sbt-dotty/sbt-test/source-dependencies/inherited-deps-java/project/DottyInjectedPlugin.scala b/sbt-dotty/sbt-test/source-dependencies/inherited-deps-java/project/DottyInjectedPlugin.scala new file mode 100644 index 000000000000..f9e3265ab2b2 --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/inherited-deps-java/project/DottyInjectedPlugin.scala @@ -0,0 +1,12 @@ +import sbt._ +import Keys._ + +object DottyInjectedPlugin extends AutoPlugin { + override def requires = plugins.JvmPlugin + override def trigger = allRequirements + + override val projectSettings = Seq( + scalaVersion := "0.1.1-bin-SNAPSHOT", + scalacOptions += "-language:Scala2" + ) +} diff --git a/sbt-dotty/sbt-test/source-dependencies/inherited-deps-java/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/inherited-deps-java/project/plugins.sbt new file mode 100644 index 000000000000..c17caab2d98c --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/inherited-deps-java/project/plugins.sbt @@ -0,0 +1 @@ +addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/inherited-deps-java/test b/sbt-dotty/sbt-test/source-dependencies/inherited-deps-java/test similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/inherited-deps-java/test rename to sbt-dotty/sbt-test/source-dependencies/inherited-deps-java/test diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/inherited_type_params/A.scala b/sbt-dotty/sbt-test/source-dependencies/inherited_type_params/A.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/inherited_type_params/A.scala rename to sbt-dotty/sbt-test/source-dependencies/inherited_type_params/A.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/inherited_type_params/build.sbt b/sbt-dotty/sbt-test/source-dependencies/inherited_type_params/build.sbt similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/inherited_type_params/build.sbt rename to sbt-dotty/sbt-test/source-dependencies/inherited_type_params/build.sbt diff --git a/sbt-dotty/sbt-test/source-dependencies/inherited_type_params/project/DottyInjectedPlugin.scala b/sbt-dotty/sbt-test/source-dependencies/inherited_type_params/project/DottyInjectedPlugin.scala new file mode 100644 index 000000000000..f9e3265ab2b2 --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/inherited_type_params/project/DottyInjectedPlugin.scala @@ -0,0 +1,12 @@ +import sbt._ +import Keys._ + +object DottyInjectedPlugin extends AutoPlugin { + override def requires = plugins.JvmPlugin + override def trigger = allRequirements + + override val projectSettings = Seq( + scalaVersion := "0.1.1-bin-SNAPSHOT", + scalacOptions += "-language:Scala2" + ) +} diff --git a/sbt-dotty/sbt-test/source-dependencies/inherited_type_params/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/inherited_type_params/project/plugins.sbt new file mode 100644 index 000000000000..c17caab2d98c --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/inherited_type_params/project/plugins.sbt @@ -0,0 +1 @@ +addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/inherited_type_params/test b/sbt-dotty/sbt-test/source-dependencies/inherited_type_params/test similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/inherited_type_params/test rename to sbt-dotty/sbt-test/source-dependencies/inherited_type_params/test diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/inline/A.scala b/sbt-dotty/sbt-test/source-dependencies/inline/A.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/inline/A.scala rename to sbt-dotty/sbt-test/source-dependencies/inline/A.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/inline/C.scala b/sbt-dotty/sbt-test/source-dependencies/inline/C.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/inline/C.scala rename to sbt-dotty/sbt-test/source-dependencies/inline/C.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/inline/changes/B1.scala b/sbt-dotty/sbt-test/source-dependencies/inline/changes/B1.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/inline/changes/B1.scala rename to sbt-dotty/sbt-test/source-dependencies/inline/changes/B1.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/inline/changes/B2.scala b/sbt-dotty/sbt-test/source-dependencies/inline/changes/B2.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/inline/changes/B2.scala rename to sbt-dotty/sbt-test/source-dependencies/inline/changes/B2.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/inline/changes/B3.scala b/sbt-dotty/sbt-test/source-dependencies/inline/changes/B3.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/inline/changes/B3.scala rename to sbt-dotty/sbt-test/source-dependencies/inline/changes/B3.scala diff --git a/sbt-dotty/sbt-test/source-dependencies/inline/project/DottyInjectedPlugin.scala b/sbt-dotty/sbt-test/source-dependencies/inline/project/DottyInjectedPlugin.scala new file mode 100644 index 000000000000..f9e3265ab2b2 --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/inline/project/DottyInjectedPlugin.scala @@ -0,0 +1,12 @@ +import sbt._ +import Keys._ + +object DottyInjectedPlugin extends AutoPlugin { + override def requires = plugins.JvmPlugin + override def trigger = allRequirements + + override val projectSettings = Seq( + scalaVersion := "0.1.1-bin-SNAPSHOT", + scalacOptions += "-language:Scala2" + ) +} diff --git a/sbt-dotty/sbt-test/source-dependencies/inline/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/inline/project/plugins.sbt new file mode 100644 index 000000000000..c17caab2d98c --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/inline/project/plugins.sbt @@ -0,0 +1 @@ +addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/inline/test b/sbt-dotty/sbt-test/source-dependencies/inline/test similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/inline/test rename to sbt-dotty/sbt-test/source-dependencies/inline/test diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/intermediate-error/A.scala b/sbt-dotty/sbt-test/source-dependencies/intermediate-error/A.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/intermediate-error/A.scala rename to sbt-dotty/sbt-test/source-dependencies/intermediate-error/A.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/intermediate-error/B.scala b/sbt-dotty/sbt-test/source-dependencies/intermediate-error/B.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/intermediate-error/B.scala rename to sbt-dotty/sbt-test/source-dependencies/intermediate-error/B.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/intermediate-error/changes/A2.scala b/sbt-dotty/sbt-test/source-dependencies/intermediate-error/changes/A2.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/intermediate-error/changes/A2.scala rename to sbt-dotty/sbt-test/source-dependencies/intermediate-error/changes/A2.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/intermediate-error/changes/A3.scala b/sbt-dotty/sbt-test/source-dependencies/intermediate-error/changes/A3.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/intermediate-error/changes/A3.scala rename to sbt-dotty/sbt-test/source-dependencies/intermediate-error/changes/A3.scala diff --git a/sbt-dotty/sbt-test/source-dependencies/intermediate-error/project/DottyInjectedPlugin.scala b/sbt-dotty/sbt-test/source-dependencies/intermediate-error/project/DottyInjectedPlugin.scala new file mode 100644 index 000000000000..f9e3265ab2b2 --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/intermediate-error/project/DottyInjectedPlugin.scala @@ -0,0 +1,12 @@ +import sbt._ +import Keys._ + +object DottyInjectedPlugin extends AutoPlugin { + override def requires = plugins.JvmPlugin + override def trigger = allRequirements + + override val projectSettings = Seq( + scalaVersion := "0.1.1-bin-SNAPSHOT", + scalacOptions += "-language:Scala2" + ) +} diff --git a/sbt-dotty/sbt-test/source-dependencies/intermediate-error/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/intermediate-error/project/plugins.sbt new file mode 100644 index 000000000000..c17caab2d98c --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/intermediate-error/project/plugins.sbt @@ -0,0 +1 @@ +addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/intermediate-error/test b/sbt-dotty/sbt-test/source-dependencies/intermediate-error/test similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/intermediate-error/test rename to sbt-dotty/sbt-test/source-dependencies/intermediate-error/test diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/java-analysis-serialization-error/Outer.java b/sbt-dotty/sbt-test/source-dependencies/java-analysis-serialization-error/Outer.java similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/java-analysis-serialization-error/Outer.java rename to sbt-dotty/sbt-test/source-dependencies/java-analysis-serialization-error/Outer.java diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/java-analysis-serialization-error/build.sbt b/sbt-dotty/sbt-test/source-dependencies/java-analysis-serialization-error/build.sbt similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/java-analysis-serialization-error/build.sbt rename to sbt-dotty/sbt-test/source-dependencies/java-analysis-serialization-error/build.sbt diff --git a/sbt-dotty/sbt-test/source-dependencies/java-analysis-serialization-error/project/DottyInjectedPlugin.scala b/sbt-dotty/sbt-test/source-dependencies/java-analysis-serialization-error/project/DottyInjectedPlugin.scala new file mode 100644 index 000000000000..f9e3265ab2b2 --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/java-analysis-serialization-error/project/DottyInjectedPlugin.scala @@ -0,0 +1,12 @@ +import sbt._ +import Keys._ + +object DottyInjectedPlugin extends AutoPlugin { + override def requires = plugins.JvmPlugin + override def trigger = allRequirements + + override val projectSettings = Seq( + scalaVersion := "0.1.1-bin-SNAPSHOT", + scalacOptions += "-language:Scala2" + ) +} diff --git a/sbt-dotty/sbt-test/source-dependencies/java-analysis-serialization-error/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/java-analysis-serialization-error/project/plugins.sbt new file mode 100644 index 000000000000..c17caab2d98c --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/java-analysis-serialization-error/project/plugins.sbt @@ -0,0 +1 @@ +addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/java-analysis-serialization-error/test b/sbt-dotty/sbt-test/source-dependencies/java-analysis-serialization-error/test similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/java-analysis-serialization-error/test rename to sbt-dotty/sbt-test/source-dependencies/java-analysis-serialization-error/test diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/java-basic/changes/A.java b/sbt-dotty/sbt-test/source-dependencies/java-basic/changes/A.java similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/java-basic/changes/A.java rename to sbt-dotty/sbt-test/source-dependencies/java-basic/changes/A.java diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/java-basic/changes/A2.java b/sbt-dotty/sbt-test/source-dependencies/java-basic/changes/A2.java similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/java-basic/changes/A2.java rename to sbt-dotty/sbt-test/source-dependencies/java-basic/changes/A2.java diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/java-basic/changes/B1.java b/sbt-dotty/sbt-test/source-dependencies/java-basic/changes/B1.java similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/java-basic/changes/B1.java rename to sbt-dotty/sbt-test/source-dependencies/java-basic/changes/B1.java diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/java-basic/changes/B2.java b/sbt-dotty/sbt-test/source-dependencies/java-basic/changes/B2.java similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/java-basic/changes/B2.java rename to sbt-dotty/sbt-test/source-dependencies/java-basic/changes/B2.java diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/java-basic/changes/B3.java b/sbt-dotty/sbt-test/source-dependencies/java-basic/changes/B3.java similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/java-basic/changes/B3.java rename to sbt-dotty/sbt-test/source-dependencies/java-basic/changes/B3.java diff --git a/sbt-dotty/sbt-test/source-dependencies/java-basic/project/DottyInjectedPlugin.scala b/sbt-dotty/sbt-test/source-dependencies/java-basic/project/DottyInjectedPlugin.scala new file mode 100644 index 000000000000..f9e3265ab2b2 --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/java-basic/project/DottyInjectedPlugin.scala @@ -0,0 +1,12 @@ +import sbt._ +import Keys._ + +object DottyInjectedPlugin extends AutoPlugin { + override def requires = plugins.JvmPlugin + override def trigger = allRequirements + + override val projectSettings = Seq( + scalaVersion := "0.1.1-bin-SNAPSHOT", + scalacOptions += "-language:Scala2" + ) +} diff --git a/sbt-dotty/sbt-test/source-dependencies/java-basic/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/java-basic/project/plugins.sbt new file mode 100644 index 000000000000..c17caab2d98c --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/java-basic/project/plugins.sbt @@ -0,0 +1 @@ +addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/java-basic/test b/sbt-dotty/sbt-test/source-dependencies/java-basic/test similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/java-basic/test rename to sbt-dotty/sbt-test/source-dependencies/java-basic/test diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/java-generic-workaround/A.java b/sbt-dotty/sbt-test/source-dependencies/java-generic-workaround/A.java similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/java-generic-workaround/A.java rename to sbt-dotty/sbt-test/source-dependencies/java-generic-workaround/A.java diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/java-generic-workaround/DefaultTreeTableSorter.java b/sbt-dotty/sbt-test/source-dependencies/java-generic-workaround/DefaultTreeTableSorter.java similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/java-generic-workaround/DefaultTreeTableSorter.java rename to sbt-dotty/sbt-test/source-dependencies/java-generic-workaround/DefaultTreeTableSorter.java diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/java-generic-workaround/TreeColumnModel.java b/sbt-dotty/sbt-test/source-dependencies/java-generic-workaround/TreeColumnModel.java similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/java-generic-workaround/TreeColumnModel.java rename to sbt-dotty/sbt-test/source-dependencies/java-generic-workaround/TreeColumnModel.java diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/java-generic-workaround/TreeTableSorter.java b/sbt-dotty/sbt-test/source-dependencies/java-generic-workaround/TreeTableSorter.java similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/java-generic-workaround/TreeTableSorter.java rename to sbt-dotty/sbt-test/source-dependencies/java-generic-workaround/TreeTableSorter.java diff --git a/sbt-dotty/sbt-test/source-dependencies/java-generic-workaround/project/DottyInjectedPlugin.scala b/sbt-dotty/sbt-test/source-dependencies/java-generic-workaround/project/DottyInjectedPlugin.scala new file mode 100644 index 000000000000..f9e3265ab2b2 --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/java-generic-workaround/project/DottyInjectedPlugin.scala @@ -0,0 +1,12 @@ +import sbt._ +import Keys._ + +object DottyInjectedPlugin extends AutoPlugin { + override def requires = plugins.JvmPlugin + override def trigger = allRequirements + + override val projectSettings = Seq( + scalaVersion := "0.1.1-bin-SNAPSHOT", + scalacOptions += "-language:Scala2" + ) +} diff --git a/sbt-dotty/sbt-test/source-dependencies/java-generic-workaround/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/java-generic-workaround/project/plugins.sbt new file mode 100644 index 000000000000..c17caab2d98c --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/java-generic-workaround/project/plugins.sbt @@ -0,0 +1 @@ +addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/java-generic-workaround/test b/sbt-dotty/sbt-test/source-dependencies/java-generic-workaround/test similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/java-generic-workaround/test rename to sbt-dotty/sbt-test/source-dependencies/java-generic-workaround/test diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/java-mixed/JJ.java b/sbt-dotty/sbt-test/source-dependencies/java-mixed/JJ.java similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/java-mixed/JJ.java rename to sbt-dotty/sbt-test/source-dependencies/java-mixed/JJ.java diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/java-mixed/build.sbt b/sbt-dotty/sbt-test/source-dependencies/java-mixed/build.sbt similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/java-mixed/build.sbt rename to sbt-dotty/sbt-test/source-dependencies/java-mixed/build.sbt diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/java-mixed/changes/S1.scala b/sbt-dotty/sbt-test/source-dependencies/java-mixed/changes/S1.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/java-mixed/changes/S1.scala rename to sbt-dotty/sbt-test/source-dependencies/java-mixed/changes/S1.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/java-mixed/changes/S2.scala b/sbt-dotty/sbt-test/source-dependencies/java-mixed/changes/S2.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/java-mixed/changes/S2.scala rename to sbt-dotty/sbt-test/source-dependencies/java-mixed/changes/S2.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/java-mixed/changes/build.sbt b/sbt-dotty/sbt-test/source-dependencies/java-mixed/changes/build.sbt similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/java-mixed/changes/build.sbt rename to sbt-dotty/sbt-test/source-dependencies/java-mixed/changes/build.sbt diff --git a/sbt-dotty/sbt-test/source-dependencies/java-mixed/project/DottyInjectedPlugin.scala b/sbt-dotty/sbt-test/source-dependencies/java-mixed/project/DottyInjectedPlugin.scala new file mode 100644 index 000000000000..f9e3265ab2b2 --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/java-mixed/project/DottyInjectedPlugin.scala @@ -0,0 +1,12 @@ +import sbt._ +import Keys._ + +object DottyInjectedPlugin extends AutoPlugin { + override def requires = plugins.JvmPlugin + override def trigger = allRequirements + + override val projectSettings = Seq( + scalaVersion := "0.1.1-bin-SNAPSHOT", + scalacOptions += "-language:Scala2" + ) +} diff --git a/sbt-dotty/sbt-test/source-dependencies/java-mixed/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/java-mixed/project/plugins.sbt new file mode 100644 index 000000000000..c17caab2d98c --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/java-mixed/project/plugins.sbt @@ -0,0 +1 @@ +addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/java-mixed/test b/sbt-dotty/sbt-test/source-dependencies/java-mixed/test similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/java-mixed/test rename to sbt-dotty/sbt-test/source-dependencies/java-mixed/test diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/java-static/changes/J1.java b/sbt-dotty/sbt-test/source-dependencies/java-static/changes/J1.java similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/java-static/changes/J1.java rename to sbt-dotty/sbt-test/source-dependencies/java-static/changes/J1.java diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/java-static/changes/J2.java b/sbt-dotty/sbt-test/source-dependencies/java-static/changes/J2.java similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/java-static/changes/J2.java rename to sbt-dotty/sbt-test/source-dependencies/java-static/changes/J2.java diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/java-static/changes/S.scala b/sbt-dotty/sbt-test/source-dependencies/java-static/changes/S.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/java-static/changes/S.scala rename to sbt-dotty/sbt-test/source-dependencies/java-static/changes/S.scala diff --git a/sbt-dotty/sbt-test/source-dependencies/java-static/project/DottyInjectedPlugin.scala b/sbt-dotty/sbt-test/source-dependencies/java-static/project/DottyInjectedPlugin.scala new file mode 100644 index 000000000000..f9e3265ab2b2 --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/java-static/project/DottyInjectedPlugin.scala @@ -0,0 +1,12 @@ +import sbt._ +import Keys._ + +object DottyInjectedPlugin extends AutoPlugin { + override def requires = plugins.JvmPlugin + override def trigger = allRequirements + + override val projectSettings = Seq( + scalaVersion := "0.1.1-bin-SNAPSHOT", + scalacOptions += "-language:Scala2" + ) +} diff --git a/sbt-dotty/sbt-test/source-dependencies/java-static/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/java-static/project/plugins.sbt new file mode 100644 index 000000000000..c17caab2d98c --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/java-static/project/plugins.sbt @@ -0,0 +1 @@ +addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/java-static/test b/sbt-dotty/sbt-test/source-dependencies/java-static/test similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/java-static/test rename to sbt-dotty/sbt-test/source-dependencies/java-static/test diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/lazy-val/A.scala b/sbt-dotty/sbt-test/source-dependencies/lazy-val/A.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/lazy-val/A.scala rename to sbt-dotty/sbt-test/source-dependencies/lazy-val/A.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/lazy-val/B.scala b/sbt-dotty/sbt-test/source-dependencies/lazy-val/B.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/lazy-val/B.scala rename to sbt-dotty/sbt-test/source-dependencies/lazy-val/B.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/lazy-val/changes/A.scala b/sbt-dotty/sbt-test/source-dependencies/lazy-val/changes/A.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/lazy-val/changes/A.scala rename to sbt-dotty/sbt-test/source-dependencies/lazy-val/changes/A.scala diff --git a/sbt-dotty/sbt-test/source-dependencies/lazy-val/project/DottyInjectedPlugin.scala b/sbt-dotty/sbt-test/source-dependencies/lazy-val/project/DottyInjectedPlugin.scala new file mode 100644 index 000000000000..f9e3265ab2b2 --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/lazy-val/project/DottyInjectedPlugin.scala @@ -0,0 +1,12 @@ +import sbt._ +import Keys._ + +object DottyInjectedPlugin extends AutoPlugin { + override def requires = plugins.JvmPlugin + override def trigger = allRequirements + + override val projectSettings = Seq( + scalaVersion := "0.1.1-bin-SNAPSHOT", + scalacOptions += "-language:Scala2" + ) +} diff --git a/sbt-dotty/sbt-test/source-dependencies/lazy-val/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/lazy-val/project/plugins.sbt new file mode 100644 index 000000000000..c17caab2d98c --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/lazy-val/project/plugins.sbt @@ -0,0 +1 @@ +addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/lazy-val/test b/sbt-dotty/sbt-test/source-dependencies/lazy-val/test similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/lazy-val/test rename to sbt-dotty/sbt-test/source-dependencies/lazy-val/test diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/less-inter-inv-java/A.java b/sbt-dotty/sbt-test/source-dependencies/less-inter-inv-java/A.java similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/less-inter-inv-java/A.java rename to sbt-dotty/sbt-test/source-dependencies/less-inter-inv-java/A.java diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/less-inter-inv-java/B.java b/sbt-dotty/sbt-test/source-dependencies/less-inter-inv-java/B.java similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/less-inter-inv-java/B.java rename to sbt-dotty/sbt-test/source-dependencies/less-inter-inv-java/B.java diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/less-inter-inv-java/C.java b/sbt-dotty/sbt-test/source-dependencies/less-inter-inv-java/C.java similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/less-inter-inv-java/C.java rename to sbt-dotty/sbt-test/source-dependencies/less-inter-inv-java/C.java diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/less-inter-inv-java/D.java b/sbt-dotty/sbt-test/source-dependencies/less-inter-inv-java/D.java similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/less-inter-inv-java/D.java rename to sbt-dotty/sbt-test/source-dependencies/less-inter-inv-java/D.java diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/less-inter-inv-java/E.java b/sbt-dotty/sbt-test/source-dependencies/less-inter-inv-java/E.java similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/less-inter-inv-java/E.java rename to sbt-dotty/sbt-test/source-dependencies/less-inter-inv-java/E.java diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/less-inter-inv-java/build.sbt b/sbt-dotty/sbt-test/source-dependencies/less-inter-inv-java/build.sbt similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/less-inter-inv-java/build.sbt rename to sbt-dotty/sbt-test/source-dependencies/less-inter-inv-java/build.sbt diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/less-inter-inv-java/changes/A2.java b/sbt-dotty/sbt-test/source-dependencies/less-inter-inv-java/changes/A2.java similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/less-inter-inv-java/changes/A2.java rename to sbt-dotty/sbt-test/source-dependencies/less-inter-inv-java/changes/A2.java diff --git a/sbt-dotty/sbt-test/source-dependencies/less-inter-inv-java/project/DottyInjectedPlugin.scala b/sbt-dotty/sbt-test/source-dependencies/less-inter-inv-java/project/DottyInjectedPlugin.scala new file mode 100644 index 000000000000..f9e3265ab2b2 --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/less-inter-inv-java/project/DottyInjectedPlugin.scala @@ -0,0 +1,12 @@ +import sbt._ +import Keys._ + +object DottyInjectedPlugin extends AutoPlugin { + override def requires = plugins.JvmPlugin + override def trigger = allRequirements + + override val projectSettings = Seq( + scalaVersion := "0.1.1-bin-SNAPSHOT", + scalacOptions += "-language:Scala2" + ) +} diff --git a/sbt-dotty/sbt-test/source-dependencies/less-inter-inv-java/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/less-inter-inv-java/project/plugins.sbt new file mode 100644 index 000000000000..c17caab2d98c --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/less-inter-inv-java/project/plugins.sbt @@ -0,0 +1 @@ +addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/less-inter-inv-java/test b/sbt-dotty/sbt-test/source-dependencies/less-inter-inv-java/test similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/less-inter-inv-java/test rename to sbt-dotty/sbt-test/source-dependencies/less-inter-inv-java/test diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/less-inter-inv/A.scala b/sbt-dotty/sbt-test/source-dependencies/less-inter-inv/A.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/less-inter-inv/A.scala rename to sbt-dotty/sbt-test/source-dependencies/less-inter-inv/A.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/less-inter-inv/B.scala b/sbt-dotty/sbt-test/source-dependencies/less-inter-inv/B.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/less-inter-inv/B.scala rename to sbt-dotty/sbt-test/source-dependencies/less-inter-inv/B.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/less-inter-inv/C.scala b/sbt-dotty/sbt-test/source-dependencies/less-inter-inv/C.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/less-inter-inv/C.scala rename to sbt-dotty/sbt-test/source-dependencies/less-inter-inv/C.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/less-inter-inv/D.scala b/sbt-dotty/sbt-test/source-dependencies/less-inter-inv/D.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/less-inter-inv/D.scala rename to sbt-dotty/sbt-test/source-dependencies/less-inter-inv/D.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/less-inter-inv/E.scala b/sbt-dotty/sbt-test/source-dependencies/less-inter-inv/E.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/less-inter-inv/E.scala rename to sbt-dotty/sbt-test/source-dependencies/less-inter-inv/E.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/less-inter-inv/build.sbt b/sbt-dotty/sbt-test/source-dependencies/less-inter-inv/build.sbt similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/less-inter-inv/build.sbt rename to sbt-dotty/sbt-test/source-dependencies/less-inter-inv/build.sbt diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/less-inter-inv/changes/A2.scala b/sbt-dotty/sbt-test/source-dependencies/less-inter-inv/changes/A2.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/less-inter-inv/changes/A2.scala rename to sbt-dotty/sbt-test/source-dependencies/less-inter-inv/changes/A2.scala diff --git a/sbt-dotty/sbt-test/source-dependencies/less-inter-inv/project/DottyInjectedPlugin.scala b/sbt-dotty/sbt-test/source-dependencies/less-inter-inv/project/DottyInjectedPlugin.scala new file mode 100644 index 000000000000..f9e3265ab2b2 --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/less-inter-inv/project/DottyInjectedPlugin.scala @@ -0,0 +1,12 @@ +import sbt._ +import Keys._ + +object DottyInjectedPlugin extends AutoPlugin { + override def requires = plugins.JvmPlugin + override def trigger = allRequirements + + override val projectSettings = Seq( + scalaVersion := "0.1.1-bin-SNAPSHOT", + scalacOptions += "-language:Scala2" + ) +} diff --git a/sbt-dotty/sbt-test/source-dependencies/less-inter-inv/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/less-inter-inv/project/plugins.sbt new file mode 100644 index 000000000000..c17caab2d98c --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/less-inter-inv/project/plugins.sbt @@ -0,0 +1 @@ +addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/less-inter-inv/test b/sbt-dotty/sbt-test/source-dependencies/less-inter-inv/test similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/less-inter-inv/test rename to sbt-dotty/sbt-test/source-dependencies/less-inter-inv/test diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/linearization/A.scala b/sbt-dotty/sbt-test/source-dependencies/linearization/A.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/linearization/A.scala rename to sbt-dotty/sbt-test/source-dependencies/linearization/A.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/linearization/B.scala b/sbt-dotty/sbt-test/source-dependencies/linearization/B.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/linearization/B.scala rename to sbt-dotty/sbt-test/source-dependencies/linearization/B.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/linearization/C.scala b/sbt-dotty/sbt-test/source-dependencies/linearization/C.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/linearization/C.scala rename to sbt-dotty/sbt-test/source-dependencies/linearization/C.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/linearization/D.scala b/sbt-dotty/sbt-test/source-dependencies/linearization/D.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/linearization/D.scala rename to sbt-dotty/sbt-test/source-dependencies/linearization/D.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/linearization/E.scala b/sbt-dotty/sbt-test/source-dependencies/linearization/E.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/linearization/E.scala rename to sbt-dotty/sbt-test/source-dependencies/linearization/E.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/linearization/F.scala b/sbt-dotty/sbt-test/source-dependencies/linearization/F.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/linearization/F.scala rename to sbt-dotty/sbt-test/source-dependencies/linearization/F.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/linearization/changes/D.scala b/sbt-dotty/sbt-test/source-dependencies/linearization/changes/D.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/linearization/changes/D.scala rename to sbt-dotty/sbt-test/source-dependencies/linearization/changes/D.scala diff --git a/sbt-dotty/sbt-test/source-dependencies/linearization/project/DottyInjectedPlugin.scala b/sbt-dotty/sbt-test/source-dependencies/linearization/project/DottyInjectedPlugin.scala new file mode 100644 index 000000000000..f9e3265ab2b2 --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/linearization/project/DottyInjectedPlugin.scala @@ -0,0 +1,12 @@ +import sbt._ +import Keys._ + +object DottyInjectedPlugin extends AutoPlugin { + override def requires = plugins.JvmPlugin + override def trigger = allRequirements + + override val projectSettings = Seq( + scalaVersion := "0.1.1-bin-SNAPSHOT", + scalacOptions += "-language:Scala2" + ) +} diff --git a/sbt-dotty/sbt-test/source-dependencies/linearization/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/linearization/project/plugins.sbt new file mode 100644 index 000000000000..c17caab2d98c --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/linearization/project/plugins.sbt @@ -0,0 +1 @@ +addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/linearization/test b/sbt-dotty/sbt-test/source-dependencies/linearization/test similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/linearization/test rename to sbt-dotty/sbt-test/source-dependencies/linearization/test diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/named/A.scala b/sbt-dotty/sbt-test/source-dependencies/named/A.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/named/A.scala rename to sbt-dotty/sbt-test/source-dependencies/named/A.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/named/B.scala b/sbt-dotty/sbt-test/source-dependencies/named/B.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/named/B.scala rename to sbt-dotty/sbt-test/source-dependencies/named/B.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/named/changes/A.scala b/sbt-dotty/sbt-test/source-dependencies/named/changes/A.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/named/changes/A.scala rename to sbt-dotty/sbt-test/source-dependencies/named/changes/A.scala diff --git a/sbt-dotty/sbt-test/source-dependencies/named/project/DottyInjectedPlugin.scala b/sbt-dotty/sbt-test/source-dependencies/named/project/DottyInjectedPlugin.scala new file mode 100644 index 000000000000..f9e3265ab2b2 --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/named/project/DottyInjectedPlugin.scala @@ -0,0 +1,12 @@ +import sbt._ +import Keys._ + +object DottyInjectedPlugin extends AutoPlugin { + override def requires = plugins.JvmPlugin + override def trigger = allRequirements + + override val projectSettings = Seq( + scalaVersion := "0.1.1-bin-SNAPSHOT", + scalacOptions += "-language:Scala2" + ) +} diff --git a/sbt-dotty/sbt-test/source-dependencies/named/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/named/project/plugins.sbt new file mode 100644 index 000000000000..c17caab2d98c --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/named/project/plugins.sbt @@ -0,0 +1 @@ +addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/named/test b/sbt-dotty/sbt-test/source-dependencies/named/test similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/named/test rename to sbt-dotty/sbt-test/source-dependencies/named/test diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/nested-case-class/changes/A0.scala b/sbt-dotty/sbt-test/source-dependencies/nested-case-class/changes/A0.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/nested-case-class/changes/A0.scala rename to sbt-dotty/sbt-test/source-dependencies/nested-case-class/changes/A0.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/nested-case-class/changes/A1.scala b/sbt-dotty/sbt-test/source-dependencies/nested-case-class/changes/A1.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/nested-case-class/changes/A1.scala rename to sbt-dotty/sbt-test/source-dependencies/nested-case-class/changes/A1.scala diff --git a/sbt-dotty/sbt-test/source-dependencies/nested-case-class/project/DottyInjectedPlugin.scala b/sbt-dotty/sbt-test/source-dependencies/nested-case-class/project/DottyInjectedPlugin.scala new file mode 100644 index 000000000000..f9e3265ab2b2 --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/nested-case-class/project/DottyInjectedPlugin.scala @@ -0,0 +1,12 @@ +import sbt._ +import Keys._ + +object DottyInjectedPlugin extends AutoPlugin { + override def requires = plugins.JvmPlugin + override def trigger = allRequirements + + override val projectSettings = Seq( + scalaVersion := "0.1.1-bin-SNAPSHOT", + scalacOptions += "-language:Scala2" + ) +} diff --git a/sbt-dotty/sbt-test/source-dependencies/nested-case-class/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/nested-case-class/project/plugins.sbt new file mode 100644 index 000000000000..c17caab2d98c --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/nested-case-class/project/plugins.sbt @@ -0,0 +1 @@ +addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/nested-case-class/test b/sbt-dotty/sbt-test/source-dependencies/nested-case-class/test similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/nested-case-class/test rename to sbt-dotty/sbt-test/source-dependencies/nested-case-class/test diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/new-cyclic/changes/A2.scala b/sbt-dotty/sbt-test/source-dependencies/new-cyclic/changes/A2.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/new-cyclic/changes/A2.scala rename to sbt-dotty/sbt-test/source-dependencies/new-cyclic/changes/A2.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/new-cyclic/pending b/sbt-dotty/sbt-test/source-dependencies/new-cyclic/pending similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/new-cyclic/pending rename to sbt-dotty/sbt-test/source-dependencies/new-cyclic/pending diff --git a/sbt-dotty/sbt-test/source-dependencies/new-cyclic/project/DottyInjectedPlugin.scala b/sbt-dotty/sbt-test/source-dependencies/new-cyclic/project/DottyInjectedPlugin.scala new file mode 100644 index 000000000000..f9e3265ab2b2 --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/new-cyclic/project/DottyInjectedPlugin.scala @@ -0,0 +1,12 @@ +import sbt._ +import Keys._ + +object DottyInjectedPlugin extends AutoPlugin { + override def requires = plugins.JvmPlugin + override def trigger = allRequirements + + override val projectSettings = Seq( + scalaVersion := "0.1.1-bin-SNAPSHOT", + scalacOptions += "-language:Scala2" + ) +} diff --git a/sbt-dotty/sbt-test/source-dependencies/new-cyclic/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/new-cyclic/project/plugins.sbt new file mode 100644 index 000000000000..c17caab2d98c --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/new-cyclic/project/plugins.sbt @@ -0,0 +1 @@ +addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/new-cyclic/src/main/scala/A.scala b/sbt-dotty/sbt-test/source-dependencies/new-cyclic/src/main/scala/A.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/new-cyclic/src/main/scala/A.scala rename to sbt-dotty/sbt-test/source-dependencies/new-cyclic/src/main/scala/A.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/new-cyclic/src/main/scala/B.scala b/sbt-dotty/sbt-test/source-dependencies/new-cyclic/src/main/scala/B.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/new-cyclic/src/main/scala/B.scala rename to sbt-dotty/sbt-test/source-dependencies/new-cyclic/src/main/scala/B.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/new-pkg-dep/changes/A1.java b/sbt-dotty/sbt-test/source-dependencies/new-pkg-dep/changes/A1.java similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/new-pkg-dep/changes/A1.java rename to sbt-dotty/sbt-test/source-dependencies/new-pkg-dep/changes/A1.java diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/new-pkg-dep/changes/B0.scala b/sbt-dotty/sbt-test/source-dependencies/new-pkg-dep/changes/B0.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/new-pkg-dep/changes/B0.scala rename to sbt-dotty/sbt-test/source-dependencies/new-pkg-dep/changes/B0.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/new-pkg-dep/changes/B1.scala b/sbt-dotty/sbt-test/source-dependencies/new-pkg-dep/changes/B1.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/new-pkg-dep/changes/B1.scala rename to sbt-dotty/sbt-test/source-dependencies/new-pkg-dep/changes/B1.scala diff --git a/sbt-dotty/sbt-test/source-dependencies/new-pkg-dep/project/DottyInjectedPlugin.scala b/sbt-dotty/sbt-test/source-dependencies/new-pkg-dep/project/DottyInjectedPlugin.scala new file mode 100644 index 000000000000..f9e3265ab2b2 --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/new-pkg-dep/project/DottyInjectedPlugin.scala @@ -0,0 +1,12 @@ +import sbt._ +import Keys._ + +object DottyInjectedPlugin extends AutoPlugin { + override def requires = plugins.JvmPlugin + override def trigger = allRequirements + + override val projectSettings = Seq( + scalaVersion := "0.1.1-bin-SNAPSHOT", + scalacOptions += "-language:Scala2" + ) +} diff --git a/sbt-dotty/sbt-test/source-dependencies/new-pkg-dep/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/new-pkg-dep/project/plugins.sbt new file mode 100644 index 000000000000..c17caab2d98c --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/new-pkg-dep/project/plugins.sbt @@ -0,0 +1 @@ +addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/new-pkg-dep/test b/sbt-dotty/sbt-test/source-dependencies/new-pkg-dep/test similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/new-pkg-dep/test rename to sbt-dotty/sbt-test/source-dependencies/new-pkg-dep/test diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/override/A.scala b/sbt-dotty/sbt-test/source-dependencies/override/A.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/override/A.scala rename to sbt-dotty/sbt-test/source-dependencies/override/A.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/override/B.scala b/sbt-dotty/sbt-test/source-dependencies/override/B.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/override/B.scala rename to sbt-dotty/sbt-test/source-dependencies/override/B.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/override/C.scala b/sbt-dotty/sbt-test/source-dependencies/override/C.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/override/C.scala rename to sbt-dotty/sbt-test/source-dependencies/override/C.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/override/D.scala b/sbt-dotty/sbt-test/source-dependencies/override/D.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/override/D.scala rename to sbt-dotty/sbt-test/source-dependencies/override/D.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/override/changes/B2.scala b/sbt-dotty/sbt-test/source-dependencies/override/changes/B2.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/override/changes/B2.scala rename to sbt-dotty/sbt-test/source-dependencies/override/changes/B2.scala diff --git a/sbt-dotty/sbt-test/source-dependencies/override/project/DottyInjectedPlugin.scala b/sbt-dotty/sbt-test/source-dependencies/override/project/DottyInjectedPlugin.scala new file mode 100644 index 000000000000..f9e3265ab2b2 --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/override/project/DottyInjectedPlugin.scala @@ -0,0 +1,12 @@ +import sbt._ +import Keys._ + +object DottyInjectedPlugin extends AutoPlugin { + override def requires = plugins.JvmPlugin + override def trigger = allRequirements + + override val projectSettings = Seq( + scalaVersion := "0.1.1-bin-SNAPSHOT", + scalacOptions += "-language:Scala2" + ) +} diff --git a/sbt-dotty/sbt-test/source-dependencies/override/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/override/project/plugins.sbt new file mode 100644 index 000000000000..c17caab2d98c --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/override/project/plugins.sbt @@ -0,0 +1 @@ +addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/override/test b/sbt-dotty/sbt-test/source-dependencies/override/test similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/override/test rename to sbt-dotty/sbt-test/source-dependencies/override/test diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/parent-change/W.scala b/sbt-dotty/sbt-test/source-dependencies/parent-change/W.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/parent-change/W.scala rename to sbt-dotty/sbt-test/source-dependencies/parent-change/W.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/parent-change/Y.scala b/sbt-dotty/sbt-test/source-dependencies/parent-change/Y.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/parent-change/Y.scala rename to sbt-dotty/sbt-test/source-dependencies/parent-change/Y.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/parent-change/Z.scala b/sbt-dotty/sbt-test/source-dependencies/parent-change/Z.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/parent-change/Z.scala rename to sbt-dotty/sbt-test/source-dependencies/parent-change/Z.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/parent-change/changes/W.scala b/sbt-dotty/sbt-test/source-dependencies/parent-change/changes/W.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/parent-change/changes/W.scala rename to sbt-dotty/sbt-test/source-dependencies/parent-change/changes/W.scala diff --git a/sbt-dotty/sbt-test/source-dependencies/parent-change/project/DottyInjectedPlugin.scala b/sbt-dotty/sbt-test/source-dependencies/parent-change/project/DottyInjectedPlugin.scala new file mode 100644 index 000000000000..f9e3265ab2b2 --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/parent-change/project/DottyInjectedPlugin.scala @@ -0,0 +1,12 @@ +import sbt._ +import Keys._ + +object DottyInjectedPlugin extends AutoPlugin { + override def requires = plugins.JvmPlugin + override def trigger = allRequirements + + override val projectSettings = Seq( + scalaVersion := "0.1.1-bin-SNAPSHOT", + scalacOptions += "-language:Scala2" + ) +} diff --git a/sbt-dotty/sbt-test/source-dependencies/parent-change/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/parent-change/project/plugins.sbt new file mode 100644 index 000000000000..c17caab2d98c --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/parent-change/project/plugins.sbt @@ -0,0 +1 @@ +addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/parent-change/test b/sbt-dotty/sbt-test/source-dependencies/parent-change/test similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/parent-change/test rename to sbt-dotty/sbt-test/source-dependencies/parent-change/test diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/parent-member-change/A.scala b/sbt-dotty/sbt-test/source-dependencies/parent-member-change/A.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/parent-member-change/A.scala rename to sbt-dotty/sbt-test/source-dependencies/parent-member-change/A.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/parent-member-change/B.scala b/sbt-dotty/sbt-test/source-dependencies/parent-member-change/B.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/parent-member-change/B.scala rename to sbt-dotty/sbt-test/source-dependencies/parent-member-change/B.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/parent-member-change/C.scala b/sbt-dotty/sbt-test/source-dependencies/parent-member-change/C.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/parent-member-change/C.scala rename to sbt-dotty/sbt-test/source-dependencies/parent-member-change/C.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/parent-member-change/changes/A.scala b/sbt-dotty/sbt-test/source-dependencies/parent-member-change/changes/A.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/parent-member-change/changes/A.scala rename to sbt-dotty/sbt-test/source-dependencies/parent-member-change/changes/A.scala diff --git a/sbt-dotty/sbt-test/source-dependencies/parent-member-change/project/DottyInjectedPlugin.scala b/sbt-dotty/sbt-test/source-dependencies/parent-member-change/project/DottyInjectedPlugin.scala new file mode 100644 index 000000000000..f9e3265ab2b2 --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/parent-member-change/project/DottyInjectedPlugin.scala @@ -0,0 +1,12 @@ +import sbt._ +import Keys._ + +object DottyInjectedPlugin extends AutoPlugin { + override def requires = plugins.JvmPlugin + override def trigger = allRequirements + + override val projectSettings = Seq( + scalaVersion := "0.1.1-bin-SNAPSHOT", + scalacOptions += "-language:Scala2" + ) +} diff --git a/sbt-dotty/sbt-test/source-dependencies/parent-member-change/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/parent-member-change/project/plugins.sbt new file mode 100644 index 000000000000..c17caab2d98c --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/parent-member-change/project/plugins.sbt @@ -0,0 +1 @@ +addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/parent-member-change/test b/sbt-dotty/sbt-test/source-dependencies/parent-member-change/test similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/parent-member-change/test rename to sbt-dotty/sbt-test/source-dependencies/parent-member-change/test diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/pkg-self/changes/A1.scala b/sbt-dotty/sbt-test/source-dependencies/pkg-self/changes/A1.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/pkg-self/changes/A1.scala rename to sbt-dotty/sbt-test/source-dependencies/pkg-self/changes/A1.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/pkg-self/changes/A2.scala b/sbt-dotty/sbt-test/source-dependencies/pkg-self/changes/A2.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/pkg-self/changes/A2.scala rename to sbt-dotty/sbt-test/source-dependencies/pkg-self/changes/A2.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/pkg-self/changes/B.scala b/sbt-dotty/sbt-test/source-dependencies/pkg-self/changes/B.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/pkg-self/changes/B.scala rename to sbt-dotty/sbt-test/source-dependencies/pkg-self/changes/B.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/pkg-self/changes/package.scala b/sbt-dotty/sbt-test/source-dependencies/pkg-self/changes/package.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/pkg-self/changes/package.scala rename to sbt-dotty/sbt-test/source-dependencies/pkg-self/changes/package.scala diff --git a/sbt-dotty/sbt-test/source-dependencies/pkg-self/project/DottyInjectedPlugin.scala b/sbt-dotty/sbt-test/source-dependencies/pkg-self/project/DottyInjectedPlugin.scala new file mode 100644 index 000000000000..f9e3265ab2b2 --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/pkg-self/project/DottyInjectedPlugin.scala @@ -0,0 +1,12 @@ +import sbt._ +import Keys._ + +object DottyInjectedPlugin extends AutoPlugin { + override def requires = plugins.JvmPlugin + override def trigger = allRequirements + + override val projectSettings = Seq( + scalaVersion := "0.1.1-bin-SNAPSHOT", + scalacOptions += "-language:Scala2" + ) +} diff --git a/sbt-dotty/sbt-test/source-dependencies/pkg-self/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/pkg-self/project/plugins.sbt new file mode 100644 index 000000000000..c17caab2d98c --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/pkg-self/project/plugins.sbt @@ -0,0 +1 @@ +addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/pkg-self/test b/sbt-dotty/sbt-test/source-dependencies/pkg-self/test similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/pkg-self/test rename to sbt-dotty/sbt-test/source-dependencies/pkg-self/test diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/qualified-access/A.scala b/sbt-dotty/sbt-test/source-dependencies/qualified-access/A.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/qualified-access/A.scala rename to sbt-dotty/sbt-test/source-dependencies/qualified-access/A.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/qualified-access/B.scala b/sbt-dotty/sbt-test/source-dependencies/qualified-access/B.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/qualified-access/B.scala rename to sbt-dotty/sbt-test/source-dependencies/qualified-access/B.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/qualified-access/changes/A.scala b/sbt-dotty/sbt-test/source-dependencies/qualified-access/changes/A.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/qualified-access/changes/A.scala rename to sbt-dotty/sbt-test/source-dependencies/qualified-access/changes/A.scala diff --git a/sbt-dotty/sbt-test/source-dependencies/qualified-access/project/DottyInjectedPlugin.scala b/sbt-dotty/sbt-test/source-dependencies/qualified-access/project/DottyInjectedPlugin.scala new file mode 100644 index 000000000000..f9e3265ab2b2 --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/qualified-access/project/DottyInjectedPlugin.scala @@ -0,0 +1,12 @@ +import sbt._ +import Keys._ + +object DottyInjectedPlugin extends AutoPlugin { + override def requires = plugins.JvmPlugin + override def trigger = allRequirements + + override val projectSettings = Seq( + scalaVersion := "0.1.1-bin-SNAPSHOT", + scalacOptions += "-language:Scala2" + ) +} diff --git a/sbt-dotty/sbt-test/source-dependencies/qualified-access/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/qualified-access/project/plugins.sbt new file mode 100644 index 000000000000..c17caab2d98c --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/qualified-access/project/plugins.sbt @@ -0,0 +1 @@ +addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/qualified-access/test b/sbt-dotty/sbt-test/source-dependencies/qualified-access/test similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/qualified-access/test rename to sbt-dotty/sbt-test/source-dependencies/qualified-access/test diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/relative-source-error/changes/absolute.sbt b/sbt-dotty/sbt-test/source-dependencies/relative-source-error/changes/absolute.sbt similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/relative-source-error/changes/absolute.sbt rename to sbt-dotty/sbt-test/source-dependencies/relative-source-error/changes/absolute.sbt diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/relative-source-error/changes/relative.sbt b/sbt-dotty/sbt-test/source-dependencies/relative-source-error/changes/relative.sbt similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/relative-source-error/changes/relative.sbt rename to sbt-dotty/sbt-test/source-dependencies/relative-source-error/changes/relative.sbt diff --git a/sbt-dotty/sbt-test/source-dependencies/relative-source-error/project/DottyInjectedPlugin.scala b/sbt-dotty/sbt-test/source-dependencies/relative-source-error/project/DottyInjectedPlugin.scala new file mode 100644 index 000000000000..f9e3265ab2b2 --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/relative-source-error/project/DottyInjectedPlugin.scala @@ -0,0 +1,12 @@ +import sbt._ +import Keys._ + +object DottyInjectedPlugin extends AutoPlugin { + override def requires = plugins.JvmPlugin + override def trigger = allRequirements + + override val projectSettings = Seq( + scalaVersion := "0.1.1-bin-SNAPSHOT", + scalacOptions += "-language:Scala2" + ) +} diff --git a/sbt-dotty/sbt-test/source-dependencies/relative-source-error/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/relative-source-error/project/plugins.sbt new file mode 100644 index 000000000000..c17caab2d98c --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/relative-source-error/project/plugins.sbt @@ -0,0 +1 @@ +addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/relative-source-error/src/A.scala b/sbt-dotty/sbt-test/source-dependencies/relative-source-error/src/A.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/relative-source-error/src/A.scala rename to sbt-dotty/sbt-test/source-dependencies/relative-source-error/src/A.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/relative-source-error/test b/sbt-dotty/sbt-test/source-dependencies/relative-source-error/test similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/relative-source-error/test rename to sbt-dotty/sbt-test/source-dependencies/relative-source-error/test diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/remove-test-a/changes/1.scala b/sbt-dotty/sbt-test/source-dependencies/remove-test-a/changes/1.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/remove-test-a/changes/1.scala rename to sbt-dotty/sbt-test/source-dependencies/remove-test-a/changes/1.scala diff --git a/sbt-dotty/sbt-test/source-dependencies/remove-test-a/project/DottyInjectedPlugin.scala b/sbt-dotty/sbt-test/source-dependencies/remove-test-a/project/DottyInjectedPlugin.scala new file mode 100644 index 000000000000..f9e3265ab2b2 --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/remove-test-a/project/DottyInjectedPlugin.scala @@ -0,0 +1,12 @@ +import sbt._ +import Keys._ + +object DottyInjectedPlugin extends AutoPlugin { + override def requires = plugins.JvmPlugin + override def trigger = allRequirements + + override val projectSettings = Seq( + scalaVersion := "0.1.1-bin-SNAPSHOT", + scalacOptions += "-language:Scala2" + ) +} diff --git a/sbt-dotty/sbt-test/source-dependencies/remove-test-a/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/remove-test-a/project/plugins.sbt new file mode 100644 index 000000000000..c17caab2d98c --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/remove-test-a/project/plugins.sbt @@ -0,0 +1 @@ +addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/remove-test-a/test b/sbt-dotty/sbt-test/source-dependencies/remove-test-a/test similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/remove-test-a/test rename to sbt-dotty/sbt-test/source-dependencies/remove-test-a/test diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/remove-test-b/changes/A2.scala b/sbt-dotty/sbt-test/source-dependencies/remove-test-b/changes/A2.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/remove-test-b/changes/A2.scala rename to sbt-dotty/sbt-test/source-dependencies/remove-test-b/changes/A2.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/remove-test-b/changes/B3.scala b/sbt-dotty/sbt-test/source-dependencies/remove-test-b/changes/B3.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/remove-test-b/changes/B3.scala rename to sbt-dotty/sbt-test/source-dependencies/remove-test-b/changes/B3.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/remove-test-b/changes/B4.scala b/sbt-dotty/sbt-test/source-dependencies/remove-test-b/changes/B4.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/remove-test-b/changes/B4.scala rename to sbt-dotty/sbt-test/source-dependencies/remove-test-b/changes/B4.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/remove-test-b/changes/B5.scala b/sbt-dotty/sbt-test/source-dependencies/remove-test-b/changes/B5.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/remove-test-b/changes/B5.scala rename to sbt-dotty/sbt-test/source-dependencies/remove-test-b/changes/B5.scala diff --git a/sbt-dotty/sbt-test/source-dependencies/remove-test-b/project/DottyInjectedPlugin.scala b/sbt-dotty/sbt-test/source-dependencies/remove-test-b/project/DottyInjectedPlugin.scala new file mode 100644 index 000000000000..f9e3265ab2b2 --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/remove-test-b/project/DottyInjectedPlugin.scala @@ -0,0 +1,12 @@ +import sbt._ +import Keys._ + +object DottyInjectedPlugin extends AutoPlugin { + override def requires = plugins.JvmPlugin + override def trigger = allRequirements + + override val projectSettings = Seq( + scalaVersion := "0.1.1-bin-SNAPSHOT", + scalacOptions += "-language:Scala2" + ) +} diff --git a/sbt-dotty/sbt-test/source-dependencies/remove-test-b/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/remove-test-b/project/plugins.sbt new file mode 100644 index 000000000000..c17caab2d98c --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/remove-test-b/project/plugins.sbt @@ -0,0 +1 @@ +addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/remove-test-b/src/main/scala/A.scala b/sbt-dotty/sbt-test/source-dependencies/remove-test-b/src/main/scala/A.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/remove-test-b/src/main/scala/A.scala rename to sbt-dotty/sbt-test/source-dependencies/remove-test-b/src/main/scala/A.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/remove-test-b/src/main/scala/B.scala b/sbt-dotty/sbt-test/source-dependencies/remove-test-b/src/main/scala/B.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/remove-test-b/src/main/scala/B.scala rename to sbt-dotty/sbt-test/source-dependencies/remove-test-b/src/main/scala/B.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/remove-test-b/test b/sbt-dotty/sbt-test/source-dependencies/remove-test-b/test similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/remove-test-b/test rename to sbt-dotty/sbt-test/source-dependencies/remove-test-b/test diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/repeated-parameters/A.scala b/sbt-dotty/sbt-test/source-dependencies/repeated-parameters/A.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/repeated-parameters/A.scala rename to sbt-dotty/sbt-test/source-dependencies/repeated-parameters/A.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/repeated-parameters/B.scala b/sbt-dotty/sbt-test/source-dependencies/repeated-parameters/B.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/repeated-parameters/B.scala rename to sbt-dotty/sbt-test/source-dependencies/repeated-parameters/B.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/repeated-parameters/changes/A.scala b/sbt-dotty/sbt-test/source-dependencies/repeated-parameters/changes/A.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/repeated-parameters/changes/A.scala rename to sbt-dotty/sbt-test/source-dependencies/repeated-parameters/changes/A.scala diff --git a/sbt-dotty/sbt-test/source-dependencies/repeated-parameters/project/DottyInjectedPlugin.scala b/sbt-dotty/sbt-test/source-dependencies/repeated-parameters/project/DottyInjectedPlugin.scala new file mode 100644 index 000000000000..f9e3265ab2b2 --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/repeated-parameters/project/DottyInjectedPlugin.scala @@ -0,0 +1,12 @@ +import sbt._ +import Keys._ + +object DottyInjectedPlugin extends AutoPlugin { + override def requires = plugins.JvmPlugin + override def trigger = allRequirements + + override val projectSettings = Seq( + scalaVersion := "0.1.1-bin-SNAPSHOT", + scalacOptions += "-language:Scala2" + ) +} diff --git a/sbt-dotty/sbt-test/source-dependencies/repeated-parameters/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/repeated-parameters/project/plugins.sbt new file mode 100644 index 000000000000..c17caab2d98c --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/repeated-parameters/project/plugins.sbt @@ -0,0 +1 @@ +addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/repeated-parameters/test b/sbt-dotty/sbt-test/source-dependencies/repeated-parameters/test similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/repeated-parameters/test rename to sbt-dotty/sbt-test/source-dependencies/repeated-parameters/test diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/replace-test-a/changes/first.scala b/sbt-dotty/sbt-test/source-dependencies/replace-test-a/changes/first.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/replace-test-a/changes/first.scala rename to sbt-dotty/sbt-test/source-dependencies/replace-test-a/changes/first.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/replace-test-a/changes/second.scala b/sbt-dotty/sbt-test/source-dependencies/replace-test-a/changes/second.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/replace-test-a/changes/second.scala rename to sbt-dotty/sbt-test/source-dependencies/replace-test-a/changes/second.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/replace-test-a/project/Build.scala b/sbt-dotty/sbt-test/source-dependencies/replace-test-a/project/Build.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/replace-test-a/project/Build.scala rename to sbt-dotty/sbt-test/source-dependencies/replace-test-a/project/Build.scala diff --git a/sbt-dotty/sbt-test/source-dependencies/replace-test-a/project/DottyInjectedPlugin.scala b/sbt-dotty/sbt-test/source-dependencies/replace-test-a/project/DottyInjectedPlugin.scala new file mode 100644 index 000000000000..f9e3265ab2b2 --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/replace-test-a/project/DottyInjectedPlugin.scala @@ -0,0 +1,12 @@ +import sbt._ +import Keys._ + +object DottyInjectedPlugin extends AutoPlugin { + override def requires = plugins.JvmPlugin + override def trigger = allRequirements + + override val projectSettings = Seq( + scalaVersion := "0.1.1-bin-SNAPSHOT", + scalacOptions += "-language:Scala2" + ) +} diff --git a/sbt-dotty/sbt-test/source-dependencies/replace-test-a/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/replace-test-a/project/plugins.sbt new file mode 100644 index 000000000000..c17caab2d98c --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/replace-test-a/project/plugins.sbt @@ -0,0 +1 @@ +addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/replace-test-a/test b/sbt-dotty/sbt-test/source-dependencies/replace-test-a/test similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/replace-test-a/test rename to sbt-dotty/sbt-test/source-dependencies/replace-test-a/test diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/resident-java/build.sbt b/sbt-dotty/sbt-test/source-dependencies/resident-java/build.sbt similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/resident-java/build.sbt rename to sbt-dotty/sbt-test/source-dependencies/resident-java/build.sbt diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/resident-java/changes/A1.java b/sbt-dotty/sbt-test/source-dependencies/resident-java/changes/A1.java similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/resident-java/changes/A1.java rename to sbt-dotty/sbt-test/source-dependencies/resident-java/changes/A1.java diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/resident-java/changes/A2.java b/sbt-dotty/sbt-test/source-dependencies/resident-java/changes/A2.java similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/resident-java/changes/A2.java rename to sbt-dotty/sbt-test/source-dependencies/resident-java/changes/A2.java diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/resident-java/changes/B0.scala b/sbt-dotty/sbt-test/source-dependencies/resident-java/changes/B0.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/resident-java/changes/B0.scala rename to sbt-dotty/sbt-test/source-dependencies/resident-java/changes/B0.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/resident-java/changes/B1.scala b/sbt-dotty/sbt-test/source-dependencies/resident-java/changes/B1.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/resident-java/changes/B1.scala rename to sbt-dotty/sbt-test/source-dependencies/resident-java/changes/B1.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/resident-java/changes/B2.scala b/sbt-dotty/sbt-test/source-dependencies/resident-java/changes/B2.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/resident-java/changes/B2.scala rename to sbt-dotty/sbt-test/source-dependencies/resident-java/changes/B2.scala diff --git a/sbt-dotty/sbt-test/source-dependencies/resident-java/project/DottyInjectedPlugin.scala b/sbt-dotty/sbt-test/source-dependencies/resident-java/project/DottyInjectedPlugin.scala new file mode 100644 index 000000000000..f9e3265ab2b2 --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/resident-java/project/DottyInjectedPlugin.scala @@ -0,0 +1,12 @@ +import sbt._ +import Keys._ + +object DottyInjectedPlugin extends AutoPlugin { + override def requires = plugins.JvmPlugin + override def trigger = allRequirements + + override val projectSettings = Seq( + scalaVersion := "0.1.1-bin-SNAPSHOT", + scalacOptions += "-language:Scala2" + ) +} diff --git a/sbt-dotty/sbt-test/source-dependencies/resident-java/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/resident-java/project/plugins.sbt new file mode 100644 index 000000000000..c17caab2d98c --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/resident-java/project/plugins.sbt @@ -0,0 +1 @@ +addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/resident-java/test b/sbt-dotty/sbt-test/source-dependencies/resident-java/test similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/resident-java/test rename to sbt-dotty/sbt-test/source-dependencies/resident-java/test diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/resident-package-object/changes/A.scala b/sbt-dotty/sbt-test/source-dependencies/resident-package-object/changes/A.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/resident-package-object/changes/A.scala rename to sbt-dotty/sbt-test/source-dependencies/resident-package-object/changes/A.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/resident-package-object/changes/package.scala b/sbt-dotty/sbt-test/source-dependencies/resident-package-object/changes/package.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/resident-package-object/changes/package.scala rename to sbt-dotty/sbt-test/source-dependencies/resident-package-object/changes/package.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/resident-package-object/changes/package2.scala b/sbt-dotty/sbt-test/source-dependencies/resident-package-object/changes/package2.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/resident-package-object/changes/package2.scala rename to sbt-dotty/sbt-test/source-dependencies/resident-package-object/changes/package2.scala diff --git a/sbt-dotty/sbt-test/source-dependencies/resident-package-object/project/DottyInjectedPlugin.scala b/sbt-dotty/sbt-test/source-dependencies/resident-package-object/project/DottyInjectedPlugin.scala new file mode 100644 index 000000000000..f9e3265ab2b2 --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/resident-package-object/project/DottyInjectedPlugin.scala @@ -0,0 +1,12 @@ +import sbt._ +import Keys._ + +object DottyInjectedPlugin extends AutoPlugin { + override def requires = plugins.JvmPlugin + override def trigger = allRequirements + + override val projectSettings = Seq( + scalaVersion := "0.1.1-bin-SNAPSHOT", + scalacOptions += "-language:Scala2" + ) +} diff --git a/sbt-dotty/sbt-test/source-dependencies/resident-package-object/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/resident-package-object/project/plugins.sbt new file mode 100644 index 000000000000..c17caab2d98c --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/resident-package-object/project/plugins.sbt @@ -0,0 +1 @@ +addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/resident-package-object/test b/sbt-dotty/sbt-test/source-dependencies/resident-package-object/test similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/resident-package-object/test rename to sbt-dotty/sbt-test/source-dependencies/resident-package-object/test diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/restore-classes/build.sbt b/sbt-dotty/sbt-test/source-dependencies/restore-classes/build.sbt similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/restore-classes/build.sbt rename to sbt-dotty/sbt-test/source-dependencies/restore-classes/build.sbt diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/restore-classes/changes/A1.scala b/sbt-dotty/sbt-test/source-dependencies/restore-classes/changes/A1.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/restore-classes/changes/A1.scala rename to sbt-dotty/sbt-test/source-dependencies/restore-classes/changes/A1.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/restore-classes/changes/A2.scala b/sbt-dotty/sbt-test/source-dependencies/restore-classes/changes/A2.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/restore-classes/changes/A2.scala rename to sbt-dotty/sbt-test/source-dependencies/restore-classes/changes/A2.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/restore-classes/changes/B.scala b/sbt-dotty/sbt-test/source-dependencies/restore-classes/changes/B.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/restore-classes/changes/B.scala rename to sbt-dotty/sbt-test/source-dependencies/restore-classes/changes/B.scala diff --git a/sbt-dotty/sbt-test/source-dependencies/restore-classes/project/DottyInjectedPlugin.scala b/sbt-dotty/sbt-test/source-dependencies/restore-classes/project/DottyInjectedPlugin.scala new file mode 100644 index 000000000000..f9e3265ab2b2 --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/restore-classes/project/DottyInjectedPlugin.scala @@ -0,0 +1,12 @@ +import sbt._ +import Keys._ + +object DottyInjectedPlugin extends AutoPlugin { + override def requires = plugins.JvmPlugin + override def trigger = allRequirements + + override val projectSettings = Seq( + scalaVersion := "0.1.1-bin-SNAPSHOT", + scalacOptions += "-language:Scala2" + ) +} diff --git a/sbt-dotty/sbt-test/source-dependencies/restore-classes/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/restore-classes/project/plugins.sbt new file mode 100644 index 000000000000..c17caab2d98c --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/restore-classes/project/plugins.sbt @@ -0,0 +1 @@ +addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/restore-classes/test b/sbt-dotty/sbt-test/source-dependencies/restore-classes/test similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/restore-classes/test rename to sbt-dotty/sbt-test/source-dependencies/restore-classes/test diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/same-file-used-names/A.scala b/sbt-dotty/sbt-test/source-dependencies/same-file-used-names/A.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/same-file-used-names/A.scala rename to sbt-dotty/sbt-test/source-dependencies/same-file-used-names/A.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/same-file-used-names/B.scala b/sbt-dotty/sbt-test/source-dependencies/same-file-used-names/B.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/same-file-used-names/B.scala rename to sbt-dotty/sbt-test/source-dependencies/same-file-used-names/B.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/same-file-used-names/build.sbt b/sbt-dotty/sbt-test/source-dependencies/same-file-used-names/build.sbt similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/same-file-used-names/build.sbt rename to sbt-dotty/sbt-test/source-dependencies/same-file-used-names/build.sbt diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/same-file-used-names/changes/B.scala b/sbt-dotty/sbt-test/source-dependencies/same-file-used-names/changes/B.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/same-file-used-names/changes/B.scala rename to sbt-dotty/sbt-test/source-dependencies/same-file-used-names/changes/B.scala diff --git a/sbt-dotty/sbt-test/source-dependencies/same-file-used-names/project/DottyInjectedPlugin.scala b/sbt-dotty/sbt-test/source-dependencies/same-file-used-names/project/DottyInjectedPlugin.scala new file mode 100644 index 000000000000..f9e3265ab2b2 --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/same-file-used-names/project/DottyInjectedPlugin.scala @@ -0,0 +1,12 @@ +import sbt._ +import Keys._ + +object DottyInjectedPlugin extends AutoPlugin { + override def requires = plugins.JvmPlugin + override def trigger = allRequirements + + override val projectSettings = Seq( + scalaVersion := "0.1.1-bin-SNAPSHOT", + scalacOptions += "-language:Scala2" + ) +} diff --git a/sbt-dotty/sbt-test/source-dependencies/same-file-used-names/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/same-file-used-names/project/plugins.sbt new file mode 100644 index 000000000000..c17caab2d98c --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/same-file-used-names/project/plugins.sbt @@ -0,0 +1 @@ +addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/same-file-used-names/test b/sbt-dotty/sbt-test/source-dependencies/same-file-used-names/test similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/same-file-used-names/test rename to sbt-dotty/sbt-test/source-dependencies/same-file-used-names/test diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/sealed/A.scala b/sbt-dotty/sbt-test/source-dependencies/sealed/A.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/sealed/A.scala rename to sbt-dotty/sbt-test/source-dependencies/sealed/A.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/sealed/D.scala b/sbt-dotty/sbt-test/source-dependencies/sealed/D.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/sealed/D.scala rename to sbt-dotty/sbt-test/source-dependencies/sealed/D.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/sealed/changes/A.scala b/sbt-dotty/sbt-test/source-dependencies/sealed/changes/A.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/sealed/changes/A.scala rename to sbt-dotty/sbt-test/source-dependencies/sealed/changes/A.scala diff --git a/sbt-dotty/sbt-test/source-dependencies/sealed/project/DottyInjectedPlugin.scala b/sbt-dotty/sbt-test/source-dependencies/sealed/project/DottyInjectedPlugin.scala new file mode 100644 index 000000000000..f9e3265ab2b2 --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/sealed/project/DottyInjectedPlugin.scala @@ -0,0 +1,12 @@ +import sbt._ +import Keys._ + +object DottyInjectedPlugin extends AutoPlugin { + override def requires = plugins.JvmPlugin + override def trigger = allRequirements + + override val projectSettings = Seq( + scalaVersion := "0.1.1-bin-SNAPSHOT", + scalacOptions += "-language:Scala2" + ) +} diff --git a/sbt-dotty/sbt-test/source-dependencies/sealed/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/sealed/project/plugins.sbt new file mode 100644 index 000000000000..c17caab2d98c --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/sealed/project/plugins.sbt @@ -0,0 +1 @@ +addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/sealed/test b/sbt-dotty/sbt-test/source-dependencies/sealed/test similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/sealed/test rename to sbt-dotty/sbt-test/source-dependencies/sealed/test diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/signature-change/B.scala b/sbt-dotty/sbt-test/source-dependencies/signature-change/B.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/signature-change/B.scala rename to sbt-dotty/sbt-test/source-dependencies/signature-change/B.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/signature-change/changes/A0.scala b/sbt-dotty/sbt-test/source-dependencies/signature-change/changes/A0.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/signature-change/changes/A0.scala rename to sbt-dotty/sbt-test/source-dependencies/signature-change/changes/A0.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/signature-change/changes/A1.scala b/sbt-dotty/sbt-test/source-dependencies/signature-change/changes/A1.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/signature-change/changes/A1.scala rename to sbt-dotty/sbt-test/source-dependencies/signature-change/changes/A1.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/signature-change/changes/A2.scala b/sbt-dotty/sbt-test/source-dependencies/signature-change/changes/A2.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/signature-change/changes/A2.scala rename to sbt-dotty/sbt-test/source-dependencies/signature-change/changes/A2.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/signature-change/changes/A3.scala b/sbt-dotty/sbt-test/source-dependencies/signature-change/changes/A3.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/signature-change/changes/A3.scala rename to sbt-dotty/sbt-test/source-dependencies/signature-change/changes/A3.scala diff --git a/sbt-dotty/sbt-test/source-dependencies/signature-change/project/DottyInjectedPlugin.scala b/sbt-dotty/sbt-test/source-dependencies/signature-change/project/DottyInjectedPlugin.scala new file mode 100644 index 000000000000..f9e3265ab2b2 --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/signature-change/project/DottyInjectedPlugin.scala @@ -0,0 +1,12 @@ +import sbt._ +import Keys._ + +object DottyInjectedPlugin extends AutoPlugin { + override def requires = plugins.JvmPlugin + override def trigger = allRequirements + + override val projectSettings = Seq( + scalaVersion := "0.1.1-bin-SNAPSHOT", + scalacOptions += "-language:Scala2" + ) +} diff --git a/sbt-dotty/sbt-test/source-dependencies/signature-change/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/signature-change/project/plugins.sbt new file mode 100644 index 000000000000..c17caab2d98c --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/signature-change/project/plugins.sbt @@ -0,0 +1 @@ +addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/signature-change/test b/sbt-dotty/sbt-test/source-dependencies/signature-change/test similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/signature-change/test rename to sbt-dotty/sbt-test/source-dependencies/signature-change/test diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/specialized/A.scala b/sbt-dotty/sbt-test/source-dependencies/specialized/A.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/specialized/A.scala rename to sbt-dotty/sbt-test/source-dependencies/specialized/A.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/specialized/B.scala b/sbt-dotty/sbt-test/source-dependencies/specialized/B.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/specialized/B.scala rename to sbt-dotty/sbt-test/source-dependencies/specialized/B.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/specialized/changes/A.scala b/sbt-dotty/sbt-test/source-dependencies/specialized/changes/A.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/specialized/changes/A.scala rename to sbt-dotty/sbt-test/source-dependencies/specialized/changes/A.scala diff --git a/sbt-dotty/sbt-test/source-dependencies/specialized/project/DottyInjectedPlugin.scala b/sbt-dotty/sbt-test/source-dependencies/specialized/project/DottyInjectedPlugin.scala new file mode 100644 index 000000000000..f9e3265ab2b2 --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/specialized/project/DottyInjectedPlugin.scala @@ -0,0 +1,12 @@ +import sbt._ +import Keys._ + +object DottyInjectedPlugin extends AutoPlugin { + override def requires = plugins.JvmPlugin + override def trigger = allRequirements + + override val projectSettings = Seq( + scalaVersion := "0.1.1-bin-SNAPSHOT", + scalacOptions += "-language:Scala2" + ) +} diff --git a/sbt-dotty/sbt-test/source-dependencies/specialized/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/specialized/project/plugins.sbt new file mode 100644 index 000000000000..c17caab2d98c --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/specialized/project/plugins.sbt @@ -0,0 +1 @@ +addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/specialized/test b/sbt-dotty/sbt-test/source-dependencies/specialized/test similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/specialized/test rename to sbt-dotty/sbt-test/source-dependencies/specialized/test diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/stability-change/A.scala b/sbt-dotty/sbt-test/source-dependencies/stability-change/A.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/stability-change/A.scala rename to sbt-dotty/sbt-test/source-dependencies/stability-change/A.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/stability-change/B.scala b/sbt-dotty/sbt-test/source-dependencies/stability-change/B.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/stability-change/B.scala rename to sbt-dotty/sbt-test/source-dependencies/stability-change/B.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/stability-change/C.scala b/sbt-dotty/sbt-test/source-dependencies/stability-change/C.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/stability-change/C.scala rename to sbt-dotty/sbt-test/source-dependencies/stability-change/C.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/stability-change/changes/A.scala b/sbt-dotty/sbt-test/source-dependencies/stability-change/changes/A.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/stability-change/changes/A.scala rename to sbt-dotty/sbt-test/source-dependencies/stability-change/changes/A.scala diff --git a/sbt-dotty/sbt-test/source-dependencies/stability-change/project/DottyInjectedPlugin.scala b/sbt-dotty/sbt-test/source-dependencies/stability-change/project/DottyInjectedPlugin.scala new file mode 100644 index 000000000000..f9e3265ab2b2 --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/stability-change/project/DottyInjectedPlugin.scala @@ -0,0 +1,12 @@ +import sbt._ +import Keys._ + +object DottyInjectedPlugin extends AutoPlugin { + override def requires = plugins.JvmPlugin + override def trigger = allRequirements + + override val projectSettings = Seq( + scalaVersion := "0.1.1-bin-SNAPSHOT", + scalacOptions += "-language:Scala2" + ) +} diff --git a/sbt-dotty/sbt-test/source-dependencies/stability-change/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/stability-change/project/plugins.sbt new file mode 100644 index 000000000000..c17caab2d98c --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/stability-change/project/plugins.sbt @@ -0,0 +1 @@ +addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/stability-change/test b/sbt-dotty/sbt-test/source-dependencies/stability-change/test similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/stability-change/test rename to sbt-dotty/sbt-test/source-dependencies/stability-change/test diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/synthetic-companion/A.scala b/sbt-dotty/sbt-test/source-dependencies/synthetic-companion/A.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/synthetic-companion/A.scala rename to sbt-dotty/sbt-test/source-dependencies/synthetic-companion/A.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/synthetic-companion/B.scala b/sbt-dotty/sbt-test/source-dependencies/synthetic-companion/B.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/synthetic-companion/B.scala rename to sbt-dotty/sbt-test/source-dependencies/synthetic-companion/B.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/synthetic-companion/changes/A2.scala b/sbt-dotty/sbt-test/source-dependencies/synthetic-companion/changes/A2.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/synthetic-companion/changes/A2.scala rename to sbt-dotty/sbt-test/source-dependencies/synthetic-companion/changes/A2.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/synthetic-companion/dbg.sbt b/sbt-dotty/sbt-test/source-dependencies/synthetic-companion/dbg.sbt similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/synthetic-companion/dbg.sbt rename to sbt-dotty/sbt-test/source-dependencies/synthetic-companion/dbg.sbt diff --git a/sbt-dotty/sbt-test/source-dependencies/synthetic-companion/project/DottyInjectedPlugin.scala b/sbt-dotty/sbt-test/source-dependencies/synthetic-companion/project/DottyInjectedPlugin.scala new file mode 100644 index 000000000000..f9e3265ab2b2 --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/synthetic-companion/project/DottyInjectedPlugin.scala @@ -0,0 +1,12 @@ +import sbt._ +import Keys._ + +object DottyInjectedPlugin extends AutoPlugin { + override def requires = plugins.JvmPlugin + override def trigger = allRequirements + + override val projectSettings = Seq( + scalaVersion := "0.1.1-bin-SNAPSHOT", + scalacOptions += "-language:Scala2" + ) +} diff --git a/sbt-dotty/sbt-test/source-dependencies/synthetic-companion/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/synthetic-companion/project/plugins.sbt new file mode 100644 index 000000000000..c17caab2d98c --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/synthetic-companion/project/plugins.sbt @@ -0,0 +1 @@ +addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/synthetic-companion/test b/sbt-dotty/sbt-test/source-dependencies/synthetic-companion/test similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/synthetic-companion/test rename to sbt-dotty/sbt-test/source-dependencies/synthetic-companion/test diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/trait-member-modified/build.sbt b/sbt-dotty/sbt-test/source-dependencies/trait-member-modified/build.sbt similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/trait-member-modified/build.sbt rename to sbt-dotty/sbt-test/source-dependencies/trait-member-modified/build.sbt diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/trait-member-modified/changes/A1.scala b/sbt-dotty/sbt-test/source-dependencies/trait-member-modified/changes/A1.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/trait-member-modified/changes/A1.scala rename to sbt-dotty/sbt-test/source-dependencies/trait-member-modified/changes/A1.scala diff --git a/sbt-dotty/sbt-test/source-dependencies/trait-member-modified/project/DottyInjectedPlugin.scala b/sbt-dotty/sbt-test/source-dependencies/trait-member-modified/project/DottyInjectedPlugin.scala new file mode 100644 index 000000000000..f9e3265ab2b2 --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/trait-member-modified/project/DottyInjectedPlugin.scala @@ -0,0 +1,12 @@ +import sbt._ +import Keys._ + +object DottyInjectedPlugin extends AutoPlugin { + override def requires = plugins.JvmPlugin + override def trigger = allRequirements + + override val projectSettings = Seq( + scalaVersion := "0.1.1-bin-SNAPSHOT", + scalacOptions += "-language:Scala2" + ) +} diff --git a/sbt-dotty/sbt-test/source-dependencies/trait-member-modified/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/trait-member-modified/project/plugins.sbt new file mode 100644 index 000000000000..c17caab2d98c --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/trait-member-modified/project/plugins.sbt @@ -0,0 +1 @@ +addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/trait-member-modified/src/main/scala/A.scala b/sbt-dotty/sbt-test/source-dependencies/trait-member-modified/src/main/scala/A.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/trait-member-modified/src/main/scala/A.scala rename to sbt-dotty/sbt-test/source-dependencies/trait-member-modified/src/main/scala/A.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/trait-member-modified/src/main/scala/B.scala b/sbt-dotty/sbt-test/source-dependencies/trait-member-modified/src/main/scala/B.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/trait-member-modified/src/main/scala/B.scala rename to sbt-dotty/sbt-test/source-dependencies/trait-member-modified/src/main/scala/B.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/trait-member-modified/test b/sbt-dotty/sbt-test/source-dependencies/trait-member-modified/test similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/trait-member-modified/test rename to sbt-dotty/sbt-test/source-dependencies/trait-member-modified/test diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/trait-private-object/A.scala b/sbt-dotty/sbt-test/source-dependencies/trait-private-object/A.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/trait-private-object/A.scala rename to sbt-dotty/sbt-test/source-dependencies/trait-private-object/A.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/trait-private-object/B.scala b/sbt-dotty/sbt-test/source-dependencies/trait-private-object/B.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/trait-private-object/B.scala rename to sbt-dotty/sbt-test/source-dependencies/trait-private-object/B.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/trait-private-object/changes/A.scala b/sbt-dotty/sbt-test/source-dependencies/trait-private-object/changes/A.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/trait-private-object/changes/A.scala rename to sbt-dotty/sbt-test/source-dependencies/trait-private-object/changes/A.scala diff --git a/sbt-dotty/sbt-test/source-dependencies/trait-private-object/project/DottyInjectedPlugin.scala b/sbt-dotty/sbt-test/source-dependencies/trait-private-object/project/DottyInjectedPlugin.scala new file mode 100644 index 000000000000..f9e3265ab2b2 --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/trait-private-object/project/DottyInjectedPlugin.scala @@ -0,0 +1,12 @@ +import sbt._ +import Keys._ + +object DottyInjectedPlugin extends AutoPlugin { + override def requires = plugins.JvmPlugin + override def trigger = allRequirements + + override val projectSettings = Seq( + scalaVersion := "0.1.1-bin-SNAPSHOT", + scalacOptions += "-language:Scala2" + ) +} diff --git a/sbt-dotty/sbt-test/source-dependencies/trait-private-object/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/trait-private-object/project/plugins.sbt new file mode 100644 index 000000000000..c17caab2d98c --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/trait-private-object/project/plugins.sbt @@ -0,0 +1 @@ +addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/trait-private-object/test b/sbt-dotty/sbt-test/source-dependencies/trait-private-object/test similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/trait-private-object/test rename to sbt-dotty/sbt-test/source-dependencies/trait-private-object/test diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/trait-private-var/B.scala b/sbt-dotty/sbt-test/source-dependencies/trait-private-var/B.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/trait-private-var/B.scala rename to sbt-dotty/sbt-test/source-dependencies/trait-private-var/B.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/trait-private-var/changes/A0.scala b/sbt-dotty/sbt-test/source-dependencies/trait-private-var/changes/A0.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/trait-private-var/changes/A0.scala rename to sbt-dotty/sbt-test/source-dependencies/trait-private-var/changes/A0.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/trait-private-var/changes/A1.scala b/sbt-dotty/sbt-test/source-dependencies/trait-private-var/changes/A1.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/trait-private-var/changes/A1.scala rename to sbt-dotty/sbt-test/source-dependencies/trait-private-var/changes/A1.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/trait-private-var/changes/A2.scala b/sbt-dotty/sbt-test/source-dependencies/trait-private-var/changes/A2.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/trait-private-var/changes/A2.scala rename to sbt-dotty/sbt-test/source-dependencies/trait-private-var/changes/A2.scala diff --git a/sbt-dotty/sbt-test/source-dependencies/trait-private-var/project/DottyInjectedPlugin.scala b/sbt-dotty/sbt-test/source-dependencies/trait-private-var/project/DottyInjectedPlugin.scala new file mode 100644 index 000000000000..f9e3265ab2b2 --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/trait-private-var/project/DottyInjectedPlugin.scala @@ -0,0 +1,12 @@ +import sbt._ +import Keys._ + +object DottyInjectedPlugin extends AutoPlugin { + override def requires = plugins.JvmPlugin + override def trigger = allRequirements + + override val projectSettings = Seq( + scalaVersion := "0.1.1-bin-SNAPSHOT", + scalacOptions += "-language:Scala2" + ) +} diff --git a/sbt-dotty/sbt-test/source-dependencies/trait-private-var/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/trait-private-var/project/plugins.sbt new file mode 100644 index 000000000000..c17caab2d98c --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/trait-private-var/project/plugins.sbt @@ -0,0 +1 @@ +addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/trait-private-var/test b/sbt-dotty/sbt-test/source-dependencies/trait-private-var/test similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/trait-private-var/test rename to sbt-dotty/sbt-test/source-dependencies/trait-private-var/test diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/trait-super/A.scala b/sbt-dotty/sbt-test/source-dependencies/trait-super/A.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/trait-super/A.scala rename to sbt-dotty/sbt-test/source-dependencies/trait-super/A.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/trait-super/B.scala b/sbt-dotty/sbt-test/source-dependencies/trait-super/B.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/trait-super/B.scala rename to sbt-dotty/sbt-test/source-dependencies/trait-super/B.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/trait-super/Main.scala b/sbt-dotty/sbt-test/source-dependencies/trait-super/Main.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/trait-super/Main.scala rename to sbt-dotty/sbt-test/source-dependencies/trait-super/Main.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/trait-super/changes/B2.scala b/sbt-dotty/sbt-test/source-dependencies/trait-super/changes/B2.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/trait-super/changes/B2.scala rename to sbt-dotty/sbt-test/source-dependencies/trait-super/changes/B2.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/trait-super/changes/B3.scala b/sbt-dotty/sbt-test/source-dependencies/trait-super/changes/B3.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/trait-super/changes/B3.scala rename to sbt-dotty/sbt-test/source-dependencies/trait-super/changes/B3.scala diff --git a/sbt-dotty/sbt-test/source-dependencies/trait-super/project/DottyInjectedPlugin.scala b/sbt-dotty/sbt-test/source-dependencies/trait-super/project/DottyInjectedPlugin.scala new file mode 100644 index 000000000000..f9e3265ab2b2 --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/trait-super/project/DottyInjectedPlugin.scala @@ -0,0 +1,12 @@ +import sbt._ +import Keys._ + +object DottyInjectedPlugin extends AutoPlugin { + override def requires = plugins.JvmPlugin + override def trigger = allRequirements + + override val projectSettings = Seq( + scalaVersion := "0.1.1-bin-SNAPSHOT", + scalacOptions += "-language:Scala2" + ) +} diff --git a/sbt-dotty/sbt-test/source-dependencies/trait-super/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/trait-super/project/plugins.sbt new file mode 100644 index 000000000000..c17caab2d98c --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/trait-super/project/plugins.sbt @@ -0,0 +1 @@ +addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/trait-super/test b/sbt-dotty/sbt-test/source-dependencies/trait-super/test similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/trait-super/test rename to sbt-dotty/sbt-test/source-dependencies/trait-super/test diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/transitive-a/changes/A2.scala b/sbt-dotty/sbt-test/source-dependencies/transitive-a/changes/A2.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/transitive-a/changes/A2.scala rename to sbt-dotty/sbt-test/source-dependencies/transitive-a/changes/A2.scala diff --git a/sbt-dotty/sbt-test/source-dependencies/transitive-a/project/DottyInjectedPlugin.scala b/sbt-dotty/sbt-test/source-dependencies/transitive-a/project/DottyInjectedPlugin.scala new file mode 100644 index 000000000000..f9e3265ab2b2 --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/transitive-a/project/DottyInjectedPlugin.scala @@ -0,0 +1,12 @@ +import sbt._ +import Keys._ + +object DottyInjectedPlugin extends AutoPlugin { + override def requires = plugins.JvmPlugin + override def trigger = allRequirements + + override val projectSettings = Seq( + scalaVersion := "0.1.1-bin-SNAPSHOT", + scalacOptions += "-language:Scala2" + ) +} diff --git a/sbt-dotty/sbt-test/source-dependencies/transitive-a/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/transitive-a/project/plugins.sbt new file mode 100644 index 000000000000..c17caab2d98c --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/transitive-a/project/plugins.sbt @@ -0,0 +1 @@ +addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/transitive-a/src/main/scala/A.scala b/sbt-dotty/sbt-test/source-dependencies/transitive-a/src/main/scala/A.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/transitive-a/src/main/scala/A.scala rename to sbt-dotty/sbt-test/source-dependencies/transitive-a/src/main/scala/A.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/transitive-a/src/main/scala/B.scala b/sbt-dotty/sbt-test/source-dependencies/transitive-a/src/main/scala/B.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/transitive-a/src/main/scala/B.scala rename to sbt-dotty/sbt-test/source-dependencies/transitive-a/src/main/scala/B.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/transitive-a/src/main/scala/C.scala b/sbt-dotty/sbt-test/source-dependencies/transitive-a/src/main/scala/C.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/transitive-a/src/main/scala/C.scala rename to sbt-dotty/sbt-test/source-dependencies/transitive-a/src/main/scala/C.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/transitive-a/test b/sbt-dotty/sbt-test/source-dependencies/transitive-a/test similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/transitive-a/test rename to sbt-dotty/sbt-test/source-dependencies/transitive-a/test diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/transitive-b/changes/A2.scala b/sbt-dotty/sbt-test/source-dependencies/transitive-b/changes/A2.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/transitive-b/changes/A2.scala rename to sbt-dotty/sbt-test/source-dependencies/transitive-b/changes/A2.scala diff --git a/sbt-dotty/sbt-test/source-dependencies/transitive-b/project/DottyInjectedPlugin.scala b/sbt-dotty/sbt-test/source-dependencies/transitive-b/project/DottyInjectedPlugin.scala new file mode 100644 index 000000000000..f9e3265ab2b2 --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/transitive-b/project/DottyInjectedPlugin.scala @@ -0,0 +1,12 @@ +import sbt._ +import Keys._ + +object DottyInjectedPlugin extends AutoPlugin { + override def requires = plugins.JvmPlugin + override def trigger = allRequirements + + override val projectSettings = Seq( + scalaVersion := "0.1.1-bin-SNAPSHOT", + scalacOptions += "-language:Scala2" + ) +} diff --git a/sbt-dotty/sbt-test/source-dependencies/transitive-b/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/transitive-b/project/plugins.sbt new file mode 100644 index 000000000000..c17caab2d98c --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/transitive-b/project/plugins.sbt @@ -0,0 +1 @@ +addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/transitive-b/src/main/scala/A.scala b/sbt-dotty/sbt-test/source-dependencies/transitive-b/src/main/scala/A.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/transitive-b/src/main/scala/A.scala rename to sbt-dotty/sbt-test/source-dependencies/transitive-b/src/main/scala/A.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/transitive-b/src/main/scala/B.scala b/sbt-dotty/sbt-test/source-dependencies/transitive-b/src/main/scala/B.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/transitive-b/src/main/scala/B.scala rename to sbt-dotty/sbt-test/source-dependencies/transitive-b/src/main/scala/B.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/transitive-b/src/main/scala/C.scala b/sbt-dotty/sbt-test/source-dependencies/transitive-b/src/main/scala/C.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/transitive-b/src/main/scala/C.scala rename to sbt-dotty/sbt-test/source-dependencies/transitive-b/src/main/scala/C.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/transitive-b/test b/sbt-dotty/sbt-test/source-dependencies/transitive-b/test similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/transitive-b/test rename to sbt-dotty/sbt-test/source-dependencies/transitive-b/test diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/transitive-inherit-java/A.java b/sbt-dotty/sbt-test/source-dependencies/transitive-inherit-java/A.java similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/transitive-inherit-java/A.java rename to sbt-dotty/sbt-test/source-dependencies/transitive-inherit-java/A.java diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/transitive-inherit-java/B.java b/sbt-dotty/sbt-test/source-dependencies/transitive-inherit-java/B.java similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/transitive-inherit-java/B.java rename to sbt-dotty/sbt-test/source-dependencies/transitive-inherit-java/B.java diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/transitive-inherit-java/C.java b/sbt-dotty/sbt-test/source-dependencies/transitive-inherit-java/C.java similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/transitive-inherit-java/C.java rename to sbt-dotty/sbt-test/source-dependencies/transitive-inherit-java/C.java diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/transitive-inherit-java/changes/A2.java b/sbt-dotty/sbt-test/source-dependencies/transitive-inherit-java/changes/A2.java similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/transitive-inherit-java/changes/A2.java rename to sbt-dotty/sbt-test/source-dependencies/transitive-inherit-java/changes/A2.java diff --git a/sbt-dotty/sbt-test/source-dependencies/transitive-inherit-java/project/DottyInjectedPlugin.scala b/sbt-dotty/sbt-test/source-dependencies/transitive-inherit-java/project/DottyInjectedPlugin.scala new file mode 100644 index 000000000000..f9e3265ab2b2 --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/transitive-inherit-java/project/DottyInjectedPlugin.scala @@ -0,0 +1,12 @@ +import sbt._ +import Keys._ + +object DottyInjectedPlugin extends AutoPlugin { + override def requires = plugins.JvmPlugin + override def trigger = allRequirements + + override val projectSettings = Seq( + scalaVersion := "0.1.1-bin-SNAPSHOT", + scalacOptions += "-language:Scala2" + ) +} diff --git a/sbt-dotty/sbt-test/source-dependencies/transitive-inherit-java/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/transitive-inherit-java/project/plugins.sbt new file mode 100644 index 000000000000..c17caab2d98c --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/transitive-inherit-java/project/plugins.sbt @@ -0,0 +1 @@ +addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/transitive-inherit-java/test b/sbt-dotty/sbt-test/source-dependencies/transitive-inherit-java/test similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/transitive-inherit-java/test rename to sbt-dotty/sbt-test/source-dependencies/transitive-inherit-java/test diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/transitive-inherit/A.scala b/sbt-dotty/sbt-test/source-dependencies/transitive-inherit/A.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/transitive-inherit/A.scala rename to sbt-dotty/sbt-test/source-dependencies/transitive-inherit/A.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/transitive-inherit/B.scala b/sbt-dotty/sbt-test/source-dependencies/transitive-inherit/B.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/transitive-inherit/B.scala rename to sbt-dotty/sbt-test/source-dependencies/transitive-inherit/B.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/transitive-inherit/C.scala b/sbt-dotty/sbt-test/source-dependencies/transitive-inherit/C.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/transitive-inherit/C.scala rename to sbt-dotty/sbt-test/source-dependencies/transitive-inherit/C.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/transitive-inherit/changes/A2.scala b/sbt-dotty/sbt-test/source-dependencies/transitive-inherit/changes/A2.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/transitive-inherit/changes/A2.scala rename to sbt-dotty/sbt-test/source-dependencies/transitive-inherit/changes/A2.scala diff --git a/sbt-dotty/sbt-test/source-dependencies/transitive-inherit/project/DottyInjectedPlugin.scala b/sbt-dotty/sbt-test/source-dependencies/transitive-inherit/project/DottyInjectedPlugin.scala new file mode 100644 index 000000000000..f9e3265ab2b2 --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/transitive-inherit/project/DottyInjectedPlugin.scala @@ -0,0 +1,12 @@ +import sbt._ +import Keys._ + +object DottyInjectedPlugin extends AutoPlugin { + override def requires = plugins.JvmPlugin + override def trigger = allRequirements + + override val projectSettings = Seq( + scalaVersion := "0.1.1-bin-SNAPSHOT", + scalacOptions += "-language:Scala2" + ) +} diff --git a/sbt-dotty/sbt-test/source-dependencies/transitive-inherit/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/transitive-inherit/project/plugins.sbt new file mode 100644 index 000000000000..c17caab2d98c --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/transitive-inherit/project/plugins.sbt @@ -0,0 +1 @@ +addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/transitive-inherit/test b/sbt-dotty/sbt-test/source-dependencies/transitive-inherit/test similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/transitive-inherit/test rename to sbt-dotty/sbt-test/source-dependencies/transitive-inherit/test diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/transitive-memberRef/build.sbt b/sbt-dotty/sbt-test/source-dependencies/transitive-memberRef/build.sbt similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/transitive-memberRef/build.sbt rename to sbt-dotty/sbt-test/source-dependencies/transitive-memberRef/build.sbt diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/transitive-memberRef/changes/A1.scala b/sbt-dotty/sbt-test/source-dependencies/transitive-memberRef/changes/A1.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/transitive-memberRef/changes/A1.scala rename to sbt-dotty/sbt-test/source-dependencies/transitive-memberRef/changes/A1.scala diff --git a/sbt-dotty/sbt-test/source-dependencies/transitive-memberRef/project/DottyInjectedPlugin.scala b/sbt-dotty/sbt-test/source-dependencies/transitive-memberRef/project/DottyInjectedPlugin.scala new file mode 100644 index 000000000000..f9e3265ab2b2 --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/transitive-memberRef/project/DottyInjectedPlugin.scala @@ -0,0 +1,12 @@ +import sbt._ +import Keys._ + +object DottyInjectedPlugin extends AutoPlugin { + override def requires = plugins.JvmPlugin + override def trigger = allRequirements + + override val projectSettings = Seq( + scalaVersion := "0.1.1-bin-SNAPSHOT", + scalacOptions += "-language:Scala2" + ) +} diff --git a/sbt-dotty/sbt-test/source-dependencies/transitive-memberRef/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/transitive-memberRef/project/plugins.sbt new file mode 100644 index 000000000000..c17caab2d98c --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/transitive-memberRef/project/plugins.sbt @@ -0,0 +1 @@ +addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/transitive-memberRef/src/main/scala/A.scala b/sbt-dotty/sbt-test/source-dependencies/transitive-memberRef/src/main/scala/A.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/transitive-memberRef/src/main/scala/A.scala rename to sbt-dotty/sbt-test/source-dependencies/transitive-memberRef/src/main/scala/A.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/transitive-memberRef/src/main/scala/B.scala b/sbt-dotty/sbt-test/source-dependencies/transitive-memberRef/src/main/scala/B.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/transitive-memberRef/src/main/scala/B.scala rename to sbt-dotty/sbt-test/source-dependencies/transitive-memberRef/src/main/scala/B.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/transitive-memberRef/src/main/scala/C.scala b/sbt-dotty/sbt-test/source-dependencies/transitive-memberRef/src/main/scala/C.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/transitive-memberRef/src/main/scala/C.scala rename to sbt-dotty/sbt-test/source-dependencies/transitive-memberRef/src/main/scala/C.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/transitive-memberRef/src/main/scala/D.scala b/sbt-dotty/sbt-test/source-dependencies/transitive-memberRef/src/main/scala/D.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/transitive-memberRef/src/main/scala/D.scala rename to sbt-dotty/sbt-test/source-dependencies/transitive-memberRef/src/main/scala/D.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/transitive-memberRef/src/main/scala/X.scala b/sbt-dotty/sbt-test/source-dependencies/transitive-memberRef/src/main/scala/X.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/transitive-memberRef/src/main/scala/X.scala rename to sbt-dotty/sbt-test/source-dependencies/transitive-memberRef/src/main/scala/X.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/transitive-memberRef/src/main/scala/Y.scala b/sbt-dotty/sbt-test/source-dependencies/transitive-memberRef/src/main/scala/Y.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/transitive-memberRef/src/main/scala/Y.scala rename to sbt-dotty/sbt-test/source-dependencies/transitive-memberRef/src/main/scala/Y.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/transitive-memberRef/test b/sbt-dotty/sbt-test/source-dependencies/transitive-memberRef/test similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/transitive-memberRef/test rename to sbt-dotty/sbt-test/source-dependencies/transitive-memberRef/test diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/type-alias/A.scala b/sbt-dotty/sbt-test/source-dependencies/type-alias/A.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/type-alias/A.scala rename to sbt-dotty/sbt-test/source-dependencies/type-alias/A.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/type-alias/B.scala b/sbt-dotty/sbt-test/source-dependencies/type-alias/B.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/type-alias/B.scala rename to sbt-dotty/sbt-test/source-dependencies/type-alias/B.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/type-alias/build.sbt b/sbt-dotty/sbt-test/source-dependencies/type-alias/build.sbt similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/type-alias/build.sbt rename to sbt-dotty/sbt-test/source-dependencies/type-alias/build.sbt diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/type-alias/changes/A.scala b/sbt-dotty/sbt-test/source-dependencies/type-alias/changes/A.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/type-alias/changes/A.scala rename to sbt-dotty/sbt-test/source-dependencies/type-alias/changes/A.scala diff --git a/sbt-dotty/sbt-test/source-dependencies/type-alias/project/DottyInjectedPlugin.scala b/sbt-dotty/sbt-test/source-dependencies/type-alias/project/DottyInjectedPlugin.scala new file mode 100644 index 000000000000..f9e3265ab2b2 --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/type-alias/project/DottyInjectedPlugin.scala @@ -0,0 +1,12 @@ +import sbt._ +import Keys._ + +object DottyInjectedPlugin extends AutoPlugin { + override def requires = plugins.JvmPlugin + override def trigger = allRequirements + + override val projectSettings = Seq( + scalaVersion := "0.1.1-bin-SNAPSHOT", + scalacOptions += "-language:Scala2" + ) +} diff --git a/sbt-dotty/sbt-test/source-dependencies/type-alias/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/type-alias/project/plugins.sbt new file mode 100644 index 000000000000..c17caab2d98c --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/type-alias/project/plugins.sbt @@ -0,0 +1 @@ +addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/type-alias/test b/sbt-dotty/sbt-test/source-dependencies/type-alias/test similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/type-alias/test rename to sbt-dotty/sbt-test/source-dependencies/type-alias/test diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/type-parameter/A.scala b/sbt-dotty/sbt-test/source-dependencies/type-parameter/A.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/type-parameter/A.scala rename to sbt-dotty/sbt-test/source-dependencies/type-parameter/A.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/type-parameter/B.scala b/sbt-dotty/sbt-test/source-dependencies/type-parameter/B.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/type-parameter/B.scala rename to sbt-dotty/sbt-test/source-dependencies/type-parameter/B.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/type-parameter/C.scala b/sbt-dotty/sbt-test/source-dependencies/type-parameter/C.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/type-parameter/C.scala rename to sbt-dotty/sbt-test/source-dependencies/type-parameter/C.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/type-parameter/D.scala b/sbt-dotty/sbt-test/source-dependencies/type-parameter/D.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/type-parameter/D.scala rename to sbt-dotty/sbt-test/source-dependencies/type-parameter/D.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/type-parameter/changes/A.scala b/sbt-dotty/sbt-test/source-dependencies/type-parameter/changes/A.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/type-parameter/changes/A.scala rename to sbt-dotty/sbt-test/source-dependencies/type-parameter/changes/A.scala diff --git a/sbt-dotty/sbt-test/source-dependencies/type-parameter/project/DottyInjectedPlugin.scala b/sbt-dotty/sbt-test/source-dependencies/type-parameter/project/DottyInjectedPlugin.scala new file mode 100644 index 000000000000..f9e3265ab2b2 --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/type-parameter/project/DottyInjectedPlugin.scala @@ -0,0 +1,12 @@ +import sbt._ +import Keys._ + +object DottyInjectedPlugin extends AutoPlugin { + override def requires = plugins.JvmPlugin + override def trigger = allRequirements + + override val projectSettings = Seq( + scalaVersion := "0.1.1-bin-SNAPSHOT", + scalacOptions += "-language:Scala2" + ) +} diff --git a/sbt-dotty/sbt-test/source-dependencies/type-parameter/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/type-parameter/project/plugins.sbt new file mode 100644 index 000000000000..c17caab2d98c --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/type-parameter/project/plugins.sbt @@ -0,0 +1 @@ +addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/type-parameter/test b/sbt-dotty/sbt-test/source-dependencies/type-parameter/test similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/type-parameter/test rename to sbt-dotty/sbt-test/source-dependencies/type-parameter/test diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/typeref-only/A.scala b/sbt-dotty/sbt-test/source-dependencies/typeref-only/A.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/typeref-only/A.scala rename to sbt-dotty/sbt-test/source-dependencies/typeref-only/A.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/typeref-only/B.scala b/sbt-dotty/sbt-test/source-dependencies/typeref-only/B.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/typeref-only/B.scala rename to sbt-dotty/sbt-test/source-dependencies/typeref-only/B.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/typeref-only/build.sbt b/sbt-dotty/sbt-test/source-dependencies/typeref-only/build.sbt similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/typeref-only/build.sbt rename to sbt-dotty/sbt-test/source-dependencies/typeref-only/build.sbt diff --git a/sbt-dotty/sbt-test/source-dependencies/typeref-only/project/DottyInjectedPlugin.scala b/sbt-dotty/sbt-test/source-dependencies/typeref-only/project/DottyInjectedPlugin.scala new file mode 100644 index 000000000000..f9e3265ab2b2 --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/typeref-only/project/DottyInjectedPlugin.scala @@ -0,0 +1,12 @@ +import sbt._ +import Keys._ + +object DottyInjectedPlugin extends AutoPlugin { + override def requires = plugins.JvmPlugin + override def trigger = allRequirements + + override val projectSettings = Seq( + scalaVersion := "0.1.1-bin-SNAPSHOT", + scalacOptions += "-language:Scala2" + ) +} diff --git a/sbt-dotty/sbt-test/source-dependencies/typeref-only/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/typeref-only/project/plugins.sbt new file mode 100644 index 000000000000..c17caab2d98c --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/typeref-only/project/plugins.sbt @@ -0,0 +1 @@ +addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/typeref-only/test b/sbt-dotty/sbt-test/source-dependencies/typeref-only/test similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/typeref-only/test rename to sbt-dotty/sbt-test/source-dependencies/typeref-only/test diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/typeref-return/A.scala b/sbt-dotty/sbt-test/source-dependencies/typeref-return/A.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/typeref-return/A.scala rename to sbt-dotty/sbt-test/source-dependencies/typeref-return/A.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/typeref-return/B.scala b/sbt-dotty/sbt-test/source-dependencies/typeref-return/B.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/typeref-return/B.scala rename to sbt-dotty/sbt-test/source-dependencies/typeref-return/B.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/typeref-return/changes/A.scala b/sbt-dotty/sbt-test/source-dependencies/typeref-return/changes/A.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/typeref-return/changes/A.scala rename to sbt-dotty/sbt-test/source-dependencies/typeref-return/changes/A.scala diff --git a/sbt-dotty/sbt-test/source-dependencies/typeref-return/project/DottyInjectedPlugin.scala b/sbt-dotty/sbt-test/source-dependencies/typeref-return/project/DottyInjectedPlugin.scala new file mode 100644 index 000000000000..f9e3265ab2b2 --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/typeref-return/project/DottyInjectedPlugin.scala @@ -0,0 +1,12 @@ +import sbt._ +import Keys._ + +object DottyInjectedPlugin extends AutoPlugin { + override def requires = plugins.JvmPlugin + override def trigger = allRequirements + + override val projectSettings = Seq( + scalaVersion := "0.1.1-bin-SNAPSHOT", + scalacOptions += "-language:Scala2" + ) +} diff --git a/sbt-dotty/sbt-test/source-dependencies/typeref-return/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/typeref-return/project/plugins.sbt new file mode 100644 index 000000000000..c17caab2d98c --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/typeref-return/project/plugins.sbt @@ -0,0 +1 @@ +addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/typeref-return/test b/sbt-dotty/sbt-test/source-dependencies/typeref-return/test similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/typeref-return/test rename to sbt-dotty/sbt-test/source-dependencies/typeref-return/test diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/types-in-used-names-a/A.scala b/sbt-dotty/sbt-test/source-dependencies/types-in-used-names-a/A.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/types-in-used-names-a/A.scala rename to sbt-dotty/sbt-test/source-dependencies/types-in-used-names-a/A.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/types-in-used-names-a/B.scala b/sbt-dotty/sbt-test/source-dependencies/types-in-used-names-a/B.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/types-in-used-names-a/B.scala rename to sbt-dotty/sbt-test/source-dependencies/types-in-used-names-a/B.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/types-in-used-names-a/C.scala b/sbt-dotty/sbt-test/source-dependencies/types-in-used-names-a/C.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/types-in-used-names-a/C.scala rename to sbt-dotty/sbt-test/source-dependencies/types-in-used-names-a/C.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/types-in-used-names-a/D.scala b/sbt-dotty/sbt-test/source-dependencies/types-in-used-names-a/D.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/types-in-used-names-a/D.scala rename to sbt-dotty/sbt-test/source-dependencies/types-in-used-names-a/D.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/types-in-used-names-a/changes/B2.scala b/sbt-dotty/sbt-test/source-dependencies/types-in-used-names-a/changes/B2.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/types-in-used-names-a/changes/B2.scala rename to sbt-dotty/sbt-test/source-dependencies/types-in-used-names-a/changes/B2.scala diff --git a/sbt-dotty/sbt-test/source-dependencies/types-in-used-names-a/project/DottyInjectedPlugin.scala b/sbt-dotty/sbt-test/source-dependencies/types-in-used-names-a/project/DottyInjectedPlugin.scala new file mode 100644 index 000000000000..f9e3265ab2b2 --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/types-in-used-names-a/project/DottyInjectedPlugin.scala @@ -0,0 +1,12 @@ +import sbt._ +import Keys._ + +object DottyInjectedPlugin extends AutoPlugin { + override def requires = plugins.JvmPlugin + override def trigger = allRequirements + + override val projectSettings = Seq( + scalaVersion := "0.1.1-bin-SNAPSHOT", + scalacOptions += "-language:Scala2" + ) +} diff --git a/sbt-dotty/sbt-test/source-dependencies/types-in-used-names-a/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/types-in-used-names-a/project/plugins.sbt new file mode 100644 index 000000000000..c17caab2d98c --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/types-in-used-names-a/project/plugins.sbt @@ -0,0 +1 @@ +addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/types-in-used-names-a/test b/sbt-dotty/sbt-test/source-dependencies/types-in-used-names-a/test similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/types-in-used-names-a/test rename to sbt-dotty/sbt-test/source-dependencies/types-in-used-names-a/test diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/types-in-used-names-b/A.scala b/sbt-dotty/sbt-test/source-dependencies/types-in-used-names-b/A.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/types-in-used-names-b/A.scala rename to sbt-dotty/sbt-test/source-dependencies/types-in-used-names-b/A.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/types-in-used-names-b/B.scala b/sbt-dotty/sbt-test/source-dependencies/types-in-used-names-b/B.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/types-in-used-names-b/B.scala rename to sbt-dotty/sbt-test/source-dependencies/types-in-used-names-b/B.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/types-in-used-names-b/changes/A2.scala b/sbt-dotty/sbt-test/source-dependencies/types-in-used-names-b/changes/A2.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/types-in-used-names-b/changes/A2.scala rename to sbt-dotty/sbt-test/source-dependencies/types-in-used-names-b/changes/A2.scala diff --git a/sbt-dotty/sbt-test/source-dependencies/types-in-used-names-b/project/DottyInjectedPlugin.scala b/sbt-dotty/sbt-test/source-dependencies/types-in-used-names-b/project/DottyInjectedPlugin.scala new file mode 100644 index 000000000000..f9e3265ab2b2 --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/types-in-used-names-b/project/DottyInjectedPlugin.scala @@ -0,0 +1,12 @@ +import sbt._ +import Keys._ + +object DottyInjectedPlugin extends AutoPlugin { + override def requires = plugins.JvmPlugin + override def trigger = allRequirements + + override val projectSettings = Seq( + scalaVersion := "0.1.1-bin-SNAPSHOT", + scalacOptions += "-language:Scala2" + ) +} diff --git a/sbt-dotty/sbt-test/source-dependencies/types-in-used-names-b/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/types-in-used-names-b/project/plugins.sbt new file mode 100644 index 000000000000..c17caab2d98c --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/types-in-used-names-b/project/plugins.sbt @@ -0,0 +1 @@ +addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/types-in-used-names-b/test b/sbt-dotty/sbt-test/source-dependencies/types-in-used-names-b/test similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/types-in-used-names-b/test rename to sbt-dotty/sbt-test/source-dependencies/types-in-used-names-b/test diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/value-class-underlying/A.scala b/sbt-dotty/sbt-test/source-dependencies/value-class-underlying/A.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/value-class-underlying/A.scala rename to sbt-dotty/sbt-test/source-dependencies/value-class-underlying/A.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/value-class-underlying/B.scala b/sbt-dotty/sbt-test/source-dependencies/value-class-underlying/B.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/value-class-underlying/B.scala rename to sbt-dotty/sbt-test/source-dependencies/value-class-underlying/B.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/value-class-underlying/C.scala b/sbt-dotty/sbt-test/source-dependencies/value-class-underlying/C.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/value-class-underlying/C.scala rename to sbt-dotty/sbt-test/source-dependencies/value-class-underlying/C.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/value-class-underlying/build.sbt b/sbt-dotty/sbt-test/source-dependencies/value-class-underlying/build.sbt similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/value-class-underlying/build.sbt rename to sbt-dotty/sbt-test/source-dependencies/value-class-underlying/build.sbt diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/value-class-underlying/changes/A2.scala b/sbt-dotty/sbt-test/source-dependencies/value-class-underlying/changes/A2.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/value-class-underlying/changes/A2.scala rename to sbt-dotty/sbt-test/source-dependencies/value-class-underlying/changes/A2.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/value-class-underlying/test b/sbt-dotty/sbt-test/source-dependencies/value-class-underlying/test similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/value-class-underlying/test rename to sbt-dotty/sbt-test/source-dependencies/value-class-underlying/test diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/value-class/build.sbt b/sbt-dotty/sbt-test/source-dependencies/value-class/build.sbt similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/value-class/build.sbt rename to sbt-dotty/sbt-test/source-dependencies/value-class/build.sbt diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/value-class/changes/A0.scala b/sbt-dotty/sbt-test/source-dependencies/value-class/changes/A0.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/value-class/changes/A0.scala rename to sbt-dotty/sbt-test/source-dependencies/value-class/changes/A0.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/value-class/changes/A1.scala b/sbt-dotty/sbt-test/source-dependencies/value-class/changes/A1.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/value-class/changes/A1.scala rename to sbt-dotty/sbt-test/source-dependencies/value-class/changes/A1.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/value-class/changes/B0.scala b/sbt-dotty/sbt-test/source-dependencies/value-class/changes/B0.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/value-class/changes/B0.scala rename to sbt-dotty/sbt-test/source-dependencies/value-class/changes/B0.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/value-class/changes/B1.scala b/sbt-dotty/sbt-test/source-dependencies/value-class/changes/B1.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/value-class/changes/B1.scala rename to sbt-dotty/sbt-test/source-dependencies/value-class/changes/B1.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/value-class/changes/B2.scala b/sbt-dotty/sbt-test/source-dependencies/value-class/changes/B2.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/value-class/changes/B2.scala rename to sbt-dotty/sbt-test/source-dependencies/value-class/changes/B2.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/value-class/changes/C0.scala b/sbt-dotty/sbt-test/source-dependencies/value-class/changes/C0.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/value-class/changes/C0.scala rename to sbt-dotty/sbt-test/source-dependencies/value-class/changes/C0.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/value-class/changes/C1.scala b/sbt-dotty/sbt-test/source-dependencies/value-class/changes/C1.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/value-class/changes/C1.scala rename to sbt-dotty/sbt-test/source-dependencies/value-class/changes/C1.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/value-class/changes/C2.scala b/sbt-dotty/sbt-test/source-dependencies/value-class/changes/C2.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/value-class/changes/C2.scala rename to sbt-dotty/sbt-test/source-dependencies/value-class/changes/C2.scala diff --git a/sbt-dotty/sbt-test/source-dependencies/value-class/project/DottyInjectedPlugin.scala b/sbt-dotty/sbt-test/source-dependencies/value-class/project/DottyInjectedPlugin.scala new file mode 100644 index 000000000000..f9e3265ab2b2 --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/value-class/project/DottyInjectedPlugin.scala @@ -0,0 +1,12 @@ +import sbt._ +import Keys._ + +object DottyInjectedPlugin extends AutoPlugin { + override def requires = plugins.JvmPlugin + override def trigger = allRequirements + + override val projectSettings = Seq( + scalaVersion := "0.1.1-bin-SNAPSHOT", + scalacOptions += "-language:Scala2" + ) +} diff --git a/sbt-dotty/sbt-test/source-dependencies/value-class/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/value-class/project/plugins.sbt new file mode 100644 index 000000000000..c17caab2d98c --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/value-class/project/plugins.sbt @@ -0,0 +1 @@ +addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/value-class/test b/sbt-dotty/sbt-test/source-dependencies/value-class/test similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/value-class/test rename to sbt-dotty/sbt-test/source-dependencies/value-class/test diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/var/A.scala b/sbt-dotty/sbt-test/source-dependencies/var/A.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/var/A.scala rename to sbt-dotty/sbt-test/source-dependencies/var/A.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/var/B.scala b/sbt-dotty/sbt-test/source-dependencies/var/B.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/var/B.scala rename to sbt-dotty/sbt-test/source-dependencies/var/B.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/var/changes/A.scala b/sbt-dotty/sbt-test/source-dependencies/var/changes/A.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/var/changes/A.scala rename to sbt-dotty/sbt-test/source-dependencies/var/changes/A.scala diff --git a/sbt-dotty/sbt-test/source-dependencies/var/project/DottyInjectedPlugin.scala b/sbt-dotty/sbt-test/source-dependencies/var/project/DottyInjectedPlugin.scala new file mode 100644 index 000000000000..f9e3265ab2b2 --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/var/project/DottyInjectedPlugin.scala @@ -0,0 +1,12 @@ +import sbt._ +import Keys._ + +object DottyInjectedPlugin extends AutoPlugin { + override def requires = plugins.JvmPlugin + override def trigger = allRequirements + + override val projectSettings = Seq( + scalaVersion := "0.1.1-bin-SNAPSHOT", + scalacOptions += "-language:Scala2" + ) +} diff --git a/sbt-dotty/sbt-test/source-dependencies/var/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/var/project/plugins.sbt new file mode 100644 index 000000000000..c17caab2d98c --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/var/project/plugins.sbt @@ -0,0 +1 @@ +addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/var/test b/sbt-dotty/sbt-test/source-dependencies/var/test similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/var/test rename to sbt-dotty/sbt-test/source-dependencies/var/test diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/variance/A.scala b/sbt-dotty/sbt-test/source-dependencies/variance/A.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/variance/A.scala rename to sbt-dotty/sbt-test/source-dependencies/variance/A.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/variance/C.scala b/sbt-dotty/sbt-test/source-dependencies/variance/C.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/variance/C.scala rename to sbt-dotty/sbt-test/source-dependencies/variance/C.scala diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/variance/changes/A.scala b/sbt-dotty/sbt-test/source-dependencies/variance/changes/A.scala similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/variance/changes/A.scala rename to sbt-dotty/sbt-test/source-dependencies/variance/changes/A.scala diff --git a/sbt-dotty/sbt-test/source-dependencies/variance/project/DottyInjectedPlugin.scala b/sbt-dotty/sbt-test/source-dependencies/variance/project/DottyInjectedPlugin.scala new file mode 100644 index 000000000000..f9e3265ab2b2 --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/variance/project/DottyInjectedPlugin.scala @@ -0,0 +1,12 @@ +import sbt._ +import Keys._ + +object DottyInjectedPlugin extends AutoPlugin { + override def requires = plugins.JvmPlugin + override def trigger = allRequirements + + override val projectSettings = Seq( + scalaVersion := "0.1.1-bin-SNAPSHOT", + scalacOptions += "-language:Scala2" + ) +} diff --git a/sbt-dotty/sbt-test/source-dependencies/variance/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/variance/project/plugins.sbt new file mode 100644 index 000000000000..c17caab2d98c --- /dev/null +++ b/sbt-dotty/sbt-test/source-dependencies/variance/project/plugins.sbt @@ -0,0 +1 @@ +addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/variance/test b/sbt-dotty/sbt-test/source-dependencies/variance/test similarity index 100% rename from sbt-scripted-tests/sbt-test/source-dependencies/variance/test rename to sbt-dotty/sbt-test/source-dependencies/variance/test diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/abstract-type/project/DottyInjectedPlugin.scala b/sbt-scripted-tests/sbt-test/source-dependencies/abstract-type/project/DottyInjectedPlugin.scala deleted file mode 100644 index 3170ad99c06c..000000000000 --- a/sbt-scripted-tests/sbt-test/source-dependencies/abstract-type/project/DottyInjectedPlugin.scala +++ /dev/null @@ -1,14 +0,0 @@ -import sbt._ -import Keys._ - -object DottyInjectedPlugin extends AutoPlugin { - override def requires = plugins.JvmPlugin - override def trigger = allRequirements - - override val projectSettings = Seq( - scalaVersion := "0.1.1-bin-SNAPSHOT", - scalaOrganization := "ch.epfl.lamp", - scalacOptions += "-language:Scala2", - scalaBinaryVersion := "0.1" - ) -} diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/added/project/DottyInjectedPlugin.scala b/sbt-scripted-tests/sbt-test/source-dependencies/added/project/DottyInjectedPlugin.scala deleted file mode 100644 index 3170ad99c06c..000000000000 --- a/sbt-scripted-tests/sbt-test/source-dependencies/added/project/DottyInjectedPlugin.scala +++ /dev/null @@ -1,14 +0,0 @@ -import sbt._ -import Keys._ - -object DottyInjectedPlugin extends AutoPlugin { - override def requires = plugins.JvmPlugin - override def trigger = allRequirements - - override val projectSettings = Seq( - scalaVersion := "0.1.1-bin-SNAPSHOT", - scalaOrganization := "ch.epfl.lamp", - scalacOptions += "-language:Scala2", - scalaBinaryVersion := "0.1" - ) -} diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/as-seen-from-a/project/DottyInjectedPlugin.scala b/sbt-scripted-tests/sbt-test/source-dependencies/as-seen-from-a/project/DottyInjectedPlugin.scala deleted file mode 100644 index 3170ad99c06c..000000000000 --- a/sbt-scripted-tests/sbt-test/source-dependencies/as-seen-from-a/project/DottyInjectedPlugin.scala +++ /dev/null @@ -1,14 +0,0 @@ -import sbt._ -import Keys._ - -object DottyInjectedPlugin extends AutoPlugin { - override def requires = plugins.JvmPlugin - override def trigger = allRequirements - - override val projectSettings = Seq( - scalaVersion := "0.1.1-bin-SNAPSHOT", - scalaOrganization := "ch.epfl.lamp", - scalacOptions += "-language:Scala2", - scalaBinaryVersion := "0.1" - ) -} diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/as-seen-from-b/project/DottyInjectedPlugin.scala b/sbt-scripted-tests/sbt-test/source-dependencies/as-seen-from-b/project/DottyInjectedPlugin.scala deleted file mode 100644 index 3170ad99c06c..000000000000 --- a/sbt-scripted-tests/sbt-test/source-dependencies/as-seen-from-b/project/DottyInjectedPlugin.scala +++ /dev/null @@ -1,14 +0,0 @@ -import sbt._ -import Keys._ - -object DottyInjectedPlugin extends AutoPlugin { - override def requires = plugins.JvmPlugin - override def trigger = allRequirements - - override val projectSettings = Seq( - scalaVersion := "0.1.1-bin-SNAPSHOT", - scalaOrganization := "ch.epfl.lamp", - scalacOptions += "-language:Scala2", - scalaBinaryVersion := "0.1" - ) -} diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/backtick-quoted-names/project/DottyInjectedPlugin.scala b/sbt-scripted-tests/sbt-test/source-dependencies/backtick-quoted-names/project/DottyInjectedPlugin.scala deleted file mode 100644 index 3170ad99c06c..000000000000 --- a/sbt-scripted-tests/sbt-test/source-dependencies/backtick-quoted-names/project/DottyInjectedPlugin.scala +++ /dev/null @@ -1,14 +0,0 @@ -import sbt._ -import Keys._ - -object DottyInjectedPlugin extends AutoPlugin { - override def requires = plugins.JvmPlugin - override def trigger = allRequirements - - override val projectSettings = Seq( - scalaVersion := "0.1.1-bin-SNAPSHOT", - scalaOrganization := "ch.epfl.lamp", - scalacOptions += "-language:Scala2", - scalaBinaryVersion := "0.1" - ) -} diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/binary/project/DottyInjectedPlugin.scala b/sbt-scripted-tests/sbt-test/source-dependencies/binary/project/DottyInjectedPlugin.scala deleted file mode 100644 index 3170ad99c06c..000000000000 --- a/sbt-scripted-tests/sbt-test/source-dependencies/binary/project/DottyInjectedPlugin.scala +++ /dev/null @@ -1,14 +0,0 @@ -import sbt._ -import Keys._ - -object DottyInjectedPlugin extends AutoPlugin { - override def requires = plugins.JvmPlugin - override def trigger = allRequirements - - override val projectSettings = Seq( - scalaVersion := "0.1.1-bin-SNAPSHOT", - scalaOrganization := "ch.epfl.lamp", - scalacOptions += "-language:Scala2", - scalaBinaryVersion := "0.1" - ) -} diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/by-name/project/DottyInjectedPlugin.scala b/sbt-scripted-tests/sbt-test/source-dependencies/by-name/project/DottyInjectedPlugin.scala deleted file mode 100644 index 3170ad99c06c..000000000000 --- a/sbt-scripted-tests/sbt-test/source-dependencies/by-name/project/DottyInjectedPlugin.scala +++ /dev/null @@ -1,14 +0,0 @@ -import sbt._ -import Keys._ - -object DottyInjectedPlugin extends AutoPlugin { - override def requires = plugins.JvmPlugin - override def trigger = allRequirements - - override val projectSettings = Seq( - scalaVersion := "0.1.1-bin-SNAPSHOT", - scalaOrganization := "ch.epfl.lamp", - scalacOptions += "-language:Scala2", - scalaBinaryVersion := "0.1" - ) -} diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/canon/project/DottyInjectedPlugin.scala b/sbt-scripted-tests/sbt-test/source-dependencies/canon/project/DottyInjectedPlugin.scala deleted file mode 100644 index 3170ad99c06c..000000000000 --- a/sbt-scripted-tests/sbt-test/source-dependencies/canon/project/DottyInjectedPlugin.scala +++ /dev/null @@ -1,14 +0,0 @@ -import sbt._ -import Keys._ - -object DottyInjectedPlugin extends AutoPlugin { - override def requires = plugins.JvmPlugin - override def trigger = allRequirements - - override val projectSettings = Seq( - scalaVersion := "0.1.1-bin-SNAPSHOT", - scalaOrganization := "ch.epfl.lamp", - scalacOptions += "-language:Scala2", - scalaBinaryVersion := "0.1" - ) -} diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/compactify/project/DottyInjectedPlugin.scala b/sbt-scripted-tests/sbt-test/source-dependencies/compactify/project/DottyInjectedPlugin.scala deleted file mode 100644 index 3170ad99c06c..000000000000 --- a/sbt-scripted-tests/sbt-test/source-dependencies/compactify/project/DottyInjectedPlugin.scala +++ /dev/null @@ -1,14 +0,0 @@ -import sbt._ -import Keys._ - -object DottyInjectedPlugin extends AutoPlugin { - override def requires = plugins.JvmPlugin - override def trigger = allRequirements - - override val projectSettings = Seq( - scalaVersion := "0.1.1-bin-SNAPSHOT", - scalaOrganization := "ch.epfl.lamp", - scalacOptions += "-language:Scala2", - scalaBinaryVersion := "0.1" - ) -} diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/constants/project/DottyInjectedPlugin.scala b/sbt-scripted-tests/sbt-test/source-dependencies/constants/project/DottyInjectedPlugin.scala deleted file mode 100644 index 3170ad99c06c..000000000000 --- a/sbt-scripted-tests/sbt-test/source-dependencies/constants/project/DottyInjectedPlugin.scala +++ /dev/null @@ -1,14 +0,0 @@ -import sbt._ -import Keys._ - -object DottyInjectedPlugin extends AutoPlugin { - override def requires = plugins.JvmPlugin - override def trigger = allRequirements - - override val projectSettings = Seq( - scalaVersion := "0.1.1-bin-SNAPSHOT", - scalaOrganization := "ch.epfl.lamp", - scalacOptions += "-language:Scala2", - scalaBinaryVersion := "0.1" - ) -} diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/default-params/project/DottyInjectedPlugin.scala b/sbt-scripted-tests/sbt-test/source-dependencies/default-params/project/DottyInjectedPlugin.scala deleted file mode 100644 index 3170ad99c06c..000000000000 --- a/sbt-scripted-tests/sbt-test/source-dependencies/default-params/project/DottyInjectedPlugin.scala +++ /dev/null @@ -1,14 +0,0 @@ -import sbt._ -import Keys._ - -object DottyInjectedPlugin extends AutoPlugin { - override def requires = plugins.JvmPlugin - override def trigger = allRequirements - - override val projectSettings = Seq( - scalaVersion := "0.1.1-bin-SNAPSHOT", - scalaOrganization := "ch.epfl.lamp", - scalacOptions += "-language:Scala2", - scalaBinaryVersion := "0.1" - ) -} diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/dup-class/project/DottyInjectedPlugin.scala b/sbt-scripted-tests/sbt-test/source-dependencies/dup-class/project/DottyInjectedPlugin.scala deleted file mode 100644 index 3170ad99c06c..000000000000 --- a/sbt-scripted-tests/sbt-test/source-dependencies/dup-class/project/DottyInjectedPlugin.scala +++ /dev/null @@ -1,14 +0,0 @@ -import sbt._ -import Keys._ - -object DottyInjectedPlugin extends AutoPlugin { - override def requires = plugins.JvmPlugin - override def trigger = allRequirements - - override val projectSettings = Seq( - scalaVersion := "0.1.1-bin-SNAPSHOT", - scalaOrganization := "ch.epfl.lamp", - scalacOptions += "-language:Scala2", - scalaBinaryVersion := "0.1" - ) -} diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/empty-a/project/DottyInjectedPlugin.scala b/sbt-scripted-tests/sbt-test/source-dependencies/empty-a/project/DottyInjectedPlugin.scala deleted file mode 100644 index 3170ad99c06c..000000000000 --- a/sbt-scripted-tests/sbt-test/source-dependencies/empty-a/project/DottyInjectedPlugin.scala +++ /dev/null @@ -1,14 +0,0 @@ -import sbt._ -import Keys._ - -object DottyInjectedPlugin extends AutoPlugin { - override def requires = plugins.JvmPlugin - override def trigger = allRequirements - - override val projectSettings = Seq( - scalaVersion := "0.1.1-bin-SNAPSHOT", - scalaOrganization := "ch.epfl.lamp", - scalacOptions += "-language:Scala2", - scalaBinaryVersion := "0.1" - ) -} diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/empty-package/project/DottyInjectedPlugin.scala b/sbt-scripted-tests/sbt-test/source-dependencies/empty-package/project/DottyInjectedPlugin.scala deleted file mode 100644 index 3170ad99c06c..000000000000 --- a/sbt-scripted-tests/sbt-test/source-dependencies/empty-package/project/DottyInjectedPlugin.scala +++ /dev/null @@ -1,14 +0,0 @@ -import sbt._ -import Keys._ - -object DottyInjectedPlugin extends AutoPlugin { - override def requires = plugins.JvmPlugin - override def trigger = allRequirements - - override val projectSettings = Seq( - scalaVersion := "0.1.1-bin-SNAPSHOT", - scalaOrganization := "ch.epfl.lamp", - scalacOptions += "-language:Scala2", - scalaBinaryVersion := "0.1" - ) -} diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/erasure/project/DottyInjectedPlugin.scala b/sbt-scripted-tests/sbt-test/source-dependencies/erasure/project/DottyInjectedPlugin.scala deleted file mode 100644 index 3170ad99c06c..000000000000 --- a/sbt-scripted-tests/sbt-test/source-dependencies/erasure/project/DottyInjectedPlugin.scala +++ /dev/null @@ -1,14 +0,0 @@ -import sbt._ -import Keys._ - -object DottyInjectedPlugin extends AutoPlugin { - override def requires = plugins.JvmPlugin - override def trigger = allRequirements - - override val projectSettings = Seq( - scalaVersion := "0.1.1-bin-SNAPSHOT", - scalaOrganization := "ch.epfl.lamp", - scalacOptions += "-language:Scala2", - scalaBinaryVersion := "0.1" - ) -} diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/export-jars/project/DottyInjectedPlugin.scala b/sbt-scripted-tests/sbt-test/source-dependencies/export-jars/project/DottyInjectedPlugin.scala deleted file mode 100644 index 3170ad99c06c..000000000000 --- a/sbt-scripted-tests/sbt-test/source-dependencies/export-jars/project/DottyInjectedPlugin.scala +++ /dev/null @@ -1,14 +0,0 @@ -import sbt._ -import Keys._ - -object DottyInjectedPlugin extends AutoPlugin { - override def requires = plugins.JvmPlugin - override def trigger = allRequirements - - override val projectSettings = Seq( - scalaVersion := "0.1.1-bin-SNAPSHOT", - scalaOrganization := "ch.epfl.lamp", - scalacOptions += "-language:Scala2", - scalaBinaryVersion := "0.1" - ) -} diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/ext/project/DottyInjectedPlugin.scala b/sbt-scripted-tests/sbt-test/source-dependencies/ext/project/DottyInjectedPlugin.scala deleted file mode 100644 index 3170ad99c06c..000000000000 --- a/sbt-scripted-tests/sbt-test/source-dependencies/ext/project/DottyInjectedPlugin.scala +++ /dev/null @@ -1,14 +0,0 @@ -import sbt._ -import Keys._ - -object DottyInjectedPlugin extends AutoPlugin { - override def requires = plugins.JvmPlugin - override def trigger = allRequirements - - override val projectSettings = Seq( - scalaVersion := "0.1.1-bin-SNAPSHOT", - scalaOrganization := "ch.epfl.lamp", - scalacOptions += "-language:Scala2", - scalaBinaryVersion := "0.1" - ) -} diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/false-error/project/DottyInjectedPlugin.scala b/sbt-scripted-tests/sbt-test/source-dependencies/false-error/project/DottyInjectedPlugin.scala deleted file mode 100644 index 3170ad99c06c..000000000000 --- a/sbt-scripted-tests/sbt-test/source-dependencies/false-error/project/DottyInjectedPlugin.scala +++ /dev/null @@ -1,14 +0,0 @@ -import sbt._ -import Keys._ - -object DottyInjectedPlugin extends AutoPlugin { - override def requires = plugins.JvmPlugin - override def trigger = allRequirements - - override val projectSettings = Seq( - scalaVersion := "0.1.1-bin-SNAPSHOT", - scalaOrganization := "ch.epfl.lamp", - scalacOptions += "-language:Scala2", - scalaBinaryVersion := "0.1" - ) -} diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/fbounded-existentials/project/DottyInjectedPlugin.scala b/sbt-scripted-tests/sbt-test/source-dependencies/fbounded-existentials/project/DottyInjectedPlugin.scala deleted file mode 100644 index 3170ad99c06c..000000000000 --- a/sbt-scripted-tests/sbt-test/source-dependencies/fbounded-existentials/project/DottyInjectedPlugin.scala +++ /dev/null @@ -1,14 +0,0 @@ -import sbt._ -import Keys._ - -object DottyInjectedPlugin extends AutoPlugin { - override def requires = plugins.JvmPlugin - override def trigger = allRequirements - - override val projectSettings = Seq( - scalaVersion := "0.1.1-bin-SNAPSHOT", - scalaOrganization := "ch.epfl.lamp", - scalacOptions += "-language:Scala2", - scalaBinaryVersion := "0.1" - ) -} diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/implicit-params/project/DottyInjectedPlugin.scala b/sbt-scripted-tests/sbt-test/source-dependencies/implicit-params/project/DottyInjectedPlugin.scala deleted file mode 100644 index 3170ad99c06c..000000000000 --- a/sbt-scripted-tests/sbt-test/source-dependencies/implicit-params/project/DottyInjectedPlugin.scala +++ /dev/null @@ -1,14 +0,0 @@ -import sbt._ -import Keys._ - -object DottyInjectedPlugin extends AutoPlugin { - override def requires = plugins.JvmPlugin - override def trigger = allRequirements - - override val projectSettings = Seq( - scalaVersion := "0.1.1-bin-SNAPSHOT", - scalaOrganization := "ch.epfl.lamp", - scalacOptions += "-language:Scala2", - scalaBinaryVersion := "0.1" - ) -} diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/implicit-search-companion-scope/project/DottyInjectedPlugin.scala b/sbt-scripted-tests/sbt-test/source-dependencies/implicit-search-companion-scope/project/DottyInjectedPlugin.scala deleted file mode 100644 index 3170ad99c06c..000000000000 --- a/sbt-scripted-tests/sbt-test/source-dependencies/implicit-search-companion-scope/project/DottyInjectedPlugin.scala +++ /dev/null @@ -1,14 +0,0 @@ -import sbt._ -import Keys._ - -object DottyInjectedPlugin extends AutoPlugin { - override def requires = plugins.JvmPlugin - override def trigger = allRequirements - - override val projectSettings = Seq( - scalaVersion := "0.1.1-bin-SNAPSHOT", - scalaOrganization := "ch.epfl.lamp", - scalacOptions += "-language:Scala2", - scalaBinaryVersion := "0.1" - ) -} diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/implicit-search/project/DottyInjectedPlugin.scala b/sbt-scripted-tests/sbt-test/source-dependencies/implicit-search/project/DottyInjectedPlugin.scala deleted file mode 100644 index 3170ad99c06c..000000000000 --- a/sbt-scripted-tests/sbt-test/source-dependencies/implicit-search/project/DottyInjectedPlugin.scala +++ /dev/null @@ -1,14 +0,0 @@ -import sbt._ -import Keys._ - -object DottyInjectedPlugin extends AutoPlugin { - override def requires = plugins.JvmPlugin - override def trigger = allRequirements - - override val projectSettings = Seq( - scalaVersion := "0.1.1-bin-SNAPSHOT", - scalaOrganization := "ch.epfl.lamp", - scalacOptions += "-language:Scala2", - scalaBinaryVersion := "0.1" - ) -} diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/implicit/project/DottyInjectedPlugin.scala b/sbt-scripted-tests/sbt-test/source-dependencies/implicit/project/DottyInjectedPlugin.scala deleted file mode 100644 index 3170ad99c06c..000000000000 --- a/sbt-scripted-tests/sbt-test/source-dependencies/implicit/project/DottyInjectedPlugin.scala +++ /dev/null @@ -1,14 +0,0 @@ -import sbt._ -import Keys._ - -object DottyInjectedPlugin extends AutoPlugin { - override def requires = plugins.JvmPlugin - override def trigger = allRequirements - - override val projectSettings = Seq( - scalaVersion := "0.1.1-bin-SNAPSHOT", - scalaOrganization := "ch.epfl.lamp", - scalacOptions += "-language:Scala2", - scalaBinaryVersion := "0.1" - ) -} diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/import-class/project/DottyInjectedPlugin.scala b/sbt-scripted-tests/sbt-test/source-dependencies/import-class/project/DottyInjectedPlugin.scala deleted file mode 100644 index 3170ad99c06c..000000000000 --- a/sbt-scripted-tests/sbt-test/source-dependencies/import-class/project/DottyInjectedPlugin.scala +++ /dev/null @@ -1,14 +0,0 @@ -import sbt._ -import Keys._ - -object DottyInjectedPlugin extends AutoPlugin { - override def requires = plugins.JvmPlugin - override def trigger = allRequirements - - override val projectSettings = Seq( - scalaVersion := "0.1.1-bin-SNAPSHOT", - scalaOrganization := "ch.epfl.lamp", - scalacOptions += "-language:Scala2", - scalaBinaryVersion := "0.1" - ) -} diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/import-package/project/DottyInjectedPlugin.scala b/sbt-scripted-tests/sbt-test/source-dependencies/import-package/project/DottyInjectedPlugin.scala deleted file mode 100644 index 3170ad99c06c..000000000000 --- a/sbt-scripted-tests/sbt-test/source-dependencies/import-package/project/DottyInjectedPlugin.scala +++ /dev/null @@ -1,14 +0,0 @@ -import sbt._ -import Keys._ - -object DottyInjectedPlugin extends AutoPlugin { - override def requires = plugins.JvmPlugin - override def trigger = allRequirements - - override val projectSettings = Seq( - scalaVersion := "0.1.1-bin-SNAPSHOT", - scalaOrganization := "ch.epfl.lamp", - scalacOptions += "-language:Scala2", - scalaBinaryVersion := "0.1" - ) -} diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/inherited-deps-java/project/DottyInjectedPlugin.scala b/sbt-scripted-tests/sbt-test/source-dependencies/inherited-deps-java/project/DottyInjectedPlugin.scala deleted file mode 100644 index 3170ad99c06c..000000000000 --- a/sbt-scripted-tests/sbt-test/source-dependencies/inherited-deps-java/project/DottyInjectedPlugin.scala +++ /dev/null @@ -1,14 +0,0 @@ -import sbt._ -import Keys._ - -object DottyInjectedPlugin extends AutoPlugin { - override def requires = plugins.JvmPlugin - override def trigger = allRequirements - - override val projectSettings = Seq( - scalaVersion := "0.1.1-bin-SNAPSHOT", - scalaOrganization := "ch.epfl.lamp", - scalacOptions += "-language:Scala2", - scalaBinaryVersion := "0.1" - ) -} diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/inherited_type_params/project/DottyInjectedPlugin.scala b/sbt-scripted-tests/sbt-test/source-dependencies/inherited_type_params/project/DottyInjectedPlugin.scala deleted file mode 100644 index 3170ad99c06c..000000000000 --- a/sbt-scripted-tests/sbt-test/source-dependencies/inherited_type_params/project/DottyInjectedPlugin.scala +++ /dev/null @@ -1,14 +0,0 @@ -import sbt._ -import Keys._ - -object DottyInjectedPlugin extends AutoPlugin { - override def requires = plugins.JvmPlugin - override def trigger = allRequirements - - override val projectSettings = Seq( - scalaVersion := "0.1.1-bin-SNAPSHOT", - scalaOrganization := "ch.epfl.lamp", - scalacOptions += "-language:Scala2", - scalaBinaryVersion := "0.1" - ) -} diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/inline/project/DottyInjectedPlugin.scala b/sbt-scripted-tests/sbt-test/source-dependencies/inline/project/DottyInjectedPlugin.scala deleted file mode 100644 index 3170ad99c06c..000000000000 --- a/sbt-scripted-tests/sbt-test/source-dependencies/inline/project/DottyInjectedPlugin.scala +++ /dev/null @@ -1,14 +0,0 @@ -import sbt._ -import Keys._ - -object DottyInjectedPlugin extends AutoPlugin { - override def requires = plugins.JvmPlugin - override def trigger = allRequirements - - override val projectSettings = Seq( - scalaVersion := "0.1.1-bin-SNAPSHOT", - scalaOrganization := "ch.epfl.lamp", - scalacOptions += "-language:Scala2", - scalaBinaryVersion := "0.1" - ) -} diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/intermediate-error/project/DottyInjectedPlugin.scala b/sbt-scripted-tests/sbt-test/source-dependencies/intermediate-error/project/DottyInjectedPlugin.scala deleted file mode 100644 index 3170ad99c06c..000000000000 --- a/sbt-scripted-tests/sbt-test/source-dependencies/intermediate-error/project/DottyInjectedPlugin.scala +++ /dev/null @@ -1,14 +0,0 @@ -import sbt._ -import Keys._ - -object DottyInjectedPlugin extends AutoPlugin { - override def requires = plugins.JvmPlugin - override def trigger = allRequirements - - override val projectSettings = Seq( - scalaVersion := "0.1.1-bin-SNAPSHOT", - scalaOrganization := "ch.epfl.lamp", - scalacOptions += "-language:Scala2", - scalaBinaryVersion := "0.1" - ) -} diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/java-analysis-serialization-error/project/DottyInjectedPlugin.scala b/sbt-scripted-tests/sbt-test/source-dependencies/java-analysis-serialization-error/project/DottyInjectedPlugin.scala deleted file mode 100644 index 3170ad99c06c..000000000000 --- a/sbt-scripted-tests/sbt-test/source-dependencies/java-analysis-serialization-error/project/DottyInjectedPlugin.scala +++ /dev/null @@ -1,14 +0,0 @@ -import sbt._ -import Keys._ - -object DottyInjectedPlugin extends AutoPlugin { - override def requires = plugins.JvmPlugin - override def trigger = allRequirements - - override val projectSettings = Seq( - scalaVersion := "0.1.1-bin-SNAPSHOT", - scalaOrganization := "ch.epfl.lamp", - scalacOptions += "-language:Scala2", - scalaBinaryVersion := "0.1" - ) -} diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/java-basic/project/DottyInjectedPlugin.scala b/sbt-scripted-tests/sbt-test/source-dependencies/java-basic/project/DottyInjectedPlugin.scala deleted file mode 100644 index 3170ad99c06c..000000000000 --- a/sbt-scripted-tests/sbt-test/source-dependencies/java-basic/project/DottyInjectedPlugin.scala +++ /dev/null @@ -1,14 +0,0 @@ -import sbt._ -import Keys._ - -object DottyInjectedPlugin extends AutoPlugin { - override def requires = plugins.JvmPlugin - override def trigger = allRequirements - - override val projectSettings = Seq( - scalaVersion := "0.1.1-bin-SNAPSHOT", - scalaOrganization := "ch.epfl.lamp", - scalacOptions += "-language:Scala2", - scalaBinaryVersion := "0.1" - ) -} diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/java-generic-workaround/project/DottyInjectedPlugin.scala b/sbt-scripted-tests/sbt-test/source-dependencies/java-generic-workaround/project/DottyInjectedPlugin.scala deleted file mode 100644 index 3170ad99c06c..000000000000 --- a/sbt-scripted-tests/sbt-test/source-dependencies/java-generic-workaround/project/DottyInjectedPlugin.scala +++ /dev/null @@ -1,14 +0,0 @@ -import sbt._ -import Keys._ - -object DottyInjectedPlugin extends AutoPlugin { - override def requires = plugins.JvmPlugin - override def trigger = allRequirements - - override val projectSettings = Seq( - scalaVersion := "0.1.1-bin-SNAPSHOT", - scalaOrganization := "ch.epfl.lamp", - scalacOptions += "-language:Scala2", - scalaBinaryVersion := "0.1" - ) -} diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/java-mixed/project/DottyInjectedPlugin.scala b/sbt-scripted-tests/sbt-test/source-dependencies/java-mixed/project/DottyInjectedPlugin.scala deleted file mode 100644 index 3170ad99c06c..000000000000 --- a/sbt-scripted-tests/sbt-test/source-dependencies/java-mixed/project/DottyInjectedPlugin.scala +++ /dev/null @@ -1,14 +0,0 @@ -import sbt._ -import Keys._ - -object DottyInjectedPlugin extends AutoPlugin { - override def requires = plugins.JvmPlugin - override def trigger = allRequirements - - override val projectSettings = Seq( - scalaVersion := "0.1.1-bin-SNAPSHOT", - scalaOrganization := "ch.epfl.lamp", - scalacOptions += "-language:Scala2", - scalaBinaryVersion := "0.1" - ) -} diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/java-static/project/DottyInjectedPlugin.scala b/sbt-scripted-tests/sbt-test/source-dependencies/java-static/project/DottyInjectedPlugin.scala deleted file mode 100644 index 3170ad99c06c..000000000000 --- a/sbt-scripted-tests/sbt-test/source-dependencies/java-static/project/DottyInjectedPlugin.scala +++ /dev/null @@ -1,14 +0,0 @@ -import sbt._ -import Keys._ - -object DottyInjectedPlugin extends AutoPlugin { - override def requires = plugins.JvmPlugin - override def trigger = allRequirements - - override val projectSettings = Seq( - scalaVersion := "0.1.1-bin-SNAPSHOT", - scalaOrganization := "ch.epfl.lamp", - scalacOptions += "-language:Scala2", - scalaBinaryVersion := "0.1" - ) -} diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/lazy-val/project/DottyInjectedPlugin.scala b/sbt-scripted-tests/sbt-test/source-dependencies/lazy-val/project/DottyInjectedPlugin.scala deleted file mode 100644 index 3170ad99c06c..000000000000 --- a/sbt-scripted-tests/sbt-test/source-dependencies/lazy-val/project/DottyInjectedPlugin.scala +++ /dev/null @@ -1,14 +0,0 @@ -import sbt._ -import Keys._ - -object DottyInjectedPlugin extends AutoPlugin { - override def requires = plugins.JvmPlugin - override def trigger = allRequirements - - override val projectSettings = Seq( - scalaVersion := "0.1.1-bin-SNAPSHOT", - scalaOrganization := "ch.epfl.lamp", - scalacOptions += "-language:Scala2", - scalaBinaryVersion := "0.1" - ) -} diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/less-inter-inv-java/project/DottyInjectedPlugin.scala b/sbt-scripted-tests/sbt-test/source-dependencies/less-inter-inv-java/project/DottyInjectedPlugin.scala deleted file mode 100644 index 3170ad99c06c..000000000000 --- a/sbt-scripted-tests/sbt-test/source-dependencies/less-inter-inv-java/project/DottyInjectedPlugin.scala +++ /dev/null @@ -1,14 +0,0 @@ -import sbt._ -import Keys._ - -object DottyInjectedPlugin extends AutoPlugin { - override def requires = plugins.JvmPlugin - override def trigger = allRequirements - - override val projectSettings = Seq( - scalaVersion := "0.1.1-bin-SNAPSHOT", - scalaOrganization := "ch.epfl.lamp", - scalacOptions += "-language:Scala2", - scalaBinaryVersion := "0.1" - ) -} diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/less-inter-inv/project/DottyInjectedPlugin.scala b/sbt-scripted-tests/sbt-test/source-dependencies/less-inter-inv/project/DottyInjectedPlugin.scala deleted file mode 100644 index 3170ad99c06c..000000000000 --- a/sbt-scripted-tests/sbt-test/source-dependencies/less-inter-inv/project/DottyInjectedPlugin.scala +++ /dev/null @@ -1,14 +0,0 @@ -import sbt._ -import Keys._ - -object DottyInjectedPlugin extends AutoPlugin { - override def requires = plugins.JvmPlugin - override def trigger = allRequirements - - override val projectSettings = Seq( - scalaVersion := "0.1.1-bin-SNAPSHOT", - scalaOrganization := "ch.epfl.lamp", - scalacOptions += "-language:Scala2", - scalaBinaryVersion := "0.1" - ) -} diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/linearization/project/DottyInjectedPlugin.scala b/sbt-scripted-tests/sbt-test/source-dependencies/linearization/project/DottyInjectedPlugin.scala deleted file mode 100644 index 3170ad99c06c..000000000000 --- a/sbt-scripted-tests/sbt-test/source-dependencies/linearization/project/DottyInjectedPlugin.scala +++ /dev/null @@ -1,14 +0,0 @@ -import sbt._ -import Keys._ - -object DottyInjectedPlugin extends AutoPlugin { - override def requires = plugins.JvmPlugin - override def trigger = allRequirements - - override val projectSettings = Seq( - scalaVersion := "0.1.1-bin-SNAPSHOT", - scalaOrganization := "ch.epfl.lamp", - scalacOptions += "-language:Scala2", - scalaBinaryVersion := "0.1" - ) -} diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/named/project/DottyInjectedPlugin.scala b/sbt-scripted-tests/sbt-test/source-dependencies/named/project/DottyInjectedPlugin.scala deleted file mode 100644 index 3170ad99c06c..000000000000 --- a/sbt-scripted-tests/sbt-test/source-dependencies/named/project/DottyInjectedPlugin.scala +++ /dev/null @@ -1,14 +0,0 @@ -import sbt._ -import Keys._ - -object DottyInjectedPlugin extends AutoPlugin { - override def requires = plugins.JvmPlugin - override def trigger = allRequirements - - override val projectSettings = Seq( - scalaVersion := "0.1.1-bin-SNAPSHOT", - scalaOrganization := "ch.epfl.lamp", - scalacOptions += "-language:Scala2", - scalaBinaryVersion := "0.1" - ) -} diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/nested-case-class/project/DottyInjectedPlugin.scala b/sbt-scripted-tests/sbt-test/source-dependencies/nested-case-class/project/DottyInjectedPlugin.scala deleted file mode 100644 index 3170ad99c06c..000000000000 --- a/sbt-scripted-tests/sbt-test/source-dependencies/nested-case-class/project/DottyInjectedPlugin.scala +++ /dev/null @@ -1,14 +0,0 @@ -import sbt._ -import Keys._ - -object DottyInjectedPlugin extends AutoPlugin { - override def requires = plugins.JvmPlugin - override def trigger = allRequirements - - override val projectSettings = Seq( - scalaVersion := "0.1.1-bin-SNAPSHOT", - scalaOrganization := "ch.epfl.lamp", - scalacOptions += "-language:Scala2", - scalaBinaryVersion := "0.1" - ) -} diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/new-cyclic/project/DottyInjectedPlugin.scala b/sbt-scripted-tests/sbt-test/source-dependencies/new-cyclic/project/DottyInjectedPlugin.scala deleted file mode 100644 index 3170ad99c06c..000000000000 --- a/sbt-scripted-tests/sbt-test/source-dependencies/new-cyclic/project/DottyInjectedPlugin.scala +++ /dev/null @@ -1,14 +0,0 @@ -import sbt._ -import Keys._ - -object DottyInjectedPlugin extends AutoPlugin { - override def requires = plugins.JvmPlugin - override def trigger = allRequirements - - override val projectSettings = Seq( - scalaVersion := "0.1.1-bin-SNAPSHOT", - scalaOrganization := "ch.epfl.lamp", - scalacOptions += "-language:Scala2", - scalaBinaryVersion := "0.1" - ) -} diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/new-pkg-dep/project/DottyInjectedPlugin.scala b/sbt-scripted-tests/sbt-test/source-dependencies/new-pkg-dep/project/DottyInjectedPlugin.scala deleted file mode 100644 index 3170ad99c06c..000000000000 --- a/sbt-scripted-tests/sbt-test/source-dependencies/new-pkg-dep/project/DottyInjectedPlugin.scala +++ /dev/null @@ -1,14 +0,0 @@ -import sbt._ -import Keys._ - -object DottyInjectedPlugin extends AutoPlugin { - override def requires = plugins.JvmPlugin - override def trigger = allRequirements - - override val projectSettings = Seq( - scalaVersion := "0.1.1-bin-SNAPSHOT", - scalaOrganization := "ch.epfl.lamp", - scalacOptions += "-language:Scala2", - scalaBinaryVersion := "0.1" - ) -} diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/override/project/DottyInjectedPlugin.scala b/sbt-scripted-tests/sbt-test/source-dependencies/override/project/DottyInjectedPlugin.scala deleted file mode 100644 index 3170ad99c06c..000000000000 --- a/sbt-scripted-tests/sbt-test/source-dependencies/override/project/DottyInjectedPlugin.scala +++ /dev/null @@ -1,14 +0,0 @@ -import sbt._ -import Keys._ - -object DottyInjectedPlugin extends AutoPlugin { - override def requires = plugins.JvmPlugin - override def trigger = allRequirements - - override val projectSettings = Seq( - scalaVersion := "0.1.1-bin-SNAPSHOT", - scalaOrganization := "ch.epfl.lamp", - scalacOptions += "-language:Scala2", - scalaBinaryVersion := "0.1" - ) -} diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/parent-change/project/DottyInjectedPlugin.scala b/sbt-scripted-tests/sbt-test/source-dependencies/parent-change/project/DottyInjectedPlugin.scala deleted file mode 100644 index 3170ad99c06c..000000000000 --- a/sbt-scripted-tests/sbt-test/source-dependencies/parent-change/project/DottyInjectedPlugin.scala +++ /dev/null @@ -1,14 +0,0 @@ -import sbt._ -import Keys._ - -object DottyInjectedPlugin extends AutoPlugin { - override def requires = plugins.JvmPlugin - override def trigger = allRequirements - - override val projectSettings = Seq( - scalaVersion := "0.1.1-bin-SNAPSHOT", - scalaOrganization := "ch.epfl.lamp", - scalacOptions += "-language:Scala2", - scalaBinaryVersion := "0.1" - ) -} diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/parent-member-change/project/DottyInjectedPlugin.scala b/sbt-scripted-tests/sbt-test/source-dependencies/parent-member-change/project/DottyInjectedPlugin.scala deleted file mode 100644 index 3170ad99c06c..000000000000 --- a/sbt-scripted-tests/sbt-test/source-dependencies/parent-member-change/project/DottyInjectedPlugin.scala +++ /dev/null @@ -1,14 +0,0 @@ -import sbt._ -import Keys._ - -object DottyInjectedPlugin extends AutoPlugin { - override def requires = plugins.JvmPlugin - override def trigger = allRequirements - - override val projectSettings = Seq( - scalaVersion := "0.1.1-bin-SNAPSHOT", - scalaOrganization := "ch.epfl.lamp", - scalacOptions += "-language:Scala2", - scalaBinaryVersion := "0.1" - ) -} diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/pkg-self/project/DottyInjectedPlugin.scala b/sbt-scripted-tests/sbt-test/source-dependencies/pkg-self/project/DottyInjectedPlugin.scala deleted file mode 100644 index 3170ad99c06c..000000000000 --- a/sbt-scripted-tests/sbt-test/source-dependencies/pkg-self/project/DottyInjectedPlugin.scala +++ /dev/null @@ -1,14 +0,0 @@ -import sbt._ -import Keys._ - -object DottyInjectedPlugin extends AutoPlugin { - override def requires = plugins.JvmPlugin - override def trigger = allRequirements - - override val projectSettings = Seq( - scalaVersion := "0.1.1-bin-SNAPSHOT", - scalaOrganization := "ch.epfl.lamp", - scalacOptions += "-language:Scala2", - scalaBinaryVersion := "0.1" - ) -} diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/qualified-access/project/DottyInjectedPlugin.scala b/sbt-scripted-tests/sbt-test/source-dependencies/qualified-access/project/DottyInjectedPlugin.scala deleted file mode 100644 index 3170ad99c06c..000000000000 --- a/sbt-scripted-tests/sbt-test/source-dependencies/qualified-access/project/DottyInjectedPlugin.scala +++ /dev/null @@ -1,14 +0,0 @@ -import sbt._ -import Keys._ - -object DottyInjectedPlugin extends AutoPlugin { - override def requires = plugins.JvmPlugin - override def trigger = allRequirements - - override val projectSettings = Seq( - scalaVersion := "0.1.1-bin-SNAPSHOT", - scalaOrganization := "ch.epfl.lamp", - scalacOptions += "-language:Scala2", - scalaBinaryVersion := "0.1" - ) -} diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/relative-source-error/project/DottyInjectedPlugin.scala b/sbt-scripted-tests/sbt-test/source-dependencies/relative-source-error/project/DottyInjectedPlugin.scala deleted file mode 100644 index 3170ad99c06c..000000000000 --- a/sbt-scripted-tests/sbt-test/source-dependencies/relative-source-error/project/DottyInjectedPlugin.scala +++ /dev/null @@ -1,14 +0,0 @@ -import sbt._ -import Keys._ - -object DottyInjectedPlugin extends AutoPlugin { - override def requires = plugins.JvmPlugin - override def trigger = allRequirements - - override val projectSettings = Seq( - scalaVersion := "0.1.1-bin-SNAPSHOT", - scalaOrganization := "ch.epfl.lamp", - scalacOptions += "-language:Scala2", - scalaBinaryVersion := "0.1" - ) -} diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/remove-test-a/project/DottyInjectedPlugin.scala b/sbt-scripted-tests/sbt-test/source-dependencies/remove-test-a/project/DottyInjectedPlugin.scala deleted file mode 100644 index 3170ad99c06c..000000000000 --- a/sbt-scripted-tests/sbt-test/source-dependencies/remove-test-a/project/DottyInjectedPlugin.scala +++ /dev/null @@ -1,14 +0,0 @@ -import sbt._ -import Keys._ - -object DottyInjectedPlugin extends AutoPlugin { - override def requires = plugins.JvmPlugin - override def trigger = allRequirements - - override val projectSettings = Seq( - scalaVersion := "0.1.1-bin-SNAPSHOT", - scalaOrganization := "ch.epfl.lamp", - scalacOptions += "-language:Scala2", - scalaBinaryVersion := "0.1" - ) -} diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/remove-test-b/project/DottyInjectedPlugin.scala b/sbt-scripted-tests/sbt-test/source-dependencies/remove-test-b/project/DottyInjectedPlugin.scala deleted file mode 100644 index 3170ad99c06c..000000000000 --- a/sbt-scripted-tests/sbt-test/source-dependencies/remove-test-b/project/DottyInjectedPlugin.scala +++ /dev/null @@ -1,14 +0,0 @@ -import sbt._ -import Keys._ - -object DottyInjectedPlugin extends AutoPlugin { - override def requires = plugins.JvmPlugin - override def trigger = allRequirements - - override val projectSettings = Seq( - scalaVersion := "0.1.1-bin-SNAPSHOT", - scalaOrganization := "ch.epfl.lamp", - scalacOptions += "-language:Scala2", - scalaBinaryVersion := "0.1" - ) -} diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/repeated-parameters/project/DottyInjectedPlugin.scala b/sbt-scripted-tests/sbt-test/source-dependencies/repeated-parameters/project/DottyInjectedPlugin.scala deleted file mode 100644 index 3170ad99c06c..000000000000 --- a/sbt-scripted-tests/sbt-test/source-dependencies/repeated-parameters/project/DottyInjectedPlugin.scala +++ /dev/null @@ -1,14 +0,0 @@ -import sbt._ -import Keys._ - -object DottyInjectedPlugin extends AutoPlugin { - override def requires = plugins.JvmPlugin - override def trigger = allRequirements - - override val projectSettings = Seq( - scalaVersion := "0.1.1-bin-SNAPSHOT", - scalaOrganization := "ch.epfl.lamp", - scalacOptions += "-language:Scala2", - scalaBinaryVersion := "0.1" - ) -} diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/replace-test-a/project/DottyInjectedPlugin.scala b/sbt-scripted-tests/sbt-test/source-dependencies/replace-test-a/project/DottyInjectedPlugin.scala deleted file mode 100644 index 3170ad99c06c..000000000000 --- a/sbt-scripted-tests/sbt-test/source-dependencies/replace-test-a/project/DottyInjectedPlugin.scala +++ /dev/null @@ -1,14 +0,0 @@ -import sbt._ -import Keys._ - -object DottyInjectedPlugin extends AutoPlugin { - override def requires = plugins.JvmPlugin - override def trigger = allRequirements - - override val projectSettings = Seq( - scalaVersion := "0.1.1-bin-SNAPSHOT", - scalaOrganization := "ch.epfl.lamp", - scalacOptions += "-language:Scala2", - scalaBinaryVersion := "0.1" - ) -} diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/resident-java/project/DottyInjectedPlugin.scala b/sbt-scripted-tests/sbt-test/source-dependencies/resident-java/project/DottyInjectedPlugin.scala deleted file mode 100644 index 3170ad99c06c..000000000000 --- a/sbt-scripted-tests/sbt-test/source-dependencies/resident-java/project/DottyInjectedPlugin.scala +++ /dev/null @@ -1,14 +0,0 @@ -import sbt._ -import Keys._ - -object DottyInjectedPlugin extends AutoPlugin { - override def requires = plugins.JvmPlugin - override def trigger = allRequirements - - override val projectSettings = Seq( - scalaVersion := "0.1.1-bin-SNAPSHOT", - scalaOrganization := "ch.epfl.lamp", - scalacOptions += "-language:Scala2", - scalaBinaryVersion := "0.1" - ) -} diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/resident-package-object/project/DottyInjectedPlugin.scala b/sbt-scripted-tests/sbt-test/source-dependencies/resident-package-object/project/DottyInjectedPlugin.scala deleted file mode 100644 index 3170ad99c06c..000000000000 --- a/sbt-scripted-tests/sbt-test/source-dependencies/resident-package-object/project/DottyInjectedPlugin.scala +++ /dev/null @@ -1,14 +0,0 @@ -import sbt._ -import Keys._ - -object DottyInjectedPlugin extends AutoPlugin { - override def requires = plugins.JvmPlugin - override def trigger = allRequirements - - override val projectSettings = Seq( - scalaVersion := "0.1.1-bin-SNAPSHOT", - scalaOrganization := "ch.epfl.lamp", - scalacOptions += "-language:Scala2", - scalaBinaryVersion := "0.1" - ) -} diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/restore-classes/project/DottyInjectedPlugin.scala b/sbt-scripted-tests/sbt-test/source-dependencies/restore-classes/project/DottyInjectedPlugin.scala deleted file mode 100644 index 3170ad99c06c..000000000000 --- a/sbt-scripted-tests/sbt-test/source-dependencies/restore-classes/project/DottyInjectedPlugin.scala +++ /dev/null @@ -1,14 +0,0 @@ -import sbt._ -import Keys._ - -object DottyInjectedPlugin extends AutoPlugin { - override def requires = plugins.JvmPlugin - override def trigger = allRequirements - - override val projectSettings = Seq( - scalaVersion := "0.1.1-bin-SNAPSHOT", - scalaOrganization := "ch.epfl.lamp", - scalacOptions += "-language:Scala2", - scalaBinaryVersion := "0.1" - ) -} diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/same-file-used-names/project/DottyInjectedPlugin.scala b/sbt-scripted-tests/sbt-test/source-dependencies/same-file-used-names/project/DottyInjectedPlugin.scala deleted file mode 100644 index 3170ad99c06c..000000000000 --- a/sbt-scripted-tests/sbt-test/source-dependencies/same-file-used-names/project/DottyInjectedPlugin.scala +++ /dev/null @@ -1,14 +0,0 @@ -import sbt._ -import Keys._ - -object DottyInjectedPlugin extends AutoPlugin { - override def requires = plugins.JvmPlugin - override def trigger = allRequirements - - override val projectSettings = Seq( - scalaVersion := "0.1.1-bin-SNAPSHOT", - scalaOrganization := "ch.epfl.lamp", - scalacOptions += "-language:Scala2", - scalaBinaryVersion := "0.1" - ) -} diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/sealed/project/DottyInjectedPlugin.scala b/sbt-scripted-tests/sbt-test/source-dependencies/sealed/project/DottyInjectedPlugin.scala deleted file mode 100644 index 3170ad99c06c..000000000000 --- a/sbt-scripted-tests/sbt-test/source-dependencies/sealed/project/DottyInjectedPlugin.scala +++ /dev/null @@ -1,14 +0,0 @@ -import sbt._ -import Keys._ - -object DottyInjectedPlugin extends AutoPlugin { - override def requires = plugins.JvmPlugin - override def trigger = allRequirements - - override val projectSettings = Seq( - scalaVersion := "0.1.1-bin-SNAPSHOT", - scalaOrganization := "ch.epfl.lamp", - scalacOptions += "-language:Scala2", - scalaBinaryVersion := "0.1" - ) -} diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/signature-change/project/DottyInjectedPlugin.scala b/sbt-scripted-tests/sbt-test/source-dependencies/signature-change/project/DottyInjectedPlugin.scala deleted file mode 100644 index 3170ad99c06c..000000000000 --- a/sbt-scripted-tests/sbt-test/source-dependencies/signature-change/project/DottyInjectedPlugin.scala +++ /dev/null @@ -1,14 +0,0 @@ -import sbt._ -import Keys._ - -object DottyInjectedPlugin extends AutoPlugin { - override def requires = plugins.JvmPlugin - override def trigger = allRequirements - - override val projectSettings = Seq( - scalaVersion := "0.1.1-bin-SNAPSHOT", - scalaOrganization := "ch.epfl.lamp", - scalacOptions += "-language:Scala2", - scalaBinaryVersion := "0.1" - ) -} diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/specialized/project/DottyInjectedPlugin.scala b/sbt-scripted-tests/sbt-test/source-dependencies/specialized/project/DottyInjectedPlugin.scala deleted file mode 100644 index 3170ad99c06c..000000000000 --- a/sbt-scripted-tests/sbt-test/source-dependencies/specialized/project/DottyInjectedPlugin.scala +++ /dev/null @@ -1,14 +0,0 @@ -import sbt._ -import Keys._ - -object DottyInjectedPlugin extends AutoPlugin { - override def requires = plugins.JvmPlugin - override def trigger = allRequirements - - override val projectSettings = Seq( - scalaVersion := "0.1.1-bin-SNAPSHOT", - scalaOrganization := "ch.epfl.lamp", - scalacOptions += "-language:Scala2", - scalaBinaryVersion := "0.1" - ) -} diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/stability-change/project/DottyInjectedPlugin.scala b/sbt-scripted-tests/sbt-test/source-dependencies/stability-change/project/DottyInjectedPlugin.scala deleted file mode 100644 index 3170ad99c06c..000000000000 --- a/sbt-scripted-tests/sbt-test/source-dependencies/stability-change/project/DottyInjectedPlugin.scala +++ /dev/null @@ -1,14 +0,0 @@ -import sbt._ -import Keys._ - -object DottyInjectedPlugin extends AutoPlugin { - override def requires = plugins.JvmPlugin - override def trigger = allRequirements - - override val projectSettings = Seq( - scalaVersion := "0.1.1-bin-SNAPSHOT", - scalaOrganization := "ch.epfl.lamp", - scalacOptions += "-language:Scala2", - scalaBinaryVersion := "0.1" - ) -} diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/synthetic-companion/project/DottyInjectedPlugin.scala b/sbt-scripted-tests/sbt-test/source-dependencies/synthetic-companion/project/DottyInjectedPlugin.scala deleted file mode 100644 index 3170ad99c06c..000000000000 --- a/sbt-scripted-tests/sbt-test/source-dependencies/synthetic-companion/project/DottyInjectedPlugin.scala +++ /dev/null @@ -1,14 +0,0 @@ -import sbt._ -import Keys._ - -object DottyInjectedPlugin extends AutoPlugin { - override def requires = plugins.JvmPlugin - override def trigger = allRequirements - - override val projectSettings = Seq( - scalaVersion := "0.1.1-bin-SNAPSHOT", - scalaOrganization := "ch.epfl.lamp", - scalacOptions += "-language:Scala2", - scalaBinaryVersion := "0.1" - ) -} diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/trait-member-modified/project/DottyInjectedPlugin.scala b/sbt-scripted-tests/sbt-test/source-dependencies/trait-member-modified/project/DottyInjectedPlugin.scala deleted file mode 100644 index 3170ad99c06c..000000000000 --- a/sbt-scripted-tests/sbt-test/source-dependencies/trait-member-modified/project/DottyInjectedPlugin.scala +++ /dev/null @@ -1,14 +0,0 @@ -import sbt._ -import Keys._ - -object DottyInjectedPlugin extends AutoPlugin { - override def requires = plugins.JvmPlugin - override def trigger = allRequirements - - override val projectSettings = Seq( - scalaVersion := "0.1.1-bin-SNAPSHOT", - scalaOrganization := "ch.epfl.lamp", - scalacOptions += "-language:Scala2", - scalaBinaryVersion := "0.1" - ) -} diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/trait-private-object/project/DottyInjectedPlugin.scala b/sbt-scripted-tests/sbt-test/source-dependencies/trait-private-object/project/DottyInjectedPlugin.scala deleted file mode 100644 index 3170ad99c06c..000000000000 --- a/sbt-scripted-tests/sbt-test/source-dependencies/trait-private-object/project/DottyInjectedPlugin.scala +++ /dev/null @@ -1,14 +0,0 @@ -import sbt._ -import Keys._ - -object DottyInjectedPlugin extends AutoPlugin { - override def requires = plugins.JvmPlugin - override def trigger = allRequirements - - override val projectSettings = Seq( - scalaVersion := "0.1.1-bin-SNAPSHOT", - scalaOrganization := "ch.epfl.lamp", - scalacOptions += "-language:Scala2", - scalaBinaryVersion := "0.1" - ) -} diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/trait-private-var/project/DottyInjectedPlugin.scala b/sbt-scripted-tests/sbt-test/source-dependencies/trait-private-var/project/DottyInjectedPlugin.scala deleted file mode 100644 index 3170ad99c06c..000000000000 --- a/sbt-scripted-tests/sbt-test/source-dependencies/trait-private-var/project/DottyInjectedPlugin.scala +++ /dev/null @@ -1,14 +0,0 @@ -import sbt._ -import Keys._ - -object DottyInjectedPlugin extends AutoPlugin { - override def requires = plugins.JvmPlugin - override def trigger = allRequirements - - override val projectSettings = Seq( - scalaVersion := "0.1.1-bin-SNAPSHOT", - scalaOrganization := "ch.epfl.lamp", - scalacOptions += "-language:Scala2", - scalaBinaryVersion := "0.1" - ) -} diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/trait-super/project/DottyInjectedPlugin.scala b/sbt-scripted-tests/sbt-test/source-dependencies/trait-super/project/DottyInjectedPlugin.scala deleted file mode 100644 index 3170ad99c06c..000000000000 --- a/sbt-scripted-tests/sbt-test/source-dependencies/trait-super/project/DottyInjectedPlugin.scala +++ /dev/null @@ -1,14 +0,0 @@ -import sbt._ -import Keys._ - -object DottyInjectedPlugin extends AutoPlugin { - override def requires = plugins.JvmPlugin - override def trigger = allRequirements - - override val projectSettings = Seq( - scalaVersion := "0.1.1-bin-SNAPSHOT", - scalaOrganization := "ch.epfl.lamp", - scalacOptions += "-language:Scala2", - scalaBinaryVersion := "0.1" - ) -} diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/transitive-a/project/DottyInjectedPlugin.scala b/sbt-scripted-tests/sbt-test/source-dependencies/transitive-a/project/DottyInjectedPlugin.scala deleted file mode 100644 index 3170ad99c06c..000000000000 --- a/sbt-scripted-tests/sbt-test/source-dependencies/transitive-a/project/DottyInjectedPlugin.scala +++ /dev/null @@ -1,14 +0,0 @@ -import sbt._ -import Keys._ - -object DottyInjectedPlugin extends AutoPlugin { - override def requires = plugins.JvmPlugin - override def trigger = allRequirements - - override val projectSettings = Seq( - scalaVersion := "0.1.1-bin-SNAPSHOT", - scalaOrganization := "ch.epfl.lamp", - scalacOptions += "-language:Scala2", - scalaBinaryVersion := "0.1" - ) -} diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/transitive-b/project/DottyInjectedPlugin.scala b/sbt-scripted-tests/sbt-test/source-dependencies/transitive-b/project/DottyInjectedPlugin.scala deleted file mode 100644 index 3170ad99c06c..000000000000 --- a/sbt-scripted-tests/sbt-test/source-dependencies/transitive-b/project/DottyInjectedPlugin.scala +++ /dev/null @@ -1,14 +0,0 @@ -import sbt._ -import Keys._ - -object DottyInjectedPlugin extends AutoPlugin { - override def requires = plugins.JvmPlugin - override def trigger = allRequirements - - override val projectSettings = Seq( - scalaVersion := "0.1.1-bin-SNAPSHOT", - scalaOrganization := "ch.epfl.lamp", - scalacOptions += "-language:Scala2", - scalaBinaryVersion := "0.1" - ) -} diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/transitive-inherit-java/project/DottyInjectedPlugin.scala b/sbt-scripted-tests/sbt-test/source-dependencies/transitive-inherit-java/project/DottyInjectedPlugin.scala deleted file mode 100644 index 3170ad99c06c..000000000000 --- a/sbt-scripted-tests/sbt-test/source-dependencies/transitive-inherit-java/project/DottyInjectedPlugin.scala +++ /dev/null @@ -1,14 +0,0 @@ -import sbt._ -import Keys._ - -object DottyInjectedPlugin extends AutoPlugin { - override def requires = plugins.JvmPlugin - override def trigger = allRequirements - - override val projectSettings = Seq( - scalaVersion := "0.1.1-bin-SNAPSHOT", - scalaOrganization := "ch.epfl.lamp", - scalacOptions += "-language:Scala2", - scalaBinaryVersion := "0.1" - ) -} diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/transitive-inherit/project/DottyInjectedPlugin.scala b/sbt-scripted-tests/sbt-test/source-dependencies/transitive-inherit/project/DottyInjectedPlugin.scala deleted file mode 100644 index 3170ad99c06c..000000000000 --- a/sbt-scripted-tests/sbt-test/source-dependencies/transitive-inherit/project/DottyInjectedPlugin.scala +++ /dev/null @@ -1,14 +0,0 @@ -import sbt._ -import Keys._ - -object DottyInjectedPlugin extends AutoPlugin { - override def requires = plugins.JvmPlugin - override def trigger = allRequirements - - override val projectSettings = Seq( - scalaVersion := "0.1.1-bin-SNAPSHOT", - scalaOrganization := "ch.epfl.lamp", - scalacOptions += "-language:Scala2", - scalaBinaryVersion := "0.1" - ) -} diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/transitive-memberRef/project/DottyInjectedPlugin.scala b/sbt-scripted-tests/sbt-test/source-dependencies/transitive-memberRef/project/DottyInjectedPlugin.scala deleted file mode 100644 index 3170ad99c06c..000000000000 --- a/sbt-scripted-tests/sbt-test/source-dependencies/transitive-memberRef/project/DottyInjectedPlugin.scala +++ /dev/null @@ -1,14 +0,0 @@ -import sbt._ -import Keys._ - -object DottyInjectedPlugin extends AutoPlugin { - override def requires = plugins.JvmPlugin - override def trigger = allRequirements - - override val projectSettings = Seq( - scalaVersion := "0.1.1-bin-SNAPSHOT", - scalaOrganization := "ch.epfl.lamp", - scalacOptions += "-language:Scala2", - scalaBinaryVersion := "0.1" - ) -} diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/type-alias/project/DottyInjectedPlugin.scala b/sbt-scripted-tests/sbt-test/source-dependencies/type-alias/project/DottyInjectedPlugin.scala deleted file mode 100644 index 3170ad99c06c..000000000000 --- a/sbt-scripted-tests/sbt-test/source-dependencies/type-alias/project/DottyInjectedPlugin.scala +++ /dev/null @@ -1,14 +0,0 @@ -import sbt._ -import Keys._ - -object DottyInjectedPlugin extends AutoPlugin { - override def requires = plugins.JvmPlugin - override def trigger = allRequirements - - override val projectSettings = Seq( - scalaVersion := "0.1.1-bin-SNAPSHOT", - scalaOrganization := "ch.epfl.lamp", - scalacOptions += "-language:Scala2", - scalaBinaryVersion := "0.1" - ) -} diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/type-parameter/project/DottyInjectedPlugin.scala b/sbt-scripted-tests/sbt-test/source-dependencies/type-parameter/project/DottyInjectedPlugin.scala deleted file mode 100644 index 3170ad99c06c..000000000000 --- a/sbt-scripted-tests/sbt-test/source-dependencies/type-parameter/project/DottyInjectedPlugin.scala +++ /dev/null @@ -1,14 +0,0 @@ -import sbt._ -import Keys._ - -object DottyInjectedPlugin extends AutoPlugin { - override def requires = plugins.JvmPlugin - override def trigger = allRequirements - - override val projectSettings = Seq( - scalaVersion := "0.1.1-bin-SNAPSHOT", - scalaOrganization := "ch.epfl.lamp", - scalacOptions += "-language:Scala2", - scalaBinaryVersion := "0.1" - ) -} diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/typeref-only/project/DottyInjectedPlugin.scala b/sbt-scripted-tests/sbt-test/source-dependencies/typeref-only/project/DottyInjectedPlugin.scala deleted file mode 100644 index 3170ad99c06c..000000000000 --- a/sbt-scripted-tests/sbt-test/source-dependencies/typeref-only/project/DottyInjectedPlugin.scala +++ /dev/null @@ -1,14 +0,0 @@ -import sbt._ -import Keys._ - -object DottyInjectedPlugin extends AutoPlugin { - override def requires = plugins.JvmPlugin - override def trigger = allRequirements - - override val projectSettings = Seq( - scalaVersion := "0.1.1-bin-SNAPSHOT", - scalaOrganization := "ch.epfl.lamp", - scalacOptions += "-language:Scala2", - scalaBinaryVersion := "0.1" - ) -} diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/typeref-return/project/DottyInjectedPlugin.scala b/sbt-scripted-tests/sbt-test/source-dependencies/typeref-return/project/DottyInjectedPlugin.scala deleted file mode 100644 index 3170ad99c06c..000000000000 --- a/sbt-scripted-tests/sbt-test/source-dependencies/typeref-return/project/DottyInjectedPlugin.scala +++ /dev/null @@ -1,14 +0,0 @@ -import sbt._ -import Keys._ - -object DottyInjectedPlugin extends AutoPlugin { - override def requires = plugins.JvmPlugin - override def trigger = allRequirements - - override val projectSettings = Seq( - scalaVersion := "0.1.1-bin-SNAPSHOT", - scalaOrganization := "ch.epfl.lamp", - scalacOptions += "-language:Scala2", - scalaBinaryVersion := "0.1" - ) -} diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/types-in-used-names-a/project/DottyInjectedPlugin.scala b/sbt-scripted-tests/sbt-test/source-dependencies/types-in-used-names-a/project/DottyInjectedPlugin.scala deleted file mode 100644 index 3170ad99c06c..000000000000 --- a/sbt-scripted-tests/sbt-test/source-dependencies/types-in-used-names-a/project/DottyInjectedPlugin.scala +++ /dev/null @@ -1,14 +0,0 @@ -import sbt._ -import Keys._ - -object DottyInjectedPlugin extends AutoPlugin { - override def requires = plugins.JvmPlugin - override def trigger = allRequirements - - override val projectSettings = Seq( - scalaVersion := "0.1.1-bin-SNAPSHOT", - scalaOrganization := "ch.epfl.lamp", - scalacOptions += "-language:Scala2", - scalaBinaryVersion := "0.1" - ) -} diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/types-in-used-names-b/project/DottyInjectedPlugin.scala b/sbt-scripted-tests/sbt-test/source-dependencies/types-in-used-names-b/project/DottyInjectedPlugin.scala deleted file mode 100644 index 3170ad99c06c..000000000000 --- a/sbt-scripted-tests/sbt-test/source-dependencies/types-in-used-names-b/project/DottyInjectedPlugin.scala +++ /dev/null @@ -1,14 +0,0 @@ -import sbt._ -import Keys._ - -object DottyInjectedPlugin extends AutoPlugin { - override def requires = plugins.JvmPlugin - override def trigger = allRequirements - - override val projectSettings = Seq( - scalaVersion := "0.1.1-bin-SNAPSHOT", - scalaOrganization := "ch.epfl.lamp", - scalacOptions += "-language:Scala2", - scalaBinaryVersion := "0.1" - ) -} diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/value-class/project/DottyInjectedPlugin.scala b/sbt-scripted-tests/sbt-test/source-dependencies/value-class/project/DottyInjectedPlugin.scala deleted file mode 100644 index 3170ad99c06c..000000000000 --- a/sbt-scripted-tests/sbt-test/source-dependencies/value-class/project/DottyInjectedPlugin.scala +++ /dev/null @@ -1,14 +0,0 @@ -import sbt._ -import Keys._ - -object DottyInjectedPlugin extends AutoPlugin { - override def requires = plugins.JvmPlugin - override def trigger = allRequirements - - override val projectSettings = Seq( - scalaVersion := "0.1.1-bin-SNAPSHOT", - scalaOrganization := "ch.epfl.lamp", - scalacOptions += "-language:Scala2", - scalaBinaryVersion := "0.1" - ) -} diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/var/project/DottyInjectedPlugin.scala b/sbt-scripted-tests/sbt-test/source-dependencies/var/project/DottyInjectedPlugin.scala deleted file mode 100644 index 3170ad99c06c..000000000000 --- a/sbt-scripted-tests/sbt-test/source-dependencies/var/project/DottyInjectedPlugin.scala +++ /dev/null @@ -1,14 +0,0 @@ -import sbt._ -import Keys._ - -object DottyInjectedPlugin extends AutoPlugin { - override def requires = plugins.JvmPlugin - override def trigger = allRequirements - - override val projectSettings = Seq( - scalaVersion := "0.1.1-bin-SNAPSHOT", - scalaOrganization := "ch.epfl.lamp", - scalacOptions += "-language:Scala2", - scalaBinaryVersion := "0.1" - ) -} diff --git a/sbt-scripted-tests/sbt-test/source-dependencies/variance/project/DottyInjectedPlugin.scala b/sbt-scripted-tests/sbt-test/source-dependencies/variance/project/DottyInjectedPlugin.scala deleted file mode 100644 index 3170ad99c06c..000000000000 --- a/sbt-scripted-tests/sbt-test/source-dependencies/variance/project/DottyInjectedPlugin.scala +++ /dev/null @@ -1,14 +0,0 @@ -import sbt._ -import Keys._ - -object DottyInjectedPlugin extends AutoPlugin { - override def requires = plugins.JvmPlugin - override def trigger = allRequirements - - override val projectSettings = Seq( - scalaVersion := "0.1.1-bin-SNAPSHOT", - scalaOrganization := "ch.epfl.lamp", - scalacOptions += "-language:Scala2", - scalaBinaryVersion := "0.1" - ) -}