From 2d10c87ce537fb42fdb134efcae53dca7305a7b7 Mon Sep 17 00:00:00 2001 From: Felix Mulder Date: Tue, 11 Oct 2016 17:28:39 +0200 Subject: [PATCH 01/55] Move sbt-bridge --- project/Build.scala | 2 +- .../src/main/scala/xsbt/CompilerClassLoader.scala | 0 .../src/main/scala/xsbt/CompilerInterface.scala | 0 .../src/main/scala/xsbt/ConsoleInterface.scala | 0 .../src/main/scala/xsbt/DelegatingReporter.scala | 0 .../bridge}/src/main/scala/xsbt/Log.scala | 0 .../bridge}/src/main/scala/xsbt/Message.scala | 0 .../src/main/scala/xsbt/ScaladocInterface.scala | 0 .../sbt-test/compilerReporter/simple/Source.scala | 0 .../src/sbt-test/compilerReporter/simple/build.sbt | 0 .../simple/project/DottyInjectedPlugin.scala | 0 .../compilerReporter/simple/project/Reporter.scala | 0 .../src/sbt-test/compilerReporter/simple/test | 0 .../source-dependencies/abstract-override/A.scala | 0 .../source-dependencies/abstract-override/B.scala | 0 .../source-dependencies/abstract-override/C.scala | 0 .../source-dependencies/abstract-override/D.scala | 0 .../abstract-override/changes/C2.scala | 0 .../project/DottyInjectedPlugin.scala | 0 .../source-dependencies/abstract-override/test | 0 .../abstract-type-override/build.sbt | 0 .../abstract-type-override/changes/Bar1.scala | 0 .../project/DottyInjectedPlugin.scala | 0 .../abstract-type-override/src/main/scala/Bar.scala | 0 .../abstract-type-override/src/main/scala/Foo.scala | 0 .../src/main/scala/Impl.scala | 0 .../source-dependencies/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 .../abstract-type/project/DottyInjectedPlugin.scala | 0 .../sbt-test/source-dependencies/abstract-type/test | 0 .../source-dependencies/added/changes/A1.scala | 0 .../source-dependencies/added/changes/A2.scala | 0 .../source-dependencies/added/changes/A3.scala | 0 .../source-dependencies/added/changes/B1.scala | 0 .../source-dependencies/added/changes/B2.scala | 0 .../added/project/DottyInjectedPlugin.scala | 0 .../src/sbt-test/source-dependencies/added/test | 0 .../source-dependencies/as-seen-from-a/A.scala | 0 .../source-dependencies/as-seen-from-a/B.scala | 0 .../source-dependencies/as-seen-from-a/C.scala | 0 .../source-dependencies/as-seen-from-a/D.scala | 0 .../as-seen-from-a/changes/B2.scala | 0 .../project/DottyInjectedPlugin.scala | 0 .../source-dependencies/as-seen-from-a/test | 0 .../source-dependencies/as-seen-from-b/A.scala | 0 .../source-dependencies/as-seen-from-b/B.scala | 0 .../source-dependencies/as-seen-from-b/C.scala | 0 .../source-dependencies/as-seen-from-b/D.scala | 0 .../as-seen-from-b/changes/B2.scala | 0 .../project/DottyInjectedPlugin.scala | 0 .../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 | 0 .../source-dependencies/backtick-quoted-names/test | 0 .../source-dependencies/binary/changes/Break.scala | 0 .../sbt-test/source-dependencies/binary/dep/A.scala | 0 .../binary/project/DottyInjectedPlugin.scala | 0 .../source-dependencies/binary/project/P.scala | 0 .../src/sbt-test/source-dependencies/binary/test | 0 .../sbt-test/source-dependencies/binary/use/B.scala | 0 .../sbt-test/source-dependencies/by-name/A.scala | 0 .../sbt-test/source-dependencies/by-name/B.scala | 0 .../source-dependencies/by-name/changes/A.scala | 0 .../by-name/project/DottyInjectedPlugin.scala | 0 .../src/sbt-test/source-dependencies/by-name/test | 0 .../sbt-test/source-dependencies/canon/Use.scala | 0 .../source-dependencies/canon/actual/A.java | 0 .../sbt-test/source-dependencies/canon/actual/a.jar | Bin .../sbt-test/source-dependencies/canon/build.sbt | 0 .../sbt-test/source-dependencies/canon/lib/a.jar | 0 .../canon/project/DottyInjectedPlugin.scala | 0 .../src/sbt-test/source-dependencies/canon/test | 0 .../source-dependencies/compactify/build.sbt | 0 .../compactify/project/DottyInjectedPlugin.scala | 0 .../compactify/src/main/scala/For.scala | 0 .../compactify/src/main/scala/Nested.scala | 0 .../sbt-test/source-dependencies/compactify/test | 0 .../source-dependencies/constants/changes/A1.scala | 0 .../source-dependencies/constants/changes/A2.scala | 0 .../source-dependencies/constants/changes/B.scala | 0 .../constants/project/DottyInjectedPlugin.scala | 0 .../src/sbt-test/source-dependencies/constants/test | 0 .../source-dependencies/default-params/A.scala | 0 .../source-dependencies/default-params/B.scala | 0 .../default-params/changes/A.scala | 0 .../project/DottyInjectedPlugin.scala | 0 .../source-dependencies/default-params/test | 0 .../source-dependencies/dup-class/changes/A.scala | 0 .../source-dependencies/dup-class/changes/A2.scala | 0 .../source-dependencies/dup-class/changes/B.scala | 0 .../dup-class/project/DottyInjectedPlugin.scala | 0 .../src/sbt-test/source-dependencies/dup-class/test | 0 .../source-dependencies/empty-a/changes/A.scala | 0 .../source-dependencies/empty-a/changes/A2.scala | 0 .../source-dependencies/empty-a/changes/B.scala | 0 .../empty-a/project/DottyInjectedPlugin.scala | 0 .../src/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 .../empty-package/project/DottyInjectedPlugin.scala | 0 .../sbt-test/source-dependencies/empty-package/test | 0 .../sbt-test/source-dependencies/erasure/A.scala | 0 .../sbt-test/source-dependencies/erasure/B.scala | 0 .../source-dependencies/erasure/changes/A.scala | 0 .../erasure/project/DottyInjectedPlugin.scala | 0 .../src/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 .../source-dependencies/export-jars/changes/B.scala | 0 .../export-jars/changes/build2.sbt | 0 .../export-jars/project/Build.scala | 0 .../export-jars/project/DottyInjectedPlugin.scala | 0 .../sbt-test/source-dependencies/export-jars/test | 0 .../src/sbt-test/source-dependencies/ext/A.scala | 0 .../src/sbt-test/source-dependencies/ext/build.sbt | 0 .../ext/project/DottyInjectedPlugin.scala | 0 .../src/sbt-test/source-dependencies/ext/test | 0 .../source-dependencies/false-error/A.scala | 0 .../source-dependencies/false-error/B.scala | 0 .../source-dependencies/false-error/changes/A.scala | 0 .../source-dependencies/false-error/pending | 0 .../false-error/project/DottyInjectedPlugin.scala | 0 .../fbounded-existentials/fbounds.scala | 0 .../project/DottyInjectedPlugin.scala | 0 .../source-dependencies/fbounded-existentials/test | 0 .../source-dependencies/implicit-params/A.scala | 0 .../source-dependencies/implicit-params/B.scala | 0 .../implicit-params/changes/A.scala | 0 .../project/DottyInjectedPlugin.scala | 0 .../source-dependencies/implicit-params/test | 0 .../changes/A1.scala | 0 .../changes/A2.scala | 0 .../implicit-search-companion-scope/changes/B.scala | 0 .../implicit-search-companion-scope/changes/C.scala | 0 .../implicit-search-companion-scope/changes/M.scala | 0 .../project/DottyInjectedPlugin.scala | 0 .../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 | 0 .../source-dependencies/implicit-search/test | 0 .../sbt-test/source-dependencies/implicit/A.scala | 0 .../sbt-test/source-dependencies/implicit/B.scala | 0 .../source-dependencies/implicit/changes/A.scala | 0 .../implicit/project/DottyInjectedPlugin.scala | 0 .../src/sbt-test/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 .../import-class/project/DottyInjectedPlugin.scala | 0 .../sbt-test/source-dependencies/import-class/test | 0 .../source-dependencies/import-package/A.scala | 0 .../source-dependencies/import-package/B.scala | 0 .../import-package/changes/A.scala | 0 .../source-dependencies/import-package/pending | 0 .../project/DottyInjectedPlugin.scala | 0 .../source-dependencies/inherited-deps-java/A.java | 0 .../source-dependencies/inherited-deps-java/B.java | 0 .../source-dependencies/inherited-deps-java/C.java | 0 .../source-dependencies/inherited-deps-java/D.java | 0 .../source-dependencies/inherited-deps-java/E.java | 0 .../source-dependencies/inherited-deps-java/F.java | 0 .../source-dependencies/inherited-deps-java/G.java | 0 .../source-dependencies/inherited-deps-java/J.java | 0 .../inherited-deps-java/build.sbt | 0 .../project/DottyInjectedPlugin.scala | 0 .../source-dependencies/inherited-deps-java/test | 0 .../inherited_type_params/A.scala | 0 .../inherited_type_params/build.sbt | 0 .../project/DottyInjectedPlugin.scala | 0 .../source-dependencies/inherited_type_params/test | 0 .../src/sbt-test/source-dependencies/inline/A.scala | 0 .../src/sbt-test/source-dependencies/inline/C.scala | 0 .../source-dependencies/inline/changes/B1.scala | 0 .../source-dependencies/inline/changes/B2.scala | 0 .../source-dependencies/inline/changes/B3.scala | 0 .../inline/project/DottyInjectedPlugin.scala | 0 .../src/sbt-test/source-dependencies/inline/test | 0 .../source-dependencies/intermediate-error/A.scala | 0 .../source-dependencies/intermediate-error/B.scala | 0 .../intermediate-error/changes/A2.scala | 0 .../intermediate-error/changes/A3.scala | 0 .../project/DottyInjectedPlugin.scala | 0 .../source-dependencies/intermediate-error/test | 0 .../java-analysis-serialization-error/Outer.java | 0 .../java-analysis-serialization-error/build.sbt | 0 .../project/DottyInjectedPlugin.scala | 0 .../java-analysis-serialization-error/test | 0 .../source-dependencies/java-basic/changes/A.java | 0 .../source-dependencies/java-basic/changes/A2.java | 0 .../source-dependencies/java-basic/changes/B1.java | 0 .../source-dependencies/java-basic/changes/B2.java | 0 .../source-dependencies/java-basic/changes/B3.java | 0 .../java-basic/project/DottyInjectedPlugin.scala | 0 .../sbt-test/source-dependencies/java-basic/test | 0 .../java-generic-workaround/A.java | 0 .../DefaultTreeTableSorter.java | 0 .../java-generic-workaround/TreeColumnModel.java | 0 .../java-generic-workaround/TreeTableSorter.java | 0 .../project/DottyInjectedPlugin.scala | 0 .../java-generic-workaround/test | 0 .../sbt-test/source-dependencies/java-mixed/JJ.java | 0 .../source-dependencies/java-mixed/build.sbt | 0 .../source-dependencies/java-mixed/changes/S1.scala | 0 .../source-dependencies/java-mixed/changes/S2.scala | 0 .../java-mixed/changes/build.sbt | 0 .../java-mixed/project/DottyInjectedPlugin.scala | 0 .../sbt-test/source-dependencies/java-mixed/test | 0 .../source-dependencies/java-static/changes/J1.java | 0 .../source-dependencies/java-static/changes/J2.java | 0 .../source-dependencies/java-static/changes/S.scala | 0 .../java-static/project/DottyInjectedPlugin.scala | 0 .../sbt-test/source-dependencies/java-static/test | 0 .../sbt-test/source-dependencies/lazy-val/A.scala | 0 .../sbt-test/source-dependencies/lazy-val/B.scala | 0 .../source-dependencies/lazy-val/changes/A.scala | 0 .../lazy-val/project/DottyInjectedPlugin.scala | 0 .../src/sbt-test/source-dependencies/lazy-val/test | 0 .../source-dependencies/less-inter-inv-java/A.java | 0 .../source-dependencies/less-inter-inv-java/B.java | 0 .../source-dependencies/less-inter-inv-java/C.java | 0 .../source-dependencies/less-inter-inv-java/D.java | 0 .../source-dependencies/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 | 0 .../source-dependencies/less-inter-inv-java/test | 0 .../source-dependencies/less-inter-inv/A.scala | 0 .../source-dependencies/less-inter-inv/B.scala | 0 .../source-dependencies/less-inter-inv/C.scala | 0 .../source-dependencies/less-inter-inv/D.scala | 0 .../source-dependencies/less-inter-inv/E.scala | 0 .../source-dependencies/less-inter-inv/build.sbt | 0 .../less-inter-inv/changes/A2.scala | 0 .../project/DottyInjectedPlugin.scala | 0 .../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 .../linearization/project/DottyInjectedPlugin.scala | 0 .../sbt-test/source-dependencies/linearization/test | 0 .../src/sbt-test/source-dependencies/named/A.scala | 0 .../src/sbt-test/source-dependencies/named/B.scala | 0 .../source-dependencies/named/changes/A.scala | 0 .../named/project/DottyInjectedPlugin.scala | 0 .../src/sbt-test/source-dependencies/named/test | 0 .../nested-case-class/changes/A0.scala | 0 .../nested-case-class/changes/A1.scala | 0 .../project/DottyInjectedPlugin.scala | 0 .../source-dependencies/nested-case-class/test | 0 .../source-dependencies/new-cyclic/changes/A2.scala | 0 .../sbt-test/source-dependencies/new-cyclic/pending | 0 .../new-cyclic/project/DottyInjectedPlugin.scala | 0 .../new-cyclic/src/main/scala/A.scala | 0 .../new-cyclic/src/main/scala/B.scala | 0 .../source-dependencies/new-pkg-dep/changes/A1.java | 0 .../new-pkg-dep/changes/B0.scala | 0 .../new-pkg-dep/changes/B1.scala | 0 .../new-pkg-dep/project/DottyInjectedPlugin.scala | 0 .../sbt-test/source-dependencies/new-pkg-dep/test | 0 .../sbt-test/source-dependencies/override/A.scala | 0 .../sbt-test/source-dependencies/override/B.scala | 0 .../sbt-test/source-dependencies/override/C.scala | 0 .../sbt-test/source-dependencies/override/D.scala | 0 .../source-dependencies/override/changes/B2.scala | 0 .../override/project/DottyInjectedPlugin.scala | 0 .../src/sbt-test/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 .../parent-change/project/DottyInjectedPlugin.scala | 0 .../sbt-test/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 | 0 .../source-dependencies/parent-member-change/test | 0 .../source-dependencies/pkg-self/changes/A1.scala | 0 .../source-dependencies/pkg-self/changes/A2.scala | 0 .../source-dependencies/pkg-self/changes/B.scala | 0 .../pkg-self/changes/package.scala | 0 .../pkg-self/project/DottyInjectedPlugin.scala | 0 .../src/sbt-test/source-dependencies/pkg-self/test | 0 .../source-dependencies/qualified-access/A.scala | 0 .../source-dependencies/qualified-access/B.scala | 0 .../qualified-access/changes/A.scala | 0 .../project/DottyInjectedPlugin.scala | 0 .../source-dependencies/qualified-access/test | 0 .../relative-source-error/changes/absolute.sbt | 0 .../relative-source-error/changes/relative.sbt | 0 .../project/DottyInjectedPlugin.scala | 0 .../relative-source-error/src/A.scala | 0 .../source-dependencies/relative-source-error/test | 0 .../remove-test-a/changes/1.scala | 0 .../remove-test-a/project/DottyInjectedPlugin.scala | 0 .../sbt-test/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 .../remove-test-b/project/DottyInjectedPlugin.scala | 0 .../remove-test-b/src/main/scala/A.scala | 0 .../remove-test-b/src/main/scala/B.scala | 0 .../sbt-test/source-dependencies/remove-test-b/test | 0 .../source-dependencies/repeated-parameters/A.scala | 0 .../source-dependencies/repeated-parameters/B.scala | 0 .../repeated-parameters/changes/A.scala | 0 .../project/DottyInjectedPlugin.scala | 0 .../source-dependencies/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 | 0 .../source-dependencies/replace-test-a/test | 0 .../source-dependencies/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 .../resident-java/project/DottyInjectedPlugin.scala | 0 .../sbt-test/source-dependencies/resident-java/test | 0 .../resident-package-object/changes/A.scala | 0 .../resident-package-object/changes/package.scala | 0 .../resident-package-object/changes/package2.scala | 0 .../project/DottyInjectedPlugin.scala | 0 .../resident-package-object/test | 0 .../source-dependencies/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 | 0 .../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 | 0 .../source-dependencies/same-file-used-names/test | 0 .../src/sbt-test/source-dependencies/sealed/A.scala | 0 .../src/sbt-test/source-dependencies/sealed/D.scala | 0 .../source-dependencies/sealed/changes/A.scala | 0 .../src/sbt-test/source-dependencies/sealed/pending | 0 .../sealed/project/DottyInjectedPlugin.scala | 0 .../source-dependencies/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 | 0 .../source-dependencies/signature-change/test | 0 .../source-dependencies/specialized/A.scala | 0 .../source-dependencies/specialized/B.scala | 0 .../source-dependencies/specialized/changes/A.scala | 0 .../specialized/project/DottyInjectedPlugin.scala | 0 .../sbt-test/source-dependencies/specialized/test | 0 .../source-dependencies/stability-change/A.scala | 0 .../source-dependencies/stability-change/B.scala | 0 .../source-dependencies/stability-change/C.scala | 0 .../stability-change/changes/A.scala | 0 .../project/DottyInjectedPlugin.scala | 0 .../source-dependencies/stability-change/test | 0 .../source-dependencies/synthetic-companion/A.scala | 0 .../source-dependencies/synthetic-companion/B.scala | 0 .../synthetic-companion/changes/A2.scala | 0 .../source-dependencies/synthetic-companion/dbg.sbt | 0 .../project/DottyInjectedPlugin.scala | 0 .../source-dependencies/synthetic-companion/test | 0 .../trait-member-modified/build.sbt | 0 .../trait-member-modified/changes/A1.scala | 0 .../project/DottyInjectedPlugin.scala | 0 .../trait-member-modified/src/main/scala/A.scala | 0 .../trait-member-modified/src/main/scala/B.scala | 0 .../source-dependencies/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 | 0 .../source-dependencies/trait-private-object/test | 0 .../source-dependencies/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 | 0 .../source-dependencies/trait-private-var/test | 0 .../source-dependencies/trait-super/A.scala | 0 .../source-dependencies/trait-super/B.scala | 0 .../source-dependencies/trait-super/Main.scala | 0 .../trait-super/changes/B2.scala | 0 .../trait-super/changes/B3.scala | 0 .../trait-super/project/DottyInjectedPlugin.scala | 0 .../sbt-test/source-dependencies/trait-super/test | 0 .../transitive-a/changes/A2.scala | 0 .../transitive-a/project/DottyInjectedPlugin.scala | 0 .../transitive-a/src/main/scala/A.scala | 0 .../transitive-a/src/main/scala/B.scala | 0 .../transitive-a/src/main/scala/C.scala | 0 .../sbt-test/source-dependencies/transitive-a/test | 0 .../transitive-b/changes/A2.scala | 0 .../transitive-b/project/DottyInjectedPlugin.scala | 0 .../transitive-b/src/main/scala/A.scala | 0 .../transitive-b/src/main/scala/B.scala | 0 .../transitive-b/src/main/scala/C.scala | 0 .../sbt-test/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 | 0 .../transitive-inherit-java/test | 0 .../source-dependencies/transitive-inherit/A.scala | 0 .../source-dependencies/transitive-inherit/B.scala | 0 .../source-dependencies/transitive-inherit/C.scala | 0 .../transitive-inherit/changes/A2.scala | 0 .../project/DottyInjectedPlugin.scala | 0 .../source-dependencies/transitive-inherit/test | 0 .../transitive-memberRef/build.sbt | 0 .../transitive-memberRef/changes/A1.scala | 0 .../project/DottyInjectedPlugin.scala | 0 .../transitive-memberRef/src/main/scala/A.scala | 0 .../transitive-memberRef/src/main/scala/B.scala | 0 .../transitive-memberRef/src/main/scala/C.scala | 0 .../transitive-memberRef/src/main/scala/D.scala | 0 .../transitive-memberRef/src/main/scala/X.scala | 0 .../transitive-memberRef/src/main/scala/Y.scala | 0 .../source-dependencies/transitive-memberRef/test | 0 .../sbt-test/source-dependencies/type-alias/A.scala | 0 .../sbt-test/source-dependencies/type-alias/B.scala | 0 .../source-dependencies/type-alias/build.sbt | 0 .../source-dependencies/type-alias/changes/A.scala | 0 .../type-alias/project/DottyInjectedPlugin.scala | 0 .../sbt-test/source-dependencies/type-alias/test | 0 .../source-dependencies/type-parameter/A.scala | 0 .../source-dependencies/type-parameter/B.scala | 0 .../source-dependencies/type-parameter/C.scala | 0 .../source-dependencies/type-parameter/D.scala | 0 .../type-parameter/changes/A.scala | 0 .../project/DottyInjectedPlugin.scala | 0 .../source-dependencies/type-parameter/test | 0 .../source-dependencies/typeref-only/A.scala | 0 .../source-dependencies/typeref-only/B.scala | 0 .../source-dependencies/typeref-only/build.sbt | 0 .../typeref-only/project/DottyInjectedPlugin.scala | 0 .../sbt-test/source-dependencies/typeref-only/test | 0 .../source-dependencies/typeref-return/A.scala | 0 .../source-dependencies/typeref-return/B.scala | 0 .../typeref-return/changes/A.scala | 0 .../project/DottyInjectedPlugin.scala | 0 .../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 | 0 .../source-dependencies/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 | 0 .../source-dependencies/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 .../source-dependencies/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 .../value-class/project/DottyInjectedPlugin.scala | 0 .../sbt-test/source-dependencies/value-class/test | 0 .../src/sbt-test/source-dependencies/var/A.scala | 0 .../src/sbt-test/source-dependencies/var/B.scala | 0 .../source-dependencies/var/changes/A.scala | 0 .../var/project/DottyInjectedPlugin.scala | 0 .../src/sbt-test/source-dependencies/var/test | 0 .../sbt-test/source-dependencies/variance/A.scala | 0 .../sbt-test/source-dependencies/variance/C.scala | 0 .../source-dependencies/variance/changes/A.scala | 0 .../variance/project/DottyInjectedPlugin.scala | 0 .../src/sbt-test/source-dependencies/variance/test | 0 .../test/scala/xsbt/DependencySpecification.scala | 0 .../test/scala/xsbt/ExtractAPISpecification.scala | 0 .../scala/xsbt/ExtractUsedNamesSpecification.scala | 0 .../scala/xsbt/ScalaCompilerForUnitTesting.scala | 0 .../bridge}/src/test/scala/xsbti/TestCallback.scala | 0 508 files changed, 1 insertion(+), 1 deletion(-) rename {bridge => sbt-bridge/bridge}/src/main/scala/xsbt/CompilerClassLoader.scala (100%) rename {bridge => sbt-bridge/bridge}/src/main/scala/xsbt/CompilerInterface.scala (100%) rename {bridge => sbt-bridge/bridge}/src/main/scala/xsbt/ConsoleInterface.scala (100%) rename {bridge => sbt-bridge/bridge}/src/main/scala/xsbt/DelegatingReporter.scala (100%) rename {bridge => sbt-bridge/bridge}/src/main/scala/xsbt/Log.scala (100%) rename {bridge => sbt-bridge/bridge}/src/main/scala/xsbt/Message.scala (100%) rename {bridge => sbt-bridge/bridge}/src/main/scala/xsbt/ScaladocInterface.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/compilerReporter/simple/Source.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/compilerReporter/simple/build.sbt (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/compilerReporter/simple/project/DottyInjectedPlugin.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/compilerReporter/simple/project/Reporter.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/compilerReporter/simple/test (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/abstract-override/A.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/abstract-override/B.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/abstract-override/C.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/abstract-override/D.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/abstract-override/changes/C2.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/abstract-override/project/DottyInjectedPlugin.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/abstract-override/test (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/abstract-type-override/build.sbt (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/abstract-type-override/changes/Bar1.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/abstract-type-override/project/DottyInjectedPlugin.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/abstract-type-override/src/main/scala/Bar.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/abstract-type-override/src/main/scala/Foo.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/abstract-type-override/src/main/scala/Impl.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/abstract-type-override/test (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/abstract-type/A.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/abstract-type/B.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/abstract-type/changes/A.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/abstract-type/project/DottyInjectedPlugin.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/abstract-type/test (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/added/changes/A1.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/added/changes/A2.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/added/changes/A3.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/added/changes/B1.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/added/changes/B2.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/added/project/DottyInjectedPlugin.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/added/test (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/as-seen-from-a/A.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/as-seen-from-a/B.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/as-seen-from-a/C.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/as-seen-from-a/D.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/as-seen-from-a/changes/B2.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/as-seen-from-a/project/DottyInjectedPlugin.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/as-seen-from-a/test (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/as-seen-from-b/A.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/as-seen-from-b/B.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/as-seen-from-b/C.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/as-seen-from-b/D.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/as-seen-from-b/changes/B2.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/as-seen-from-b/project/DottyInjectedPlugin.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/as-seen-from-b/test (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/backtick-quoted-names/A.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/backtick-quoted-names/B.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/backtick-quoted-names/build.sbt (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/backtick-quoted-names/changes/A.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/backtick-quoted-names/project/DottyInjectedPlugin.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/backtick-quoted-names/test (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/binary/changes/Break.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/binary/dep/A.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/binary/project/DottyInjectedPlugin.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/binary/project/P.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/binary/test (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/binary/use/B.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/by-name/A.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/by-name/B.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/by-name/changes/A.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/by-name/project/DottyInjectedPlugin.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/by-name/test (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/canon/Use.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/canon/actual/A.java (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/canon/actual/a.jar (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/canon/build.sbt (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/canon/lib/a.jar (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/canon/project/DottyInjectedPlugin.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/canon/test (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/compactify/build.sbt (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/compactify/project/DottyInjectedPlugin.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/compactify/src/main/scala/For.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/compactify/src/main/scala/Nested.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/compactify/test (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/constants/changes/A1.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/constants/changes/A2.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/constants/changes/B.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/constants/project/DottyInjectedPlugin.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/constants/test (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/default-params/A.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/default-params/B.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/default-params/changes/A.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/default-params/project/DottyInjectedPlugin.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/default-params/test (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/dup-class/changes/A.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/dup-class/changes/A2.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/dup-class/changes/B.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/dup-class/project/DottyInjectedPlugin.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/dup-class/test (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/empty-a/changes/A.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/empty-a/changes/A2.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/empty-a/changes/B.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/empty-a/project/DottyInjectedPlugin.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/empty-a/test (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/empty-package/changes/Define1.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/empty-package/changes/Define2.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/empty-package/changes/Use.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/empty-package/project/DottyInjectedPlugin.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/empty-package/test (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/erasure/A.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/erasure/B.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/erasure/changes/A.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/erasure/project/DottyInjectedPlugin.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/erasure/test (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/export-jars/changes/A1.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/export-jars/changes/A2.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/export-jars/changes/A3.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/export-jars/changes/B.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/export-jars/changes/build2.sbt (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/export-jars/project/Build.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/export-jars/project/DottyInjectedPlugin.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/export-jars/test (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/ext/A.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/ext/build.sbt (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/ext/project/DottyInjectedPlugin.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/ext/test (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/false-error/A.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/false-error/B.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/false-error/changes/A.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/false-error/pending (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/false-error/project/DottyInjectedPlugin.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/fbounded-existentials/fbounds.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/fbounded-existentials/project/DottyInjectedPlugin.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/fbounded-existentials/test (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/implicit-params/A.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/implicit-params/B.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/implicit-params/changes/A.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/implicit-params/project/DottyInjectedPlugin.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/implicit-params/test (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/implicit-search-companion-scope/changes/A1.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/implicit-search-companion-scope/changes/A2.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/implicit-search-companion-scope/changes/B.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/implicit-search-companion-scope/changes/C.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/implicit-search-companion-scope/changes/M.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/implicit-search-companion-scope/project/DottyInjectedPlugin.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/implicit-search-companion-scope/test (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/implicit-search/changes/A1.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/implicit-search/changes/A2.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/implicit-search/changes/B.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/implicit-search/changes/C.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/implicit-search/project/DottyInjectedPlugin.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/implicit-search/test (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/implicit/A.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/implicit/B.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/implicit/changes/A.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/implicit/project/DottyInjectedPlugin.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/implicit/test (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/import-class/A.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/import-class/B.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/import-class/changes/A.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/import-class/project/DottyInjectedPlugin.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/import-class/test (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/import-package/A.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/import-package/B.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/import-package/changes/A.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/import-package/pending (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/import-package/project/DottyInjectedPlugin.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/inherited-deps-java/A.java (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/inherited-deps-java/B.java (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/inherited-deps-java/C.java (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/inherited-deps-java/D.java (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/inherited-deps-java/E.java (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/inherited-deps-java/F.java (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/inherited-deps-java/G.java (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/inherited-deps-java/J.java (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/inherited-deps-java/build.sbt (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/inherited-deps-java/project/DottyInjectedPlugin.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/inherited-deps-java/test (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/inherited_type_params/A.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/inherited_type_params/build.sbt (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/inherited_type_params/project/DottyInjectedPlugin.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/inherited_type_params/test (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/inline/A.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/inline/C.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/inline/changes/B1.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/inline/changes/B2.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/inline/changes/B3.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/inline/project/DottyInjectedPlugin.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/inline/test (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/intermediate-error/A.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/intermediate-error/B.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/intermediate-error/changes/A2.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/intermediate-error/changes/A3.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/intermediate-error/project/DottyInjectedPlugin.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/intermediate-error/test (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/java-analysis-serialization-error/Outer.java (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/java-analysis-serialization-error/build.sbt (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/java-analysis-serialization-error/project/DottyInjectedPlugin.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/java-analysis-serialization-error/test (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/java-basic/changes/A.java (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/java-basic/changes/A2.java (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/java-basic/changes/B1.java (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/java-basic/changes/B2.java (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/java-basic/changes/B3.java (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/java-basic/project/DottyInjectedPlugin.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/java-basic/test (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/java-generic-workaround/A.java (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/java-generic-workaround/DefaultTreeTableSorter.java (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/java-generic-workaround/TreeColumnModel.java (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/java-generic-workaround/TreeTableSorter.java (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/java-generic-workaround/project/DottyInjectedPlugin.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/java-generic-workaround/test (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/java-mixed/JJ.java (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/java-mixed/build.sbt (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/java-mixed/changes/S1.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/java-mixed/changes/S2.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/java-mixed/changes/build.sbt (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/java-mixed/project/DottyInjectedPlugin.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/java-mixed/test (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/java-static/changes/J1.java (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/java-static/changes/J2.java (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/java-static/changes/S.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/java-static/project/DottyInjectedPlugin.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/java-static/test (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/lazy-val/A.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/lazy-val/B.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/lazy-val/changes/A.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/lazy-val/project/DottyInjectedPlugin.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/lazy-val/test (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/less-inter-inv-java/A.java (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/less-inter-inv-java/B.java (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/less-inter-inv-java/C.java (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/less-inter-inv-java/D.java (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/less-inter-inv-java/E.java (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/less-inter-inv-java/build.sbt (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/less-inter-inv-java/changes/A2.java (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/less-inter-inv-java/project/DottyInjectedPlugin.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/less-inter-inv-java/test (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/less-inter-inv/A.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/less-inter-inv/B.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/less-inter-inv/C.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/less-inter-inv/D.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/less-inter-inv/E.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/less-inter-inv/build.sbt (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/less-inter-inv/changes/A2.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/less-inter-inv/project/DottyInjectedPlugin.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/less-inter-inv/test (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/linearization/A.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/linearization/B.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/linearization/C.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/linearization/D.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/linearization/E.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/linearization/F.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/linearization/changes/D.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/linearization/project/DottyInjectedPlugin.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/linearization/test (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/named/A.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/named/B.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/named/changes/A.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/named/project/DottyInjectedPlugin.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/named/test (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/nested-case-class/changes/A0.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/nested-case-class/changes/A1.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/nested-case-class/project/DottyInjectedPlugin.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/nested-case-class/test (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/new-cyclic/changes/A2.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/new-cyclic/pending (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/new-cyclic/project/DottyInjectedPlugin.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/new-cyclic/src/main/scala/A.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/new-cyclic/src/main/scala/B.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/new-pkg-dep/changes/A1.java (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/new-pkg-dep/changes/B0.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/new-pkg-dep/changes/B1.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/new-pkg-dep/project/DottyInjectedPlugin.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/new-pkg-dep/test (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/override/A.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/override/B.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/override/C.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/override/D.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/override/changes/B2.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/override/project/DottyInjectedPlugin.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/override/test (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/parent-change/W.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/parent-change/Y.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/parent-change/Z.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/parent-change/changes/W.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/parent-change/project/DottyInjectedPlugin.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/parent-change/test (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/parent-member-change/A.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/parent-member-change/B.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/parent-member-change/C.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/parent-member-change/changes/A.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/parent-member-change/project/DottyInjectedPlugin.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/parent-member-change/test (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/pkg-self/changes/A1.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/pkg-self/changes/A2.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/pkg-self/changes/B.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/pkg-self/changes/package.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/pkg-self/project/DottyInjectedPlugin.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/pkg-self/test (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/qualified-access/A.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/qualified-access/B.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/qualified-access/changes/A.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/qualified-access/project/DottyInjectedPlugin.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/qualified-access/test (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/relative-source-error/changes/absolute.sbt (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/relative-source-error/changes/relative.sbt (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/relative-source-error/project/DottyInjectedPlugin.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/relative-source-error/src/A.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/relative-source-error/test (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/remove-test-a/changes/1.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/remove-test-a/project/DottyInjectedPlugin.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/remove-test-a/test (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/remove-test-b/changes/A2.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/remove-test-b/changes/B3.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/remove-test-b/changes/B4.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/remove-test-b/changes/B5.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/remove-test-b/project/DottyInjectedPlugin.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/remove-test-b/src/main/scala/A.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/remove-test-b/src/main/scala/B.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/remove-test-b/test (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/repeated-parameters/A.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/repeated-parameters/B.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/repeated-parameters/changes/A.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/repeated-parameters/project/DottyInjectedPlugin.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/repeated-parameters/test (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/replace-test-a/changes/first.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/replace-test-a/changes/second.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/replace-test-a/project/Build.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/replace-test-a/project/DottyInjectedPlugin.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/replace-test-a/test (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/resident-java/build.sbt (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/resident-java/changes/A1.java (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/resident-java/changes/A2.java (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/resident-java/changes/B0.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/resident-java/changes/B1.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/resident-java/changes/B2.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/resident-java/project/DottyInjectedPlugin.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/resident-java/test (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/resident-package-object/changes/A.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/resident-package-object/changes/package.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/resident-package-object/changes/package2.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/resident-package-object/project/DottyInjectedPlugin.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/resident-package-object/test (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/restore-classes/build.sbt (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/restore-classes/changes/A1.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/restore-classes/changes/A2.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/restore-classes/changes/B.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/restore-classes/project/DottyInjectedPlugin.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/restore-classes/test (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/same-file-used-names/A.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/same-file-used-names/B.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/same-file-used-names/build.sbt (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/same-file-used-names/changes/B.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/same-file-used-names/project/DottyInjectedPlugin.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/same-file-used-names/test (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/sealed/A.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/sealed/D.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/sealed/changes/A.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/sealed/pending (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/sealed/project/DottyInjectedPlugin.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/signature-change/B.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/signature-change/changes/A0.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/signature-change/changes/A1.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/signature-change/changes/A2.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/signature-change/changes/A3.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/signature-change/project/DottyInjectedPlugin.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/signature-change/test (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/specialized/A.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/specialized/B.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/specialized/changes/A.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/specialized/project/DottyInjectedPlugin.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/specialized/test (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/stability-change/A.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/stability-change/B.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/stability-change/C.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/stability-change/changes/A.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/stability-change/project/DottyInjectedPlugin.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/stability-change/test (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/synthetic-companion/A.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/synthetic-companion/B.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/synthetic-companion/changes/A2.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/synthetic-companion/dbg.sbt (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/synthetic-companion/project/DottyInjectedPlugin.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/synthetic-companion/test (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/trait-member-modified/build.sbt (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/trait-member-modified/changes/A1.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/trait-member-modified/project/DottyInjectedPlugin.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/trait-member-modified/src/main/scala/A.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/trait-member-modified/src/main/scala/B.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/trait-member-modified/test (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/trait-private-object/A.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/trait-private-object/B.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/trait-private-object/changes/A.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/trait-private-object/project/DottyInjectedPlugin.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/trait-private-object/test (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/trait-private-var/B.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/trait-private-var/changes/A0.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/trait-private-var/changes/A1.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/trait-private-var/changes/A2.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/trait-private-var/project/DottyInjectedPlugin.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/trait-private-var/test (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/trait-super/A.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/trait-super/B.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/trait-super/Main.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/trait-super/changes/B2.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/trait-super/changes/B3.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/trait-super/project/DottyInjectedPlugin.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/trait-super/test (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/transitive-a/changes/A2.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/transitive-a/project/DottyInjectedPlugin.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/transitive-a/src/main/scala/A.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/transitive-a/src/main/scala/B.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/transitive-a/src/main/scala/C.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/transitive-a/test (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/transitive-b/changes/A2.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/transitive-b/project/DottyInjectedPlugin.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/transitive-b/src/main/scala/A.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/transitive-b/src/main/scala/B.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/transitive-b/src/main/scala/C.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/transitive-b/test (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/transitive-inherit-java/A.java (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/transitive-inherit-java/B.java (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/transitive-inherit-java/C.java (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/transitive-inherit-java/changes/A2.java (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/transitive-inherit-java/project/DottyInjectedPlugin.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/transitive-inherit-java/test (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/transitive-inherit/A.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/transitive-inherit/B.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/transitive-inherit/C.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/transitive-inherit/changes/A2.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/transitive-inherit/project/DottyInjectedPlugin.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/transitive-inherit/test (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/transitive-memberRef/build.sbt (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/transitive-memberRef/changes/A1.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/transitive-memberRef/project/DottyInjectedPlugin.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/transitive-memberRef/src/main/scala/A.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/transitive-memberRef/src/main/scala/B.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/transitive-memberRef/src/main/scala/C.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/transitive-memberRef/src/main/scala/D.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/transitive-memberRef/src/main/scala/X.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/transitive-memberRef/src/main/scala/Y.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/transitive-memberRef/test (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/type-alias/A.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/type-alias/B.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/type-alias/build.sbt (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/type-alias/changes/A.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/type-alias/project/DottyInjectedPlugin.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/type-alias/test (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/type-parameter/A.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/type-parameter/B.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/type-parameter/C.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/type-parameter/D.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/type-parameter/changes/A.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/type-parameter/project/DottyInjectedPlugin.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/type-parameter/test (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/typeref-only/A.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/typeref-only/B.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/typeref-only/build.sbt (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/typeref-only/project/DottyInjectedPlugin.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/typeref-only/test (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/typeref-return/A.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/typeref-return/B.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/typeref-return/changes/A.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/typeref-return/project/DottyInjectedPlugin.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/typeref-return/test (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/types-in-used-names-a/A.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/types-in-used-names-a/B.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/types-in-used-names-a/C.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/types-in-used-names-a/D.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/types-in-used-names-a/changes/B2.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/types-in-used-names-a/project/DottyInjectedPlugin.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/types-in-used-names-a/test (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/types-in-used-names-b/A.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/types-in-used-names-b/B.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/types-in-used-names-b/changes/A2.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/types-in-used-names-b/project/DottyInjectedPlugin.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/types-in-used-names-b/test (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/value-class-underlying/A.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/value-class-underlying/B.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/value-class-underlying/C.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/value-class-underlying/build.sbt (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/value-class-underlying/changes/A2.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/value-class-underlying/test (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/value-class/build.sbt (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/value-class/changes/A0.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/value-class/changes/A1.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/value-class/changes/B0.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/value-class/changes/B1.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/value-class/changes/B2.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/value-class/changes/C0.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/value-class/changes/C1.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/value-class/changes/C2.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/value-class/project/DottyInjectedPlugin.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/value-class/test (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/var/A.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/var/B.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/var/changes/A.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/var/project/DottyInjectedPlugin.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/var/test (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/variance/A.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/variance/C.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/variance/changes/A.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/variance/project/DottyInjectedPlugin.scala (100%) rename {bridge => sbt-bridge/bridge}/src/sbt-test/source-dependencies/variance/test (100%) rename {bridge => sbt-bridge/bridge}/src/test/scala/xsbt/DependencySpecification.scala (100%) rename {bridge => sbt-bridge/bridge}/src/test/scala/xsbt/ExtractAPISpecification.scala (100%) rename {bridge => sbt-bridge/bridge}/src/test/scala/xsbt/ExtractUsedNamesSpecification.scala (100%) rename {bridge => sbt-bridge/bridge}/src/test/scala/xsbt/ScalaCompilerForUnitTesting.scala (100%) rename {bridge => sbt-bridge/bridge}/src/test/scala/xsbti/TestCallback.scala (100%) diff --git a/project/Build.scala b/project/Build.scala index 5b8465b4e6ec..799f8ef8fcfe 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -214,7 +214,7 @@ object DottyBuild extends Build { // until sbt/sbt#2402 is fixed (https://github.com/sbt/sbt/issues/2402) lazy val cleanSbtBridge = TaskKey[Unit]("cleanSbtBridge", "delete dotty-sbt-bridge cache") - lazy val `dotty-bridge` = project.in(file("bridge")). + lazy val `dotty-sbt-bridge` = project.in(file("sbt-bridge")). dependsOn(dotty). settings( overrideScalaVersionSetting, diff --git a/bridge/src/main/scala/xsbt/CompilerClassLoader.scala b/sbt-bridge/bridge/src/main/scala/xsbt/CompilerClassLoader.scala similarity index 100% rename from bridge/src/main/scala/xsbt/CompilerClassLoader.scala rename to sbt-bridge/bridge/src/main/scala/xsbt/CompilerClassLoader.scala diff --git a/bridge/src/main/scala/xsbt/CompilerInterface.scala b/sbt-bridge/bridge/src/main/scala/xsbt/CompilerInterface.scala similarity index 100% rename from bridge/src/main/scala/xsbt/CompilerInterface.scala rename to sbt-bridge/bridge/src/main/scala/xsbt/CompilerInterface.scala diff --git a/bridge/src/main/scala/xsbt/ConsoleInterface.scala b/sbt-bridge/bridge/src/main/scala/xsbt/ConsoleInterface.scala similarity index 100% rename from bridge/src/main/scala/xsbt/ConsoleInterface.scala rename to sbt-bridge/bridge/src/main/scala/xsbt/ConsoleInterface.scala diff --git a/bridge/src/main/scala/xsbt/DelegatingReporter.scala b/sbt-bridge/bridge/src/main/scala/xsbt/DelegatingReporter.scala similarity index 100% rename from bridge/src/main/scala/xsbt/DelegatingReporter.scala rename to sbt-bridge/bridge/src/main/scala/xsbt/DelegatingReporter.scala diff --git a/bridge/src/main/scala/xsbt/Log.scala b/sbt-bridge/bridge/src/main/scala/xsbt/Log.scala similarity index 100% rename from bridge/src/main/scala/xsbt/Log.scala rename to sbt-bridge/bridge/src/main/scala/xsbt/Log.scala diff --git a/bridge/src/main/scala/xsbt/Message.scala b/sbt-bridge/bridge/src/main/scala/xsbt/Message.scala similarity index 100% rename from bridge/src/main/scala/xsbt/Message.scala rename to sbt-bridge/bridge/src/main/scala/xsbt/Message.scala diff --git a/bridge/src/main/scala/xsbt/ScaladocInterface.scala b/sbt-bridge/bridge/src/main/scala/xsbt/ScaladocInterface.scala similarity index 100% rename from bridge/src/main/scala/xsbt/ScaladocInterface.scala rename to sbt-bridge/bridge/src/main/scala/xsbt/ScaladocInterface.scala diff --git a/bridge/src/sbt-test/compilerReporter/simple/Source.scala b/sbt-bridge/bridge/src/sbt-test/compilerReporter/simple/Source.scala similarity index 100% rename from bridge/src/sbt-test/compilerReporter/simple/Source.scala rename to sbt-bridge/bridge/src/sbt-test/compilerReporter/simple/Source.scala diff --git a/bridge/src/sbt-test/compilerReporter/simple/build.sbt b/sbt-bridge/bridge/src/sbt-test/compilerReporter/simple/build.sbt similarity index 100% rename from bridge/src/sbt-test/compilerReporter/simple/build.sbt rename to sbt-bridge/bridge/src/sbt-test/compilerReporter/simple/build.sbt diff --git a/bridge/src/sbt-test/compilerReporter/simple/project/DottyInjectedPlugin.scala b/sbt-bridge/bridge/src/sbt-test/compilerReporter/simple/project/DottyInjectedPlugin.scala similarity index 100% rename from bridge/src/sbt-test/compilerReporter/simple/project/DottyInjectedPlugin.scala rename to sbt-bridge/bridge/src/sbt-test/compilerReporter/simple/project/DottyInjectedPlugin.scala diff --git a/bridge/src/sbt-test/compilerReporter/simple/project/Reporter.scala b/sbt-bridge/bridge/src/sbt-test/compilerReporter/simple/project/Reporter.scala similarity index 100% rename from bridge/src/sbt-test/compilerReporter/simple/project/Reporter.scala rename to sbt-bridge/bridge/src/sbt-test/compilerReporter/simple/project/Reporter.scala diff --git a/bridge/src/sbt-test/compilerReporter/simple/test b/sbt-bridge/bridge/src/sbt-test/compilerReporter/simple/test similarity index 100% rename from bridge/src/sbt-test/compilerReporter/simple/test rename to sbt-bridge/bridge/src/sbt-test/compilerReporter/simple/test diff --git a/bridge/src/sbt-test/source-dependencies/abstract-override/A.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/abstract-override/A.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/abstract-override/A.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/abstract-override/A.scala diff --git a/bridge/src/sbt-test/source-dependencies/abstract-override/B.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/abstract-override/B.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/abstract-override/B.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/abstract-override/B.scala diff --git a/bridge/src/sbt-test/source-dependencies/abstract-override/C.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/abstract-override/C.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/abstract-override/C.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/abstract-override/C.scala diff --git a/bridge/src/sbt-test/source-dependencies/abstract-override/D.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/abstract-override/D.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/abstract-override/D.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/abstract-override/D.scala diff --git a/bridge/src/sbt-test/source-dependencies/abstract-override/changes/C2.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/abstract-override/changes/C2.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/abstract-override/changes/C2.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/abstract-override/changes/C2.scala diff --git a/bridge/src/sbt-test/source-dependencies/abstract-override/project/DottyInjectedPlugin.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/abstract-override/project/DottyInjectedPlugin.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/abstract-override/project/DottyInjectedPlugin.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/abstract-override/project/DottyInjectedPlugin.scala diff --git a/bridge/src/sbt-test/source-dependencies/abstract-override/test b/sbt-bridge/bridge/src/sbt-test/source-dependencies/abstract-override/test similarity index 100% rename from bridge/src/sbt-test/source-dependencies/abstract-override/test rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/abstract-override/test diff --git a/bridge/src/sbt-test/source-dependencies/abstract-type-override/build.sbt b/sbt-bridge/bridge/src/sbt-test/source-dependencies/abstract-type-override/build.sbt similarity index 100% rename from bridge/src/sbt-test/source-dependencies/abstract-type-override/build.sbt rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/abstract-type-override/build.sbt diff --git a/bridge/src/sbt-test/source-dependencies/abstract-type-override/changes/Bar1.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/abstract-type-override/changes/Bar1.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/abstract-type-override/changes/Bar1.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/abstract-type-override/changes/Bar1.scala diff --git a/bridge/src/sbt-test/source-dependencies/abstract-type-override/project/DottyInjectedPlugin.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/abstract-type-override/project/DottyInjectedPlugin.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/abstract-type-override/project/DottyInjectedPlugin.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/abstract-type-override/project/DottyInjectedPlugin.scala diff --git a/bridge/src/sbt-test/source-dependencies/abstract-type-override/src/main/scala/Bar.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/abstract-type-override/src/main/scala/Bar.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/abstract-type-override/src/main/scala/Bar.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/abstract-type-override/src/main/scala/Bar.scala diff --git a/bridge/src/sbt-test/source-dependencies/abstract-type-override/src/main/scala/Foo.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/abstract-type-override/src/main/scala/Foo.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/abstract-type-override/src/main/scala/Foo.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/abstract-type-override/src/main/scala/Foo.scala diff --git a/bridge/src/sbt-test/source-dependencies/abstract-type-override/src/main/scala/Impl.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/abstract-type-override/src/main/scala/Impl.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/abstract-type-override/src/main/scala/Impl.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/abstract-type-override/src/main/scala/Impl.scala diff --git a/bridge/src/sbt-test/source-dependencies/abstract-type-override/test b/sbt-bridge/bridge/src/sbt-test/source-dependencies/abstract-type-override/test similarity index 100% rename from bridge/src/sbt-test/source-dependencies/abstract-type-override/test rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/abstract-type-override/test diff --git a/bridge/src/sbt-test/source-dependencies/abstract-type/A.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/abstract-type/A.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/abstract-type/A.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/abstract-type/A.scala diff --git a/bridge/src/sbt-test/source-dependencies/abstract-type/B.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/abstract-type/B.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/abstract-type/B.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/abstract-type/B.scala diff --git a/bridge/src/sbt-test/source-dependencies/abstract-type/changes/A.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/abstract-type/changes/A.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/abstract-type/changes/A.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/abstract-type/changes/A.scala diff --git a/bridge/src/sbt-test/source-dependencies/abstract-type/project/DottyInjectedPlugin.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/abstract-type/project/DottyInjectedPlugin.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/abstract-type/project/DottyInjectedPlugin.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/abstract-type/project/DottyInjectedPlugin.scala diff --git a/bridge/src/sbt-test/source-dependencies/abstract-type/test b/sbt-bridge/bridge/src/sbt-test/source-dependencies/abstract-type/test similarity index 100% rename from bridge/src/sbt-test/source-dependencies/abstract-type/test rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/abstract-type/test diff --git a/bridge/src/sbt-test/source-dependencies/added/changes/A1.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/added/changes/A1.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/added/changes/A1.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/added/changes/A1.scala diff --git a/bridge/src/sbt-test/source-dependencies/added/changes/A2.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/added/changes/A2.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/added/changes/A2.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/added/changes/A2.scala diff --git a/bridge/src/sbt-test/source-dependencies/added/changes/A3.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/added/changes/A3.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/added/changes/A3.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/added/changes/A3.scala diff --git a/bridge/src/sbt-test/source-dependencies/added/changes/B1.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/added/changes/B1.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/added/changes/B1.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/added/changes/B1.scala diff --git a/bridge/src/sbt-test/source-dependencies/added/changes/B2.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/added/changes/B2.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/added/changes/B2.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/added/changes/B2.scala diff --git a/bridge/src/sbt-test/source-dependencies/added/project/DottyInjectedPlugin.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/added/project/DottyInjectedPlugin.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/added/project/DottyInjectedPlugin.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/added/project/DottyInjectedPlugin.scala diff --git a/bridge/src/sbt-test/source-dependencies/added/test b/sbt-bridge/bridge/src/sbt-test/source-dependencies/added/test similarity index 100% rename from bridge/src/sbt-test/source-dependencies/added/test rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/added/test diff --git a/bridge/src/sbt-test/source-dependencies/as-seen-from-a/A.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/as-seen-from-a/A.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/as-seen-from-a/A.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/as-seen-from-a/A.scala diff --git a/bridge/src/sbt-test/source-dependencies/as-seen-from-a/B.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/as-seen-from-a/B.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/as-seen-from-a/B.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/as-seen-from-a/B.scala diff --git a/bridge/src/sbt-test/source-dependencies/as-seen-from-a/C.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/as-seen-from-a/C.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/as-seen-from-a/C.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/as-seen-from-a/C.scala diff --git a/bridge/src/sbt-test/source-dependencies/as-seen-from-a/D.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/as-seen-from-a/D.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/as-seen-from-a/D.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/as-seen-from-a/D.scala diff --git a/bridge/src/sbt-test/source-dependencies/as-seen-from-a/changes/B2.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/as-seen-from-a/changes/B2.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/as-seen-from-a/changes/B2.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/as-seen-from-a/changes/B2.scala diff --git a/bridge/src/sbt-test/source-dependencies/as-seen-from-a/project/DottyInjectedPlugin.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/as-seen-from-a/project/DottyInjectedPlugin.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/as-seen-from-a/project/DottyInjectedPlugin.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/as-seen-from-a/project/DottyInjectedPlugin.scala diff --git a/bridge/src/sbt-test/source-dependencies/as-seen-from-a/test b/sbt-bridge/bridge/src/sbt-test/source-dependencies/as-seen-from-a/test similarity index 100% rename from bridge/src/sbt-test/source-dependencies/as-seen-from-a/test rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/as-seen-from-a/test diff --git a/bridge/src/sbt-test/source-dependencies/as-seen-from-b/A.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/as-seen-from-b/A.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/as-seen-from-b/A.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/as-seen-from-b/A.scala diff --git a/bridge/src/sbt-test/source-dependencies/as-seen-from-b/B.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/as-seen-from-b/B.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/as-seen-from-b/B.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/as-seen-from-b/B.scala diff --git a/bridge/src/sbt-test/source-dependencies/as-seen-from-b/C.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/as-seen-from-b/C.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/as-seen-from-b/C.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/as-seen-from-b/C.scala diff --git a/bridge/src/sbt-test/source-dependencies/as-seen-from-b/D.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/as-seen-from-b/D.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/as-seen-from-b/D.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/as-seen-from-b/D.scala diff --git a/bridge/src/sbt-test/source-dependencies/as-seen-from-b/changes/B2.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/as-seen-from-b/changes/B2.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/as-seen-from-b/changes/B2.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/as-seen-from-b/changes/B2.scala diff --git a/bridge/src/sbt-test/source-dependencies/as-seen-from-b/project/DottyInjectedPlugin.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/as-seen-from-b/project/DottyInjectedPlugin.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/as-seen-from-b/project/DottyInjectedPlugin.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/as-seen-from-b/project/DottyInjectedPlugin.scala diff --git a/bridge/src/sbt-test/source-dependencies/as-seen-from-b/test b/sbt-bridge/bridge/src/sbt-test/source-dependencies/as-seen-from-b/test similarity index 100% rename from bridge/src/sbt-test/source-dependencies/as-seen-from-b/test rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/as-seen-from-b/test diff --git a/bridge/src/sbt-test/source-dependencies/backtick-quoted-names/A.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/backtick-quoted-names/A.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/backtick-quoted-names/A.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/backtick-quoted-names/A.scala diff --git a/bridge/src/sbt-test/source-dependencies/backtick-quoted-names/B.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/backtick-quoted-names/B.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/backtick-quoted-names/B.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/backtick-quoted-names/B.scala diff --git a/bridge/src/sbt-test/source-dependencies/backtick-quoted-names/build.sbt b/sbt-bridge/bridge/src/sbt-test/source-dependencies/backtick-quoted-names/build.sbt similarity index 100% rename from bridge/src/sbt-test/source-dependencies/backtick-quoted-names/build.sbt rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/backtick-quoted-names/build.sbt diff --git a/bridge/src/sbt-test/source-dependencies/backtick-quoted-names/changes/A.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/backtick-quoted-names/changes/A.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/backtick-quoted-names/changes/A.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/backtick-quoted-names/changes/A.scala diff --git a/bridge/src/sbt-test/source-dependencies/backtick-quoted-names/project/DottyInjectedPlugin.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/backtick-quoted-names/project/DottyInjectedPlugin.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/backtick-quoted-names/project/DottyInjectedPlugin.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/backtick-quoted-names/project/DottyInjectedPlugin.scala diff --git a/bridge/src/sbt-test/source-dependencies/backtick-quoted-names/test b/sbt-bridge/bridge/src/sbt-test/source-dependencies/backtick-quoted-names/test similarity index 100% rename from bridge/src/sbt-test/source-dependencies/backtick-quoted-names/test rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/backtick-quoted-names/test diff --git a/bridge/src/sbt-test/source-dependencies/binary/changes/Break.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/binary/changes/Break.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/binary/changes/Break.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/binary/changes/Break.scala diff --git a/bridge/src/sbt-test/source-dependencies/binary/dep/A.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/binary/dep/A.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/binary/dep/A.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/binary/dep/A.scala diff --git a/bridge/src/sbt-test/source-dependencies/binary/project/DottyInjectedPlugin.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/binary/project/DottyInjectedPlugin.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/binary/project/DottyInjectedPlugin.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/binary/project/DottyInjectedPlugin.scala diff --git a/bridge/src/sbt-test/source-dependencies/binary/project/P.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/binary/project/P.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/binary/project/P.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/binary/project/P.scala diff --git a/bridge/src/sbt-test/source-dependencies/binary/test b/sbt-bridge/bridge/src/sbt-test/source-dependencies/binary/test similarity index 100% rename from bridge/src/sbt-test/source-dependencies/binary/test rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/binary/test diff --git a/bridge/src/sbt-test/source-dependencies/binary/use/B.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/binary/use/B.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/binary/use/B.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/binary/use/B.scala diff --git a/bridge/src/sbt-test/source-dependencies/by-name/A.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/by-name/A.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/by-name/A.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/by-name/A.scala diff --git a/bridge/src/sbt-test/source-dependencies/by-name/B.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/by-name/B.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/by-name/B.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/by-name/B.scala diff --git a/bridge/src/sbt-test/source-dependencies/by-name/changes/A.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/by-name/changes/A.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/by-name/changes/A.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/by-name/changes/A.scala diff --git a/bridge/src/sbt-test/source-dependencies/by-name/project/DottyInjectedPlugin.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/by-name/project/DottyInjectedPlugin.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/by-name/project/DottyInjectedPlugin.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/by-name/project/DottyInjectedPlugin.scala diff --git a/bridge/src/sbt-test/source-dependencies/by-name/test b/sbt-bridge/bridge/src/sbt-test/source-dependencies/by-name/test similarity index 100% rename from bridge/src/sbt-test/source-dependencies/by-name/test rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/by-name/test diff --git a/bridge/src/sbt-test/source-dependencies/canon/Use.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/canon/Use.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/canon/Use.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/canon/Use.scala diff --git a/bridge/src/sbt-test/source-dependencies/canon/actual/A.java b/sbt-bridge/bridge/src/sbt-test/source-dependencies/canon/actual/A.java similarity index 100% rename from bridge/src/sbt-test/source-dependencies/canon/actual/A.java rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/canon/actual/A.java diff --git a/bridge/src/sbt-test/source-dependencies/canon/actual/a.jar b/sbt-bridge/bridge/src/sbt-test/source-dependencies/canon/actual/a.jar similarity index 100% rename from bridge/src/sbt-test/source-dependencies/canon/actual/a.jar rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/canon/actual/a.jar diff --git a/bridge/src/sbt-test/source-dependencies/canon/build.sbt b/sbt-bridge/bridge/src/sbt-test/source-dependencies/canon/build.sbt similarity index 100% rename from bridge/src/sbt-test/source-dependencies/canon/build.sbt rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/canon/build.sbt diff --git a/bridge/src/sbt-test/source-dependencies/canon/lib/a.jar b/sbt-bridge/bridge/src/sbt-test/source-dependencies/canon/lib/a.jar similarity index 100% rename from bridge/src/sbt-test/source-dependencies/canon/lib/a.jar rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/canon/lib/a.jar diff --git a/bridge/src/sbt-test/source-dependencies/canon/project/DottyInjectedPlugin.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/canon/project/DottyInjectedPlugin.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/canon/project/DottyInjectedPlugin.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/canon/project/DottyInjectedPlugin.scala diff --git a/bridge/src/sbt-test/source-dependencies/canon/test b/sbt-bridge/bridge/src/sbt-test/source-dependencies/canon/test similarity index 100% rename from bridge/src/sbt-test/source-dependencies/canon/test rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/canon/test diff --git a/bridge/src/sbt-test/source-dependencies/compactify/build.sbt b/sbt-bridge/bridge/src/sbt-test/source-dependencies/compactify/build.sbt similarity index 100% rename from bridge/src/sbt-test/source-dependencies/compactify/build.sbt rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/compactify/build.sbt diff --git a/bridge/src/sbt-test/source-dependencies/compactify/project/DottyInjectedPlugin.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/compactify/project/DottyInjectedPlugin.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/compactify/project/DottyInjectedPlugin.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/compactify/project/DottyInjectedPlugin.scala diff --git a/bridge/src/sbt-test/source-dependencies/compactify/src/main/scala/For.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/compactify/src/main/scala/For.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/compactify/src/main/scala/For.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/compactify/src/main/scala/For.scala diff --git a/bridge/src/sbt-test/source-dependencies/compactify/src/main/scala/Nested.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/compactify/src/main/scala/Nested.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/compactify/src/main/scala/Nested.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/compactify/src/main/scala/Nested.scala diff --git a/bridge/src/sbt-test/source-dependencies/compactify/test b/sbt-bridge/bridge/src/sbt-test/source-dependencies/compactify/test similarity index 100% rename from bridge/src/sbt-test/source-dependencies/compactify/test rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/compactify/test diff --git a/bridge/src/sbt-test/source-dependencies/constants/changes/A1.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/constants/changes/A1.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/constants/changes/A1.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/constants/changes/A1.scala diff --git a/bridge/src/sbt-test/source-dependencies/constants/changes/A2.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/constants/changes/A2.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/constants/changes/A2.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/constants/changes/A2.scala diff --git a/bridge/src/sbt-test/source-dependencies/constants/changes/B.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/constants/changes/B.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/constants/changes/B.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/constants/changes/B.scala diff --git a/bridge/src/sbt-test/source-dependencies/constants/project/DottyInjectedPlugin.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/constants/project/DottyInjectedPlugin.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/constants/project/DottyInjectedPlugin.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/constants/project/DottyInjectedPlugin.scala diff --git a/bridge/src/sbt-test/source-dependencies/constants/test b/sbt-bridge/bridge/src/sbt-test/source-dependencies/constants/test similarity index 100% rename from bridge/src/sbt-test/source-dependencies/constants/test rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/constants/test diff --git a/bridge/src/sbt-test/source-dependencies/default-params/A.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/default-params/A.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/default-params/A.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/default-params/A.scala diff --git a/bridge/src/sbt-test/source-dependencies/default-params/B.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/default-params/B.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/default-params/B.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/default-params/B.scala diff --git a/bridge/src/sbt-test/source-dependencies/default-params/changes/A.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/default-params/changes/A.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/default-params/changes/A.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/default-params/changes/A.scala diff --git a/bridge/src/sbt-test/source-dependencies/default-params/project/DottyInjectedPlugin.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/default-params/project/DottyInjectedPlugin.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/default-params/project/DottyInjectedPlugin.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/default-params/project/DottyInjectedPlugin.scala diff --git a/bridge/src/sbt-test/source-dependencies/default-params/test b/sbt-bridge/bridge/src/sbt-test/source-dependencies/default-params/test similarity index 100% rename from bridge/src/sbt-test/source-dependencies/default-params/test rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/default-params/test diff --git a/bridge/src/sbt-test/source-dependencies/dup-class/changes/A.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/dup-class/changes/A.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/dup-class/changes/A.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/dup-class/changes/A.scala diff --git a/bridge/src/sbt-test/source-dependencies/dup-class/changes/A2.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/dup-class/changes/A2.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/dup-class/changes/A2.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/dup-class/changes/A2.scala diff --git a/bridge/src/sbt-test/source-dependencies/dup-class/changes/B.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/dup-class/changes/B.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/dup-class/changes/B.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/dup-class/changes/B.scala diff --git a/bridge/src/sbt-test/source-dependencies/dup-class/project/DottyInjectedPlugin.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/dup-class/project/DottyInjectedPlugin.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/dup-class/project/DottyInjectedPlugin.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/dup-class/project/DottyInjectedPlugin.scala diff --git a/bridge/src/sbt-test/source-dependencies/dup-class/test b/sbt-bridge/bridge/src/sbt-test/source-dependencies/dup-class/test similarity index 100% rename from bridge/src/sbt-test/source-dependencies/dup-class/test rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/dup-class/test diff --git a/bridge/src/sbt-test/source-dependencies/empty-a/changes/A.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/empty-a/changes/A.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/empty-a/changes/A.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/empty-a/changes/A.scala diff --git a/bridge/src/sbt-test/source-dependencies/empty-a/changes/A2.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/empty-a/changes/A2.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/empty-a/changes/A2.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/empty-a/changes/A2.scala diff --git a/bridge/src/sbt-test/source-dependencies/empty-a/changes/B.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/empty-a/changes/B.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/empty-a/changes/B.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/empty-a/changes/B.scala diff --git a/bridge/src/sbt-test/source-dependencies/empty-a/project/DottyInjectedPlugin.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/empty-a/project/DottyInjectedPlugin.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/empty-a/project/DottyInjectedPlugin.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/empty-a/project/DottyInjectedPlugin.scala diff --git a/bridge/src/sbt-test/source-dependencies/empty-a/test b/sbt-bridge/bridge/src/sbt-test/source-dependencies/empty-a/test similarity index 100% rename from bridge/src/sbt-test/source-dependencies/empty-a/test rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/empty-a/test diff --git a/bridge/src/sbt-test/source-dependencies/empty-package/changes/Define1.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/empty-package/changes/Define1.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/empty-package/changes/Define1.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/empty-package/changes/Define1.scala diff --git a/bridge/src/sbt-test/source-dependencies/empty-package/changes/Define2.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/empty-package/changes/Define2.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/empty-package/changes/Define2.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/empty-package/changes/Define2.scala diff --git a/bridge/src/sbt-test/source-dependencies/empty-package/changes/Use.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/empty-package/changes/Use.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/empty-package/changes/Use.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/empty-package/changes/Use.scala diff --git a/bridge/src/sbt-test/source-dependencies/empty-package/project/DottyInjectedPlugin.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/empty-package/project/DottyInjectedPlugin.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/empty-package/project/DottyInjectedPlugin.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/empty-package/project/DottyInjectedPlugin.scala diff --git a/bridge/src/sbt-test/source-dependencies/empty-package/test b/sbt-bridge/bridge/src/sbt-test/source-dependencies/empty-package/test similarity index 100% rename from bridge/src/sbt-test/source-dependencies/empty-package/test rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/empty-package/test diff --git a/bridge/src/sbt-test/source-dependencies/erasure/A.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/erasure/A.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/erasure/A.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/erasure/A.scala diff --git a/bridge/src/sbt-test/source-dependencies/erasure/B.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/erasure/B.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/erasure/B.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/erasure/B.scala diff --git a/bridge/src/sbt-test/source-dependencies/erasure/changes/A.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/erasure/changes/A.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/erasure/changes/A.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/erasure/changes/A.scala diff --git a/bridge/src/sbt-test/source-dependencies/erasure/project/DottyInjectedPlugin.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/erasure/project/DottyInjectedPlugin.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/erasure/project/DottyInjectedPlugin.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/erasure/project/DottyInjectedPlugin.scala diff --git a/bridge/src/sbt-test/source-dependencies/erasure/test b/sbt-bridge/bridge/src/sbt-test/source-dependencies/erasure/test similarity index 100% rename from bridge/src/sbt-test/source-dependencies/erasure/test rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/erasure/test diff --git a/bridge/src/sbt-test/source-dependencies/export-jars/changes/A1.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/export-jars/changes/A1.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/export-jars/changes/A1.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/export-jars/changes/A1.scala diff --git a/bridge/src/sbt-test/source-dependencies/export-jars/changes/A2.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/export-jars/changes/A2.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/export-jars/changes/A2.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/export-jars/changes/A2.scala diff --git a/bridge/src/sbt-test/source-dependencies/export-jars/changes/A3.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/export-jars/changes/A3.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/export-jars/changes/A3.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/export-jars/changes/A3.scala diff --git a/bridge/src/sbt-test/source-dependencies/export-jars/changes/B.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/export-jars/changes/B.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/export-jars/changes/B.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/export-jars/changes/B.scala diff --git a/bridge/src/sbt-test/source-dependencies/export-jars/changes/build2.sbt b/sbt-bridge/bridge/src/sbt-test/source-dependencies/export-jars/changes/build2.sbt similarity index 100% rename from bridge/src/sbt-test/source-dependencies/export-jars/changes/build2.sbt rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/export-jars/changes/build2.sbt diff --git a/bridge/src/sbt-test/source-dependencies/export-jars/project/Build.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/export-jars/project/Build.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/export-jars/project/Build.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/export-jars/project/Build.scala diff --git a/bridge/src/sbt-test/source-dependencies/export-jars/project/DottyInjectedPlugin.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/export-jars/project/DottyInjectedPlugin.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/export-jars/project/DottyInjectedPlugin.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/export-jars/project/DottyInjectedPlugin.scala diff --git a/bridge/src/sbt-test/source-dependencies/export-jars/test b/sbt-bridge/bridge/src/sbt-test/source-dependencies/export-jars/test similarity index 100% rename from bridge/src/sbt-test/source-dependencies/export-jars/test rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/export-jars/test diff --git a/bridge/src/sbt-test/source-dependencies/ext/A.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/ext/A.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/ext/A.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/ext/A.scala diff --git a/bridge/src/sbt-test/source-dependencies/ext/build.sbt b/sbt-bridge/bridge/src/sbt-test/source-dependencies/ext/build.sbt similarity index 100% rename from bridge/src/sbt-test/source-dependencies/ext/build.sbt rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/ext/build.sbt diff --git a/bridge/src/sbt-test/source-dependencies/ext/project/DottyInjectedPlugin.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/ext/project/DottyInjectedPlugin.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/ext/project/DottyInjectedPlugin.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/ext/project/DottyInjectedPlugin.scala diff --git a/bridge/src/sbt-test/source-dependencies/ext/test b/sbt-bridge/bridge/src/sbt-test/source-dependencies/ext/test similarity index 100% rename from bridge/src/sbt-test/source-dependencies/ext/test rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/ext/test diff --git a/bridge/src/sbt-test/source-dependencies/false-error/A.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/false-error/A.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/false-error/A.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/false-error/A.scala diff --git a/bridge/src/sbt-test/source-dependencies/false-error/B.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/false-error/B.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/false-error/B.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/false-error/B.scala diff --git a/bridge/src/sbt-test/source-dependencies/false-error/changes/A.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/false-error/changes/A.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/false-error/changes/A.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/false-error/changes/A.scala diff --git a/bridge/src/sbt-test/source-dependencies/false-error/pending b/sbt-bridge/bridge/src/sbt-test/source-dependencies/false-error/pending similarity index 100% rename from bridge/src/sbt-test/source-dependencies/false-error/pending rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/false-error/pending diff --git a/bridge/src/sbt-test/source-dependencies/false-error/project/DottyInjectedPlugin.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/false-error/project/DottyInjectedPlugin.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/false-error/project/DottyInjectedPlugin.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/false-error/project/DottyInjectedPlugin.scala diff --git a/bridge/src/sbt-test/source-dependencies/fbounded-existentials/fbounds.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/fbounded-existentials/fbounds.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/fbounded-existentials/fbounds.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/fbounded-existentials/fbounds.scala diff --git a/bridge/src/sbt-test/source-dependencies/fbounded-existentials/project/DottyInjectedPlugin.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/fbounded-existentials/project/DottyInjectedPlugin.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/fbounded-existentials/project/DottyInjectedPlugin.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/fbounded-existentials/project/DottyInjectedPlugin.scala diff --git a/bridge/src/sbt-test/source-dependencies/fbounded-existentials/test b/sbt-bridge/bridge/src/sbt-test/source-dependencies/fbounded-existentials/test similarity index 100% rename from bridge/src/sbt-test/source-dependencies/fbounded-existentials/test rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/fbounded-existentials/test diff --git a/bridge/src/sbt-test/source-dependencies/implicit-params/A.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/implicit-params/A.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/implicit-params/A.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/implicit-params/A.scala diff --git a/bridge/src/sbt-test/source-dependencies/implicit-params/B.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/implicit-params/B.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/implicit-params/B.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/implicit-params/B.scala diff --git a/bridge/src/sbt-test/source-dependencies/implicit-params/changes/A.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/implicit-params/changes/A.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/implicit-params/changes/A.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/implicit-params/changes/A.scala diff --git a/bridge/src/sbt-test/source-dependencies/implicit-params/project/DottyInjectedPlugin.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/implicit-params/project/DottyInjectedPlugin.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/implicit-params/project/DottyInjectedPlugin.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/implicit-params/project/DottyInjectedPlugin.scala diff --git a/bridge/src/sbt-test/source-dependencies/implicit-params/test b/sbt-bridge/bridge/src/sbt-test/source-dependencies/implicit-params/test similarity index 100% rename from bridge/src/sbt-test/source-dependencies/implicit-params/test rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/implicit-params/test diff --git a/bridge/src/sbt-test/source-dependencies/implicit-search-companion-scope/changes/A1.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/implicit-search-companion-scope/changes/A1.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/implicit-search-companion-scope/changes/A1.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/implicit-search-companion-scope/changes/A1.scala diff --git a/bridge/src/sbt-test/source-dependencies/implicit-search-companion-scope/changes/A2.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/implicit-search-companion-scope/changes/A2.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/implicit-search-companion-scope/changes/A2.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/implicit-search-companion-scope/changes/A2.scala diff --git a/bridge/src/sbt-test/source-dependencies/implicit-search-companion-scope/changes/B.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/implicit-search-companion-scope/changes/B.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/implicit-search-companion-scope/changes/B.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/implicit-search-companion-scope/changes/B.scala diff --git a/bridge/src/sbt-test/source-dependencies/implicit-search-companion-scope/changes/C.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/implicit-search-companion-scope/changes/C.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/implicit-search-companion-scope/changes/C.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/implicit-search-companion-scope/changes/C.scala diff --git a/bridge/src/sbt-test/source-dependencies/implicit-search-companion-scope/changes/M.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/implicit-search-companion-scope/changes/M.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/implicit-search-companion-scope/changes/M.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/implicit-search-companion-scope/changes/M.scala diff --git a/bridge/src/sbt-test/source-dependencies/implicit-search-companion-scope/project/DottyInjectedPlugin.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/implicit-search-companion-scope/project/DottyInjectedPlugin.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/implicit-search-companion-scope/project/DottyInjectedPlugin.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/implicit-search-companion-scope/project/DottyInjectedPlugin.scala diff --git a/bridge/src/sbt-test/source-dependencies/implicit-search-companion-scope/test b/sbt-bridge/bridge/src/sbt-test/source-dependencies/implicit-search-companion-scope/test similarity index 100% rename from bridge/src/sbt-test/source-dependencies/implicit-search-companion-scope/test rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/implicit-search-companion-scope/test diff --git a/bridge/src/sbt-test/source-dependencies/implicit-search/changes/A1.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/implicit-search/changes/A1.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/implicit-search/changes/A1.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/implicit-search/changes/A1.scala diff --git a/bridge/src/sbt-test/source-dependencies/implicit-search/changes/A2.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/implicit-search/changes/A2.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/implicit-search/changes/A2.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/implicit-search/changes/A2.scala diff --git a/bridge/src/sbt-test/source-dependencies/implicit-search/changes/B.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/implicit-search/changes/B.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/implicit-search/changes/B.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/implicit-search/changes/B.scala diff --git a/bridge/src/sbt-test/source-dependencies/implicit-search/changes/C.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/implicit-search/changes/C.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/implicit-search/changes/C.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/implicit-search/changes/C.scala diff --git a/bridge/src/sbt-test/source-dependencies/implicit-search/project/DottyInjectedPlugin.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/implicit-search/project/DottyInjectedPlugin.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/implicit-search/project/DottyInjectedPlugin.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/implicit-search/project/DottyInjectedPlugin.scala diff --git a/bridge/src/sbt-test/source-dependencies/implicit-search/test b/sbt-bridge/bridge/src/sbt-test/source-dependencies/implicit-search/test similarity index 100% rename from bridge/src/sbt-test/source-dependencies/implicit-search/test rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/implicit-search/test diff --git a/bridge/src/sbt-test/source-dependencies/implicit/A.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/implicit/A.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/implicit/A.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/implicit/A.scala diff --git a/bridge/src/sbt-test/source-dependencies/implicit/B.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/implicit/B.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/implicit/B.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/implicit/B.scala diff --git a/bridge/src/sbt-test/source-dependencies/implicit/changes/A.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/implicit/changes/A.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/implicit/changes/A.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/implicit/changes/A.scala diff --git a/bridge/src/sbt-test/source-dependencies/implicit/project/DottyInjectedPlugin.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/implicit/project/DottyInjectedPlugin.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/implicit/project/DottyInjectedPlugin.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/implicit/project/DottyInjectedPlugin.scala diff --git a/bridge/src/sbt-test/source-dependencies/implicit/test b/sbt-bridge/bridge/src/sbt-test/source-dependencies/implicit/test similarity index 100% rename from bridge/src/sbt-test/source-dependencies/implicit/test rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/implicit/test diff --git a/bridge/src/sbt-test/source-dependencies/import-class/A.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/import-class/A.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/import-class/A.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/import-class/A.scala diff --git a/bridge/src/sbt-test/source-dependencies/import-class/B.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/import-class/B.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/import-class/B.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/import-class/B.scala diff --git a/bridge/src/sbt-test/source-dependencies/import-class/changes/A.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/import-class/changes/A.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/import-class/changes/A.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/import-class/changes/A.scala diff --git a/bridge/src/sbt-test/source-dependencies/import-class/project/DottyInjectedPlugin.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/import-class/project/DottyInjectedPlugin.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/import-class/project/DottyInjectedPlugin.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/import-class/project/DottyInjectedPlugin.scala diff --git a/bridge/src/sbt-test/source-dependencies/import-class/test b/sbt-bridge/bridge/src/sbt-test/source-dependencies/import-class/test similarity index 100% rename from bridge/src/sbt-test/source-dependencies/import-class/test rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/import-class/test diff --git a/bridge/src/sbt-test/source-dependencies/import-package/A.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/import-package/A.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/import-package/A.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/import-package/A.scala diff --git a/bridge/src/sbt-test/source-dependencies/import-package/B.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/import-package/B.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/import-package/B.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/import-package/B.scala diff --git a/bridge/src/sbt-test/source-dependencies/import-package/changes/A.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/import-package/changes/A.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/import-package/changes/A.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/import-package/changes/A.scala diff --git a/bridge/src/sbt-test/source-dependencies/import-package/pending b/sbt-bridge/bridge/src/sbt-test/source-dependencies/import-package/pending similarity index 100% rename from bridge/src/sbt-test/source-dependencies/import-package/pending rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/import-package/pending diff --git a/bridge/src/sbt-test/source-dependencies/import-package/project/DottyInjectedPlugin.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/import-package/project/DottyInjectedPlugin.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/import-package/project/DottyInjectedPlugin.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/import-package/project/DottyInjectedPlugin.scala diff --git a/bridge/src/sbt-test/source-dependencies/inherited-deps-java/A.java b/sbt-bridge/bridge/src/sbt-test/source-dependencies/inherited-deps-java/A.java similarity index 100% rename from bridge/src/sbt-test/source-dependencies/inherited-deps-java/A.java rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/inherited-deps-java/A.java diff --git a/bridge/src/sbt-test/source-dependencies/inherited-deps-java/B.java b/sbt-bridge/bridge/src/sbt-test/source-dependencies/inherited-deps-java/B.java similarity index 100% rename from bridge/src/sbt-test/source-dependencies/inherited-deps-java/B.java rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/inherited-deps-java/B.java diff --git a/bridge/src/sbt-test/source-dependencies/inherited-deps-java/C.java b/sbt-bridge/bridge/src/sbt-test/source-dependencies/inherited-deps-java/C.java similarity index 100% rename from bridge/src/sbt-test/source-dependencies/inherited-deps-java/C.java rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/inherited-deps-java/C.java diff --git a/bridge/src/sbt-test/source-dependencies/inherited-deps-java/D.java b/sbt-bridge/bridge/src/sbt-test/source-dependencies/inherited-deps-java/D.java similarity index 100% rename from bridge/src/sbt-test/source-dependencies/inherited-deps-java/D.java rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/inherited-deps-java/D.java diff --git a/bridge/src/sbt-test/source-dependencies/inherited-deps-java/E.java b/sbt-bridge/bridge/src/sbt-test/source-dependencies/inherited-deps-java/E.java similarity index 100% rename from bridge/src/sbt-test/source-dependencies/inherited-deps-java/E.java rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/inherited-deps-java/E.java diff --git a/bridge/src/sbt-test/source-dependencies/inherited-deps-java/F.java b/sbt-bridge/bridge/src/sbt-test/source-dependencies/inherited-deps-java/F.java similarity index 100% rename from bridge/src/sbt-test/source-dependencies/inherited-deps-java/F.java rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/inherited-deps-java/F.java diff --git a/bridge/src/sbt-test/source-dependencies/inherited-deps-java/G.java b/sbt-bridge/bridge/src/sbt-test/source-dependencies/inherited-deps-java/G.java similarity index 100% rename from bridge/src/sbt-test/source-dependencies/inherited-deps-java/G.java rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/inherited-deps-java/G.java diff --git a/bridge/src/sbt-test/source-dependencies/inherited-deps-java/J.java b/sbt-bridge/bridge/src/sbt-test/source-dependencies/inherited-deps-java/J.java similarity index 100% rename from bridge/src/sbt-test/source-dependencies/inherited-deps-java/J.java rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/inherited-deps-java/J.java diff --git a/bridge/src/sbt-test/source-dependencies/inherited-deps-java/build.sbt b/sbt-bridge/bridge/src/sbt-test/source-dependencies/inherited-deps-java/build.sbt similarity index 100% rename from bridge/src/sbt-test/source-dependencies/inherited-deps-java/build.sbt rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/inherited-deps-java/build.sbt diff --git a/bridge/src/sbt-test/source-dependencies/inherited-deps-java/project/DottyInjectedPlugin.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/inherited-deps-java/project/DottyInjectedPlugin.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/inherited-deps-java/project/DottyInjectedPlugin.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/inherited-deps-java/project/DottyInjectedPlugin.scala diff --git a/bridge/src/sbt-test/source-dependencies/inherited-deps-java/test b/sbt-bridge/bridge/src/sbt-test/source-dependencies/inherited-deps-java/test similarity index 100% rename from bridge/src/sbt-test/source-dependencies/inherited-deps-java/test rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/inherited-deps-java/test diff --git a/bridge/src/sbt-test/source-dependencies/inherited_type_params/A.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/inherited_type_params/A.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/inherited_type_params/A.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/inherited_type_params/A.scala diff --git a/bridge/src/sbt-test/source-dependencies/inherited_type_params/build.sbt b/sbt-bridge/bridge/src/sbt-test/source-dependencies/inherited_type_params/build.sbt similarity index 100% rename from bridge/src/sbt-test/source-dependencies/inherited_type_params/build.sbt rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/inherited_type_params/build.sbt diff --git a/bridge/src/sbt-test/source-dependencies/inherited_type_params/project/DottyInjectedPlugin.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/inherited_type_params/project/DottyInjectedPlugin.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/inherited_type_params/project/DottyInjectedPlugin.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/inherited_type_params/project/DottyInjectedPlugin.scala diff --git a/bridge/src/sbt-test/source-dependencies/inherited_type_params/test b/sbt-bridge/bridge/src/sbt-test/source-dependencies/inherited_type_params/test similarity index 100% rename from bridge/src/sbt-test/source-dependencies/inherited_type_params/test rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/inherited_type_params/test diff --git a/bridge/src/sbt-test/source-dependencies/inline/A.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/inline/A.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/inline/A.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/inline/A.scala diff --git a/bridge/src/sbt-test/source-dependencies/inline/C.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/inline/C.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/inline/C.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/inline/C.scala diff --git a/bridge/src/sbt-test/source-dependencies/inline/changes/B1.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/inline/changes/B1.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/inline/changes/B1.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/inline/changes/B1.scala diff --git a/bridge/src/sbt-test/source-dependencies/inline/changes/B2.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/inline/changes/B2.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/inline/changes/B2.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/inline/changes/B2.scala diff --git a/bridge/src/sbt-test/source-dependencies/inline/changes/B3.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/inline/changes/B3.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/inline/changes/B3.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/inline/changes/B3.scala diff --git a/bridge/src/sbt-test/source-dependencies/inline/project/DottyInjectedPlugin.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/inline/project/DottyInjectedPlugin.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/inline/project/DottyInjectedPlugin.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/inline/project/DottyInjectedPlugin.scala diff --git a/bridge/src/sbt-test/source-dependencies/inline/test b/sbt-bridge/bridge/src/sbt-test/source-dependencies/inline/test similarity index 100% rename from bridge/src/sbt-test/source-dependencies/inline/test rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/inline/test diff --git a/bridge/src/sbt-test/source-dependencies/intermediate-error/A.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/intermediate-error/A.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/intermediate-error/A.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/intermediate-error/A.scala diff --git a/bridge/src/sbt-test/source-dependencies/intermediate-error/B.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/intermediate-error/B.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/intermediate-error/B.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/intermediate-error/B.scala diff --git a/bridge/src/sbt-test/source-dependencies/intermediate-error/changes/A2.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/intermediate-error/changes/A2.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/intermediate-error/changes/A2.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/intermediate-error/changes/A2.scala diff --git a/bridge/src/sbt-test/source-dependencies/intermediate-error/changes/A3.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/intermediate-error/changes/A3.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/intermediate-error/changes/A3.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/intermediate-error/changes/A3.scala diff --git a/bridge/src/sbt-test/source-dependencies/intermediate-error/project/DottyInjectedPlugin.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/intermediate-error/project/DottyInjectedPlugin.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/intermediate-error/project/DottyInjectedPlugin.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/intermediate-error/project/DottyInjectedPlugin.scala diff --git a/bridge/src/sbt-test/source-dependencies/intermediate-error/test b/sbt-bridge/bridge/src/sbt-test/source-dependencies/intermediate-error/test similarity index 100% rename from bridge/src/sbt-test/source-dependencies/intermediate-error/test rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/intermediate-error/test diff --git a/bridge/src/sbt-test/source-dependencies/java-analysis-serialization-error/Outer.java b/sbt-bridge/bridge/src/sbt-test/source-dependencies/java-analysis-serialization-error/Outer.java similarity index 100% rename from bridge/src/sbt-test/source-dependencies/java-analysis-serialization-error/Outer.java rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/java-analysis-serialization-error/Outer.java diff --git a/bridge/src/sbt-test/source-dependencies/java-analysis-serialization-error/build.sbt b/sbt-bridge/bridge/src/sbt-test/source-dependencies/java-analysis-serialization-error/build.sbt similarity index 100% rename from bridge/src/sbt-test/source-dependencies/java-analysis-serialization-error/build.sbt rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/java-analysis-serialization-error/build.sbt diff --git a/bridge/src/sbt-test/source-dependencies/java-analysis-serialization-error/project/DottyInjectedPlugin.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/java-analysis-serialization-error/project/DottyInjectedPlugin.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/java-analysis-serialization-error/project/DottyInjectedPlugin.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/java-analysis-serialization-error/project/DottyInjectedPlugin.scala diff --git a/bridge/src/sbt-test/source-dependencies/java-analysis-serialization-error/test b/sbt-bridge/bridge/src/sbt-test/source-dependencies/java-analysis-serialization-error/test similarity index 100% rename from bridge/src/sbt-test/source-dependencies/java-analysis-serialization-error/test rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/java-analysis-serialization-error/test diff --git a/bridge/src/sbt-test/source-dependencies/java-basic/changes/A.java b/sbt-bridge/bridge/src/sbt-test/source-dependencies/java-basic/changes/A.java similarity index 100% rename from bridge/src/sbt-test/source-dependencies/java-basic/changes/A.java rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/java-basic/changes/A.java diff --git a/bridge/src/sbt-test/source-dependencies/java-basic/changes/A2.java b/sbt-bridge/bridge/src/sbt-test/source-dependencies/java-basic/changes/A2.java similarity index 100% rename from bridge/src/sbt-test/source-dependencies/java-basic/changes/A2.java rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/java-basic/changes/A2.java diff --git a/bridge/src/sbt-test/source-dependencies/java-basic/changes/B1.java b/sbt-bridge/bridge/src/sbt-test/source-dependencies/java-basic/changes/B1.java similarity index 100% rename from bridge/src/sbt-test/source-dependencies/java-basic/changes/B1.java rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/java-basic/changes/B1.java diff --git a/bridge/src/sbt-test/source-dependencies/java-basic/changes/B2.java b/sbt-bridge/bridge/src/sbt-test/source-dependencies/java-basic/changes/B2.java similarity index 100% rename from bridge/src/sbt-test/source-dependencies/java-basic/changes/B2.java rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/java-basic/changes/B2.java diff --git a/bridge/src/sbt-test/source-dependencies/java-basic/changes/B3.java b/sbt-bridge/bridge/src/sbt-test/source-dependencies/java-basic/changes/B3.java similarity index 100% rename from bridge/src/sbt-test/source-dependencies/java-basic/changes/B3.java rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/java-basic/changes/B3.java diff --git a/bridge/src/sbt-test/source-dependencies/java-basic/project/DottyInjectedPlugin.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/java-basic/project/DottyInjectedPlugin.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/java-basic/project/DottyInjectedPlugin.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/java-basic/project/DottyInjectedPlugin.scala diff --git a/bridge/src/sbt-test/source-dependencies/java-basic/test b/sbt-bridge/bridge/src/sbt-test/source-dependencies/java-basic/test similarity index 100% rename from bridge/src/sbt-test/source-dependencies/java-basic/test rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/java-basic/test diff --git a/bridge/src/sbt-test/source-dependencies/java-generic-workaround/A.java b/sbt-bridge/bridge/src/sbt-test/source-dependencies/java-generic-workaround/A.java similarity index 100% rename from bridge/src/sbt-test/source-dependencies/java-generic-workaround/A.java rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/java-generic-workaround/A.java diff --git a/bridge/src/sbt-test/source-dependencies/java-generic-workaround/DefaultTreeTableSorter.java b/sbt-bridge/bridge/src/sbt-test/source-dependencies/java-generic-workaround/DefaultTreeTableSorter.java similarity index 100% rename from bridge/src/sbt-test/source-dependencies/java-generic-workaround/DefaultTreeTableSorter.java rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/java-generic-workaround/DefaultTreeTableSorter.java diff --git a/bridge/src/sbt-test/source-dependencies/java-generic-workaround/TreeColumnModel.java b/sbt-bridge/bridge/src/sbt-test/source-dependencies/java-generic-workaround/TreeColumnModel.java similarity index 100% rename from bridge/src/sbt-test/source-dependencies/java-generic-workaround/TreeColumnModel.java rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/java-generic-workaround/TreeColumnModel.java diff --git a/bridge/src/sbt-test/source-dependencies/java-generic-workaround/TreeTableSorter.java b/sbt-bridge/bridge/src/sbt-test/source-dependencies/java-generic-workaround/TreeTableSorter.java similarity index 100% rename from bridge/src/sbt-test/source-dependencies/java-generic-workaround/TreeTableSorter.java rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/java-generic-workaround/TreeTableSorter.java diff --git a/bridge/src/sbt-test/source-dependencies/java-generic-workaround/project/DottyInjectedPlugin.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/java-generic-workaround/project/DottyInjectedPlugin.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/java-generic-workaround/project/DottyInjectedPlugin.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/java-generic-workaround/project/DottyInjectedPlugin.scala diff --git a/bridge/src/sbt-test/source-dependencies/java-generic-workaround/test b/sbt-bridge/bridge/src/sbt-test/source-dependencies/java-generic-workaround/test similarity index 100% rename from bridge/src/sbt-test/source-dependencies/java-generic-workaround/test rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/java-generic-workaround/test diff --git a/bridge/src/sbt-test/source-dependencies/java-mixed/JJ.java b/sbt-bridge/bridge/src/sbt-test/source-dependencies/java-mixed/JJ.java similarity index 100% rename from bridge/src/sbt-test/source-dependencies/java-mixed/JJ.java rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/java-mixed/JJ.java diff --git a/bridge/src/sbt-test/source-dependencies/java-mixed/build.sbt b/sbt-bridge/bridge/src/sbt-test/source-dependencies/java-mixed/build.sbt similarity index 100% rename from bridge/src/sbt-test/source-dependencies/java-mixed/build.sbt rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/java-mixed/build.sbt diff --git a/bridge/src/sbt-test/source-dependencies/java-mixed/changes/S1.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/java-mixed/changes/S1.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/java-mixed/changes/S1.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/java-mixed/changes/S1.scala diff --git a/bridge/src/sbt-test/source-dependencies/java-mixed/changes/S2.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/java-mixed/changes/S2.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/java-mixed/changes/S2.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/java-mixed/changes/S2.scala diff --git a/bridge/src/sbt-test/source-dependencies/java-mixed/changes/build.sbt b/sbt-bridge/bridge/src/sbt-test/source-dependencies/java-mixed/changes/build.sbt similarity index 100% rename from bridge/src/sbt-test/source-dependencies/java-mixed/changes/build.sbt rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/java-mixed/changes/build.sbt diff --git a/bridge/src/sbt-test/source-dependencies/java-mixed/project/DottyInjectedPlugin.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/java-mixed/project/DottyInjectedPlugin.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/java-mixed/project/DottyInjectedPlugin.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/java-mixed/project/DottyInjectedPlugin.scala diff --git a/bridge/src/sbt-test/source-dependencies/java-mixed/test b/sbt-bridge/bridge/src/sbt-test/source-dependencies/java-mixed/test similarity index 100% rename from bridge/src/sbt-test/source-dependencies/java-mixed/test rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/java-mixed/test diff --git a/bridge/src/sbt-test/source-dependencies/java-static/changes/J1.java b/sbt-bridge/bridge/src/sbt-test/source-dependencies/java-static/changes/J1.java similarity index 100% rename from bridge/src/sbt-test/source-dependencies/java-static/changes/J1.java rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/java-static/changes/J1.java diff --git a/bridge/src/sbt-test/source-dependencies/java-static/changes/J2.java b/sbt-bridge/bridge/src/sbt-test/source-dependencies/java-static/changes/J2.java similarity index 100% rename from bridge/src/sbt-test/source-dependencies/java-static/changes/J2.java rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/java-static/changes/J2.java diff --git a/bridge/src/sbt-test/source-dependencies/java-static/changes/S.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/java-static/changes/S.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/java-static/changes/S.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/java-static/changes/S.scala diff --git a/bridge/src/sbt-test/source-dependencies/java-static/project/DottyInjectedPlugin.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/java-static/project/DottyInjectedPlugin.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/java-static/project/DottyInjectedPlugin.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/java-static/project/DottyInjectedPlugin.scala diff --git a/bridge/src/sbt-test/source-dependencies/java-static/test b/sbt-bridge/bridge/src/sbt-test/source-dependencies/java-static/test similarity index 100% rename from bridge/src/sbt-test/source-dependencies/java-static/test rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/java-static/test diff --git a/bridge/src/sbt-test/source-dependencies/lazy-val/A.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/lazy-val/A.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/lazy-val/A.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/lazy-val/A.scala diff --git a/bridge/src/sbt-test/source-dependencies/lazy-val/B.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/lazy-val/B.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/lazy-val/B.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/lazy-val/B.scala diff --git a/bridge/src/sbt-test/source-dependencies/lazy-val/changes/A.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/lazy-val/changes/A.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/lazy-val/changes/A.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/lazy-val/changes/A.scala diff --git a/bridge/src/sbt-test/source-dependencies/lazy-val/project/DottyInjectedPlugin.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/lazy-val/project/DottyInjectedPlugin.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/lazy-val/project/DottyInjectedPlugin.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/lazy-val/project/DottyInjectedPlugin.scala diff --git a/bridge/src/sbt-test/source-dependencies/lazy-val/test b/sbt-bridge/bridge/src/sbt-test/source-dependencies/lazy-val/test similarity index 100% rename from bridge/src/sbt-test/source-dependencies/lazy-val/test rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/lazy-val/test diff --git a/bridge/src/sbt-test/source-dependencies/less-inter-inv-java/A.java b/sbt-bridge/bridge/src/sbt-test/source-dependencies/less-inter-inv-java/A.java similarity index 100% rename from bridge/src/sbt-test/source-dependencies/less-inter-inv-java/A.java rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/less-inter-inv-java/A.java diff --git a/bridge/src/sbt-test/source-dependencies/less-inter-inv-java/B.java b/sbt-bridge/bridge/src/sbt-test/source-dependencies/less-inter-inv-java/B.java similarity index 100% rename from bridge/src/sbt-test/source-dependencies/less-inter-inv-java/B.java rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/less-inter-inv-java/B.java diff --git a/bridge/src/sbt-test/source-dependencies/less-inter-inv-java/C.java b/sbt-bridge/bridge/src/sbt-test/source-dependencies/less-inter-inv-java/C.java similarity index 100% rename from bridge/src/sbt-test/source-dependencies/less-inter-inv-java/C.java rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/less-inter-inv-java/C.java diff --git a/bridge/src/sbt-test/source-dependencies/less-inter-inv-java/D.java b/sbt-bridge/bridge/src/sbt-test/source-dependencies/less-inter-inv-java/D.java similarity index 100% rename from bridge/src/sbt-test/source-dependencies/less-inter-inv-java/D.java rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/less-inter-inv-java/D.java diff --git a/bridge/src/sbt-test/source-dependencies/less-inter-inv-java/E.java b/sbt-bridge/bridge/src/sbt-test/source-dependencies/less-inter-inv-java/E.java similarity index 100% rename from bridge/src/sbt-test/source-dependencies/less-inter-inv-java/E.java rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/less-inter-inv-java/E.java diff --git a/bridge/src/sbt-test/source-dependencies/less-inter-inv-java/build.sbt b/sbt-bridge/bridge/src/sbt-test/source-dependencies/less-inter-inv-java/build.sbt similarity index 100% rename from bridge/src/sbt-test/source-dependencies/less-inter-inv-java/build.sbt rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/less-inter-inv-java/build.sbt diff --git a/bridge/src/sbt-test/source-dependencies/less-inter-inv-java/changes/A2.java b/sbt-bridge/bridge/src/sbt-test/source-dependencies/less-inter-inv-java/changes/A2.java similarity index 100% rename from bridge/src/sbt-test/source-dependencies/less-inter-inv-java/changes/A2.java rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/less-inter-inv-java/changes/A2.java diff --git a/bridge/src/sbt-test/source-dependencies/less-inter-inv-java/project/DottyInjectedPlugin.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/less-inter-inv-java/project/DottyInjectedPlugin.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/less-inter-inv-java/project/DottyInjectedPlugin.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/less-inter-inv-java/project/DottyInjectedPlugin.scala diff --git a/bridge/src/sbt-test/source-dependencies/less-inter-inv-java/test b/sbt-bridge/bridge/src/sbt-test/source-dependencies/less-inter-inv-java/test similarity index 100% rename from bridge/src/sbt-test/source-dependencies/less-inter-inv-java/test rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/less-inter-inv-java/test diff --git a/bridge/src/sbt-test/source-dependencies/less-inter-inv/A.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/less-inter-inv/A.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/less-inter-inv/A.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/less-inter-inv/A.scala diff --git a/bridge/src/sbt-test/source-dependencies/less-inter-inv/B.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/less-inter-inv/B.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/less-inter-inv/B.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/less-inter-inv/B.scala diff --git a/bridge/src/sbt-test/source-dependencies/less-inter-inv/C.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/less-inter-inv/C.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/less-inter-inv/C.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/less-inter-inv/C.scala diff --git a/bridge/src/sbt-test/source-dependencies/less-inter-inv/D.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/less-inter-inv/D.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/less-inter-inv/D.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/less-inter-inv/D.scala diff --git a/bridge/src/sbt-test/source-dependencies/less-inter-inv/E.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/less-inter-inv/E.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/less-inter-inv/E.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/less-inter-inv/E.scala diff --git a/bridge/src/sbt-test/source-dependencies/less-inter-inv/build.sbt b/sbt-bridge/bridge/src/sbt-test/source-dependencies/less-inter-inv/build.sbt similarity index 100% rename from bridge/src/sbt-test/source-dependencies/less-inter-inv/build.sbt rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/less-inter-inv/build.sbt diff --git a/bridge/src/sbt-test/source-dependencies/less-inter-inv/changes/A2.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/less-inter-inv/changes/A2.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/less-inter-inv/changes/A2.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/less-inter-inv/changes/A2.scala diff --git a/bridge/src/sbt-test/source-dependencies/less-inter-inv/project/DottyInjectedPlugin.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/less-inter-inv/project/DottyInjectedPlugin.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/less-inter-inv/project/DottyInjectedPlugin.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/less-inter-inv/project/DottyInjectedPlugin.scala diff --git a/bridge/src/sbt-test/source-dependencies/less-inter-inv/test b/sbt-bridge/bridge/src/sbt-test/source-dependencies/less-inter-inv/test similarity index 100% rename from bridge/src/sbt-test/source-dependencies/less-inter-inv/test rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/less-inter-inv/test diff --git a/bridge/src/sbt-test/source-dependencies/linearization/A.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/linearization/A.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/linearization/A.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/linearization/A.scala diff --git a/bridge/src/sbt-test/source-dependencies/linearization/B.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/linearization/B.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/linearization/B.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/linearization/B.scala diff --git a/bridge/src/sbt-test/source-dependencies/linearization/C.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/linearization/C.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/linearization/C.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/linearization/C.scala diff --git a/bridge/src/sbt-test/source-dependencies/linearization/D.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/linearization/D.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/linearization/D.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/linearization/D.scala diff --git a/bridge/src/sbt-test/source-dependencies/linearization/E.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/linearization/E.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/linearization/E.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/linearization/E.scala diff --git a/bridge/src/sbt-test/source-dependencies/linearization/F.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/linearization/F.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/linearization/F.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/linearization/F.scala diff --git a/bridge/src/sbt-test/source-dependencies/linearization/changes/D.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/linearization/changes/D.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/linearization/changes/D.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/linearization/changes/D.scala diff --git a/bridge/src/sbt-test/source-dependencies/linearization/project/DottyInjectedPlugin.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/linearization/project/DottyInjectedPlugin.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/linearization/project/DottyInjectedPlugin.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/linearization/project/DottyInjectedPlugin.scala diff --git a/bridge/src/sbt-test/source-dependencies/linearization/test b/sbt-bridge/bridge/src/sbt-test/source-dependencies/linearization/test similarity index 100% rename from bridge/src/sbt-test/source-dependencies/linearization/test rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/linearization/test diff --git a/bridge/src/sbt-test/source-dependencies/named/A.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/named/A.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/named/A.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/named/A.scala diff --git a/bridge/src/sbt-test/source-dependencies/named/B.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/named/B.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/named/B.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/named/B.scala diff --git a/bridge/src/sbt-test/source-dependencies/named/changes/A.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/named/changes/A.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/named/changes/A.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/named/changes/A.scala diff --git a/bridge/src/sbt-test/source-dependencies/named/project/DottyInjectedPlugin.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/named/project/DottyInjectedPlugin.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/named/project/DottyInjectedPlugin.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/named/project/DottyInjectedPlugin.scala diff --git a/bridge/src/sbt-test/source-dependencies/named/test b/sbt-bridge/bridge/src/sbt-test/source-dependencies/named/test similarity index 100% rename from bridge/src/sbt-test/source-dependencies/named/test rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/named/test diff --git a/bridge/src/sbt-test/source-dependencies/nested-case-class/changes/A0.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/nested-case-class/changes/A0.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/nested-case-class/changes/A0.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/nested-case-class/changes/A0.scala diff --git a/bridge/src/sbt-test/source-dependencies/nested-case-class/changes/A1.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/nested-case-class/changes/A1.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/nested-case-class/changes/A1.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/nested-case-class/changes/A1.scala diff --git a/bridge/src/sbt-test/source-dependencies/nested-case-class/project/DottyInjectedPlugin.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/nested-case-class/project/DottyInjectedPlugin.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/nested-case-class/project/DottyInjectedPlugin.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/nested-case-class/project/DottyInjectedPlugin.scala diff --git a/bridge/src/sbt-test/source-dependencies/nested-case-class/test b/sbt-bridge/bridge/src/sbt-test/source-dependencies/nested-case-class/test similarity index 100% rename from bridge/src/sbt-test/source-dependencies/nested-case-class/test rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/nested-case-class/test diff --git a/bridge/src/sbt-test/source-dependencies/new-cyclic/changes/A2.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/new-cyclic/changes/A2.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/new-cyclic/changes/A2.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/new-cyclic/changes/A2.scala diff --git a/bridge/src/sbt-test/source-dependencies/new-cyclic/pending b/sbt-bridge/bridge/src/sbt-test/source-dependencies/new-cyclic/pending similarity index 100% rename from bridge/src/sbt-test/source-dependencies/new-cyclic/pending rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/new-cyclic/pending diff --git a/bridge/src/sbt-test/source-dependencies/new-cyclic/project/DottyInjectedPlugin.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/new-cyclic/project/DottyInjectedPlugin.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/new-cyclic/project/DottyInjectedPlugin.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/new-cyclic/project/DottyInjectedPlugin.scala diff --git a/bridge/src/sbt-test/source-dependencies/new-cyclic/src/main/scala/A.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/new-cyclic/src/main/scala/A.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/new-cyclic/src/main/scala/A.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/new-cyclic/src/main/scala/A.scala diff --git a/bridge/src/sbt-test/source-dependencies/new-cyclic/src/main/scala/B.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/new-cyclic/src/main/scala/B.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/new-cyclic/src/main/scala/B.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/new-cyclic/src/main/scala/B.scala diff --git a/bridge/src/sbt-test/source-dependencies/new-pkg-dep/changes/A1.java b/sbt-bridge/bridge/src/sbt-test/source-dependencies/new-pkg-dep/changes/A1.java similarity index 100% rename from bridge/src/sbt-test/source-dependencies/new-pkg-dep/changes/A1.java rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/new-pkg-dep/changes/A1.java diff --git a/bridge/src/sbt-test/source-dependencies/new-pkg-dep/changes/B0.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/new-pkg-dep/changes/B0.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/new-pkg-dep/changes/B0.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/new-pkg-dep/changes/B0.scala diff --git a/bridge/src/sbt-test/source-dependencies/new-pkg-dep/changes/B1.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/new-pkg-dep/changes/B1.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/new-pkg-dep/changes/B1.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/new-pkg-dep/changes/B1.scala diff --git a/bridge/src/sbt-test/source-dependencies/new-pkg-dep/project/DottyInjectedPlugin.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/new-pkg-dep/project/DottyInjectedPlugin.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/new-pkg-dep/project/DottyInjectedPlugin.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/new-pkg-dep/project/DottyInjectedPlugin.scala diff --git a/bridge/src/sbt-test/source-dependencies/new-pkg-dep/test b/sbt-bridge/bridge/src/sbt-test/source-dependencies/new-pkg-dep/test similarity index 100% rename from bridge/src/sbt-test/source-dependencies/new-pkg-dep/test rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/new-pkg-dep/test diff --git a/bridge/src/sbt-test/source-dependencies/override/A.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/override/A.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/override/A.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/override/A.scala diff --git a/bridge/src/sbt-test/source-dependencies/override/B.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/override/B.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/override/B.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/override/B.scala diff --git a/bridge/src/sbt-test/source-dependencies/override/C.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/override/C.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/override/C.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/override/C.scala diff --git a/bridge/src/sbt-test/source-dependencies/override/D.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/override/D.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/override/D.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/override/D.scala diff --git a/bridge/src/sbt-test/source-dependencies/override/changes/B2.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/override/changes/B2.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/override/changes/B2.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/override/changes/B2.scala diff --git a/bridge/src/sbt-test/source-dependencies/override/project/DottyInjectedPlugin.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/override/project/DottyInjectedPlugin.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/override/project/DottyInjectedPlugin.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/override/project/DottyInjectedPlugin.scala diff --git a/bridge/src/sbt-test/source-dependencies/override/test b/sbt-bridge/bridge/src/sbt-test/source-dependencies/override/test similarity index 100% rename from bridge/src/sbt-test/source-dependencies/override/test rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/override/test diff --git a/bridge/src/sbt-test/source-dependencies/parent-change/W.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/parent-change/W.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/parent-change/W.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/parent-change/W.scala diff --git a/bridge/src/sbt-test/source-dependencies/parent-change/Y.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/parent-change/Y.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/parent-change/Y.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/parent-change/Y.scala diff --git a/bridge/src/sbt-test/source-dependencies/parent-change/Z.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/parent-change/Z.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/parent-change/Z.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/parent-change/Z.scala diff --git a/bridge/src/sbt-test/source-dependencies/parent-change/changes/W.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/parent-change/changes/W.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/parent-change/changes/W.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/parent-change/changes/W.scala diff --git a/bridge/src/sbt-test/source-dependencies/parent-change/project/DottyInjectedPlugin.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/parent-change/project/DottyInjectedPlugin.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/parent-change/project/DottyInjectedPlugin.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/parent-change/project/DottyInjectedPlugin.scala diff --git a/bridge/src/sbt-test/source-dependencies/parent-change/test b/sbt-bridge/bridge/src/sbt-test/source-dependencies/parent-change/test similarity index 100% rename from bridge/src/sbt-test/source-dependencies/parent-change/test rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/parent-change/test diff --git a/bridge/src/sbt-test/source-dependencies/parent-member-change/A.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/parent-member-change/A.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/parent-member-change/A.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/parent-member-change/A.scala diff --git a/bridge/src/sbt-test/source-dependencies/parent-member-change/B.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/parent-member-change/B.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/parent-member-change/B.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/parent-member-change/B.scala diff --git a/bridge/src/sbt-test/source-dependencies/parent-member-change/C.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/parent-member-change/C.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/parent-member-change/C.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/parent-member-change/C.scala diff --git a/bridge/src/sbt-test/source-dependencies/parent-member-change/changes/A.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/parent-member-change/changes/A.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/parent-member-change/changes/A.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/parent-member-change/changes/A.scala diff --git a/bridge/src/sbt-test/source-dependencies/parent-member-change/project/DottyInjectedPlugin.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/parent-member-change/project/DottyInjectedPlugin.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/parent-member-change/project/DottyInjectedPlugin.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/parent-member-change/project/DottyInjectedPlugin.scala diff --git a/bridge/src/sbt-test/source-dependencies/parent-member-change/test b/sbt-bridge/bridge/src/sbt-test/source-dependencies/parent-member-change/test similarity index 100% rename from bridge/src/sbt-test/source-dependencies/parent-member-change/test rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/parent-member-change/test diff --git a/bridge/src/sbt-test/source-dependencies/pkg-self/changes/A1.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/pkg-self/changes/A1.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/pkg-self/changes/A1.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/pkg-self/changes/A1.scala diff --git a/bridge/src/sbt-test/source-dependencies/pkg-self/changes/A2.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/pkg-self/changes/A2.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/pkg-self/changes/A2.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/pkg-self/changes/A2.scala diff --git a/bridge/src/sbt-test/source-dependencies/pkg-self/changes/B.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/pkg-self/changes/B.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/pkg-self/changes/B.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/pkg-self/changes/B.scala diff --git a/bridge/src/sbt-test/source-dependencies/pkg-self/changes/package.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/pkg-self/changes/package.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/pkg-self/changes/package.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/pkg-self/changes/package.scala diff --git a/bridge/src/sbt-test/source-dependencies/pkg-self/project/DottyInjectedPlugin.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/pkg-self/project/DottyInjectedPlugin.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/pkg-self/project/DottyInjectedPlugin.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/pkg-self/project/DottyInjectedPlugin.scala diff --git a/bridge/src/sbt-test/source-dependencies/pkg-self/test b/sbt-bridge/bridge/src/sbt-test/source-dependencies/pkg-self/test similarity index 100% rename from bridge/src/sbt-test/source-dependencies/pkg-self/test rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/pkg-self/test diff --git a/bridge/src/sbt-test/source-dependencies/qualified-access/A.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/qualified-access/A.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/qualified-access/A.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/qualified-access/A.scala diff --git a/bridge/src/sbt-test/source-dependencies/qualified-access/B.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/qualified-access/B.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/qualified-access/B.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/qualified-access/B.scala diff --git a/bridge/src/sbt-test/source-dependencies/qualified-access/changes/A.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/qualified-access/changes/A.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/qualified-access/changes/A.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/qualified-access/changes/A.scala diff --git a/bridge/src/sbt-test/source-dependencies/qualified-access/project/DottyInjectedPlugin.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/qualified-access/project/DottyInjectedPlugin.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/qualified-access/project/DottyInjectedPlugin.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/qualified-access/project/DottyInjectedPlugin.scala diff --git a/bridge/src/sbt-test/source-dependencies/qualified-access/test b/sbt-bridge/bridge/src/sbt-test/source-dependencies/qualified-access/test similarity index 100% rename from bridge/src/sbt-test/source-dependencies/qualified-access/test rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/qualified-access/test diff --git a/bridge/src/sbt-test/source-dependencies/relative-source-error/changes/absolute.sbt b/sbt-bridge/bridge/src/sbt-test/source-dependencies/relative-source-error/changes/absolute.sbt similarity index 100% rename from bridge/src/sbt-test/source-dependencies/relative-source-error/changes/absolute.sbt rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/relative-source-error/changes/absolute.sbt diff --git a/bridge/src/sbt-test/source-dependencies/relative-source-error/changes/relative.sbt b/sbt-bridge/bridge/src/sbt-test/source-dependencies/relative-source-error/changes/relative.sbt similarity index 100% rename from bridge/src/sbt-test/source-dependencies/relative-source-error/changes/relative.sbt rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/relative-source-error/changes/relative.sbt diff --git a/bridge/src/sbt-test/source-dependencies/relative-source-error/project/DottyInjectedPlugin.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/relative-source-error/project/DottyInjectedPlugin.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/relative-source-error/project/DottyInjectedPlugin.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/relative-source-error/project/DottyInjectedPlugin.scala diff --git a/bridge/src/sbt-test/source-dependencies/relative-source-error/src/A.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/relative-source-error/src/A.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/relative-source-error/src/A.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/relative-source-error/src/A.scala diff --git a/bridge/src/sbt-test/source-dependencies/relative-source-error/test b/sbt-bridge/bridge/src/sbt-test/source-dependencies/relative-source-error/test similarity index 100% rename from bridge/src/sbt-test/source-dependencies/relative-source-error/test rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/relative-source-error/test diff --git a/bridge/src/sbt-test/source-dependencies/remove-test-a/changes/1.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/remove-test-a/changes/1.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/remove-test-a/changes/1.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/remove-test-a/changes/1.scala diff --git a/bridge/src/sbt-test/source-dependencies/remove-test-a/project/DottyInjectedPlugin.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/remove-test-a/project/DottyInjectedPlugin.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/remove-test-a/project/DottyInjectedPlugin.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/remove-test-a/project/DottyInjectedPlugin.scala diff --git a/bridge/src/sbt-test/source-dependencies/remove-test-a/test b/sbt-bridge/bridge/src/sbt-test/source-dependencies/remove-test-a/test similarity index 100% rename from bridge/src/sbt-test/source-dependencies/remove-test-a/test rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/remove-test-a/test diff --git a/bridge/src/sbt-test/source-dependencies/remove-test-b/changes/A2.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/remove-test-b/changes/A2.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/remove-test-b/changes/A2.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/remove-test-b/changes/A2.scala diff --git a/bridge/src/sbt-test/source-dependencies/remove-test-b/changes/B3.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/remove-test-b/changes/B3.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/remove-test-b/changes/B3.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/remove-test-b/changes/B3.scala diff --git a/bridge/src/sbt-test/source-dependencies/remove-test-b/changes/B4.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/remove-test-b/changes/B4.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/remove-test-b/changes/B4.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/remove-test-b/changes/B4.scala diff --git a/bridge/src/sbt-test/source-dependencies/remove-test-b/changes/B5.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/remove-test-b/changes/B5.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/remove-test-b/changes/B5.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/remove-test-b/changes/B5.scala diff --git a/bridge/src/sbt-test/source-dependencies/remove-test-b/project/DottyInjectedPlugin.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/remove-test-b/project/DottyInjectedPlugin.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/remove-test-b/project/DottyInjectedPlugin.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/remove-test-b/project/DottyInjectedPlugin.scala diff --git a/bridge/src/sbt-test/source-dependencies/remove-test-b/src/main/scala/A.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/remove-test-b/src/main/scala/A.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/remove-test-b/src/main/scala/A.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/remove-test-b/src/main/scala/A.scala diff --git a/bridge/src/sbt-test/source-dependencies/remove-test-b/src/main/scala/B.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/remove-test-b/src/main/scala/B.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/remove-test-b/src/main/scala/B.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/remove-test-b/src/main/scala/B.scala diff --git a/bridge/src/sbt-test/source-dependencies/remove-test-b/test b/sbt-bridge/bridge/src/sbt-test/source-dependencies/remove-test-b/test similarity index 100% rename from bridge/src/sbt-test/source-dependencies/remove-test-b/test rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/remove-test-b/test diff --git a/bridge/src/sbt-test/source-dependencies/repeated-parameters/A.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/repeated-parameters/A.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/repeated-parameters/A.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/repeated-parameters/A.scala diff --git a/bridge/src/sbt-test/source-dependencies/repeated-parameters/B.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/repeated-parameters/B.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/repeated-parameters/B.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/repeated-parameters/B.scala diff --git a/bridge/src/sbt-test/source-dependencies/repeated-parameters/changes/A.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/repeated-parameters/changes/A.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/repeated-parameters/changes/A.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/repeated-parameters/changes/A.scala diff --git a/bridge/src/sbt-test/source-dependencies/repeated-parameters/project/DottyInjectedPlugin.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/repeated-parameters/project/DottyInjectedPlugin.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/repeated-parameters/project/DottyInjectedPlugin.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/repeated-parameters/project/DottyInjectedPlugin.scala diff --git a/bridge/src/sbt-test/source-dependencies/repeated-parameters/test b/sbt-bridge/bridge/src/sbt-test/source-dependencies/repeated-parameters/test similarity index 100% rename from bridge/src/sbt-test/source-dependencies/repeated-parameters/test rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/repeated-parameters/test diff --git a/bridge/src/sbt-test/source-dependencies/replace-test-a/changes/first.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/replace-test-a/changes/first.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/replace-test-a/changes/first.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/replace-test-a/changes/first.scala diff --git a/bridge/src/sbt-test/source-dependencies/replace-test-a/changes/second.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/replace-test-a/changes/second.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/replace-test-a/changes/second.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/replace-test-a/changes/second.scala diff --git a/bridge/src/sbt-test/source-dependencies/replace-test-a/project/Build.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/replace-test-a/project/Build.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/replace-test-a/project/Build.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/replace-test-a/project/Build.scala diff --git a/bridge/src/sbt-test/source-dependencies/replace-test-a/project/DottyInjectedPlugin.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/replace-test-a/project/DottyInjectedPlugin.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/replace-test-a/project/DottyInjectedPlugin.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/replace-test-a/project/DottyInjectedPlugin.scala diff --git a/bridge/src/sbt-test/source-dependencies/replace-test-a/test b/sbt-bridge/bridge/src/sbt-test/source-dependencies/replace-test-a/test similarity index 100% rename from bridge/src/sbt-test/source-dependencies/replace-test-a/test rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/replace-test-a/test diff --git a/bridge/src/sbt-test/source-dependencies/resident-java/build.sbt b/sbt-bridge/bridge/src/sbt-test/source-dependencies/resident-java/build.sbt similarity index 100% rename from bridge/src/sbt-test/source-dependencies/resident-java/build.sbt rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/resident-java/build.sbt diff --git a/bridge/src/sbt-test/source-dependencies/resident-java/changes/A1.java b/sbt-bridge/bridge/src/sbt-test/source-dependencies/resident-java/changes/A1.java similarity index 100% rename from bridge/src/sbt-test/source-dependencies/resident-java/changes/A1.java rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/resident-java/changes/A1.java diff --git a/bridge/src/sbt-test/source-dependencies/resident-java/changes/A2.java b/sbt-bridge/bridge/src/sbt-test/source-dependencies/resident-java/changes/A2.java similarity index 100% rename from bridge/src/sbt-test/source-dependencies/resident-java/changes/A2.java rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/resident-java/changes/A2.java diff --git a/bridge/src/sbt-test/source-dependencies/resident-java/changes/B0.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/resident-java/changes/B0.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/resident-java/changes/B0.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/resident-java/changes/B0.scala diff --git a/bridge/src/sbt-test/source-dependencies/resident-java/changes/B1.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/resident-java/changes/B1.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/resident-java/changes/B1.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/resident-java/changes/B1.scala diff --git a/bridge/src/sbt-test/source-dependencies/resident-java/changes/B2.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/resident-java/changes/B2.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/resident-java/changes/B2.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/resident-java/changes/B2.scala diff --git a/bridge/src/sbt-test/source-dependencies/resident-java/project/DottyInjectedPlugin.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/resident-java/project/DottyInjectedPlugin.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/resident-java/project/DottyInjectedPlugin.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/resident-java/project/DottyInjectedPlugin.scala diff --git a/bridge/src/sbt-test/source-dependencies/resident-java/test b/sbt-bridge/bridge/src/sbt-test/source-dependencies/resident-java/test similarity index 100% rename from bridge/src/sbt-test/source-dependencies/resident-java/test rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/resident-java/test diff --git a/bridge/src/sbt-test/source-dependencies/resident-package-object/changes/A.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/resident-package-object/changes/A.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/resident-package-object/changes/A.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/resident-package-object/changes/A.scala diff --git a/bridge/src/sbt-test/source-dependencies/resident-package-object/changes/package.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/resident-package-object/changes/package.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/resident-package-object/changes/package.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/resident-package-object/changes/package.scala diff --git a/bridge/src/sbt-test/source-dependencies/resident-package-object/changes/package2.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/resident-package-object/changes/package2.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/resident-package-object/changes/package2.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/resident-package-object/changes/package2.scala diff --git a/bridge/src/sbt-test/source-dependencies/resident-package-object/project/DottyInjectedPlugin.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/resident-package-object/project/DottyInjectedPlugin.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/resident-package-object/project/DottyInjectedPlugin.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/resident-package-object/project/DottyInjectedPlugin.scala diff --git a/bridge/src/sbt-test/source-dependencies/resident-package-object/test b/sbt-bridge/bridge/src/sbt-test/source-dependencies/resident-package-object/test similarity index 100% rename from bridge/src/sbt-test/source-dependencies/resident-package-object/test rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/resident-package-object/test diff --git a/bridge/src/sbt-test/source-dependencies/restore-classes/build.sbt b/sbt-bridge/bridge/src/sbt-test/source-dependencies/restore-classes/build.sbt similarity index 100% rename from bridge/src/sbt-test/source-dependencies/restore-classes/build.sbt rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/restore-classes/build.sbt diff --git a/bridge/src/sbt-test/source-dependencies/restore-classes/changes/A1.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/restore-classes/changes/A1.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/restore-classes/changes/A1.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/restore-classes/changes/A1.scala diff --git a/bridge/src/sbt-test/source-dependencies/restore-classes/changes/A2.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/restore-classes/changes/A2.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/restore-classes/changes/A2.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/restore-classes/changes/A2.scala diff --git a/bridge/src/sbt-test/source-dependencies/restore-classes/changes/B.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/restore-classes/changes/B.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/restore-classes/changes/B.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/restore-classes/changes/B.scala diff --git a/bridge/src/sbt-test/source-dependencies/restore-classes/project/DottyInjectedPlugin.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/restore-classes/project/DottyInjectedPlugin.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/restore-classes/project/DottyInjectedPlugin.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/restore-classes/project/DottyInjectedPlugin.scala diff --git a/bridge/src/sbt-test/source-dependencies/restore-classes/test b/sbt-bridge/bridge/src/sbt-test/source-dependencies/restore-classes/test similarity index 100% rename from bridge/src/sbt-test/source-dependencies/restore-classes/test rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/restore-classes/test diff --git a/bridge/src/sbt-test/source-dependencies/same-file-used-names/A.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/same-file-used-names/A.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/same-file-used-names/A.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/same-file-used-names/A.scala diff --git a/bridge/src/sbt-test/source-dependencies/same-file-used-names/B.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/same-file-used-names/B.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/same-file-used-names/B.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/same-file-used-names/B.scala diff --git a/bridge/src/sbt-test/source-dependencies/same-file-used-names/build.sbt b/sbt-bridge/bridge/src/sbt-test/source-dependencies/same-file-used-names/build.sbt similarity index 100% rename from bridge/src/sbt-test/source-dependencies/same-file-used-names/build.sbt rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/same-file-used-names/build.sbt diff --git a/bridge/src/sbt-test/source-dependencies/same-file-used-names/changes/B.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/same-file-used-names/changes/B.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/same-file-used-names/changes/B.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/same-file-used-names/changes/B.scala diff --git a/bridge/src/sbt-test/source-dependencies/same-file-used-names/project/DottyInjectedPlugin.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/same-file-used-names/project/DottyInjectedPlugin.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/same-file-used-names/project/DottyInjectedPlugin.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/same-file-used-names/project/DottyInjectedPlugin.scala diff --git a/bridge/src/sbt-test/source-dependencies/same-file-used-names/test b/sbt-bridge/bridge/src/sbt-test/source-dependencies/same-file-used-names/test similarity index 100% rename from bridge/src/sbt-test/source-dependencies/same-file-used-names/test rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/same-file-used-names/test diff --git a/bridge/src/sbt-test/source-dependencies/sealed/A.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/sealed/A.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/sealed/A.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/sealed/A.scala diff --git a/bridge/src/sbt-test/source-dependencies/sealed/D.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/sealed/D.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/sealed/D.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/sealed/D.scala diff --git a/bridge/src/sbt-test/source-dependencies/sealed/changes/A.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/sealed/changes/A.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/sealed/changes/A.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/sealed/changes/A.scala diff --git a/bridge/src/sbt-test/source-dependencies/sealed/pending b/sbt-bridge/bridge/src/sbt-test/source-dependencies/sealed/pending similarity index 100% rename from bridge/src/sbt-test/source-dependencies/sealed/pending rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/sealed/pending diff --git a/bridge/src/sbt-test/source-dependencies/sealed/project/DottyInjectedPlugin.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/sealed/project/DottyInjectedPlugin.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/sealed/project/DottyInjectedPlugin.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/sealed/project/DottyInjectedPlugin.scala diff --git a/bridge/src/sbt-test/source-dependencies/signature-change/B.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/signature-change/B.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/signature-change/B.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/signature-change/B.scala diff --git a/bridge/src/sbt-test/source-dependencies/signature-change/changes/A0.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/signature-change/changes/A0.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/signature-change/changes/A0.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/signature-change/changes/A0.scala diff --git a/bridge/src/sbt-test/source-dependencies/signature-change/changes/A1.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/signature-change/changes/A1.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/signature-change/changes/A1.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/signature-change/changes/A1.scala diff --git a/bridge/src/sbt-test/source-dependencies/signature-change/changes/A2.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/signature-change/changes/A2.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/signature-change/changes/A2.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/signature-change/changes/A2.scala diff --git a/bridge/src/sbt-test/source-dependencies/signature-change/changes/A3.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/signature-change/changes/A3.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/signature-change/changes/A3.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/signature-change/changes/A3.scala diff --git a/bridge/src/sbt-test/source-dependencies/signature-change/project/DottyInjectedPlugin.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/signature-change/project/DottyInjectedPlugin.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/signature-change/project/DottyInjectedPlugin.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/signature-change/project/DottyInjectedPlugin.scala diff --git a/bridge/src/sbt-test/source-dependencies/signature-change/test b/sbt-bridge/bridge/src/sbt-test/source-dependencies/signature-change/test similarity index 100% rename from bridge/src/sbt-test/source-dependencies/signature-change/test rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/signature-change/test diff --git a/bridge/src/sbt-test/source-dependencies/specialized/A.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/specialized/A.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/specialized/A.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/specialized/A.scala diff --git a/bridge/src/sbt-test/source-dependencies/specialized/B.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/specialized/B.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/specialized/B.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/specialized/B.scala diff --git a/bridge/src/sbt-test/source-dependencies/specialized/changes/A.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/specialized/changes/A.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/specialized/changes/A.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/specialized/changes/A.scala diff --git a/bridge/src/sbt-test/source-dependencies/specialized/project/DottyInjectedPlugin.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/specialized/project/DottyInjectedPlugin.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/specialized/project/DottyInjectedPlugin.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/specialized/project/DottyInjectedPlugin.scala diff --git a/bridge/src/sbt-test/source-dependencies/specialized/test b/sbt-bridge/bridge/src/sbt-test/source-dependencies/specialized/test similarity index 100% rename from bridge/src/sbt-test/source-dependencies/specialized/test rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/specialized/test diff --git a/bridge/src/sbt-test/source-dependencies/stability-change/A.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/stability-change/A.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/stability-change/A.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/stability-change/A.scala diff --git a/bridge/src/sbt-test/source-dependencies/stability-change/B.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/stability-change/B.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/stability-change/B.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/stability-change/B.scala diff --git a/bridge/src/sbt-test/source-dependencies/stability-change/C.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/stability-change/C.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/stability-change/C.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/stability-change/C.scala diff --git a/bridge/src/sbt-test/source-dependencies/stability-change/changes/A.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/stability-change/changes/A.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/stability-change/changes/A.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/stability-change/changes/A.scala diff --git a/bridge/src/sbt-test/source-dependencies/stability-change/project/DottyInjectedPlugin.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/stability-change/project/DottyInjectedPlugin.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/stability-change/project/DottyInjectedPlugin.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/stability-change/project/DottyInjectedPlugin.scala diff --git a/bridge/src/sbt-test/source-dependencies/stability-change/test b/sbt-bridge/bridge/src/sbt-test/source-dependencies/stability-change/test similarity index 100% rename from bridge/src/sbt-test/source-dependencies/stability-change/test rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/stability-change/test diff --git a/bridge/src/sbt-test/source-dependencies/synthetic-companion/A.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/synthetic-companion/A.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/synthetic-companion/A.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/synthetic-companion/A.scala diff --git a/bridge/src/sbt-test/source-dependencies/synthetic-companion/B.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/synthetic-companion/B.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/synthetic-companion/B.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/synthetic-companion/B.scala diff --git a/bridge/src/sbt-test/source-dependencies/synthetic-companion/changes/A2.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/synthetic-companion/changes/A2.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/synthetic-companion/changes/A2.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/synthetic-companion/changes/A2.scala diff --git a/bridge/src/sbt-test/source-dependencies/synthetic-companion/dbg.sbt b/sbt-bridge/bridge/src/sbt-test/source-dependencies/synthetic-companion/dbg.sbt similarity index 100% rename from bridge/src/sbt-test/source-dependencies/synthetic-companion/dbg.sbt rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/synthetic-companion/dbg.sbt diff --git a/bridge/src/sbt-test/source-dependencies/synthetic-companion/project/DottyInjectedPlugin.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/synthetic-companion/project/DottyInjectedPlugin.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/synthetic-companion/project/DottyInjectedPlugin.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/synthetic-companion/project/DottyInjectedPlugin.scala diff --git a/bridge/src/sbt-test/source-dependencies/synthetic-companion/test b/sbt-bridge/bridge/src/sbt-test/source-dependencies/synthetic-companion/test similarity index 100% rename from bridge/src/sbt-test/source-dependencies/synthetic-companion/test rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/synthetic-companion/test diff --git a/bridge/src/sbt-test/source-dependencies/trait-member-modified/build.sbt b/sbt-bridge/bridge/src/sbt-test/source-dependencies/trait-member-modified/build.sbt similarity index 100% rename from bridge/src/sbt-test/source-dependencies/trait-member-modified/build.sbt rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/trait-member-modified/build.sbt diff --git a/bridge/src/sbt-test/source-dependencies/trait-member-modified/changes/A1.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/trait-member-modified/changes/A1.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/trait-member-modified/changes/A1.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/trait-member-modified/changes/A1.scala diff --git a/bridge/src/sbt-test/source-dependencies/trait-member-modified/project/DottyInjectedPlugin.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/trait-member-modified/project/DottyInjectedPlugin.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/trait-member-modified/project/DottyInjectedPlugin.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/trait-member-modified/project/DottyInjectedPlugin.scala diff --git a/bridge/src/sbt-test/source-dependencies/trait-member-modified/src/main/scala/A.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/trait-member-modified/src/main/scala/A.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/trait-member-modified/src/main/scala/A.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/trait-member-modified/src/main/scala/A.scala diff --git a/bridge/src/sbt-test/source-dependencies/trait-member-modified/src/main/scala/B.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/trait-member-modified/src/main/scala/B.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/trait-member-modified/src/main/scala/B.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/trait-member-modified/src/main/scala/B.scala diff --git a/bridge/src/sbt-test/source-dependencies/trait-member-modified/test b/sbt-bridge/bridge/src/sbt-test/source-dependencies/trait-member-modified/test similarity index 100% rename from bridge/src/sbt-test/source-dependencies/trait-member-modified/test rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/trait-member-modified/test diff --git a/bridge/src/sbt-test/source-dependencies/trait-private-object/A.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/trait-private-object/A.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/trait-private-object/A.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/trait-private-object/A.scala diff --git a/bridge/src/sbt-test/source-dependencies/trait-private-object/B.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/trait-private-object/B.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/trait-private-object/B.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/trait-private-object/B.scala diff --git a/bridge/src/sbt-test/source-dependencies/trait-private-object/changes/A.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/trait-private-object/changes/A.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/trait-private-object/changes/A.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/trait-private-object/changes/A.scala diff --git a/bridge/src/sbt-test/source-dependencies/trait-private-object/project/DottyInjectedPlugin.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/trait-private-object/project/DottyInjectedPlugin.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/trait-private-object/project/DottyInjectedPlugin.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/trait-private-object/project/DottyInjectedPlugin.scala diff --git a/bridge/src/sbt-test/source-dependencies/trait-private-object/test b/sbt-bridge/bridge/src/sbt-test/source-dependencies/trait-private-object/test similarity index 100% rename from bridge/src/sbt-test/source-dependencies/trait-private-object/test rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/trait-private-object/test diff --git a/bridge/src/sbt-test/source-dependencies/trait-private-var/B.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/trait-private-var/B.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/trait-private-var/B.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/trait-private-var/B.scala diff --git a/bridge/src/sbt-test/source-dependencies/trait-private-var/changes/A0.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/trait-private-var/changes/A0.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/trait-private-var/changes/A0.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/trait-private-var/changes/A0.scala diff --git a/bridge/src/sbt-test/source-dependencies/trait-private-var/changes/A1.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/trait-private-var/changes/A1.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/trait-private-var/changes/A1.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/trait-private-var/changes/A1.scala diff --git a/bridge/src/sbt-test/source-dependencies/trait-private-var/changes/A2.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/trait-private-var/changes/A2.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/trait-private-var/changes/A2.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/trait-private-var/changes/A2.scala diff --git a/bridge/src/sbt-test/source-dependencies/trait-private-var/project/DottyInjectedPlugin.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/trait-private-var/project/DottyInjectedPlugin.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/trait-private-var/project/DottyInjectedPlugin.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/trait-private-var/project/DottyInjectedPlugin.scala diff --git a/bridge/src/sbt-test/source-dependencies/trait-private-var/test b/sbt-bridge/bridge/src/sbt-test/source-dependencies/trait-private-var/test similarity index 100% rename from bridge/src/sbt-test/source-dependencies/trait-private-var/test rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/trait-private-var/test diff --git a/bridge/src/sbt-test/source-dependencies/trait-super/A.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/trait-super/A.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/trait-super/A.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/trait-super/A.scala diff --git a/bridge/src/sbt-test/source-dependencies/trait-super/B.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/trait-super/B.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/trait-super/B.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/trait-super/B.scala diff --git a/bridge/src/sbt-test/source-dependencies/trait-super/Main.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/trait-super/Main.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/trait-super/Main.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/trait-super/Main.scala diff --git a/bridge/src/sbt-test/source-dependencies/trait-super/changes/B2.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/trait-super/changes/B2.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/trait-super/changes/B2.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/trait-super/changes/B2.scala diff --git a/bridge/src/sbt-test/source-dependencies/trait-super/changes/B3.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/trait-super/changes/B3.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/trait-super/changes/B3.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/trait-super/changes/B3.scala diff --git a/bridge/src/sbt-test/source-dependencies/trait-super/project/DottyInjectedPlugin.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/trait-super/project/DottyInjectedPlugin.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/trait-super/project/DottyInjectedPlugin.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/trait-super/project/DottyInjectedPlugin.scala diff --git a/bridge/src/sbt-test/source-dependencies/trait-super/test b/sbt-bridge/bridge/src/sbt-test/source-dependencies/trait-super/test similarity index 100% rename from bridge/src/sbt-test/source-dependencies/trait-super/test rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/trait-super/test diff --git a/bridge/src/sbt-test/source-dependencies/transitive-a/changes/A2.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/transitive-a/changes/A2.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/transitive-a/changes/A2.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/transitive-a/changes/A2.scala diff --git a/bridge/src/sbt-test/source-dependencies/transitive-a/project/DottyInjectedPlugin.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/transitive-a/project/DottyInjectedPlugin.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/transitive-a/project/DottyInjectedPlugin.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/transitive-a/project/DottyInjectedPlugin.scala diff --git a/bridge/src/sbt-test/source-dependencies/transitive-a/src/main/scala/A.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/transitive-a/src/main/scala/A.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/transitive-a/src/main/scala/A.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/transitive-a/src/main/scala/A.scala diff --git a/bridge/src/sbt-test/source-dependencies/transitive-a/src/main/scala/B.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/transitive-a/src/main/scala/B.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/transitive-a/src/main/scala/B.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/transitive-a/src/main/scala/B.scala diff --git a/bridge/src/sbt-test/source-dependencies/transitive-a/src/main/scala/C.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/transitive-a/src/main/scala/C.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/transitive-a/src/main/scala/C.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/transitive-a/src/main/scala/C.scala diff --git a/bridge/src/sbt-test/source-dependencies/transitive-a/test b/sbt-bridge/bridge/src/sbt-test/source-dependencies/transitive-a/test similarity index 100% rename from bridge/src/sbt-test/source-dependencies/transitive-a/test rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/transitive-a/test diff --git a/bridge/src/sbt-test/source-dependencies/transitive-b/changes/A2.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/transitive-b/changes/A2.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/transitive-b/changes/A2.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/transitive-b/changes/A2.scala diff --git a/bridge/src/sbt-test/source-dependencies/transitive-b/project/DottyInjectedPlugin.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/transitive-b/project/DottyInjectedPlugin.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/transitive-b/project/DottyInjectedPlugin.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/transitive-b/project/DottyInjectedPlugin.scala diff --git a/bridge/src/sbt-test/source-dependencies/transitive-b/src/main/scala/A.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/transitive-b/src/main/scala/A.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/transitive-b/src/main/scala/A.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/transitive-b/src/main/scala/A.scala diff --git a/bridge/src/sbt-test/source-dependencies/transitive-b/src/main/scala/B.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/transitive-b/src/main/scala/B.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/transitive-b/src/main/scala/B.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/transitive-b/src/main/scala/B.scala diff --git a/bridge/src/sbt-test/source-dependencies/transitive-b/src/main/scala/C.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/transitive-b/src/main/scala/C.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/transitive-b/src/main/scala/C.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/transitive-b/src/main/scala/C.scala diff --git a/bridge/src/sbt-test/source-dependencies/transitive-b/test b/sbt-bridge/bridge/src/sbt-test/source-dependencies/transitive-b/test similarity index 100% rename from bridge/src/sbt-test/source-dependencies/transitive-b/test rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/transitive-b/test diff --git a/bridge/src/sbt-test/source-dependencies/transitive-inherit-java/A.java b/sbt-bridge/bridge/src/sbt-test/source-dependencies/transitive-inherit-java/A.java similarity index 100% rename from bridge/src/sbt-test/source-dependencies/transitive-inherit-java/A.java rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/transitive-inherit-java/A.java diff --git a/bridge/src/sbt-test/source-dependencies/transitive-inherit-java/B.java b/sbt-bridge/bridge/src/sbt-test/source-dependencies/transitive-inherit-java/B.java similarity index 100% rename from bridge/src/sbt-test/source-dependencies/transitive-inherit-java/B.java rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/transitive-inherit-java/B.java diff --git a/bridge/src/sbt-test/source-dependencies/transitive-inherit-java/C.java b/sbt-bridge/bridge/src/sbt-test/source-dependencies/transitive-inherit-java/C.java similarity index 100% rename from bridge/src/sbt-test/source-dependencies/transitive-inherit-java/C.java rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/transitive-inherit-java/C.java diff --git a/bridge/src/sbt-test/source-dependencies/transitive-inherit-java/changes/A2.java b/sbt-bridge/bridge/src/sbt-test/source-dependencies/transitive-inherit-java/changes/A2.java similarity index 100% rename from bridge/src/sbt-test/source-dependencies/transitive-inherit-java/changes/A2.java rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/transitive-inherit-java/changes/A2.java diff --git a/bridge/src/sbt-test/source-dependencies/transitive-inherit-java/project/DottyInjectedPlugin.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/transitive-inherit-java/project/DottyInjectedPlugin.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/transitive-inherit-java/project/DottyInjectedPlugin.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/transitive-inherit-java/project/DottyInjectedPlugin.scala diff --git a/bridge/src/sbt-test/source-dependencies/transitive-inherit-java/test b/sbt-bridge/bridge/src/sbt-test/source-dependencies/transitive-inherit-java/test similarity index 100% rename from bridge/src/sbt-test/source-dependencies/transitive-inherit-java/test rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/transitive-inherit-java/test diff --git a/bridge/src/sbt-test/source-dependencies/transitive-inherit/A.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/transitive-inherit/A.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/transitive-inherit/A.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/transitive-inherit/A.scala diff --git a/bridge/src/sbt-test/source-dependencies/transitive-inherit/B.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/transitive-inherit/B.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/transitive-inherit/B.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/transitive-inherit/B.scala diff --git a/bridge/src/sbt-test/source-dependencies/transitive-inherit/C.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/transitive-inherit/C.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/transitive-inherit/C.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/transitive-inherit/C.scala diff --git a/bridge/src/sbt-test/source-dependencies/transitive-inherit/changes/A2.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/transitive-inherit/changes/A2.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/transitive-inherit/changes/A2.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/transitive-inherit/changes/A2.scala diff --git a/bridge/src/sbt-test/source-dependencies/transitive-inherit/project/DottyInjectedPlugin.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/transitive-inherit/project/DottyInjectedPlugin.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/transitive-inherit/project/DottyInjectedPlugin.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/transitive-inherit/project/DottyInjectedPlugin.scala diff --git a/bridge/src/sbt-test/source-dependencies/transitive-inherit/test b/sbt-bridge/bridge/src/sbt-test/source-dependencies/transitive-inherit/test similarity index 100% rename from bridge/src/sbt-test/source-dependencies/transitive-inherit/test rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/transitive-inherit/test diff --git a/bridge/src/sbt-test/source-dependencies/transitive-memberRef/build.sbt b/sbt-bridge/bridge/src/sbt-test/source-dependencies/transitive-memberRef/build.sbt similarity index 100% rename from bridge/src/sbt-test/source-dependencies/transitive-memberRef/build.sbt rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/transitive-memberRef/build.sbt diff --git a/bridge/src/sbt-test/source-dependencies/transitive-memberRef/changes/A1.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/transitive-memberRef/changes/A1.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/transitive-memberRef/changes/A1.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/transitive-memberRef/changes/A1.scala diff --git a/bridge/src/sbt-test/source-dependencies/transitive-memberRef/project/DottyInjectedPlugin.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/transitive-memberRef/project/DottyInjectedPlugin.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/transitive-memberRef/project/DottyInjectedPlugin.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/transitive-memberRef/project/DottyInjectedPlugin.scala diff --git a/bridge/src/sbt-test/source-dependencies/transitive-memberRef/src/main/scala/A.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/transitive-memberRef/src/main/scala/A.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/transitive-memberRef/src/main/scala/A.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/transitive-memberRef/src/main/scala/A.scala diff --git a/bridge/src/sbt-test/source-dependencies/transitive-memberRef/src/main/scala/B.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/transitive-memberRef/src/main/scala/B.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/transitive-memberRef/src/main/scala/B.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/transitive-memberRef/src/main/scala/B.scala diff --git a/bridge/src/sbt-test/source-dependencies/transitive-memberRef/src/main/scala/C.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/transitive-memberRef/src/main/scala/C.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/transitive-memberRef/src/main/scala/C.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/transitive-memberRef/src/main/scala/C.scala diff --git a/bridge/src/sbt-test/source-dependencies/transitive-memberRef/src/main/scala/D.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/transitive-memberRef/src/main/scala/D.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/transitive-memberRef/src/main/scala/D.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/transitive-memberRef/src/main/scala/D.scala diff --git a/bridge/src/sbt-test/source-dependencies/transitive-memberRef/src/main/scala/X.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/transitive-memberRef/src/main/scala/X.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/transitive-memberRef/src/main/scala/X.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/transitive-memberRef/src/main/scala/X.scala diff --git a/bridge/src/sbt-test/source-dependencies/transitive-memberRef/src/main/scala/Y.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/transitive-memberRef/src/main/scala/Y.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/transitive-memberRef/src/main/scala/Y.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/transitive-memberRef/src/main/scala/Y.scala diff --git a/bridge/src/sbt-test/source-dependencies/transitive-memberRef/test b/sbt-bridge/bridge/src/sbt-test/source-dependencies/transitive-memberRef/test similarity index 100% rename from bridge/src/sbt-test/source-dependencies/transitive-memberRef/test rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/transitive-memberRef/test diff --git a/bridge/src/sbt-test/source-dependencies/type-alias/A.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/type-alias/A.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/type-alias/A.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/type-alias/A.scala diff --git a/bridge/src/sbt-test/source-dependencies/type-alias/B.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/type-alias/B.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/type-alias/B.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/type-alias/B.scala diff --git a/bridge/src/sbt-test/source-dependencies/type-alias/build.sbt b/sbt-bridge/bridge/src/sbt-test/source-dependencies/type-alias/build.sbt similarity index 100% rename from bridge/src/sbt-test/source-dependencies/type-alias/build.sbt rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/type-alias/build.sbt diff --git a/bridge/src/sbt-test/source-dependencies/type-alias/changes/A.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/type-alias/changes/A.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/type-alias/changes/A.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/type-alias/changes/A.scala diff --git a/bridge/src/sbt-test/source-dependencies/type-alias/project/DottyInjectedPlugin.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/type-alias/project/DottyInjectedPlugin.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/type-alias/project/DottyInjectedPlugin.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/type-alias/project/DottyInjectedPlugin.scala diff --git a/bridge/src/sbt-test/source-dependencies/type-alias/test b/sbt-bridge/bridge/src/sbt-test/source-dependencies/type-alias/test similarity index 100% rename from bridge/src/sbt-test/source-dependencies/type-alias/test rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/type-alias/test diff --git a/bridge/src/sbt-test/source-dependencies/type-parameter/A.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/type-parameter/A.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/type-parameter/A.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/type-parameter/A.scala diff --git a/bridge/src/sbt-test/source-dependencies/type-parameter/B.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/type-parameter/B.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/type-parameter/B.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/type-parameter/B.scala diff --git a/bridge/src/sbt-test/source-dependencies/type-parameter/C.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/type-parameter/C.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/type-parameter/C.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/type-parameter/C.scala diff --git a/bridge/src/sbt-test/source-dependencies/type-parameter/D.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/type-parameter/D.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/type-parameter/D.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/type-parameter/D.scala diff --git a/bridge/src/sbt-test/source-dependencies/type-parameter/changes/A.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/type-parameter/changes/A.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/type-parameter/changes/A.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/type-parameter/changes/A.scala diff --git a/bridge/src/sbt-test/source-dependencies/type-parameter/project/DottyInjectedPlugin.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/type-parameter/project/DottyInjectedPlugin.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/type-parameter/project/DottyInjectedPlugin.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/type-parameter/project/DottyInjectedPlugin.scala diff --git a/bridge/src/sbt-test/source-dependencies/type-parameter/test b/sbt-bridge/bridge/src/sbt-test/source-dependencies/type-parameter/test similarity index 100% rename from bridge/src/sbt-test/source-dependencies/type-parameter/test rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/type-parameter/test diff --git a/bridge/src/sbt-test/source-dependencies/typeref-only/A.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/typeref-only/A.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/typeref-only/A.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/typeref-only/A.scala diff --git a/bridge/src/sbt-test/source-dependencies/typeref-only/B.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/typeref-only/B.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/typeref-only/B.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/typeref-only/B.scala diff --git a/bridge/src/sbt-test/source-dependencies/typeref-only/build.sbt b/sbt-bridge/bridge/src/sbt-test/source-dependencies/typeref-only/build.sbt similarity index 100% rename from bridge/src/sbt-test/source-dependencies/typeref-only/build.sbt rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/typeref-only/build.sbt diff --git a/bridge/src/sbt-test/source-dependencies/typeref-only/project/DottyInjectedPlugin.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/typeref-only/project/DottyInjectedPlugin.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/typeref-only/project/DottyInjectedPlugin.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/typeref-only/project/DottyInjectedPlugin.scala diff --git a/bridge/src/sbt-test/source-dependencies/typeref-only/test b/sbt-bridge/bridge/src/sbt-test/source-dependencies/typeref-only/test similarity index 100% rename from bridge/src/sbt-test/source-dependencies/typeref-only/test rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/typeref-only/test diff --git a/bridge/src/sbt-test/source-dependencies/typeref-return/A.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/typeref-return/A.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/typeref-return/A.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/typeref-return/A.scala diff --git a/bridge/src/sbt-test/source-dependencies/typeref-return/B.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/typeref-return/B.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/typeref-return/B.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/typeref-return/B.scala diff --git a/bridge/src/sbt-test/source-dependencies/typeref-return/changes/A.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/typeref-return/changes/A.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/typeref-return/changes/A.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/typeref-return/changes/A.scala diff --git a/bridge/src/sbt-test/source-dependencies/typeref-return/project/DottyInjectedPlugin.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/typeref-return/project/DottyInjectedPlugin.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/typeref-return/project/DottyInjectedPlugin.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/typeref-return/project/DottyInjectedPlugin.scala diff --git a/bridge/src/sbt-test/source-dependencies/typeref-return/test b/sbt-bridge/bridge/src/sbt-test/source-dependencies/typeref-return/test similarity index 100% rename from bridge/src/sbt-test/source-dependencies/typeref-return/test rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/typeref-return/test diff --git a/bridge/src/sbt-test/source-dependencies/types-in-used-names-a/A.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/types-in-used-names-a/A.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/types-in-used-names-a/A.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/types-in-used-names-a/A.scala diff --git a/bridge/src/sbt-test/source-dependencies/types-in-used-names-a/B.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/types-in-used-names-a/B.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/types-in-used-names-a/B.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/types-in-used-names-a/B.scala diff --git a/bridge/src/sbt-test/source-dependencies/types-in-used-names-a/C.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/types-in-used-names-a/C.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/types-in-used-names-a/C.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/types-in-used-names-a/C.scala diff --git a/bridge/src/sbt-test/source-dependencies/types-in-used-names-a/D.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/types-in-used-names-a/D.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/types-in-used-names-a/D.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/types-in-used-names-a/D.scala diff --git a/bridge/src/sbt-test/source-dependencies/types-in-used-names-a/changes/B2.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/types-in-used-names-a/changes/B2.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/types-in-used-names-a/changes/B2.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/types-in-used-names-a/changes/B2.scala diff --git a/bridge/src/sbt-test/source-dependencies/types-in-used-names-a/project/DottyInjectedPlugin.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/types-in-used-names-a/project/DottyInjectedPlugin.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/types-in-used-names-a/project/DottyInjectedPlugin.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/types-in-used-names-a/project/DottyInjectedPlugin.scala diff --git a/bridge/src/sbt-test/source-dependencies/types-in-used-names-a/test b/sbt-bridge/bridge/src/sbt-test/source-dependencies/types-in-used-names-a/test similarity index 100% rename from bridge/src/sbt-test/source-dependencies/types-in-used-names-a/test rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/types-in-used-names-a/test diff --git a/bridge/src/sbt-test/source-dependencies/types-in-used-names-b/A.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/types-in-used-names-b/A.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/types-in-used-names-b/A.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/types-in-used-names-b/A.scala diff --git a/bridge/src/sbt-test/source-dependencies/types-in-used-names-b/B.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/types-in-used-names-b/B.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/types-in-used-names-b/B.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/types-in-used-names-b/B.scala diff --git a/bridge/src/sbt-test/source-dependencies/types-in-used-names-b/changes/A2.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/types-in-used-names-b/changes/A2.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/types-in-used-names-b/changes/A2.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/types-in-used-names-b/changes/A2.scala diff --git a/bridge/src/sbt-test/source-dependencies/types-in-used-names-b/project/DottyInjectedPlugin.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/types-in-used-names-b/project/DottyInjectedPlugin.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/types-in-used-names-b/project/DottyInjectedPlugin.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/types-in-used-names-b/project/DottyInjectedPlugin.scala diff --git a/bridge/src/sbt-test/source-dependencies/types-in-used-names-b/test b/sbt-bridge/bridge/src/sbt-test/source-dependencies/types-in-used-names-b/test similarity index 100% rename from bridge/src/sbt-test/source-dependencies/types-in-used-names-b/test rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/types-in-used-names-b/test diff --git a/bridge/src/sbt-test/source-dependencies/value-class-underlying/A.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/value-class-underlying/A.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/value-class-underlying/A.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/value-class-underlying/A.scala diff --git a/bridge/src/sbt-test/source-dependencies/value-class-underlying/B.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/value-class-underlying/B.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/value-class-underlying/B.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/value-class-underlying/B.scala diff --git a/bridge/src/sbt-test/source-dependencies/value-class-underlying/C.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/value-class-underlying/C.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/value-class-underlying/C.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/value-class-underlying/C.scala diff --git a/bridge/src/sbt-test/source-dependencies/value-class-underlying/build.sbt b/sbt-bridge/bridge/src/sbt-test/source-dependencies/value-class-underlying/build.sbt similarity index 100% rename from bridge/src/sbt-test/source-dependencies/value-class-underlying/build.sbt rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/value-class-underlying/build.sbt diff --git a/bridge/src/sbt-test/source-dependencies/value-class-underlying/changes/A2.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/value-class-underlying/changes/A2.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/value-class-underlying/changes/A2.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/value-class-underlying/changes/A2.scala diff --git a/bridge/src/sbt-test/source-dependencies/value-class-underlying/test b/sbt-bridge/bridge/src/sbt-test/source-dependencies/value-class-underlying/test similarity index 100% rename from bridge/src/sbt-test/source-dependencies/value-class-underlying/test rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/value-class-underlying/test diff --git a/bridge/src/sbt-test/source-dependencies/value-class/build.sbt b/sbt-bridge/bridge/src/sbt-test/source-dependencies/value-class/build.sbt similarity index 100% rename from bridge/src/sbt-test/source-dependencies/value-class/build.sbt rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/value-class/build.sbt diff --git a/bridge/src/sbt-test/source-dependencies/value-class/changes/A0.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/value-class/changes/A0.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/value-class/changes/A0.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/value-class/changes/A0.scala diff --git a/bridge/src/sbt-test/source-dependencies/value-class/changes/A1.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/value-class/changes/A1.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/value-class/changes/A1.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/value-class/changes/A1.scala diff --git a/bridge/src/sbt-test/source-dependencies/value-class/changes/B0.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/value-class/changes/B0.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/value-class/changes/B0.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/value-class/changes/B0.scala diff --git a/bridge/src/sbt-test/source-dependencies/value-class/changes/B1.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/value-class/changes/B1.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/value-class/changes/B1.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/value-class/changes/B1.scala diff --git a/bridge/src/sbt-test/source-dependencies/value-class/changes/B2.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/value-class/changes/B2.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/value-class/changes/B2.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/value-class/changes/B2.scala diff --git a/bridge/src/sbt-test/source-dependencies/value-class/changes/C0.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/value-class/changes/C0.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/value-class/changes/C0.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/value-class/changes/C0.scala diff --git a/bridge/src/sbt-test/source-dependencies/value-class/changes/C1.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/value-class/changes/C1.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/value-class/changes/C1.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/value-class/changes/C1.scala diff --git a/bridge/src/sbt-test/source-dependencies/value-class/changes/C2.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/value-class/changes/C2.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/value-class/changes/C2.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/value-class/changes/C2.scala diff --git a/bridge/src/sbt-test/source-dependencies/value-class/project/DottyInjectedPlugin.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/value-class/project/DottyInjectedPlugin.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/value-class/project/DottyInjectedPlugin.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/value-class/project/DottyInjectedPlugin.scala diff --git a/bridge/src/sbt-test/source-dependencies/value-class/test b/sbt-bridge/bridge/src/sbt-test/source-dependencies/value-class/test similarity index 100% rename from bridge/src/sbt-test/source-dependencies/value-class/test rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/value-class/test diff --git a/bridge/src/sbt-test/source-dependencies/var/A.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/var/A.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/var/A.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/var/A.scala diff --git a/bridge/src/sbt-test/source-dependencies/var/B.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/var/B.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/var/B.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/var/B.scala diff --git a/bridge/src/sbt-test/source-dependencies/var/changes/A.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/var/changes/A.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/var/changes/A.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/var/changes/A.scala diff --git a/bridge/src/sbt-test/source-dependencies/var/project/DottyInjectedPlugin.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/var/project/DottyInjectedPlugin.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/var/project/DottyInjectedPlugin.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/var/project/DottyInjectedPlugin.scala diff --git a/bridge/src/sbt-test/source-dependencies/var/test b/sbt-bridge/bridge/src/sbt-test/source-dependencies/var/test similarity index 100% rename from bridge/src/sbt-test/source-dependencies/var/test rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/var/test diff --git a/bridge/src/sbt-test/source-dependencies/variance/A.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/variance/A.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/variance/A.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/variance/A.scala diff --git a/bridge/src/sbt-test/source-dependencies/variance/C.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/variance/C.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/variance/C.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/variance/C.scala diff --git a/bridge/src/sbt-test/source-dependencies/variance/changes/A.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/variance/changes/A.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/variance/changes/A.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/variance/changes/A.scala diff --git a/bridge/src/sbt-test/source-dependencies/variance/project/DottyInjectedPlugin.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/variance/project/DottyInjectedPlugin.scala similarity index 100% rename from bridge/src/sbt-test/source-dependencies/variance/project/DottyInjectedPlugin.scala rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/variance/project/DottyInjectedPlugin.scala diff --git a/bridge/src/sbt-test/source-dependencies/variance/test b/sbt-bridge/bridge/src/sbt-test/source-dependencies/variance/test similarity index 100% rename from bridge/src/sbt-test/source-dependencies/variance/test rename to sbt-bridge/bridge/src/sbt-test/source-dependencies/variance/test diff --git a/bridge/src/test/scala/xsbt/DependencySpecification.scala b/sbt-bridge/bridge/src/test/scala/xsbt/DependencySpecification.scala similarity index 100% rename from bridge/src/test/scala/xsbt/DependencySpecification.scala rename to sbt-bridge/bridge/src/test/scala/xsbt/DependencySpecification.scala diff --git a/bridge/src/test/scala/xsbt/ExtractAPISpecification.scala b/sbt-bridge/bridge/src/test/scala/xsbt/ExtractAPISpecification.scala similarity index 100% rename from bridge/src/test/scala/xsbt/ExtractAPISpecification.scala rename to sbt-bridge/bridge/src/test/scala/xsbt/ExtractAPISpecification.scala diff --git a/bridge/src/test/scala/xsbt/ExtractUsedNamesSpecification.scala b/sbt-bridge/bridge/src/test/scala/xsbt/ExtractUsedNamesSpecification.scala similarity index 100% rename from bridge/src/test/scala/xsbt/ExtractUsedNamesSpecification.scala rename to sbt-bridge/bridge/src/test/scala/xsbt/ExtractUsedNamesSpecification.scala diff --git a/bridge/src/test/scala/xsbt/ScalaCompilerForUnitTesting.scala b/sbt-bridge/bridge/src/test/scala/xsbt/ScalaCompilerForUnitTesting.scala similarity index 100% rename from bridge/src/test/scala/xsbt/ScalaCompilerForUnitTesting.scala rename to sbt-bridge/bridge/src/test/scala/xsbt/ScalaCompilerForUnitTesting.scala diff --git a/bridge/src/test/scala/xsbti/TestCallback.scala b/sbt-bridge/bridge/src/test/scala/xsbti/TestCallback.scala similarity index 100% rename from bridge/src/test/scala/xsbti/TestCallback.scala rename to sbt-bridge/bridge/src/test/scala/xsbti/TestCallback.scala From 2769e1b5b680868433c91b37d44f9420d728c4ac Mon Sep 17 00:00:00 2001 From: Felix Mulder Date: Tue, 18 Oct 2016 17:42:57 +0200 Subject: [PATCH 02/55] separate lib from compiler --- bin/common | 13 ++++-- bin/dotc | 8 ++-- {src => library/src}/dotty/DottyPredef.scala | 0 .../src}/dotty/runtime/Arrays.scala | 0 .../src}/dotty/runtime/LazyHolders.scala | 0 .../src}/dotty/runtime/LazyVals.scala | 0 .../src}/dotty/runtime/LegacyApp.scala | 0 .../src}/dotty/runtime/vc/VCPrototype.scala | 0 {src => library/src}/scala/Eq.scala | 0 {src => library/src}/scala/Function23.scala | 0 {src => library/src}/scala/Function24.scala | 0 {src => library/src}/scala/Function25.scala | 0 {src => library/src}/scala/Function26.scala | 0 {src => library/src}/scala/Function27.scala | 0 {src => library/src}/scala/Function28.scala | 0 {src => library/src}/scala/Function29.scala | 0 {src => library/src}/scala/Function30.scala | 0 {src => library/src}/scala/Product0.scala | 0 .../scala/annotation/internal/Alias.scala | 0 .../internal/AnnotationDefault.scala | 0 .../src}/scala/annotation/internal/Body.scala | 0 .../scala/annotation/internal/Child.scala | 0 .../annotation/internal/InlineParam.scala | 0 .../scala/annotation/internal/Repeated.scala | 0 .../annotation/internal/SourceFile.scala | 0 .../internal/TASTYLongSignature.java | 0 .../annotation/internal/TASTYSignature.java | 0 .../internal/UnsafeNonvariant.scala | 0 .../src}/scala/annotation/static.scala | 0 .../src}/scala/compat/java8/JFunction.java | 0 .../scala/compat/java8/JFunction0$mcB$sp.java | 0 .../scala/compat/java8/JFunction0$mcC$sp.java | 0 .../scala/compat/java8/JFunction0$mcD$sp.java | 0 .../scala/compat/java8/JFunction0$mcF$sp.java | 0 .../scala/compat/java8/JFunction0$mcI$sp.java | 0 .../scala/compat/java8/JFunction0$mcJ$sp.java | 0 .../scala/compat/java8/JFunction0$mcS$sp.java | 0 .../scala/compat/java8/JFunction0$mcV$sp.java | 0 .../scala/compat/java8/JFunction0$mcZ$sp.java | 0 .../src}/scala/compat/java8/JFunction0.java | 0 .../compat/java8/JFunction1$mcDD$sp.java | 0 .../compat/java8/JFunction1$mcDF$sp.java | 0 .../compat/java8/JFunction1$mcDI$sp.java | 0 .../compat/java8/JFunction1$mcDJ$sp.java | 0 .../compat/java8/JFunction1$mcFD$sp.java | 0 .../compat/java8/JFunction1$mcFF$sp.java | 0 .../compat/java8/JFunction1$mcFI$sp.java | 0 .../compat/java8/JFunction1$mcFJ$sp.java | 0 .../compat/java8/JFunction1$mcID$sp.java | 0 .../compat/java8/JFunction1$mcIF$sp.java | 0 .../compat/java8/JFunction1$mcII$sp.java | 0 .../compat/java8/JFunction1$mcIJ$sp.java | 0 .../compat/java8/JFunction1$mcJD$sp.java | 0 .../compat/java8/JFunction1$mcJF$sp.java | 0 .../compat/java8/JFunction1$mcJI$sp.java | 0 .../compat/java8/JFunction1$mcJJ$sp.java | 0 .../compat/java8/JFunction1$mcVD$sp.java | 0 .../compat/java8/JFunction1$mcVF$sp.java | 0 .../compat/java8/JFunction1$mcVI$sp.java | 0 .../compat/java8/JFunction1$mcVJ$sp.java | 0 .../compat/java8/JFunction1$mcZD$sp.java | 0 .../compat/java8/JFunction1$mcZF$sp.java | 0 .../compat/java8/JFunction1$mcZI$sp.java | 0 .../compat/java8/JFunction1$mcZJ$sp.java | 0 .../src}/scala/compat/java8/JFunction1.java | 0 .../src}/scala/compat/java8/JFunction10.java | 0 .../src}/scala/compat/java8/JFunction11.java | 0 .../src}/scala/compat/java8/JFunction12.java | 0 .../src}/scala/compat/java8/JFunction13.java | 0 .../src}/scala/compat/java8/JFunction14.java | 0 .../src}/scala/compat/java8/JFunction15.java | 0 .../src}/scala/compat/java8/JFunction16.java | 0 .../src}/scala/compat/java8/JFunction17.java | 0 .../src}/scala/compat/java8/JFunction18.java | 0 .../src}/scala/compat/java8/JFunction19.java | 0 .../compat/java8/JFunction2$mcDDD$sp.java | 0 .../compat/java8/JFunction2$mcDDI$sp.java | 0 .../compat/java8/JFunction2$mcDDJ$sp.java | 0 .../compat/java8/JFunction2$mcDID$sp.java | 0 .../compat/java8/JFunction2$mcDII$sp.java | 0 .../compat/java8/JFunction2$mcDIJ$sp.java | 0 .../compat/java8/JFunction2$mcDJD$sp.java | 0 .../compat/java8/JFunction2$mcDJI$sp.java | 0 .../compat/java8/JFunction2$mcDJJ$sp.java | 0 .../compat/java8/JFunction2$mcFDD$sp.java | 0 .../compat/java8/JFunction2$mcFDI$sp.java | 0 .../compat/java8/JFunction2$mcFDJ$sp.java | 0 .../compat/java8/JFunction2$mcFID$sp.java | 0 .../compat/java8/JFunction2$mcFII$sp.java | 0 .../compat/java8/JFunction2$mcFIJ$sp.java | 0 .../compat/java8/JFunction2$mcFJD$sp.java | 0 .../compat/java8/JFunction2$mcFJI$sp.java | 0 .../compat/java8/JFunction2$mcFJJ$sp.java | 0 .../compat/java8/JFunction2$mcIDD$sp.java | 0 .../compat/java8/JFunction2$mcIDI$sp.java | 0 .../compat/java8/JFunction2$mcIDJ$sp.java | 0 .../compat/java8/JFunction2$mcIID$sp.java | 0 .../compat/java8/JFunction2$mcIII$sp.java | 0 .../compat/java8/JFunction2$mcIIJ$sp.java | 0 .../compat/java8/JFunction2$mcIJD$sp.java | 0 .../compat/java8/JFunction2$mcIJI$sp.java | 0 .../compat/java8/JFunction2$mcIJJ$sp.java | 0 .../compat/java8/JFunction2$mcJDD$sp.java | 0 .../compat/java8/JFunction2$mcJDI$sp.java | 0 .../compat/java8/JFunction2$mcJDJ$sp.java | 0 .../compat/java8/JFunction2$mcJID$sp.java | 0 .../compat/java8/JFunction2$mcJII$sp.java | 0 .../compat/java8/JFunction2$mcJIJ$sp.java | 0 .../compat/java8/JFunction2$mcJJD$sp.java | 0 .../compat/java8/JFunction2$mcJJI$sp.java | 0 .../compat/java8/JFunction2$mcJJJ$sp.java | 0 .../compat/java8/JFunction2$mcVDD$sp.java | 0 .../compat/java8/JFunction2$mcVDI$sp.java | 0 .../compat/java8/JFunction2$mcVDJ$sp.java | 0 .../compat/java8/JFunction2$mcVID$sp.java | 0 .../compat/java8/JFunction2$mcVII$sp.java | 0 .../compat/java8/JFunction2$mcVIJ$sp.java | 0 .../compat/java8/JFunction2$mcVJD$sp.java | 0 .../compat/java8/JFunction2$mcVJI$sp.java | 0 .../compat/java8/JFunction2$mcVJJ$sp.java | 0 .../compat/java8/JFunction2$mcZDD$sp.java | 0 .../compat/java8/JFunction2$mcZDI$sp.java | 0 .../compat/java8/JFunction2$mcZDJ$sp.java | 0 .../compat/java8/JFunction2$mcZID$sp.java | 0 .../compat/java8/JFunction2$mcZII$sp.java | 0 .../compat/java8/JFunction2$mcZIJ$sp.java | 0 .../compat/java8/JFunction2$mcZJD$sp.java | 0 .../compat/java8/JFunction2$mcZJI$sp.java | 0 .../compat/java8/JFunction2$mcZJJ$sp.java | 0 .../src}/scala/compat/java8/JFunction2.java | 0 .../src}/scala/compat/java8/JFunction20.java | 0 .../src}/scala/compat/java8/JFunction21.java | 0 .../src}/scala/compat/java8/JFunction22.java | 0 .../src}/scala/compat/java8/JFunction3.java | 0 .../src}/scala/compat/java8/JFunction4.java | 0 .../src}/scala/compat/java8/JFunction5.java | 0 .../src}/scala/compat/java8/JFunction6.java | 0 .../src}/scala/compat/java8/JFunction7.java | 0 .../src}/scala/compat/java8/JFunction8.java | 0 .../src}/scala/compat/java8/JFunction9.java | 0 .../src}/scala/compat/java8/JProcedure0.java | 0 .../src}/scala/compat/java8/JProcedure1.java | 0 .../src}/scala/compat/java8/JProcedure10.java | 0 .../src}/scala/compat/java8/JProcedure11.java | 0 .../src}/scala/compat/java8/JProcedure12.java | 0 .../src}/scala/compat/java8/JProcedure13.java | 0 .../src}/scala/compat/java8/JProcedure14.java | 0 .../src}/scala/compat/java8/JProcedure15.java | 0 .../src}/scala/compat/java8/JProcedure16.java | 0 .../src}/scala/compat/java8/JProcedure17.java | 0 .../src}/scala/compat/java8/JProcedure18.java | 0 .../src}/scala/compat/java8/JProcedure19.java | 0 .../src}/scala/compat/java8/JProcedure2.java | 0 .../src}/scala/compat/java8/JProcedure20.java | 0 .../src}/scala/compat/java8/JProcedure21.java | 0 .../src}/scala/compat/java8/JProcedure22.java | 0 .../src}/scala/compat/java8/JProcedure3.java | 0 .../src}/scala/compat/java8/JProcedure4.java | 0 .../src}/scala/compat/java8/JProcedure5.java | 0 .../src}/scala/compat/java8/JProcedure6.java | 0 .../src}/scala/compat/java8/JProcedure7.java | 0 .../src}/scala/compat/java8/JProcedure8.java | 0 .../src}/scala/compat/java8/JProcedure9.java | 0 .../src}/scala/runtime/ScalaRunTime.scala | 0 project/Build.scala | 42 +++++++++++++------ src/typedapply.scala | 11 ----- 166 files changed, 43 insertions(+), 31 deletions(-) rename {src => library/src}/dotty/DottyPredef.scala (100%) rename {src => library/src}/dotty/runtime/Arrays.scala (100%) rename {src => library/src}/dotty/runtime/LazyHolders.scala (100%) rename {src => library/src}/dotty/runtime/LazyVals.scala (100%) rename {src => library/src}/dotty/runtime/LegacyApp.scala (100%) rename {src => library/src}/dotty/runtime/vc/VCPrototype.scala (100%) rename {src => library/src}/scala/Eq.scala (100%) rename {src => library/src}/scala/Function23.scala (100%) rename {src => library/src}/scala/Function24.scala (100%) rename {src => library/src}/scala/Function25.scala (100%) rename {src => library/src}/scala/Function26.scala (100%) rename {src => library/src}/scala/Function27.scala (100%) rename {src => library/src}/scala/Function28.scala (100%) rename {src => library/src}/scala/Function29.scala (100%) rename {src => library/src}/scala/Function30.scala (100%) rename {src => library/src}/scala/Product0.scala (100%) rename {src => library/src}/scala/annotation/internal/Alias.scala (100%) rename {src => library/src}/scala/annotation/internal/AnnotationDefault.scala (100%) rename {src => library/src}/scala/annotation/internal/Body.scala (100%) rename {src => library/src}/scala/annotation/internal/Child.scala (100%) rename {src => library/src}/scala/annotation/internal/InlineParam.scala (100%) rename {src => library/src}/scala/annotation/internal/Repeated.scala (100%) rename {src => library/src}/scala/annotation/internal/SourceFile.scala (100%) rename {src => library/src}/scala/annotation/internal/TASTYLongSignature.java (100%) rename {src => library/src}/scala/annotation/internal/TASTYSignature.java (100%) rename {src => library/src}/scala/annotation/internal/UnsafeNonvariant.scala (100%) rename {src => library/src}/scala/annotation/static.scala (100%) rename {src => library/src}/scala/compat/java8/JFunction.java (100%) rename {src => library/src}/scala/compat/java8/JFunction0$mcB$sp.java (100%) rename {src => library/src}/scala/compat/java8/JFunction0$mcC$sp.java (100%) rename {src => library/src}/scala/compat/java8/JFunction0$mcD$sp.java (100%) rename {src => library/src}/scala/compat/java8/JFunction0$mcF$sp.java (100%) rename {src => library/src}/scala/compat/java8/JFunction0$mcI$sp.java (100%) rename {src => library/src}/scala/compat/java8/JFunction0$mcJ$sp.java (100%) rename {src => library/src}/scala/compat/java8/JFunction0$mcS$sp.java (100%) rename {src => library/src}/scala/compat/java8/JFunction0$mcV$sp.java (100%) rename {src => library/src}/scala/compat/java8/JFunction0$mcZ$sp.java (100%) rename {src => library/src}/scala/compat/java8/JFunction0.java (100%) rename {src => library/src}/scala/compat/java8/JFunction1$mcDD$sp.java (100%) rename {src => library/src}/scala/compat/java8/JFunction1$mcDF$sp.java (100%) rename {src => library/src}/scala/compat/java8/JFunction1$mcDI$sp.java (100%) rename {src => library/src}/scala/compat/java8/JFunction1$mcDJ$sp.java (100%) rename {src => library/src}/scala/compat/java8/JFunction1$mcFD$sp.java (100%) rename {src => library/src}/scala/compat/java8/JFunction1$mcFF$sp.java (100%) rename {src => library/src}/scala/compat/java8/JFunction1$mcFI$sp.java (100%) rename {src => library/src}/scala/compat/java8/JFunction1$mcFJ$sp.java (100%) rename {src => library/src}/scala/compat/java8/JFunction1$mcID$sp.java (100%) rename {src => library/src}/scala/compat/java8/JFunction1$mcIF$sp.java (100%) rename {src => library/src}/scala/compat/java8/JFunction1$mcII$sp.java (100%) rename {src => library/src}/scala/compat/java8/JFunction1$mcIJ$sp.java (100%) rename {src => library/src}/scala/compat/java8/JFunction1$mcJD$sp.java (100%) rename {src => library/src}/scala/compat/java8/JFunction1$mcJF$sp.java (100%) rename {src => library/src}/scala/compat/java8/JFunction1$mcJI$sp.java (100%) rename {src => library/src}/scala/compat/java8/JFunction1$mcJJ$sp.java (100%) rename {src => library/src}/scala/compat/java8/JFunction1$mcVD$sp.java (100%) rename {src => library/src}/scala/compat/java8/JFunction1$mcVF$sp.java (100%) rename {src => library/src}/scala/compat/java8/JFunction1$mcVI$sp.java (100%) rename {src => library/src}/scala/compat/java8/JFunction1$mcVJ$sp.java (100%) rename {src => library/src}/scala/compat/java8/JFunction1$mcZD$sp.java (100%) rename {src => library/src}/scala/compat/java8/JFunction1$mcZF$sp.java (100%) rename {src => library/src}/scala/compat/java8/JFunction1$mcZI$sp.java (100%) rename {src => library/src}/scala/compat/java8/JFunction1$mcZJ$sp.java (100%) rename {src => library/src}/scala/compat/java8/JFunction1.java (100%) rename {src => library/src}/scala/compat/java8/JFunction10.java (100%) rename {src => library/src}/scala/compat/java8/JFunction11.java (100%) rename {src => library/src}/scala/compat/java8/JFunction12.java (100%) rename {src => library/src}/scala/compat/java8/JFunction13.java (100%) rename {src => library/src}/scala/compat/java8/JFunction14.java (100%) rename {src => library/src}/scala/compat/java8/JFunction15.java (100%) rename {src => library/src}/scala/compat/java8/JFunction16.java (100%) rename {src => library/src}/scala/compat/java8/JFunction17.java (100%) rename {src => library/src}/scala/compat/java8/JFunction18.java (100%) rename {src => library/src}/scala/compat/java8/JFunction19.java (100%) rename {src => library/src}/scala/compat/java8/JFunction2$mcDDD$sp.java (100%) rename {src => library/src}/scala/compat/java8/JFunction2$mcDDI$sp.java (100%) rename {src => library/src}/scala/compat/java8/JFunction2$mcDDJ$sp.java (100%) rename {src => library/src}/scala/compat/java8/JFunction2$mcDID$sp.java (100%) rename {src => library/src}/scala/compat/java8/JFunction2$mcDII$sp.java (100%) rename {src => library/src}/scala/compat/java8/JFunction2$mcDIJ$sp.java (100%) rename {src => library/src}/scala/compat/java8/JFunction2$mcDJD$sp.java (100%) rename {src => library/src}/scala/compat/java8/JFunction2$mcDJI$sp.java (100%) rename {src => library/src}/scala/compat/java8/JFunction2$mcDJJ$sp.java (100%) rename {src => library/src}/scala/compat/java8/JFunction2$mcFDD$sp.java (100%) rename {src => library/src}/scala/compat/java8/JFunction2$mcFDI$sp.java (100%) rename {src => library/src}/scala/compat/java8/JFunction2$mcFDJ$sp.java (100%) rename {src => library/src}/scala/compat/java8/JFunction2$mcFID$sp.java (100%) rename {src => library/src}/scala/compat/java8/JFunction2$mcFII$sp.java (100%) rename {src => library/src}/scala/compat/java8/JFunction2$mcFIJ$sp.java (100%) rename {src => library/src}/scala/compat/java8/JFunction2$mcFJD$sp.java (100%) rename {src => library/src}/scala/compat/java8/JFunction2$mcFJI$sp.java (100%) rename {src => library/src}/scala/compat/java8/JFunction2$mcFJJ$sp.java (100%) rename {src => library/src}/scala/compat/java8/JFunction2$mcIDD$sp.java (100%) rename {src => library/src}/scala/compat/java8/JFunction2$mcIDI$sp.java (100%) rename {src => library/src}/scala/compat/java8/JFunction2$mcIDJ$sp.java (100%) rename {src => library/src}/scala/compat/java8/JFunction2$mcIID$sp.java (100%) rename {src => library/src}/scala/compat/java8/JFunction2$mcIII$sp.java (100%) rename {src => library/src}/scala/compat/java8/JFunction2$mcIIJ$sp.java (100%) rename {src => library/src}/scala/compat/java8/JFunction2$mcIJD$sp.java (100%) rename {src => library/src}/scala/compat/java8/JFunction2$mcIJI$sp.java (100%) rename {src => library/src}/scala/compat/java8/JFunction2$mcIJJ$sp.java (100%) rename {src => library/src}/scala/compat/java8/JFunction2$mcJDD$sp.java (100%) rename {src => library/src}/scala/compat/java8/JFunction2$mcJDI$sp.java (100%) rename {src => library/src}/scala/compat/java8/JFunction2$mcJDJ$sp.java (100%) rename {src => library/src}/scala/compat/java8/JFunction2$mcJID$sp.java (100%) rename {src => library/src}/scala/compat/java8/JFunction2$mcJII$sp.java (100%) rename {src => library/src}/scala/compat/java8/JFunction2$mcJIJ$sp.java (100%) rename {src => library/src}/scala/compat/java8/JFunction2$mcJJD$sp.java (100%) rename {src => library/src}/scala/compat/java8/JFunction2$mcJJI$sp.java (100%) rename {src => library/src}/scala/compat/java8/JFunction2$mcJJJ$sp.java (100%) rename {src => library/src}/scala/compat/java8/JFunction2$mcVDD$sp.java (100%) rename {src => library/src}/scala/compat/java8/JFunction2$mcVDI$sp.java (100%) rename {src => library/src}/scala/compat/java8/JFunction2$mcVDJ$sp.java (100%) rename {src => library/src}/scala/compat/java8/JFunction2$mcVID$sp.java (100%) rename {src => library/src}/scala/compat/java8/JFunction2$mcVII$sp.java (100%) rename {src => library/src}/scala/compat/java8/JFunction2$mcVIJ$sp.java (100%) rename {src => library/src}/scala/compat/java8/JFunction2$mcVJD$sp.java (100%) rename {src => library/src}/scala/compat/java8/JFunction2$mcVJI$sp.java (100%) rename {src => library/src}/scala/compat/java8/JFunction2$mcVJJ$sp.java (100%) rename {src => library/src}/scala/compat/java8/JFunction2$mcZDD$sp.java (100%) rename {src => library/src}/scala/compat/java8/JFunction2$mcZDI$sp.java (100%) rename {src => library/src}/scala/compat/java8/JFunction2$mcZDJ$sp.java (100%) rename {src => library/src}/scala/compat/java8/JFunction2$mcZID$sp.java (100%) rename {src => library/src}/scala/compat/java8/JFunction2$mcZII$sp.java (100%) rename {src => library/src}/scala/compat/java8/JFunction2$mcZIJ$sp.java (100%) rename {src => library/src}/scala/compat/java8/JFunction2$mcZJD$sp.java (100%) rename {src => library/src}/scala/compat/java8/JFunction2$mcZJI$sp.java (100%) rename {src => library/src}/scala/compat/java8/JFunction2$mcZJJ$sp.java (100%) rename {src => library/src}/scala/compat/java8/JFunction2.java (100%) rename {src => library/src}/scala/compat/java8/JFunction20.java (100%) rename {src => library/src}/scala/compat/java8/JFunction21.java (100%) rename {src => library/src}/scala/compat/java8/JFunction22.java (100%) rename {src => library/src}/scala/compat/java8/JFunction3.java (100%) rename {src => library/src}/scala/compat/java8/JFunction4.java (100%) rename {src => library/src}/scala/compat/java8/JFunction5.java (100%) rename {src => library/src}/scala/compat/java8/JFunction6.java (100%) rename {src => library/src}/scala/compat/java8/JFunction7.java (100%) rename {src => library/src}/scala/compat/java8/JFunction8.java (100%) rename {src => library/src}/scala/compat/java8/JFunction9.java (100%) rename {src => library/src}/scala/compat/java8/JProcedure0.java (100%) rename {src => library/src}/scala/compat/java8/JProcedure1.java (100%) rename {src => library/src}/scala/compat/java8/JProcedure10.java (100%) rename {src => library/src}/scala/compat/java8/JProcedure11.java (100%) rename {src => library/src}/scala/compat/java8/JProcedure12.java (100%) rename {src => library/src}/scala/compat/java8/JProcedure13.java (100%) rename {src => library/src}/scala/compat/java8/JProcedure14.java (100%) rename {src => library/src}/scala/compat/java8/JProcedure15.java (100%) rename {src => library/src}/scala/compat/java8/JProcedure16.java (100%) rename {src => library/src}/scala/compat/java8/JProcedure17.java (100%) rename {src => library/src}/scala/compat/java8/JProcedure18.java (100%) rename {src => library/src}/scala/compat/java8/JProcedure19.java (100%) rename {src => library/src}/scala/compat/java8/JProcedure2.java (100%) rename {src => library/src}/scala/compat/java8/JProcedure20.java (100%) rename {src => library/src}/scala/compat/java8/JProcedure21.java (100%) rename {src => library/src}/scala/compat/java8/JProcedure22.java (100%) rename {src => library/src}/scala/compat/java8/JProcedure3.java (100%) rename {src => library/src}/scala/compat/java8/JProcedure4.java (100%) rename {src => library/src}/scala/compat/java8/JProcedure5.java (100%) rename {src => library/src}/scala/compat/java8/JProcedure6.java (100%) rename {src => library/src}/scala/compat/java8/JProcedure7.java (100%) rename {src => library/src}/scala/compat/java8/JProcedure8.java (100%) rename {src => library/src}/scala/compat/java8/JProcedure9.java (100%) rename {src => library/src}/scala/runtime/ScalaRunTime.scala (100%) delete mode 100644 src/typedapply.scala diff --git a/bin/common b/bin/common index 8f46773302ff..0d7dc615042a 100755 --- a/bin/common +++ b/bin/common @@ -74,6 +74,7 @@ function build_jar { function update_packages { echo "$INTERFACES_JAR" > $DOTTY_ROOT/.packages echo "$MAIN_JAR" >> $DOTTY_ROOT/.packages + echo "$DOTTY_LIB_JAR" >> $DOTTY_ROOT/.packages echo "$TEST_JAR" >> $DOTTY_ROOT/.packages } @@ -84,10 +85,14 @@ function build_all { INTERFACES_JAR=$(build_jar dotty-interfaces/package interfaces/target) printf "done\n" - printf "Building dotty..." + printf "Building dotty-compiler..." MAIN_JAR=$(build_jar package "target/scala-$SCALA_BINARY_VERSION") printf "done\n" + printf "Building dotty library..." + DOTTY_LIB_JAR=$(build_jar dotty-library/package "library/target/scala-$SCALA_BINARY_VERSION") + printf "done\n" + printf "Building tests..." TEST_JAR=$(build_jar test:package "target/scala-$SCALA_BINARY_VERSION" '/dotty.*-tests\.jar/p') printf "done\n" @@ -101,10 +106,11 @@ if [ ! -f "$DOTTY_ROOT/.packages" ]; then else IFS=$'\r\n' GLOBIGNORE='*' command eval 'JARS=($(cat $DOTTY_ROOT/.packages))' - if [ "${#JARS[@]}" == "3" ]; then + if [ "${#JARS[@]}" == "4" ]; then INTERFACES_JAR="${JARS[0]}" MAIN_JAR="${JARS[1]}" - TEST_JAR="${JARS[2]}" + DOTTY_LIB_JAR="${JARS[2]}" + TEST_JAR="${JARS[3]}" else echo "Failed to parse .packages file" build_all @@ -126,6 +132,7 @@ function check_jar { check_jar "dotty-interfaces" $INTERFACES_JAR "interfaces" 'INTERFACES_JAR=$(build_jar dotty-interfaces/package interfaces/target)' check_jar "dotty" $MAIN_JAR "src" 'MAIN_JAR=$(build_jar package target/scala-$SCALA_BINARY_VERSION)' +check_jar "dotty-library" $DOTTY_LIB_JAR "library" 'DOTTY_LIB_JAR=$(build_jar dotty-library/package library/target/scala-$SCALA_BINARY_VERSION)' check_jar "dotty-tests" $TEST_JAR "test" 'TEST_JAR=$(build_jar test:package target/scala-$SCALA_BINARY_VERSION /dotty.*-tests\.jar/p)' # Autodetecting the scala-library location, in case it wasn't provided by an environment variable diff --git a/bin/dotc b/bin/dotc index 3f529194c3af..57e97ba5c7cf 100755 --- a/bin/dotc +++ b/bin/dotc @@ -115,12 +115,12 @@ trap onExit INT classpathArgs () { if [[ "true" == $bootstrapped ]]; then check_jar "dotty-bootstrapped" $DOTTY_JAR "target" 'build_jar "test:runMain dotc.build" target' &> /dev/null - toolchain="$DOTTY_JAR:$SCALA_LIBRARY_JAR:$SCALA_REFLECT_JAR:$SCALA_COMPILER_JAR:$SBT_INTERFACE_JAR" + toolchain="$DOTTY_JAR:$DOTTY_LIB_JAR:$SCALA_LIBRARY_JAR:$SCALA_REFLECT_JAR:$SCALA_COMPILER_JAR:$SBT_INTERFACE_JAR" else - toolchain="$SCALA_LIBRARY_JAR:$SCALA_REFLECT_JAR:$SCALA_COMPILER_JAR:$SBT_INTERFACE_JAR" + toolchain="$SCALA_LIBRARY_JAR:$DOTTY_LIB_JAR:$SCALA_REFLECT_JAR:$SCALA_COMPILER_JAR:$SBT_INTERFACE_JAR" fi - bcpJars="$INTERFACES_JAR:$MAIN_JAR" - cpJars="$INTERFACES_JAR:$MAIN_JAR:$TEST_JAR" + bcpJars="$INTERFACES_JAR:$MAIN_JAR:$DOTTY_LIB_JAR" + cpJars="$INTERFACES_JAR:$MAIN_JAR:$DOTTY_LIB_JAR:$TEST_JAR" if [[ -n "$cygwin" ]]; then if [[ "$OS" = "Windows_NT" ]] && cygpath -m .>/dev/null 2>/dev/null ; then diff --git a/src/dotty/DottyPredef.scala b/library/src/dotty/DottyPredef.scala similarity index 100% rename from src/dotty/DottyPredef.scala rename to library/src/dotty/DottyPredef.scala diff --git a/src/dotty/runtime/Arrays.scala b/library/src/dotty/runtime/Arrays.scala similarity index 100% rename from src/dotty/runtime/Arrays.scala rename to library/src/dotty/runtime/Arrays.scala diff --git a/src/dotty/runtime/LazyHolders.scala b/library/src/dotty/runtime/LazyHolders.scala similarity index 100% rename from src/dotty/runtime/LazyHolders.scala rename to library/src/dotty/runtime/LazyHolders.scala diff --git a/src/dotty/runtime/LazyVals.scala b/library/src/dotty/runtime/LazyVals.scala similarity index 100% rename from src/dotty/runtime/LazyVals.scala rename to library/src/dotty/runtime/LazyVals.scala diff --git a/src/dotty/runtime/LegacyApp.scala b/library/src/dotty/runtime/LegacyApp.scala similarity index 100% rename from src/dotty/runtime/LegacyApp.scala rename to library/src/dotty/runtime/LegacyApp.scala diff --git a/src/dotty/runtime/vc/VCPrototype.scala b/library/src/dotty/runtime/vc/VCPrototype.scala similarity index 100% rename from src/dotty/runtime/vc/VCPrototype.scala rename to library/src/dotty/runtime/vc/VCPrototype.scala diff --git a/src/scala/Eq.scala b/library/src/scala/Eq.scala similarity index 100% rename from src/scala/Eq.scala rename to library/src/scala/Eq.scala diff --git a/src/scala/Function23.scala b/library/src/scala/Function23.scala similarity index 100% rename from src/scala/Function23.scala rename to library/src/scala/Function23.scala diff --git a/src/scala/Function24.scala b/library/src/scala/Function24.scala similarity index 100% rename from src/scala/Function24.scala rename to library/src/scala/Function24.scala diff --git a/src/scala/Function25.scala b/library/src/scala/Function25.scala similarity index 100% rename from src/scala/Function25.scala rename to library/src/scala/Function25.scala diff --git a/src/scala/Function26.scala b/library/src/scala/Function26.scala similarity index 100% rename from src/scala/Function26.scala rename to library/src/scala/Function26.scala diff --git a/src/scala/Function27.scala b/library/src/scala/Function27.scala similarity index 100% rename from src/scala/Function27.scala rename to library/src/scala/Function27.scala diff --git a/src/scala/Function28.scala b/library/src/scala/Function28.scala similarity index 100% rename from src/scala/Function28.scala rename to library/src/scala/Function28.scala diff --git a/src/scala/Function29.scala b/library/src/scala/Function29.scala similarity index 100% rename from src/scala/Function29.scala rename to library/src/scala/Function29.scala diff --git a/src/scala/Function30.scala b/library/src/scala/Function30.scala similarity index 100% rename from src/scala/Function30.scala rename to library/src/scala/Function30.scala diff --git a/src/scala/Product0.scala b/library/src/scala/Product0.scala similarity index 100% rename from src/scala/Product0.scala rename to library/src/scala/Product0.scala diff --git a/src/scala/annotation/internal/Alias.scala b/library/src/scala/annotation/internal/Alias.scala similarity index 100% rename from src/scala/annotation/internal/Alias.scala rename to library/src/scala/annotation/internal/Alias.scala diff --git a/src/scala/annotation/internal/AnnotationDefault.scala b/library/src/scala/annotation/internal/AnnotationDefault.scala similarity index 100% rename from src/scala/annotation/internal/AnnotationDefault.scala rename to library/src/scala/annotation/internal/AnnotationDefault.scala diff --git a/src/scala/annotation/internal/Body.scala b/library/src/scala/annotation/internal/Body.scala similarity index 100% rename from src/scala/annotation/internal/Body.scala rename to library/src/scala/annotation/internal/Body.scala diff --git a/src/scala/annotation/internal/Child.scala b/library/src/scala/annotation/internal/Child.scala similarity index 100% rename from src/scala/annotation/internal/Child.scala rename to library/src/scala/annotation/internal/Child.scala diff --git a/src/scala/annotation/internal/InlineParam.scala b/library/src/scala/annotation/internal/InlineParam.scala similarity index 100% rename from src/scala/annotation/internal/InlineParam.scala rename to library/src/scala/annotation/internal/InlineParam.scala diff --git a/src/scala/annotation/internal/Repeated.scala b/library/src/scala/annotation/internal/Repeated.scala similarity index 100% rename from src/scala/annotation/internal/Repeated.scala rename to library/src/scala/annotation/internal/Repeated.scala diff --git a/src/scala/annotation/internal/SourceFile.scala b/library/src/scala/annotation/internal/SourceFile.scala similarity index 100% rename from src/scala/annotation/internal/SourceFile.scala rename to library/src/scala/annotation/internal/SourceFile.scala diff --git a/src/scala/annotation/internal/TASTYLongSignature.java b/library/src/scala/annotation/internal/TASTYLongSignature.java similarity index 100% rename from src/scala/annotation/internal/TASTYLongSignature.java rename to library/src/scala/annotation/internal/TASTYLongSignature.java diff --git a/src/scala/annotation/internal/TASTYSignature.java b/library/src/scala/annotation/internal/TASTYSignature.java similarity index 100% rename from src/scala/annotation/internal/TASTYSignature.java rename to library/src/scala/annotation/internal/TASTYSignature.java diff --git a/src/scala/annotation/internal/UnsafeNonvariant.scala b/library/src/scala/annotation/internal/UnsafeNonvariant.scala similarity index 100% rename from src/scala/annotation/internal/UnsafeNonvariant.scala rename to library/src/scala/annotation/internal/UnsafeNonvariant.scala diff --git a/src/scala/annotation/static.scala b/library/src/scala/annotation/static.scala similarity index 100% rename from src/scala/annotation/static.scala rename to library/src/scala/annotation/static.scala diff --git a/src/scala/compat/java8/JFunction.java b/library/src/scala/compat/java8/JFunction.java similarity index 100% rename from src/scala/compat/java8/JFunction.java rename to library/src/scala/compat/java8/JFunction.java diff --git a/src/scala/compat/java8/JFunction0$mcB$sp.java b/library/src/scala/compat/java8/JFunction0$mcB$sp.java similarity index 100% rename from src/scala/compat/java8/JFunction0$mcB$sp.java rename to library/src/scala/compat/java8/JFunction0$mcB$sp.java diff --git a/src/scala/compat/java8/JFunction0$mcC$sp.java b/library/src/scala/compat/java8/JFunction0$mcC$sp.java similarity index 100% rename from src/scala/compat/java8/JFunction0$mcC$sp.java rename to library/src/scala/compat/java8/JFunction0$mcC$sp.java diff --git a/src/scala/compat/java8/JFunction0$mcD$sp.java b/library/src/scala/compat/java8/JFunction0$mcD$sp.java similarity index 100% rename from src/scala/compat/java8/JFunction0$mcD$sp.java rename to library/src/scala/compat/java8/JFunction0$mcD$sp.java diff --git a/src/scala/compat/java8/JFunction0$mcF$sp.java b/library/src/scala/compat/java8/JFunction0$mcF$sp.java similarity index 100% rename from src/scala/compat/java8/JFunction0$mcF$sp.java rename to library/src/scala/compat/java8/JFunction0$mcF$sp.java diff --git a/src/scala/compat/java8/JFunction0$mcI$sp.java b/library/src/scala/compat/java8/JFunction0$mcI$sp.java similarity index 100% rename from src/scala/compat/java8/JFunction0$mcI$sp.java rename to library/src/scala/compat/java8/JFunction0$mcI$sp.java diff --git a/src/scala/compat/java8/JFunction0$mcJ$sp.java b/library/src/scala/compat/java8/JFunction0$mcJ$sp.java similarity index 100% rename from src/scala/compat/java8/JFunction0$mcJ$sp.java rename to library/src/scala/compat/java8/JFunction0$mcJ$sp.java diff --git a/src/scala/compat/java8/JFunction0$mcS$sp.java b/library/src/scala/compat/java8/JFunction0$mcS$sp.java similarity index 100% rename from src/scala/compat/java8/JFunction0$mcS$sp.java rename to library/src/scala/compat/java8/JFunction0$mcS$sp.java diff --git a/src/scala/compat/java8/JFunction0$mcV$sp.java b/library/src/scala/compat/java8/JFunction0$mcV$sp.java similarity index 100% rename from src/scala/compat/java8/JFunction0$mcV$sp.java rename to library/src/scala/compat/java8/JFunction0$mcV$sp.java diff --git a/src/scala/compat/java8/JFunction0$mcZ$sp.java b/library/src/scala/compat/java8/JFunction0$mcZ$sp.java similarity index 100% rename from src/scala/compat/java8/JFunction0$mcZ$sp.java rename to library/src/scala/compat/java8/JFunction0$mcZ$sp.java diff --git a/src/scala/compat/java8/JFunction0.java b/library/src/scala/compat/java8/JFunction0.java similarity index 100% rename from src/scala/compat/java8/JFunction0.java rename to library/src/scala/compat/java8/JFunction0.java diff --git a/src/scala/compat/java8/JFunction1$mcDD$sp.java b/library/src/scala/compat/java8/JFunction1$mcDD$sp.java similarity index 100% rename from src/scala/compat/java8/JFunction1$mcDD$sp.java rename to library/src/scala/compat/java8/JFunction1$mcDD$sp.java diff --git a/src/scala/compat/java8/JFunction1$mcDF$sp.java b/library/src/scala/compat/java8/JFunction1$mcDF$sp.java similarity index 100% rename from src/scala/compat/java8/JFunction1$mcDF$sp.java rename to library/src/scala/compat/java8/JFunction1$mcDF$sp.java diff --git a/src/scala/compat/java8/JFunction1$mcDI$sp.java b/library/src/scala/compat/java8/JFunction1$mcDI$sp.java similarity index 100% rename from src/scala/compat/java8/JFunction1$mcDI$sp.java rename to library/src/scala/compat/java8/JFunction1$mcDI$sp.java diff --git a/src/scala/compat/java8/JFunction1$mcDJ$sp.java b/library/src/scala/compat/java8/JFunction1$mcDJ$sp.java similarity index 100% rename from src/scala/compat/java8/JFunction1$mcDJ$sp.java rename to library/src/scala/compat/java8/JFunction1$mcDJ$sp.java diff --git a/src/scala/compat/java8/JFunction1$mcFD$sp.java b/library/src/scala/compat/java8/JFunction1$mcFD$sp.java similarity index 100% rename from src/scala/compat/java8/JFunction1$mcFD$sp.java rename to library/src/scala/compat/java8/JFunction1$mcFD$sp.java diff --git a/src/scala/compat/java8/JFunction1$mcFF$sp.java b/library/src/scala/compat/java8/JFunction1$mcFF$sp.java similarity index 100% rename from src/scala/compat/java8/JFunction1$mcFF$sp.java rename to library/src/scala/compat/java8/JFunction1$mcFF$sp.java diff --git a/src/scala/compat/java8/JFunction1$mcFI$sp.java b/library/src/scala/compat/java8/JFunction1$mcFI$sp.java similarity index 100% rename from src/scala/compat/java8/JFunction1$mcFI$sp.java rename to library/src/scala/compat/java8/JFunction1$mcFI$sp.java diff --git a/src/scala/compat/java8/JFunction1$mcFJ$sp.java b/library/src/scala/compat/java8/JFunction1$mcFJ$sp.java similarity index 100% rename from src/scala/compat/java8/JFunction1$mcFJ$sp.java rename to library/src/scala/compat/java8/JFunction1$mcFJ$sp.java diff --git a/src/scala/compat/java8/JFunction1$mcID$sp.java b/library/src/scala/compat/java8/JFunction1$mcID$sp.java similarity index 100% rename from src/scala/compat/java8/JFunction1$mcID$sp.java rename to library/src/scala/compat/java8/JFunction1$mcID$sp.java diff --git a/src/scala/compat/java8/JFunction1$mcIF$sp.java b/library/src/scala/compat/java8/JFunction1$mcIF$sp.java similarity index 100% rename from src/scala/compat/java8/JFunction1$mcIF$sp.java rename to library/src/scala/compat/java8/JFunction1$mcIF$sp.java diff --git a/src/scala/compat/java8/JFunction1$mcII$sp.java b/library/src/scala/compat/java8/JFunction1$mcII$sp.java similarity index 100% rename from src/scala/compat/java8/JFunction1$mcII$sp.java rename to library/src/scala/compat/java8/JFunction1$mcII$sp.java diff --git a/src/scala/compat/java8/JFunction1$mcIJ$sp.java b/library/src/scala/compat/java8/JFunction1$mcIJ$sp.java similarity index 100% rename from src/scala/compat/java8/JFunction1$mcIJ$sp.java rename to library/src/scala/compat/java8/JFunction1$mcIJ$sp.java diff --git a/src/scala/compat/java8/JFunction1$mcJD$sp.java b/library/src/scala/compat/java8/JFunction1$mcJD$sp.java similarity index 100% rename from src/scala/compat/java8/JFunction1$mcJD$sp.java rename to library/src/scala/compat/java8/JFunction1$mcJD$sp.java diff --git a/src/scala/compat/java8/JFunction1$mcJF$sp.java b/library/src/scala/compat/java8/JFunction1$mcJF$sp.java similarity index 100% rename from src/scala/compat/java8/JFunction1$mcJF$sp.java rename to library/src/scala/compat/java8/JFunction1$mcJF$sp.java diff --git a/src/scala/compat/java8/JFunction1$mcJI$sp.java b/library/src/scala/compat/java8/JFunction1$mcJI$sp.java similarity index 100% rename from src/scala/compat/java8/JFunction1$mcJI$sp.java rename to library/src/scala/compat/java8/JFunction1$mcJI$sp.java diff --git a/src/scala/compat/java8/JFunction1$mcJJ$sp.java b/library/src/scala/compat/java8/JFunction1$mcJJ$sp.java similarity index 100% rename from src/scala/compat/java8/JFunction1$mcJJ$sp.java rename to library/src/scala/compat/java8/JFunction1$mcJJ$sp.java diff --git a/src/scala/compat/java8/JFunction1$mcVD$sp.java b/library/src/scala/compat/java8/JFunction1$mcVD$sp.java similarity index 100% rename from src/scala/compat/java8/JFunction1$mcVD$sp.java rename to library/src/scala/compat/java8/JFunction1$mcVD$sp.java diff --git a/src/scala/compat/java8/JFunction1$mcVF$sp.java b/library/src/scala/compat/java8/JFunction1$mcVF$sp.java similarity index 100% rename from src/scala/compat/java8/JFunction1$mcVF$sp.java rename to library/src/scala/compat/java8/JFunction1$mcVF$sp.java diff --git a/src/scala/compat/java8/JFunction1$mcVI$sp.java b/library/src/scala/compat/java8/JFunction1$mcVI$sp.java similarity index 100% rename from src/scala/compat/java8/JFunction1$mcVI$sp.java rename to library/src/scala/compat/java8/JFunction1$mcVI$sp.java diff --git a/src/scala/compat/java8/JFunction1$mcVJ$sp.java b/library/src/scala/compat/java8/JFunction1$mcVJ$sp.java similarity index 100% rename from src/scala/compat/java8/JFunction1$mcVJ$sp.java rename to library/src/scala/compat/java8/JFunction1$mcVJ$sp.java diff --git a/src/scala/compat/java8/JFunction1$mcZD$sp.java b/library/src/scala/compat/java8/JFunction1$mcZD$sp.java similarity index 100% rename from src/scala/compat/java8/JFunction1$mcZD$sp.java rename to library/src/scala/compat/java8/JFunction1$mcZD$sp.java diff --git a/src/scala/compat/java8/JFunction1$mcZF$sp.java b/library/src/scala/compat/java8/JFunction1$mcZF$sp.java similarity index 100% rename from src/scala/compat/java8/JFunction1$mcZF$sp.java rename to library/src/scala/compat/java8/JFunction1$mcZF$sp.java diff --git a/src/scala/compat/java8/JFunction1$mcZI$sp.java b/library/src/scala/compat/java8/JFunction1$mcZI$sp.java similarity index 100% rename from src/scala/compat/java8/JFunction1$mcZI$sp.java rename to library/src/scala/compat/java8/JFunction1$mcZI$sp.java diff --git a/src/scala/compat/java8/JFunction1$mcZJ$sp.java b/library/src/scala/compat/java8/JFunction1$mcZJ$sp.java similarity index 100% rename from src/scala/compat/java8/JFunction1$mcZJ$sp.java rename to library/src/scala/compat/java8/JFunction1$mcZJ$sp.java diff --git a/src/scala/compat/java8/JFunction1.java b/library/src/scala/compat/java8/JFunction1.java similarity index 100% rename from src/scala/compat/java8/JFunction1.java rename to library/src/scala/compat/java8/JFunction1.java diff --git a/src/scala/compat/java8/JFunction10.java b/library/src/scala/compat/java8/JFunction10.java similarity index 100% rename from src/scala/compat/java8/JFunction10.java rename to library/src/scala/compat/java8/JFunction10.java diff --git a/src/scala/compat/java8/JFunction11.java b/library/src/scala/compat/java8/JFunction11.java similarity index 100% rename from src/scala/compat/java8/JFunction11.java rename to library/src/scala/compat/java8/JFunction11.java diff --git a/src/scala/compat/java8/JFunction12.java b/library/src/scala/compat/java8/JFunction12.java similarity index 100% rename from src/scala/compat/java8/JFunction12.java rename to library/src/scala/compat/java8/JFunction12.java diff --git a/src/scala/compat/java8/JFunction13.java b/library/src/scala/compat/java8/JFunction13.java similarity index 100% rename from src/scala/compat/java8/JFunction13.java rename to library/src/scala/compat/java8/JFunction13.java diff --git a/src/scala/compat/java8/JFunction14.java b/library/src/scala/compat/java8/JFunction14.java similarity index 100% rename from src/scala/compat/java8/JFunction14.java rename to library/src/scala/compat/java8/JFunction14.java diff --git a/src/scala/compat/java8/JFunction15.java b/library/src/scala/compat/java8/JFunction15.java similarity index 100% rename from src/scala/compat/java8/JFunction15.java rename to library/src/scala/compat/java8/JFunction15.java diff --git a/src/scala/compat/java8/JFunction16.java b/library/src/scala/compat/java8/JFunction16.java similarity index 100% rename from src/scala/compat/java8/JFunction16.java rename to library/src/scala/compat/java8/JFunction16.java diff --git a/src/scala/compat/java8/JFunction17.java b/library/src/scala/compat/java8/JFunction17.java similarity index 100% rename from src/scala/compat/java8/JFunction17.java rename to library/src/scala/compat/java8/JFunction17.java diff --git a/src/scala/compat/java8/JFunction18.java b/library/src/scala/compat/java8/JFunction18.java similarity index 100% rename from src/scala/compat/java8/JFunction18.java rename to library/src/scala/compat/java8/JFunction18.java diff --git a/src/scala/compat/java8/JFunction19.java b/library/src/scala/compat/java8/JFunction19.java similarity index 100% rename from src/scala/compat/java8/JFunction19.java rename to library/src/scala/compat/java8/JFunction19.java diff --git a/src/scala/compat/java8/JFunction2$mcDDD$sp.java b/library/src/scala/compat/java8/JFunction2$mcDDD$sp.java similarity index 100% rename from src/scala/compat/java8/JFunction2$mcDDD$sp.java rename to library/src/scala/compat/java8/JFunction2$mcDDD$sp.java diff --git a/src/scala/compat/java8/JFunction2$mcDDI$sp.java b/library/src/scala/compat/java8/JFunction2$mcDDI$sp.java similarity index 100% rename from src/scala/compat/java8/JFunction2$mcDDI$sp.java rename to library/src/scala/compat/java8/JFunction2$mcDDI$sp.java diff --git a/src/scala/compat/java8/JFunction2$mcDDJ$sp.java b/library/src/scala/compat/java8/JFunction2$mcDDJ$sp.java similarity index 100% rename from src/scala/compat/java8/JFunction2$mcDDJ$sp.java rename to library/src/scala/compat/java8/JFunction2$mcDDJ$sp.java diff --git a/src/scala/compat/java8/JFunction2$mcDID$sp.java b/library/src/scala/compat/java8/JFunction2$mcDID$sp.java similarity index 100% rename from src/scala/compat/java8/JFunction2$mcDID$sp.java rename to library/src/scala/compat/java8/JFunction2$mcDID$sp.java diff --git a/src/scala/compat/java8/JFunction2$mcDII$sp.java b/library/src/scala/compat/java8/JFunction2$mcDII$sp.java similarity index 100% rename from src/scala/compat/java8/JFunction2$mcDII$sp.java rename to library/src/scala/compat/java8/JFunction2$mcDII$sp.java diff --git a/src/scala/compat/java8/JFunction2$mcDIJ$sp.java b/library/src/scala/compat/java8/JFunction2$mcDIJ$sp.java similarity index 100% rename from src/scala/compat/java8/JFunction2$mcDIJ$sp.java rename to library/src/scala/compat/java8/JFunction2$mcDIJ$sp.java diff --git a/src/scala/compat/java8/JFunction2$mcDJD$sp.java b/library/src/scala/compat/java8/JFunction2$mcDJD$sp.java similarity index 100% rename from src/scala/compat/java8/JFunction2$mcDJD$sp.java rename to library/src/scala/compat/java8/JFunction2$mcDJD$sp.java diff --git a/src/scala/compat/java8/JFunction2$mcDJI$sp.java b/library/src/scala/compat/java8/JFunction2$mcDJI$sp.java similarity index 100% rename from src/scala/compat/java8/JFunction2$mcDJI$sp.java rename to library/src/scala/compat/java8/JFunction2$mcDJI$sp.java diff --git a/src/scala/compat/java8/JFunction2$mcDJJ$sp.java b/library/src/scala/compat/java8/JFunction2$mcDJJ$sp.java similarity index 100% rename from src/scala/compat/java8/JFunction2$mcDJJ$sp.java rename to library/src/scala/compat/java8/JFunction2$mcDJJ$sp.java diff --git a/src/scala/compat/java8/JFunction2$mcFDD$sp.java b/library/src/scala/compat/java8/JFunction2$mcFDD$sp.java similarity index 100% rename from src/scala/compat/java8/JFunction2$mcFDD$sp.java rename to library/src/scala/compat/java8/JFunction2$mcFDD$sp.java diff --git a/src/scala/compat/java8/JFunction2$mcFDI$sp.java b/library/src/scala/compat/java8/JFunction2$mcFDI$sp.java similarity index 100% rename from src/scala/compat/java8/JFunction2$mcFDI$sp.java rename to library/src/scala/compat/java8/JFunction2$mcFDI$sp.java diff --git a/src/scala/compat/java8/JFunction2$mcFDJ$sp.java b/library/src/scala/compat/java8/JFunction2$mcFDJ$sp.java similarity index 100% rename from src/scala/compat/java8/JFunction2$mcFDJ$sp.java rename to library/src/scala/compat/java8/JFunction2$mcFDJ$sp.java diff --git a/src/scala/compat/java8/JFunction2$mcFID$sp.java b/library/src/scala/compat/java8/JFunction2$mcFID$sp.java similarity index 100% rename from src/scala/compat/java8/JFunction2$mcFID$sp.java rename to library/src/scala/compat/java8/JFunction2$mcFID$sp.java diff --git a/src/scala/compat/java8/JFunction2$mcFII$sp.java b/library/src/scala/compat/java8/JFunction2$mcFII$sp.java similarity index 100% rename from src/scala/compat/java8/JFunction2$mcFII$sp.java rename to library/src/scala/compat/java8/JFunction2$mcFII$sp.java diff --git a/src/scala/compat/java8/JFunction2$mcFIJ$sp.java b/library/src/scala/compat/java8/JFunction2$mcFIJ$sp.java similarity index 100% rename from src/scala/compat/java8/JFunction2$mcFIJ$sp.java rename to library/src/scala/compat/java8/JFunction2$mcFIJ$sp.java diff --git a/src/scala/compat/java8/JFunction2$mcFJD$sp.java b/library/src/scala/compat/java8/JFunction2$mcFJD$sp.java similarity index 100% rename from src/scala/compat/java8/JFunction2$mcFJD$sp.java rename to library/src/scala/compat/java8/JFunction2$mcFJD$sp.java diff --git a/src/scala/compat/java8/JFunction2$mcFJI$sp.java b/library/src/scala/compat/java8/JFunction2$mcFJI$sp.java similarity index 100% rename from src/scala/compat/java8/JFunction2$mcFJI$sp.java rename to library/src/scala/compat/java8/JFunction2$mcFJI$sp.java diff --git a/src/scala/compat/java8/JFunction2$mcFJJ$sp.java b/library/src/scala/compat/java8/JFunction2$mcFJJ$sp.java similarity index 100% rename from src/scala/compat/java8/JFunction2$mcFJJ$sp.java rename to library/src/scala/compat/java8/JFunction2$mcFJJ$sp.java diff --git a/src/scala/compat/java8/JFunction2$mcIDD$sp.java b/library/src/scala/compat/java8/JFunction2$mcIDD$sp.java similarity index 100% rename from src/scala/compat/java8/JFunction2$mcIDD$sp.java rename to library/src/scala/compat/java8/JFunction2$mcIDD$sp.java diff --git a/src/scala/compat/java8/JFunction2$mcIDI$sp.java b/library/src/scala/compat/java8/JFunction2$mcIDI$sp.java similarity index 100% rename from src/scala/compat/java8/JFunction2$mcIDI$sp.java rename to library/src/scala/compat/java8/JFunction2$mcIDI$sp.java diff --git a/src/scala/compat/java8/JFunction2$mcIDJ$sp.java b/library/src/scala/compat/java8/JFunction2$mcIDJ$sp.java similarity index 100% rename from src/scala/compat/java8/JFunction2$mcIDJ$sp.java rename to library/src/scala/compat/java8/JFunction2$mcIDJ$sp.java diff --git a/src/scala/compat/java8/JFunction2$mcIID$sp.java b/library/src/scala/compat/java8/JFunction2$mcIID$sp.java similarity index 100% rename from src/scala/compat/java8/JFunction2$mcIID$sp.java rename to library/src/scala/compat/java8/JFunction2$mcIID$sp.java diff --git a/src/scala/compat/java8/JFunction2$mcIII$sp.java b/library/src/scala/compat/java8/JFunction2$mcIII$sp.java similarity index 100% rename from src/scala/compat/java8/JFunction2$mcIII$sp.java rename to library/src/scala/compat/java8/JFunction2$mcIII$sp.java diff --git a/src/scala/compat/java8/JFunction2$mcIIJ$sp.java b/library/src/scala/compat/java8/JFunction2$mcIIJ$sp.java similarity index 100% rename from src/scala/compat/java8/JFunction2$mcIIJ$sp.java rename to library/src/scala/compat/java8/JFunction2$mcIIJ$sp.java diff --git a/src/scala/compat/java8/JFunction2$mcIJD$sp.java b/library/src/scala/compat/java8/JFunction2$mcIJD$sp.java similarity index 100% rename from src/scala/compat/java8/JFunction2$mcIJD$sp.java rename to library/src/scala/compat/java8/JFunction2$mcIJD$sp.java diff --git a/src/scala/compat/java8/JFunction2$mcIJI$sp.java b/library/src/scala/compat/java8/JFunction2$mcIJI$sp.java similarity index 100% rename from src/scala/compat/java8/JFunction2$mcIJI$sp.java rename to library/src/scala/compat/java8/JFunction2$mcIJI$sp.java diff --git a/src/scala/compat/java8/JFunction2$mcIJJ$sp.java b/library/src/scala/compat/java8/JFunction2$mcIJJ$sp.java similarity index 100% rename from src/scala/compat/java8/JFunction2$mcIJJ$sp.java rename to library/src/scala/compat/java8/JFunction2$mcIJJ$sp.java diff --git a/src/scala/compat/java8/JFunction2$mcJDD$sp.java b/library/src/scala/compat/java8/JFunction2$mcJDD$sp.java similarity index 100% rename from src/scala/compat/java8/JFunction2$mcJDD$sp.java rename to library/src/scala/compat/java8/JFunction2$mcJDD$sp.java diff --git a/src/scala/compat/java8/JFunction2$mcJDI$sp.java b/library/src/scala/compat/java8/JFunction2$mcJDI$sp.java similarity index 100% rename from src/scala/compat/java8/JFunction2$mcJDI$sp.java rename to library/src/scala/compat/java8/JFunction2$mcJDI$sp.java diff --git a/src/scala/compat/java8/JFunction2$mcJDJ$sp.java b/library/src/scala/compat/java8/JFunction2$mcJDJ$sp.java similarity index 100% rename from src/scala/compat/java8/JFunction2$mcJDJ$sp.java rename to library/src/scala/compat/java8/JFunction2$mcJDJ$sp.java diff --git a/src/scala/compat/java8/JFunction2$mcJID$sp.java b/library/src/scala/compat/java8/JFunction2$mcJID$sp.java similarity index 100% rename from src/scala/compat/java8/JFunction2$mcJID$sp.java rename to library/src/scala/compat/java8/JFunction2$mcJID$sp.java diff --git a/src/scala/compat/java8/JFunction2$mcJII$sp.java b/library/src/scala/compat/java8/JFunction2$mcJII$sp.java similarity index 100% rename from src/scala/compat/java8/JFunction2$mcJII$sp.java rename to library/src/scala/compat/java8/JFunction2$mcJII$sp.java diff --git a/src/scala/compat/java8/JFunction2$mcJIJ$sp.java b/library/src/scala/compat/java8/JFunction2$mcJIJ$sp.java similarity index 100% rename from src/scala/compat/java8/JFunction2$mcJIJ$sp.java rename to library/src/scala/compat/java8/JFunction2$mcJIJ$sp.java diff --git a/src/scala/compat/java8/JFunction2$mcJJD$sp.java b/library/src/scala/compat/java8/JFunction2$mcJJD$sp.java similarity index 100% rename from src/scala/compat/java8/JFunction2$mcJJD$sp.java rename to library/src/scala/compat/java8/JFunction2$mcJJD$sp.java diff --git a/src/scala/compat/java8/JFunction2$mcJJI$sp.java b/library/src/scala/compat/java8/JFunction2$mcJJI$sp.java similarity index 100% rename from src/scala/compat/java8/JFunction2$mcJJI$sp.java rename to library/src/scala/compat/java8/JFunction2$mcJJI$sp.java diff --git a/src/scala/compat/java8/JFunction2$mcJJJ$sp.java b/library/src/scala/compat/java8/JFunction2$mcJJJ$sp.java similarity index 100% rename from src/scala/compat/java8/JFunction2$mcJJJ$sp.java rename to library/src/scala/compat/java8/JFunction2$mcJJJ$sp.java diff --git a/src/scala/compat/java8/JFunction2$mcVDD$sp.java b/library/src/scala/compat/java8/JFunction2$mcVDD$sp.java similarity index 100% rename from src/scala/compat/java8/JFunction2$mcVDD$sp.java rename to library/src/scala/compat/java8/JFunction2$mcVDD$sp.java diff --git a/src/scala/compat/java8/JFunction2$mcVDI$sp.java b/library/src/scala/compat/java8/JFunction2$mcVDI$sp.java similarity index 100% rename from src/scala/compat/java8/JFunction2$mcVDI$sp.java rename to library/src/scala/compat/java8/JFunction2$mcVDI$sp.java diff --git a/src/scala/compat/java8/JFunction2$mcVDJ$sp.java b/library/src/scala/compat/java8/JFunction2$mcVDJ$sp.java similarity index 100% rename from src/scala/compat/java8/JFunction2$mcVDJ$sp.java rename to library/src/scala/compat/java8/JFunction2$mcVDJ$sp.java diff --git a/src/scala/compat/java8/JFunction2$mcVID$sp.java b/library/src/scala/compat/java8/JFunction2$mcVID$sp.java similarity index 100% rename from src/scala/compat/java8/JFunction2$mcVID$sp.java rename to library/src/scala/compat/java8/JFunction2$mcVID$sp.java diff --git a/src/scala/compat/java8/JFunction2$mcVII$sp.java b/library/src/scala/compat/java8/JFunction2$mcVII$sp.java similarity index 100% rename from src/scala/compat/java8/JFunction2$mcVII$sp.java rename to library/src/scala/compat/java8/JFunction2$mcVII$sp.java diff --git a/src/scala/compat/java8/JFunction2$mcVIJ$sp.java b/library/src/scala/compat/java8/JFunction2$mcVIJ$sp.java similarity index 100% rename from src/scala/compat/java8/JFunction2$mcVIJ$sp.java rename to library/src/scala/compat/java8/JFunction2$mcVIJ$sp.java diff --git a/src/scala/compat/java8/JFunction2$mcVJD$sp.java b/library/src/scala/compat/java8/JFunction2$mcVJD$sp.java similarity index 100% rename from src/scala/compat/java8/JFunction2$mcVJD$sp.java rename to library/src/scala/compat/java8/JFunction2$mcVJD$sp.java diff --git a/src/scala/compat/java8/JFunction2$mcVJI$sp.java b/library/src/scala/compat/java8/JFunction2$mcVJI$sp.java similarity index 100% rename from src/scala/compat/java8/JFunction2$mcVJI$sp.java rename to library/src/scala/compat/java8/JFunction2$mcVJI$sp.java diff --git a/src/scala/compat/java8/JFunction2$mcVJJ$sp.java b/library/src/scala/compat/java8/JFunction2$mcVJJ$sp.java similarity index 100% rename from src/scala/compat/java8/JFunction2$mcVJJ$sp.java rename to library/src/scala/compat/java8/JFunction2$mcVJJ$sp.java diff --git a/src/scala/compat/java8/JFunction2$mcZDD$sp.java b/library/src/scala/compat/java8/JFunction2$mcZDD$sp.java similarity index 100% rename from src/scala/compat/java8/JFunction2$mcZDD$sp.java rename to library/src/scala/compat/java8/JFunction2$mcZDD$sp.java diff --git a/src/scala/compat/java8/JFunction2$mcZDI$sp.java b/library/src/scala/compat/java8/JFunction2$mcZDI$sp.java similarity index 100% rename from src/scala/compat/java8/JFunction2$mcZDI$sp.java rename to library/src/scala/compat/java8/JFunction2$mcZDI$sp.java diff --git a/src/scala/compat/java8/JFunction2$mcZDJ$sp.java b/library/src/scala/compat/java8/JFunction2$mcZDJ$sp.java similarity index 100% rename from src/scala/compat/java8/JFunction2$mcZDJ$sp.java rename to library/src/scala/compat/java8/JFunction2$mcZDJ$sp.java diff --git a/src/scala/compat/java8/JFunction2$mcZID$sp.java b/library/src/scala/compat/java8/JFunction2$mcZID$sp.java similarity index 100% rename from src/scala/compat/java8/JFunction2$mcZID$sp.java rename to library/src/scala/compat/java8/JFunction2$mcZID$sp.java diff --git a/src/scala/compat/java8/JFunction2$mcZII$sp.java b/library/src/scala/compat/java8/JFunction2$mcZII$sp.java similarity index 100% rename from src/scala/compat/java8/JFunction2$mcZII$sp.java rename to library/src/scala/compat/java8/JFunction2$mcZII$sp.java diff --git a/src/scala/compat/java8/JFunction2$mcZIJ$sp.java b/library/src/scala/compat/java8/JFunction2$mcZIJ$sp.java similarity index 100% rename from src/scala/compat/java8/JFunction2$mcZIJ$sp.java rename to library/src/scala/compat/java8/JFunction2$mcZIJ$sp.java diff --git a/src/scala/compat/java8/JFunction2$mcZJD$sp.java b/library/src/scala/compat/java8/JFunction2$mcZJD$sp.java similarity index 100% rename from src/scala/compat/java8/JFunction2$mcZJD$sp.java rename to library/src/scala/compat/java8/JFunction2$mcZJD$sp.java diff --git a/src/scala/compat/java8/JFunction2$mcZJI$sp.java b/library/src/scala/compat/java8/JFunction2$mcZJI$sp.java similarity index 100% rename from src/scala/compat/java8/JFunction2$mcZJI$sp.java rename to library/src/scala/compat/java8/JFunction2$mcZJI$sp.java diff --git a/src/scala/compat/java8/JFunction2$mcZJJ$sp.java b/library/src/scala/compat/java8/JFunction2$mcZJJ$sp.java similarity index 100% rename from src/scala/compat/java8/JFunction2$mcZJJ$sp.java rename to library/src/scala/compat/java8/JFunction2$mcZJJ$sp.java diff --git a/src/scala/compat/java8/JFunction2.java b/library/src/scala/compat/java8/JFunction2.java similarity index 100% rename from src/scala/compat/java8/JFunction2.java rename to library/src/scala/compat/java8/JFunction2.java diff --git a/src/scala/compat/java8/JFunction20.java b/library/src/scala/compat/java8/JFunction20.java similarity index 100% rename from src/scala/compat/java8/JFunction20.java rename to library/src/scala/compat/java8/JFunction20.java diff --git a/src/scala/compat/java8/JFunction21.java b/library/src/scala/compat/java8/JFunction21.java similarity index 100% rename from src/scala/compat/java8/JFunction21.java rename to library/src/scala/compat/java8/JFunction21.java diff --git a/src/scala/compat/java8/JFunction22.java b/library/src/scala/compat/java8/JFunction22.java similarity index 100% rename from src/scala/compat/java8/JFunction22.java rename to library/src/scala/compat/java8/JFunction22.java diff --git a/src/scala/compat/java8/JFunction3.java b/library/src/scala/compat/java8/JFunction3.java similarity index 100% rename from src/scala/compat/java8/JFunction3.java rename to library/src/scala/compat/java8/JFunction3.java diff --git a/src/scala/compat/java8/JFunction4.java b/library/src/scala/compat/java8/JFunction4.java similarity index 100% rename from src/scala/compat/java8/JFunction4.java rename to library/src/scala/compat/java8/JFunction4.java diff --git a/src/scala/compat/java8/JFunction5.java b/library/src/scala/compat/java8/JFunction5.java similarity index 100% rename from src/scala/compat/java8/JFunction5.java rename to library/src/scala/compat/java8/JFunction5.java diff --git a/src/scala/compat/java8/JFunction6.java b/library/src/scala/compat/java8/JFunction6.java similarity index 100% rename from src/scala/compat/java8/JFunction6.java rename to library/src/scala/compat/java8/JFunction6.java diff --git a/src/scala/compat/java8/JFunction7.java b/library/src/scala/compat/java8/JFunction7.java similarity index 100% rename from src/scala/compat/java8/JFunction7.java rename to library/src/scala/compat/java8/JFunction7.java diff --git a/src/scala/compat/java8/JFunction8.java b/library/src/scala/compat/java8/JFunction8.java similarity index 100% rename from src/scala/compat/java8/JFunction8.java rename to library/src/scala/compat/java8/JFunction8.java diff --git a/src/scala/compat/java8/JFunction9.java b/library/src/scala/compat/java8/JFunction9.java similarity index 100% rename from src/scala/compat/java8/JFunction9.java rename to library/src/scala/compat/java8/JFunction9.java diff --git a/src/scala/compat/java8/JProcedure0.java b/library/src/scala/compat/java8/JProcedure0.java similarity index 100% rename from src/scala/compat/java8/JProcedure0.java rename to library/src/scala/compat/java8/JProcedure0.java diff --git a/src/scala/compat/java8/JProcedure1.java b/library/src/scala/compat/java8/JProcedure1.java similarity index 100% rename from src/scala/compat/java8/JProcedure1.java rename to library/src/scala/compat/java8/JProcedure1.java diff --git a/src/scala/compat/java8/JProcedure10.java b/library/src/scala/compat/java8/JProcedure10.java similarity index 100% rename from src/scala/compat/java8/JProcedure10.java rename to library/src/scala/compat/java8/JProcedure10.java diff --git a/src/scala/compat/java8/JProcedure11.java b/library/src/scala/compat/java8/JProcedure11.java similarity index 100% rename from src/scala/compat/java8/JProcedure11.java rename to library/src/scala/compat/java8/JProcedure11.java diff --git a/src/scala/compat/java8/JProcedure12.java b/library/src/scala/compat/java8/JProcedure12.java similarity index 100% rename from src/scala/compat/java8/JProcedure12.java rename to library/src/scala/compat/java8/JProcedure12.java diff --git a/src/scala/compat/java8/JProcedure13.java b/library/src/scala/compat/java8/JProcedure13.java similarity index 100% rename from src/scala/compat/java8/JProcedure13.java rename to library/src/scala/compat/java8/JProcedure13.java diff --git a/src/scala/compat/java8/JProcedure14.java b/library/src/scala/compat/java8/JProcedure14.java similarity index 100% rename from src/scala/compat/java8/JProcedure14.java rename to library/src/scala/compat/java8/JProcedure14.java diff --git a/src/scala/compat/java8/JProcedure15.java b/library/src/scala/compat/java8/JProcedure15.java similarity index 100% rename from src/scala/compat/java8/JProcedure15.java rename to library/src/scala/compat/java8/JProcedure15.java diff --git a/src/scala/compat/java8/JProcedure16.java b/library/src/scala/compat/java8/JProcedure16.java similarity index 100% rename from src/scala/compat/java8/JProcedure16.java rename to library/src/scala/compat/java8/JProcedure16.java diff --git a/src/scala/compat/java8/JProcedure17.java b/library/src/scala/compat/java8/JProcedure17.java similarity index 100% rename from src/scala/compat/java8/JProcedure17.java rename to library/src/scala/compat/java8/JProcedure17.java diff --git a/src/scala/compat/java8/JProcedure18.java b/library/src/scala/compat/java8/JProcedure18.java similarity index 100% rename from src/scala/compat/java8/JProcedure18.java rename to library/src/scala/compat/java8/JProcedure18.java diff --git a/src/scala/compat/java8/JProcedure19.java b/library/src/scala/compat/java8/JProcedure19.java similarity index 100% rename from src/scala/compat/java8/JProcedure19.java rename to library/src/scala/compat/java8/JProcedure19.java diff --git a/src/scala/compat/java8/JProcedure2.java b/library/src/scala/compat/java8/JProcedure2.java similarity index 100% rename from src/scala/compat/java8/JProcedure2.java rename to library/src/scala/compat/java8/JProcedure2.java diff --git a/src/scala/compat/java8/JProcedure20.java b/library/src/scala/compat/java8/JProcedure20.java similarity index 100% rename from src/scala/compat/java8/JProcedure20.java rename to library/src/scala/compat/java8/JProcedure20.java diff --git a/src/scala/compat/java8/JProcedure21.java b/library/src/scala/compat/java8/JProcedure21.java similarity index 100% rename from src/scala/compat/java8/JProcedure21.java rename to library/src/scala/compat/java8/JProcedure21.java diff --git a/src/scala/compat/java8/JProcedure22.java b/library/src/scala/compat/java8/JProcedure22.java similarity index 100% rename from src/scala/compat/java8/JProcedure22.java rename to library/src/scala/compat/java8/JProcedure22.java diff --git a/src/scala/compat/java8/JProcedure3.java b/library/src/scala/compat/java8/JProcedure3.java similarity index 100% rename from src/scala/compat/java8/JProcedure3.java rename to library/src/scala/compat/java8/JProcedure3.java diff --git a/src/scala/compat/java8/JProcedure4.java b/library/src/scala/compat/java8/JProcedure4.java similarity index 100% rename from src/scala/compat/java8/JProcedure4.java rename to library/src/scala/compat/java8/JProcedure4.java diff --git a/src/scala/compat/java8/JProcedure5.java b/library/src/scala/compat/java8/JProcedure5.java similarity index 100% rename from src/scala/compat/java8/JProcedure5.java rename to library/src/scala/compat/java8/JProcedure5.java diff --git a/src/scala/compat/java8/JProcedure6.java b/library/src/scala/compat/java8/JProcedure6.java similarity index 100% rename from src/scala/compat/java8/JProcedure6.java rename to library/src/scala/compat/java8/JProcedure6.java diff --git a/src/scala/compat/java8/JProcedure7.java b/library/src/scala/compat/java8/JProcedure7.java similarity index 100% rename from src/scala/compat/java8/JProcedure7.java rename to library/src/scala/compat/java8/JProcedure7.java diff --git a/src/scala/compat/java8/JProcedure8.java b/library/src/scala/compat/java8/JProcedure8.java similarity index 100% rename from src/scala/compat/java8/JProcedure8.java rename to library/src/scala/compat/java8/JProcedure8.java diff --git a/src/scala/compat/java8/JProcedure9.java b/library/src/scala/compat/java8/JProcedure9.java similarity index 100% rename from src/scala/compat/java8/JProcedure9.java rename to library/src/scala/compat/java8/JProcedure9.java diff --git a/src/scala/runtime/ScalaRunTime.scala b/library/src/scala/runtime/ScalaRunTime.scala similarity index 100% rename from src/scala/runtime/ScalaRunTime.scala rename to library/src/scala/runtime/ScalaRunTime.scala diff --git a/project/Build.scala b/project/Build.scala index 799f8ef8fcfe..fbbd2012814e 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -51,6 +51,15 @@ object DottyBuild extends Build { private val overrideScalaVersionSetting = ivyScala := ivyScala.value.map(_.copy(overrideScalaVersion = true)) + // set sources to src/, tests to test/ and resources to resources/ + lazy val sourceStructure = Seq( + scalaSource in Compile := baseDirectory.value / "src", + scalaSource in Test := baseDirectory.value / "test", + javaSource in Compile := baseDirectory.value / "src", + javaSource in Test := baseDirectory.value / "test", + resourceDirectory in Compile := baseDirectory.value / "resources" + ) + lazy val `dotty-interfaces` = project.in(file("interfaces")). settings( // Do not append Scala versions to the generated artifacts @@ -62,17 +71,15 @@ object DottyBuild extends Build { ). settings(publishing) - lazy val dotty = project.in(file(".")). + lazy val `dotty-compiler` = project.in(file(".")). dependsOn(`dotty-interfaces`). + dependsOn(`dotty-library`). + settings(sourceStructure). settings( overrideScalaVersionSetting, - // set sources to src/, tests to test/ and resources to resources/ - scalaSource in Compile := baseDirectory.value / "src", - javaSource in Compile := baseDirectory.value / "src", - scalaSource in Test := baseDirectory.value / "test", - javaSource in Test := baseDirectory.value / "test", - resourceDirectory in Compile := baseDirectory.value / "resources", + // necessary evil: dottydoc currently needs to be included in the dotty + // project, for sbt integration unmanagedSourceDirectories in Compile := Seq((scalaSource in Compile).value), unmanagedSourceDirectories in Compile += baseDirectory.value / "dottydoc" / "src", unmanagedSourceDirectories in Test := Seq((scalaSource in Test).value), @@ -130,7 +137,7 @@ object DottyBuild extends Build { val args = Def.spaceDelimited("").parsed val jars = Seq((packageBin in Compile).value.getAbsolutePath) ++ getJarPaths(partestDeps.value, ivyPaths.value.ivyHome) - val dottyJars = "-dottyJars " + (jars.length + 1) + " dotty.jar" + " " + jars.mkString(" ") + val dottyJars = "-dottyJars " + (jars.length + 2) + " dotty.jar dotty-lib.jar" + " " + jars.mkString(" ") // Provide the jars required on the classpath of run tests runTask(Test, "dotty.partest.DPConsoleRunner", dottyJars + " " + args.mkString(" ")) }, @@ -211,17 +218,26 @@ object DottyBuild extends Build { ). settings(publishing) + lazy val `dotty-library` = project.in(file("library")). + settings(sourceStructure). + settings( + libraryDependencies ++= Seq( + "org.scala-lang" % "scala-reflect" % scalaVersion.value, + "org.scala-lang" % "scala-library" % scalaVersion.value + ) + ) + // until sbt/sbt#2402 is fixed (https://github.com/sbt/sbt/issues/2402) lazy val cleanSbtBridge = TaskKey[Unit]("cleanSbtBridge", "delete dotty-sbt-bridge cache") lazy val `dotty-sbt-bridge` = project.in(file("sbt-bridge")). - dependsOn(dotty). + dependsOn(`dotty-compiler`). settings( overrideScalaVersionSetting, cleanSbtBridge := { val dottyBridgeVersion = version.value - val dottyVersion = (version in dotty).value + val dottyVersion = (version in `dotty-compiler`).value val classVersion = System.getProperty("java.class.version") val sbtV = sbtVersion.value @@ -335,11 +351,11 @@ object DottyInjectedPlugin extends AutoPlugin { ))) lazy val `dotty-bench` = project.in(file("bench")). - dependsOn(dotty % "compile->test"). + dependsOn(`dotty-compiler` % "compile->test"). settings( overrideScalaVersionSetting, - baseDirectory in (Test,run) := (baseDirectory in dotty).value, + baseDirectory in (Test,run) := (baseDirectory in `dotty-compiler`).value, libraryDependencies ++= Seq( scalaCompiler % Test, @@ -474,7 +490,7 @@ object DottyInjectedPlugin extends AutoPlugin { def cpToString(cp: Seq[File]) = cp.map(_.getAbsolutePath).mkString(java.io.File.pathSeparator) - val compilerCp = Attributed.data((fullClasspath in (dotty, Compile)).value) + val compilerCp = Attributed.data((fullClasspath in (`dotty-compiler`, Compile)).value) val cpStr = cpToString(classpath ++ compilerCp) // List all my dependencies (recompile if any of these changes) diff --git a/src/typedapply.scala b/src/typedapply.scala deleted file mode 100644 index 8496d528bb67..000000000000 --- a/src/typedapply.scala +++ /dev/null @@ -1,11 +0,0 @@ -object typedapply { - - def foo[X, Y](x: X, y: Y) = (x, y) - - foo(1, "abc") - - foo[Int, String](1, "abc") - - foo[Int, String] _ - -} From 805884cb664467ae97922e1afe44891c64fcfde2 Mon Sep 17 00:00:00 2001 From: Felix Mulder Date: Wed, 19 Oct 2016 15:03:26 +0200 Subject: [PATCH 03/55] Remove compiler when running applications via dotr --- bin/dotr | 3 +-- test/dotty/partest/DPConsoleRunner.scala | 6 +++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/bin/dotr b/bin/dotr index 8a495e780fa1..553b831caf6f 100755 --- a/bin/dotr +++ b/bin/dotr @@ -11,8 +11,7 @@ DOTTY_ROOT="$( cd "$DOTTY_ROOT" >& /dev/null && pwd )/.." # absolute # Load common functions and variables source $DOTTY_ROOT/bin/common -# CLASS_PATH is derived from the DOTTY_ROOT and SCALA_LIBRARY_JAR -CLASS_PATH="-Xbootclasspath/a:.:$DOTTY_ROOT/target/scala-$SCALA_BINARY_VERSION/classes/:.:$SCALA_LIBRARY_JAR" +CLASS_PATH="-classpath .:$DOTTY_LIB_JAR:.:$SCALA_LIBRARY_JAR" function runMain { local jbin=$(which "java") diff --git a/test/dotty/partest/DPConsoleRunner.scala b/test/dotty/partest/DPConsoleRunner.scala index d445722c9588..18fac4de8fca 100644 --- a/test/dotty/partest/DPConsoleRunner.scala +++ b/test/dotty/partest/DPConsoleRunner.scala @@ -302,7 +302,11 @@ class DPTestRunner(testFile: File, suiteRunner: DPSuiteRunner) extends nest.Runn } // override to add dotty and scala jars to classpath - override def extraClasspath = suiteRunner.fileManager.asInstanceOf[DottyFileManager].extraJarList ::: super.extraClasspath + override def extraClasspath = { + val cp = suiteRunner.fileManager.asInstanceOf[DottyFileManager].extraJarList ::: super.extraClasspath + println(s"extraClasspath: $cp") + cp + } // override to keep class files if failed and delete clog if ok override def cleanup = if (lastState.isOk) { From 6351c6cc8c3014fd1fbb8244e872c9e28773dad0 Mon Sep 17 00:00:00 2001 From: Felix Mulder Date: Wed, 19 Oct 2016 15:30:27 +0200 Subject: [PATCH 04/55] Create dotty-lib.jar for run tests --- .gitignore | 1 + bin/common | 4 +- library/src/dotty/runtime/LegacyApp.scala | 7 +- project/Build.scala | 35 +++++- .../tools/dotc/config/JavaPlatform.scala | 4 +- .../tools/dotc/config/PathResolver.scala | 22 +++- test/dotc/build.scala | 22 +++- test/dotc/tests.scala | 64 +++++++--- test/dotty/partest/DPConsoleRunner.scala | 113 ++++++++++++++---- test/test/CompilerTest.scala | 42 +++++-- test/test/DottyTest.scala | 9 +- test/test/InterfaceEntryPointTest.scala | 15 ++- tests/run/programmatic-main.check | 27 ----- tests/run/programmatic-main.scala | 16 --- tests/run/t2512.scala | 13 -- tests/run/t6194.check | 1 - tests/run/t6194.scala | 8 -- 17 files changed, 268 insertions(+), 135 deletions(-) delete mode 100644 tests/run/programmatic-main.check delete mode 100644 tests/run/programmatic-main.scala delete mode 100644 tests/run/t2512.scala delete mode 100644 tests/run/t6194.check delete mode 100644 tests/run/t6194.scala diff --git a/.gitignore b/.gitignore index 7c5baf8f8ece..9bee7afb8154 100644 --- a/.gitignore +++ b/.gitignore @@ -31,6 +31,7 @@ classes/ # Partest dotty.jar +dotty-lib.jar tests/partest-generated/ tests/locks/ /test-classes/ diff --git a/bin/common b/bin/common index 0d7dc615042a..cbefc33f851d 100755 --- a/bin/common +++ b/bin/common @@ -86,7 +86,7 @@ function build_all { printf "done\n" printf "Building dotty-compiler..." - MAIN_JAR=$(build_jar package "target/scala-$SCALA_BINARY_VERSION") + MAIN_JAR=$(build_jar dotty-compiler/package "target/scala-$SCALA_BINARY_VERSION") printf "done\n" printf "Building dotty library..." @@ -131,7 +131,7 @@ function check_jar { } check_jar "dotty-interfaces" $INTERFACES_JAR "interfaces" 'INTERFACES_JAR=$(build_jar dotty-interfaces/package interfaces/target)' -check_jar "dotty" $MAIN_JAR "src" 'MAIN_JAR=$(build_jar package target/scala-$SCALA_BINARY_VERSION)' +check_jar "dotty" $MAIN_JAR "src" 'MAIN_JAR=$(build_jar dotty-compiler/package target/scala-$SCALA_BINARY_VERSION)' check_jar "dotty-library" $DOTTY_LIB_JAR "library" 'DOTTY_LIB_JAR=$(build_jar dotty-library/package library/target/scala-$SCALA_BINARY_VERSION)' check_jar "dotty-tests" $TEST_JAR "test" 'TEST_JAR=$(build_jar test:package target/scala-$SCALA_BINARY_VERSION /dotty.*-tests\.jar/p)' diff --git a/library/src/dotty/runtime/LegacyApp.scala b/library/src/dotty/runtime/LegacyApp.scala index 2c4b295d05b5..1eae4c2be0c2 100644 --- a/library/src/dotty/runtime/LegacyApp.scala +++ b/library/src/dotty/runtime/LegacyApp.scala @@ -1,9 +1,8 @@ package dotty.runtime - -/** - * replaces the `scala.App` class which relies on `DelayedInit` functionality, not supported by Dotty. - */ +/** Replaces the `scala.App` class which relies on `DelayedInit` functionality, + * not supported by Dotty. + */ class LegacyApp { def main(args: Array[String]): Unit = () } diff --git a/project/Build.scala b/project/Build.scala index fbbd2012814e..7e48e2ddd971 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -137,7 +137,7 @@ object DottyBuild extends Build { val args = Def.spaceDelimited("").parsed val jars = Seq((packageBin in Compile).value.getAbsolutePath) ++ getJarPaths(partestDeps.value, ivyPaths.value.ivyHome) - val dottyJars = "-dottyJars " + (jars.length + 2) + " dotty.jar dotty-lib.jar" + " " + jars.mkString(" ") + val dottyJars = "-dottyJars " + (jars.length + 1) + " dotty-lib.jar" + " " + jars.mkString(" ") // Provide the jars required on the classpath of run tests runTask(Test, "dotty.partest.DPConsoleRunner", dottyJars + " " + args.mkString(" ")) }, @@ -191,7 +191,7 @@ object DottyBuild extends Build { path = file.getAbsolutePath } yield "-Xbootclasspath/p:" + path // dotty itself needs to be in the bootclasspath - val fullpath = ("-Xbootclasspath/p:" + "dotty.jar") :: ("-Xbootclasspath/a:" + bin) :: path.toList + val fullpath = /*("-Xbootclasspath/p:" + "dotty.jar") ::*/ ("-Xbootclasspath/a:" + bin) :: path.toList // System.err.println("BOOTPATH: " + fullpath) val travis_build = // propagate if this is a travis build @@ -211,10 +211,33 @@ object DottyBuild extends Build { } ). settings( - addCommandAlias("partest", ";test:package;package;test:runMain dotc.build;lockPartestFile;test:test;runPartestRunner") ++ - addCommandAlias("partest-only", ";test:package;package;test:runMain dotc.build;lockPartestFile;test:test-only dotc.tests;runPartestRunner") ++ - addCommandAlias("partest-only-no-bootstrap", ";test:package;package; lockPartestFile;test:test-only dotc.tests;runPartestRunner") ++ - addCommandAlias("dottydoc", ";dottydoc/run") + addCommandAlias( + "partest", + ";test:package" + + ";dotty-compiler/package" + + ";dotty-library/package" + + ";test:runMain dotc.build" + + ";lockPartestFile" + + ";test:test" + + ";runPartestRunner" + ) ++ + addCommandAlias("partest-only", + ";test:package" + + ";dotty-compiler/package" + + ";dotty-library/package" + + ";test:runMain dotc.build" + + ";lockPartestFile" + + ";test:test-only dotc.tests" + + ";runPartestRunner" + ) ++ + addCommandAlias( + "partest-only-no-bootstrap", + ";test:package" + + ";package" + + ";lockPartestFile" + + ";test:test-only dotc.tests" + + ";runPartestRunner" + ) ). settings(publishing) diff --git a/src/dotty/tools/dotc/config/JavaPlatform.scala b/src/dotty/tools/dotc/config/JavaPlatform.scala index 433b5b3f00c2..5a21acd1507b 100644 --- a/src/dotty/tools/dotc/config/JavaPlatform.scala +++ b/src/dotty/tools/dotc/config/JavaPlatform.scala @@ -16,7 +16,9 @@ class JavaPlatform extends Platform { def classPath(implicit ctx: Context): ClassPath = { if (currentClassPath.isEmpty) currentClassPath = Some(new PathResolver().result) - currentClassPath.get + val cp = currentClassPath.get + println(cp) + cp } // The given symbol is a method with the right name and signature to be a runnable java program. diff --git a/src/dotty/tools/dotc/config/PathResolver.scala b/src/dotty/tools/dotc/config/PathResolver.scala index 55d585e9488d..83d4c6933544 100644 --- a/src/dotty/tools/dotc/config/PathResolver.scala +++ b/src/dotty/tools/dotc/config/PathResolver.scala @@ -46,7 +46,23 @@ object PathResolver { def classPathEnv = envOrElse("CLASSPATH", "") def sourcePathEnv = envOrElse("SOURCEPATH", "") - def javaBootClassPath = propOrElse("sun.boot.class.path", searchForBootClasspath) + def javaBootClassPath = + propOrElse("sun.boot.class.path", searchForBootClasspath) + .split(":") + .filterNot { jar => + // This classpath gets propagated to the compiled resources and as + // such needs to be purged of things that should not be on the + // compiled programs' classpath: + jar.contains("dotty-compiler") || + jar.contains("dotty-library") || + jar.contains("dotty-interfaces") || + // let's blacklist locally compiled classes: + jar.contains("dotty/library/target") || + jar.contains("dotty/interfaces/target") || + jar.contains("dotty/target/scala-2.11") + } + .mkString(":") + def javaExtDirs = propOrEmpty("java.ext.dirs") def scalaHome = propOrEmpty("scala.home") def scalaExtDirs = propOrEmpty("scala.ext.dirs") @@ -213,11 +229,11 @@ class PathResolver(implicit ctx: Context) { * - Otherwise, if CLASSPATH is set, it is that * - If neither of those, then "." is used. */ - def userClassPath = ( + def userClassPath = { if (!settings.classpath.isDefault) settings.classpath.value else sys.env.getOrElse("CLASSPATH", ".") - ) + } import context._ diff --git a/test/dotc/build.scala b/test/dotc/build.scala index a805af7e50d6..b1c8db7c7a0f 100644 --- a/test/dotc/build.scala +++ b/test/dotc/build.scala @@ -16,15 +16,25 @@ object build extends tests { } } if(deleteFolder) folder.delete() -} + } - def main(args: Array[String]): Unit = { - println("------------ Building dotty ------------") + def clearOutput() = { deleteFilesInFolder(new File(defaultOutputDir)) // clear previous output val keepFile = new File(defaultOutputDir + ".keep") keepFile.createNewFile() - dotty // build output dir - val p = Runtime.getRuntime.exec(Array("jar", "cf", "dotty.jar", "-C", "out", ".")) - p.waitFor() + } + + def main(args: Array[String]): Unit = { + println("---------- Building bootstrapped dotty-lib ----------------------------------------------") + clearOutput() + dottyBootedLib + val p1 = Runtime.getRuntime.exec(Array("jar", "cf", "dotty-lib.jar", "-C", "out", ".")) + p1.waitFor() + + println("---------- Building bootstrapped dotty depending on dotty-lib compiled by dotty ----------") + clearOutput() + dottyDependsOnBootedLib + val p2 = Runtime.getRuntime.exec(Array("jar", "cf", "dotty.jar", "-C", "out", ".")) + p2.waitFor() } } diff --git a/test/dotc/tests.scala b/test/dotc/tests.scala index 01539aa5af07..4d3e8e1dd393 100644 --- a/test/dotc/tests.scala +++ b/test/dotc/tests.scala @@ -14,19 +14,26 @@ class tests extends CompilerTest { val defaultOutputDir = "./out/" val noCheckOptions = List( -// "-verbose", -// "-Ylog:frontend", -// "-Xprompt", -// "-explaintypes", -// "-Yshow-suppressed-errors", - "-d", defaultOutputDir, - "-pagewidth", "160") - - implicit val defaultOptions = noCheckOptions ++ - List("-Yno-deep-subtypes", "-Yno-double-bindings", "-Yforce-sbt-phases", "-color:never") ++ { - if (isRunByJenkins) List("-Ycheck:tailrec,resolveSuper,mixin,restoreScopes,labelDef") // should be Ycheck:all, but #725 - else List("-Ycheck:tailrec,resolveSuper,mixin,restoreScopes,labelDef") - } +// "-verbose", +// "-Ylog:frontend", +// "-Xprompt", +// "-explaintypes", +// "-Yshow-suppressed-errors", + "-d", defaultOutputDir, + "-pagewidth", "80" + ) + + implicit val defaultOptions = noCheckOptions ++ { + if (isRunByJenkins) List("-Ycheck:tailrec,resolveSuper,mixin,restoreScopes,labelDef") // should be Ycheck:all, but #725 + else List("-Ycheck:tailrec,resolveSuper,mixin,restoreScopes,labelDef") + } ++ List( + "-Yno-deep-subtypes", + "-Yno-double-bindings", + "-Yforce-sbt-phases", + "-color:never", + "-classpath", + "./library/target/scala-2.11/dotty-library_2.11-0.1-SNAPSHOT.jar" + ) val testPickling = List("-Xprint-types", "-Ytest-pickler", "-Ystop-after:pickler", "-Yprintpos") @@ -58,6 +65,7 @@ class tests extends CompilerTest { val parsingDir = dotcDir + "parsing/" val dottyReplDir = dotcDir + "repl/" val typerDir = dotcDir + "typer/" + val libDir = "./library/src/" @Before def cleanup(): Unit = { // remove class files from stdlib and tests compilation @@ -177,7 +185,31 @@ class tests extends CompilerTest { |./scala-scala/src/library/scala/collection/generic/GenSeqFactory.scala""".stripMargin) @Test def compileIndexedSeq = compileLine("./scala-scala/src/library/scala/collection/immutable/IndexedSeq.scala") - @Test def dotty = compileDir(dottyDir, ".", List("-deep", "-Ycheck-reentrant", "-strict"))(allowDeepSubtypes) // note the -deep argument + // Not a junit test anymore since it is order dependent + def dottyBootedLib = compileDir( + libDir, + ".", + List( + "-deep", "-Ycheck-reentrant", "-strict", "-classpath", defaultOutputDir + + ":./target/scala-2.11/dotty-compiler_2.11-0.1-SNAPSHOT.jar" //WAT??? + ) + )(allowDeepSubtypes) // note the -deep argument + + // Not a junit test anymore since it is order dependent + def dottyDependsOnBootedLib = compileDir( + dottyDir, + ".", + List( + "-deep", "-Ycheck-reentrant", "-strict", "-classpath", defaultOutputDir + + ":./dotty-lib.jar" + + ":./interfaces/target/dotty-interfaces-0.1-SNAPSHOT.jar" + + // this needs to get compiled together with the compiler: + //":./target/scala-2.11/src_managed/main/scalajs-ir-src/" + // but falling back to: + ":/home/fixel/.ivy2/cache/org.scala-js/scalajs-ir_2.11/jars/scalajs-ir_2.11-0.6.8.jar" + // for the time being. + ) + )(allowDeepSubtypes) // note the -deep argument @Test def dotc_ast = compileDir(dotcDir, "ast") @Test def dotc_config = compileDir(dotcDir, "config") @@ -231,8 +263,8 @@ class tests extends CompilerTest { // Disabled because we get stale symbol errors on the SourceFile annotation, which is normal. // @Test def tasty_annotation_internal = compileDir(s"${dottyDir}annotation/", "internal", testPickling) - @Test def tasty_runtime = compileDir(s"$dottyDir", "runtime", testPickling) - @Test def tasty_runtime_vc = compileDir(s"${dottyDir}runtime/", "vc", testPickling) + @Test def tasty_runtime = compileDir(s"${libDir}dotty/", "runtime", testPickling) + @Test def tasty_runtime_vc = compileDir(s"${libDir}dotty/runtime/", "vc", testPickling) @Test def tasty_tools = compileDir(dottyDir, "tools", testPickling) diff --git a/test/dotty/partest/DPConsoleRunner.scala b/test/dotty/partest/DPConsoleRunner.scala index 18fac4de8fca..27d53159b968 100644 --- a/test/dotty/partest/DPConsoleRunner.scala +++ b/test/dotty/partest/DPConsoleRunner.scala @@ -7,6 +7,9 @@ package dotty.partest import scala.reflect.io.AbstractFile import scala.tools.partest._ import scala.tools.partest.nest._ +import TestState.{ Pass, Fail, Crash, Uninitialized, Updated } +import ClassPath.{ join, split } +import FileManager.{ compareFiles, compareContents, joinPaths, withTempFile } import scala.util.matching.Regex import tools.nsc.io.{ File => NSCFile } import java.io.{ File, PrintStream, FileOutputStream, PrintWriter, FileWriter } @@ -27,6 +30,10 @@ object DPConsoleRunner { case Nil => sys.error("Error: DPConsoleRunner needs \"-dottyJars *\".") case jarFinder(nr, jarString) :: Nil => val jars = jarString.split(" ").toList + println("------------------------------------------------------------") + println("jars:") + jars.foreach(println) + println("------------------------------------------------------------") val count = nr.toInt if (jars.length < count) sys.error("Error: DPConsoleRunner found wrong number of dottyJars: " + jars + ", expected: " + nr) @@ -39,7 +46,6 @@ object DPConsoleRunner { // console runner has a suite runner which creates a test runner for each test class DPConsoleRunner(args: String, extraJars: List[String]) extends ConsoleRunner(args) { - override val suiteRunner = new DPSuiteRunner ( testSourcePath = optSourcePath getOrElse DPConfig.testRoot, fileManager = new DottyFileManager(extraJars), @@ -149,7 +155,11 @@ class DPTestRunner(testFile: File, suiteRunner: DPSuiteRunner) extends nest.Runn "-d", outDir.getAbsolutePath, "-classpath", - joinPaths(outDir :: extraClasspath ++ testClassPath) + joinPaths(outDir :: extraClasspath.filter { fp => + fp.endsWith("dotty-lib.jar") || + fp.endsWith("scala-library-2.11.5.jar") || + fp.endsWith("scala-reflect-2.11.5.jar") + }) ) ++ files.map(_.getAbsolutePath) pushTranscript(args mkString " ") @@ -162,6 +172,59 @@ class DPTestRunner(testFile: File, suiteRunner: DPSuiteRunner) extends nest.Runn } } + override def run(): TestState = { + if (kind == "run") { + // javac runner, for one, would merely append to an existing log file, so + // just delete it before we start + logFile.delete() + runTestCommon(execTest(outDir, logFile) && diffIsOk) + lastState + } else super.run() + } + + // Re-implemented for running tests + def execTest(outDir: File, logFile: File): Boolean = { + val argsFile = testFile changeExtension "javaopts" + val argString = file2String(argsFile) + if (argString != "") NestUI.verbose( + "Found javaopts file '%s', using options: '%s'".format(argsFile, argString) + ) + + val classpath = joinPaths { + val sep = sys.props("path.separator") + val fps = extraClasspath.filter { fp => + fp.endsWith("dotty-lib.jar") || + fp.endsWith("scala-library-2.11.5.jar") || + fp.endsWith("scala-reflect-2.11.5.jar") + } + + fps ++ fileManager.testClassPath + } + + val javaOpts: List[String] = ( + suiteRunner.javaOpts.split(' ') ++ + extraJavaOptions ++ + argString.split(' ') + ).map(_.trim).filter(_ != "").toList + + val cmd: List[String] = (suiteRunner.javaCmdPath :: javaOpts) ++ ( + "-classpath" :: join(outDir.toString, classpath) :: + "Test" :: "jvm" :: // default argument to Test class in super is "jvm" + Nil + ) + + pushTranscript((cmd mkString s" \\$EOL ") + " > " + logFile.getName) + nextTestAction(runCommand(cmd, logFile)) { + case false => + //_transcript append EOL + logFile.fileContents + // think this is equivalent: + val contents = logFile.fileContents + println(contents) + pushTranscript(contents) + genFail("non-zero exit code") + } + } + // FIXME: This is copy-pasted from nest.Runner where it is private // Remove this once https://github.com/scala/scala-partest/pull/61 is merged /** Runs command redirecting standard out and @@ -196,6 +259,7 @@ class DPTestRunner(testFile: File, suiteRunner: DPSuiteRunner) extends nest.Runn if (specificFlags.isEmpty) defaultFlags else specificFlags } + val defaultFlags = { val defaultFile = parentFile.listFiles.toList.find(_.getName == "__defaultFlags.flags") defaultFile.map({ file => @@ -206,7 +270,6 @@ class DPTestRunner(testFile: File, suiteRunner: DPSuiteRunner) extends nest.Runn // override to add the check for nr of compilation errors if there's a // target.nerr file override def runNegTest() = runInContext { - import TestState.{ Crash, Fail } import scala.reflect.internal.FatalError sealed abstract class NegTestState @@ -233,11 +296,14 @@ class DPTestRunner(testFile: File, suiteRunner: DPSuiteRunner) extends nest.Runn // we keep the partest semantics where only one round needs to fail // compilation, not all - val compFailingRounds = compilationRounds(testFile).map({round => - val ok = round.isOk - setLastState(if (ok) genPass else genFail("compilation failed")) - (round.result, ok) - }).filter({ case (_, ok) => !ok }) + val compFailingRounds = + compilationRounds(testFile) + .map { round => + val ok = round.isOk + setLastState(if (ok) genPass else genFail("compilation failed")) + (round.result, ok) + } + .filter { case (_, ok) => !ok } val failureStates = compFailingRounds.map({ case (result, _) => result match { // or, OK, we'll let you crash the compiler with a FatalError if you supply a check file @@ -250,21 +316,24 @@ class DPTestRunner(testFile: File, suiteRunner: DPSuiteRunner) extends nest.Runn true } else { val existsNerr = failureStates.exists({ - case CompFailedButWrongNErr(exp, found) => nextTestActionFailing(s"wrong number of compilation errors, expected: $exp, found: $found"); true - case _ => false + case CompFailedButWrongNErr(exp, found) => + nextTestActionFailing(s"wrong number of compilation errors, expected: $exp, found: $found") + true + case _ => + false }) - if (existsNerr) { - false - } else { + + if (existsNerr) false + else { val existsDiff = failureStates.exists({ - case CompFailedButWrongDiff() => nextTestActionFailing(s"output differs"); true - case _ => false + case CompFailedButWrongDiff() => + nextTestActionFailing(s"output differs") + true + case _ => + false }) - if (existsDiff) { - false - } else { - nextTestActionFailing("expected compilation failure") - } + if (existsDiff) false + else nextTestActionFailing("expected compilation failure") } } } @@ -297,14 +366,14 @@ class DPTestRunner(testFile: File, suiteRunner: DPSuiteRunner) extends nest.Runn } pushTranscript(bestDiff) genFail("output differs") - case None => genPass() // redundant default case + case None => genPass() // redundant default case } getOrElse true } // override to add dotty and scala jars to classpath override def extraClasspath = { val cp = suiteRunner.fileManager.asInstanceOf[DottyFileManager].extraJarList ::: super.extraClasspath - println(s"extraClasspath: $cp") + //println(s"extraClasspath: $cp") cp } diff --git a/test/test/CompilerTest.scala b/test/test/CompilerTest.scala index 8cf6b2feb1d2..fe63106b5f2e 100644 --- a/test/test/CompilerTest.scala +++ b/test/test/CompilerTest.scala @@ -124,6 +124,26 @@ abstract class CompilerTest { compileFile(prefix, fileName, args, extension, true) } + def findJarFromRuntime(partialName: String): String = { + val urls = ClassLoader.getSystemClassLoader.asInstanceOf[java.net.URLClassLoader].getURLs.map(_.getFile.toString) + urls.find(_.contains(partialName)).getOrElse { + throw new java.io.FileNotFoundException( + s"""Unable to locate $partialName on classpath:\n${urls.toList.mkString("\n")}""" + ) + } + } + + private def compileWithJavac(fs: Array[String], args: Array[String]): Unit = { + val scalaLib = findJarFromRuntime("scala-library") + val fullArgs = Array( + "javac", + "-classpath", + s".:$scalaLib" + ) ++ args ++ fs ++ Array("-d", defaultOutputDir) + + Runtime.getRuntime.exec(fullArgs).waitFor() + } + /** Compiles the code files in the given directory together. If args starts * with "-deep", all files in subdirectories (and so on) are included. */ def compileDir(prefix: String, dirName: String, args: List[String] = Nil, runTest: Boolean = false) @@ -134,14 +154,21 @@ abstract class CompilerTest { case "-deep" :: args1 => (dir.deepFiles, args1) case _ => (dir.files, args) } - val filePaths = files.toArray.map(_.toString).filter(name => (name endsWith ".scala") || (name endsWith ".java")) + val (filePaths, javaFilePaths) = files + .toArray.map(_.toString) + .foldLeft((Array.empty[String], Array.empty[String])) { case (acc @ (fp, jfp), name) => + if (name endsWith ".scala") (name +: fp, jfp) + else if (name endsWith ".java") (fp, name +: jfp) + else (fp, jfp) + } val expErrors = expectedErrors(filePaths.toList) - (filePaths, normArgs, expErrors) + (filePaths, javaFilePaths, normArgs, expErrors) } if (!generatePartestFiles || !partestableDir(prefix, dirName, args ++ defaultOptions)) { if (runTest) log(s"WARNING: run tests can only be run by partest, JUnit just verifies compilation: $prefix$dirName") - val (filePaths, normArgs, expErrors) = computeFilePathsAndExpErrors + val (filePaths, javaFilePaths, normArgs, expErrors) = computeFilePathsAndExpErrors + compileWithJavac(javaFilePaths, Array.empty) // javac needs to run first on dotty-library compileArgs(filePaths ++ normArgs, expErrors) } else { val (sourceDir, flags, deep) = args match { @@ -154,7 +181,7 @@ abstract class CompilerTest { if (sourceDir.exists) { val firstDest = Directory(DPConfig.testRoot + JFile.separator + kind + JFile.separator + dirName) val xerrors = if (isNegTest(prefix)) { - val (_, _, expErrors) = computeFilePathsAndExpErrors + val (_, _, _, expErrors) = computeFilePathsAndExpErrors expErrors.map(_.totalErrors).sum } else 0 computeDestAndCopyFiles(sourceDir, firstDest, kind, flags, xerrors.toString) @@ -234,6 +261,7 @@ abstract class CompilerTest { private def compileArgs(args: Array[String], expectedErrorsPerFile: List[ErrorsInFile]) (implicit defaultOptions: List[String]): Unit = { val allArgs = args ++ defaultOptions + //println(s"""all args: ${allArgs.mkString("\n")}""") val processor = if (allArgs.exists(_.startsWith("#"))) Bench else Main val storeReporter = new Reporter with UniqueMessagePositions with HideNonSensicalMessages { private val consoleReporter = new ConsoleReporter() @@ -472,16 +500,16 @@ abstract class CompilerTest { try { SFile(dest)(scala.io.Codec.UTF8).writeAll((s"/* !!!!! WARNING: DO NOT MODIFY. Original is at: $file !!!!! */").replace("\\", "/"), file.slurp("UTF-8")) } catch { - case unmappable: java.nio.charset.MalformedInputException => + case unmappable: java.nio.charset.MalformedInputException => copyfile(file, true) //there are bytes that can't be mapped with UTF-8. Bail and just do a straight byte-wise copy without the warning header. } } } - processFileDir(sourceFile, { sf => + processFileDir(sourceFile, { sf => if (extensionsToCopy.contains(sf.extension)) { dest.parent.jfile.mkdirs - copyfile(sf, false) + copyfile(sf, false) } else { log(s"WARNING: ignoring $sf") } diff --git a/test/test/DottyTest.scala b/test/test/DottyTest.scala index 4c8cd8a7b318..57bd9bbc4b4a 100644 --- a/test/test/DottyTest.scala +++ b/test/test/DottyTest.scala @@ -22,8 +22,14 @@ class DottyTest extends ContextEscapeDetection{ val base = new ContextBase {} import base.settings._ val ctx = base.initialCtx.fresh - base.initialize()(ctx) ctx.setSetting(ctx.settings.encoding, "UTF8") + ctx.setSetting( + ctx.settings.classpath, + "./library/target/scala-2.11/dotty-library_2.11-0.1-SNAPSHOT.jar" + ) + // when classpath is changed in ctx, we need to re-initialize to get the + // correct classpath from PathResolver + base.initialize()(ctx) ctx } @@ -31,6 +37,7 @@ class DottyTest extends ContextEscapeDetection{ override def clearCtx() = { ctx = null } + private def compilerWithChecker(phase: String)(assertion:(tpd.Tree, Context) => Unit) = new Compiler { override def phases = { val allPhases = super.phases diff --git a/test/test/InterfaceEntryPointTest.scala b/test/test/InterfaceEntryPointTest.scala index 438a9fa4771a..a1a8433d7cbd 100644 --- a/test/test/InterfaceEntryPointTest.scala +++ b/test/test/InterfaceEntryPointTest.scala @@ -18,8 +18,17 @@ import scala.collection.mutable.ListBuffer */ class InterfaceEntryPointTest { @Test def runCompilerFromInterface = { - val sources = List("./tests/pos/HelloWorld.scala").map(p => new java.io.File(p).getPath()) - val args = sources ++ List("-d", "./out/") + val sources = + List("./tests/pos/HelloWorld.scala").map(p => new java.io.File(p).getPath()) + val dottyInterfaces = + new java.io.File("./interfaces/dotty-interfaces-0.1-SNAPSHOT.jar").getPath + val dottyLibrary = + new java.io.File("./library/target/scala-2.11/dotty-library_2.11-0.1-SNAPSHOT.jar").getPath + + val args = + sources ++ + List("-d", "./out/") ++ + List("-classpath", dottyInterfaces + ":" + dottyLibrary) val mainClass = Class.forName("dotty.tools.dotc.Main") val process = mainClass.getMethod("process", @@ -45,6 +54,8 @@ class InterfaceEntryPointTest { errorCount += 1 if (diag.level == Diagnostic.WARNING) warningCount += 1 + + println(diag.message) } } diff --git a/tests/run/programmatic-main.check b/tests/run/programmatic-main.check deleted file mode 100644 index 1cd94ccb453f..000000000000 --- a/tests/run/programmatic-main.check +++ /dev/null @@ -1,27 +0,0 @@ - phase name id description - ---------- -- ----------- - parser 1 parse source into ASTs, perform simple desugaring - namer 2 resolve names, attach symbols to named trees -packageobjects 3 load package objects - typer 4 the meat and potatoes: type the trees - patmat 5 translate match expressions -superaccessors 6 add super accessors in traits and nested classes - extmethods 7 add extension methods for inline classes - pickler 8 serialize symbol tables - refchecks 9 reference/override checking, translate nested objects - uncurry 10 uncurry, translate function values to anonymous classes - tailcalls 11 replace tail calls by jumps - specialize 12 @specialized-driven class and method specialization - explicitouter 13 this refs to outer pointers - erasure 14 erase types, add interfaces for traits - posterasure 15 clean up erased inline classes - lazyvals 16 allocate bitmaps, translate lazy vals into lazified defs - lambdalift 17 move nested functions to top level - constructors 18 move field definitions into constructors - flatten 19 eliminate inner classes - mixin 20 mixin composition - cleanup 21 platform-specific cleanups, generate reflective calls - delambdafy 22 remove lambdas - icode 23 generate portable intermediate code - jvm 24 generate JVM bytecode - terminal 25 the last phase during a compilation run diff --git a/tests/run/programmatic-main.scala b/tests/run/programmatic-main.scala deleted file mode 100644 index 542ac2781e47..000000000000 --- a/tests/run/programmatic-main.scala +++ /dev/null @@ -1,16 +0,0 @@ - -import scala.language.postfixOps -import scala.tools.nsc._ -import io.Path - -object Test { - val cwd = Option(System.getProperty("partest.cwd")) getOrElse "." - val basedir = Path(cwd).parent / "lib" path - val baseargs = Array("-usejavacp", "-bootclasspath", basedir + "/scala-library.jar", "-cp", basedir + "/scala-compiler.jar") - - def main(args: Array[String]): Unit = { - Console.withErr(Console.out) { - Main process (baseargs ++ "-Xpluginsdir /does/not/exist/foo/quux -Xshow-phases".split(' ')) - } - } -} diff --git a/tests/run/t2512.scala b/tests/run/t2512.scala deleted file mode 100644 index 8166839a9abd..000000000000 --- a/tests/run/t2512.scala +++ /dev/null @@ -1,13 +0,0 @@ -import scala.tools.nsc.util.HashSet - -object Test { - val runs = 10000 - class Bop - - def main(args: Array[String]): Unit = { - val set: HashSet[Bop] = HashSet("Bop", 16) - (1 to runs).toList foreach (_ => set addEntry new Bop) - - assert(runs == set.size && set.size == set.iterator.length) - } -} diff --git a/tests/run/t6194.check b/tests/run/t6194.check deleted file mode 100644 index b325f479d794..000000000000 --- a/tests/run/t6194.check +++ /dev/null @@ -1 +0,0 @@ -C:\FooBar\Java\includes\*.jar diff --git a/tests/run/t6194.scala b/tests/run/t6194.scala deleted file mode 100644 index ced325942725..000000000000 --- a/tests/run/t6194.scala +++ /dev/null @@ -1,8 +0,0 @@ -import scala.tools.nsc.util._ - -object Test { - def main(args: Array[String]): Unit = { - val cp = ClassPath.expandPath("""C:\FooBar\Java\includes\*.jar""") mkString java.io.File.pathSeparator - println(cp) - } -} From bbc46b4ad9aecd0998f0fa49f349a91f1d665ca8 Mon Sep 17 00:00:00 2001 From: Felix Mulder Date: Sun, 23 Oct 2016 16:22:00 +0200 Subject: [PATCH 05/55] Add dotty-library to classpath in dottydoc tests --- dottydoc/test/BaseTest.scala | 4 ++ project/Build.scala | 16 ++++--- .../tools/dotc/config/JavaPlatform.scala | 2 +- .../tools/dotc/config/PathResolver.scala | 41 +++++++--------- .../tools/dotc/config/ScalaSettings.scala | 2 +- test/dotc/tests.scala | 23 +++++---- test/test/CompilerTest.scala | 11 +++-- test/test/OtherEntryPointsTest.scala | 17 ++++--- test/test/ShowClassTests.scala | 13 +++++ test/test/TestREPL.scala | 12 ++++- tests/repl/errmsgs.check | 48 +++++++++---------- tests/repl/imports.check | 2 +- 12 files changed, 111 insertions(+), 80 deletions(-) diff --git a/dottydoc/test/BaseTest.scala b/dottydoc/test/BaseTest.scala index 303c476a53b9..e439c6eca02f 100644 --- a/dottydoc/test/BaseTest.scala +++ b/dottydoc/test/BaseTest.scala @@ -21,6 +21,10 @@ trait DottyTest { ctx.setSetting(ctx.settings.YkeepComments, true) ctx.setSetting(ctx.settings.YnoInline, true) ctx.setProperty(ContextDoc, new ContextDottydoc) + ctx.setSetting( + ctx.settings.classpath, + "./library/target/scala-2.11/dotty-library_2.11-0.1-SNAPSHOT.jar" + ) base.initialize()(ctx) ctx } diff --git a/project/Build.scala b/project/Build.scala index 7e48e2ddd971..e650325d4050 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -212,19 +212,22 @@ object DottyBuild extends Build { ). settings( addCommandAlias( - "partest", - ";test:package" + + "packageAll", + ";dotty-interfaces/package" + ";dotty-compiler/package" + ";dotty-library/package" + + ";test:package" + ) ++ + addCommandAlias( + "partest", + ";packageAll" + ";test:runMain dotc.build" + ";lockPartestFile" + ";test:test" + ";runPartestRunner" ) ++ addCommandAlias("partest-only", - ";test:package" + - ";dotty-compiler/package" + - ";dotty-library/package" + + ";packageAll" + ";test:runMain dotc.build" + ";lockPartestFile" + ";test:test-only dotc.tests" + @@ -232,8 +235,7 @@ object DottyBuild extends Build { ) ++ addCommandAlias( "partest-only-no-bootstrap", - ";test:package" + - ";package" + + ";packageAll" + ";lockPartestFile" + ";test:test-only dotc.tests" + ";runPartestRunner" diff --git a/src/dotty/tools/dotc/config/JavaPlatform.scala b/src/dotty/tools/dotc/config/JavaPlatform.scala index 5a21acd1507b..a695202d33fc 100644 --- a/src/dotty/tools/dotc/config/JavaPlatform.scala +++ b/src/dotty/tools/dotc/config/JavaPlatform.scala @@ -17,7 +17,7 @@ class JavaPlatform extends Platform { if (currentClassPath.isEmpty) currentClassPath = Some(new PathResolver().result) val cp = currentClassPath.get - println(cp) + //println(cp) cp } diff --git a/src/dotty/tools/dotc/config/PathResolver.scala b/src/dotty/tools/dotc/config/PathResolver.scala index 83d4c6933544..1f9ee7eecc01 100644 --- a/src/dotty/tools/dotc/config/PathResolver.scala +++ b/src/dotty/tools/dotc/config/PathResolver.scala @@ -20,7 +20,7 @@ object PathResolver { // security exceptions. import AccessControl._ - def firstNonEmpty(xs: String*) = xs find (_ != "") getOrElse "" + def firstNonEmpty(xs: String*) = xs find (_ != "") getOrElse "" /** Map all classpath elements to absolute paths and reconstruct the classpath. */ @@ -50,16 +50,12 @@ object PathResolver { propOrElse("sun.boot.class.path", searchForBootClasspath) .split(":") .filterNot { jar => - // This classpath gets propagated to the compiled resources and as - // such needs to be purged of things that should not be on the - // compiled programs' classpath: - jar.contains("dotty-compiler") || - jar.contains("dotty-library") || - jar.contains("dotty-interfaces") || // let's blacklist locally compiled classes: - jar.contains("dotty/library/target") || - jar.contains("dotty/interfaces/target") || - jar.contains("dotty/target/scala-2.11") + jar.contains("/dotty/library/target/classes") || + jar.contains("/dotty/library/target/scala-2.11/classes") || + jar.contains("/dotty/interfaces/target/classes") || + jar.contains("/dotty/target/scala-2.11/classes") || + jar.contains("/dotty/target/classes") } .mkString(":") @@ -71,20 +67,14 @@ object PathResolver { def javaUserClassPath = propOrElse("java.class.path", "") def useJavaClassPath = propOrFalse("scala.usejavacp") - override def toString = """ + override def toString = s""" |object Environment { - | scalaHome = %s (useJavaClassPath = %s) - | javaBootClassPath = <%d chars> - | javaExtDirs = %s - | javaUserClassPath = %s - | scalaExtDirs = %s - |}""".trim.stripMargin.format( - scalaHome, useJavaClassPath, - javaBootClassPath.length, - ppcp(javaExtDirs), - ppcp(javaUserClassPath), - ppcp(scalaExtDirs) - ) + | scalaHome = $scalaHome (useJavaClassPath = $useJavaClassPath) + | javaBootClassPath = <${javaBootClassPath.length} chars> + | javaExtDirs = ${ppcp(javaExtDirs)} + | javaUserClassPath = ${ppcp(javaUserClassPath)} + | scalaExtDirs = ${ppcp(scalaExtDirs)} + |}""".trim.stripMargin } /** Default values based on those in Environment as interpreted according @@ -259,7 +249,7 @@ class PathResolver(implicit ctx: Context) { | javaBootClassPath = %s | javaExtDirs = %s | javaUserClassPath = %s - | useJavaClassPath = %s + | useJavaClassPath = %s | scalaBootClassPath = %s | scalaExtDirs = %s | userClassPath = %s @@ -276,7 +266,8 @@ class PathResolver(implicit ctx: Context) { def containers = Calculated.containers lazy val result: JavaClassPath = { - val cp = new JavaClassPath(containers.toIndexedSeq, context) + val (dottyJars, others) = containers.partition(_.name.contains("dotty")) + val cp = new JavaClassPath((dottyJars ++ others).toIndexedSeq, context) if (settings.Ylogcp.value) { Console.println("Classpath built from " + settings.toConciseString(ctx.sstate)) Console.println("Defaults: " + PathResolver.Defaults) diff --git a/src/dotty/tools/dotc/config/ScalaSettings.scala b/src/dotty/tools/dotc/config/ScalaSettings.scala index 8f47e08bf302..fd2ded0b5d95 100644 --- a/src/dotty/tools/dotc/config/ScalaSettings.scala +++ b/src/dotty/tools/dotc/config/ScalaSettings.scala @@ -42,7 +42,7 @@ class ScalaSettings extends Settings.SettingGroup { val usejavacp = BooleanSetting("-usejavacp", "Utilize the java.class.path in classpath resolution.") val verbose = BooleanSetting("-verbose", "Output messages about what the compiler is doing.") val version = BooleanSetting("-version", "Print product version and exit.") - val pageWidth = IntSetting("-pagewidth", "Set page width", 120) + val pageWidth = IntSetting("-pagewidth", "Set page width", 80) val jvmargs = PrefixSetting("-J", "-J", "Pass directly to the runtime system.") val defines = PrefixSetting("-Dproperty=value", "-D", "Pass -Dproperty=value directly to the runtime system.") diff --git a/test/dotc/tests.scala b/test/dotc/tests.scala index 4d3e8e1dd393..747396c73a81 100644 --- a/test/dotc/tests.scala +++ b/test/dotc/tests.scala @@ -19,22 +19,25 @@ class tests extends CompilerTest { // "-Xprompt", // "-explaintypes", // "-Yshow-suppressed-errors", - "-d", defaultOutputDir, - "-pagewidth", "80" + "-pagewidth", "120", + "-d", defaultOutputDir ) - implicit val defaultOptions = noCheckOptions ++ { - if (isRunByJenkins) List("-Ycheck:tailrec,resolveSuper,mixin,restoreScopes,labelDef") // should be Ycheck:all, but #725 - else List("-Ycheck:tailrec,resolveSuper,mixin,restoreScopes,labelDef") - } ++ List( + val classPath = List( "-Yno-deep-subtypes", "-Yno-double-bindings", "-Yforce-sbt-phases", "-color:never", "-classpath", - "./library/target/scala-2.11/dotty-library_2.11-0.1-SNAPSHOT.jar" + "./library/target/scala-2.11/dotty-library_2.11-0.1-SNAPSHOT.jar" + + ":./interfaces/target/dotty-interfaces-0.1-SNAPSHOT.jar" ) + implicit val defaultOptions = noCheckOptions ++ { + if (isRunByJenkins) List("-Ycheck:tailrec,resolveSuper,mixin,restoreScopes,labelDef") // should be Ycheck:all, but #725 + else List("-Ycheck:tailrec,resolveSuper,mixin,restoreScopes,labelDef") + } ++ classPath + val testPickling = List("-Xprint-types", "-Ytest-pickler", "-Ystop-after:pickler", "-Yprintpos") val twice = List("#runs", "2") @@ -191,7 +194,9 @@ class tests extends CompilerTest { ".", List( "-deep", "-Ycheck-reentrant", "-strict", "-classpath", defaultOutputDir + - ":./target/scala-2.11/dotty-compiler_2.11-0.1-SNAPSHOT.jar" //WAT??? + ":./target/scala-2.11/dotty-compiler_2.11-0.1-SNAPSHOT.jar" + + ":./interfaces/target/dotty-interfaces-0.1-SNAPSHOT.jar" + + ":./library/target/scala-2.11/dotty-library_2.11-0.1-SNAPSHOT.jar" ) )(allowDeepSubtypes) // note the -deep argument @@ -214,7 +219,7 @@ class tests extends CompilerTest { @Test def dotc_ast = compileDir(dotcDir, "ast") @Test def dotc_config = compileDir(dotcDir, "config") @Test def dotc_core = compileDir(dotcDir, "core")(allowDeepSubtypes)// twice omitted to make tests run faster - @Test def dotc_core_nocheck = compileDir(dotcDir, "core")(noCheckOptions) + @Test def dotc_core_nocheck = compileDir(dotcDir, "core")(noCheckOptions ++ classPath) // This directory doesn't exist anymore // @Test def dotc_core_pickling = compileDir(coreDir, "pickling")(allowDeepSubtypes)// twice omitted to make tests run faster diff --git a/test/test/CompilerTest.scala b/test/test/CompilerTest.scala index fe63106b5f2e..5a4a9830a787 100644 --- a/test/test/CompilerTest.scala +++ b/test/test/CompilerTest.scala @@ -133,15 +133,18 @@ abstract class CompilerTest { } } - private def compileWithJavac(fs: Array[String], args: Array[String]): Unit = { + private def compileWithJavac( + fs: Array[String], + args: Array[String] + )(implicit defaultOptions: List[String]): Boolean = { val scalaLib = findJarFromRuntime("scala-library") val fullArgs = Array( "javac", "-classpath", s".:$scalaLib" - ) ++ args ++ fs ++ Array("-d", defaultOutputDir) + ) ++ args ++ defaultOptions.dropWhile("-d" != _).take(2) ++ fs - Runtime.getRuntime.exec(fullArgs).waitFor() + Runtime.getRuntime.exec(fullArgs).waitFor() == 0 } /** Compiles the code files in the given directory together. If args starts @@ -169,7 +172,7 @@ abstract class CompilerTest { log(s"WARNING: run tests can only be run by partest, JUnit just verifies compilation: $prefix$dirName") val (filePaths, javaFilePaths, normArgs, expErrors) = computeFilePathsAndExpErrors compileWithJavac(javaFilePaths, Array.empty) // javac needs to run first on dotty-library - compileArgs(filePaths ++ normArgs, expErrors) + compileArgs(javaFilePaths ++ filePaths ++ normArgs, expErrors) } else { val (sourceDir, flags, deep) = args match { case "-deep" :: args1 => (flattenDir(prefix, dirName), args1 ++ defaultOptions, "deep") diff --git a/test/test/OtherEntryPointsTest.scala b/test/test/OtherEntryPointsTest.scala index abaa043c0111..ae46fa36f931 100644 --- a/test/test/OtherEntryPointsTest.scala +++ b/test/test/OtherEntryPointsTest.scala @@ -17,10 +17,18 @@ import scala.collection.mutable.ListBuffer * @see [[InterfaceEntryPointTest]] */ class OtherEntryPointsTest { - @Test def runCompiler = { - val sources = List("./tests/pos/HelloWorld.scala").map(p => new java.io.File(p).getPath()) - val args = sources ++ List("-d", "./out/") + private val sources = + List("./tests/pos/HelloWorld.scala").map(p => new java.io.File(p).getPath()) + private val dottyInterfaces = + new java.io.File("./interfaces/dotty-interfaces-0.1-SNAPSHOT.jar").getPath + private val dottyLibrary = + new java.io.File("./library/target/scala-2.11/dotty-library_2.11-0.1-SNAPSHOT.jar").getPath + private val args = + sources ++ + List("-d", "./out/") ++ + List("-classpath", dottyInterfaces + ":" + dottyLibrary) + @Test def runCompiler = { val reporter = new CustomReporter val callback = new CustomCompilerCallback @@ -32,9 +40,6 @@ class OtherEntryPointsTest { } @Test def runCompilerWithContext = { - val sources = List("./tests/pos/HelloWorld.scala").map(p => new java.io.File(p).getPath()) - val args = sources ++ List("-d", "./out/") - val reporter = new CustomReporter val callback = new CustomCompilerCallback val context = (new ContextBase).initialCtx.fresh diff --git a/test/test/ShowClassTests.scala b/test/test/ShowClassTests.scala index d5e59c16992c..81e304296fe7 100644 --- a/test/test/ShowClassTests.scala +++ b/test/test/ShowClassTests.scala @@ -11,6 +11,19 @@ import dotty.tools.dotc.core.Decorators._ import org.junit.Test class ShowClassTests extends DottyTest { + ctx = { + val base = new ContextBase + import base.settings._ + val ctx = base.initialCtx.fresh + ctx.setSetting(ctx.settings.encoding, "UTF8") + ctx.setSetting( + ctx.settings.classpath, + "./library/target/scala-2.11/dotty-library_2.11-0.1-SNAPSHOT.jar" + + ":./interfaces/target/dotty-interfaces-0.1-SNAPSHOT.jar" + ) + base.initialize()(ctx) + ctx + } def debug_println(msg: => Any) = { if (sys.props.isDefinedAt("test.ShowClassTests.verbose")) diff --git a/test/test/TestREPL.scala b/test/test/TestREPL.scala index 9867cb4ecf20..cccfacc41abe 100644 --- a/test/test/TestREPL.scala +++ b/test/test/TestREPL.scala @@ -20,8 +20,16 @@ class TestREPL(script: String) extends REPL { override lazy val config = new REPL.Config { override val output = new NewLinePrintWriter(out) - override def context(ctx: Context) = - ctx.fresh.setSetting(ctx.settings.color, "never") + override def context(ctx: Context) = { + val fresh = ctx.fresh + fresh.setSetting(ctx.settings.color, "never") + fresh.setSetting( + ctx.settings.classpath, + "./library/target/scala-2.11/dotty-library_2.11-0.1-SNAPSHOT.jar" + ) + fresh.initialize()(fresh) + fresh + } override def input(in: Interpreter)(implicit ctx: Context) = new InteractiveReader { val lines = script.lines.buffered diff --git a/tests/repl/errmsgs.check b/tests/repl/errmsgs.check index 2bcb40eb0c64..f0ccdf53f675 100644 --- a/tests/repl/errmsgs.check +++ b/tests/repl/errmsgs.check @@ -1,42 +1,42 @@ scala> class Inv[T](x: T) defined class Inv scala> val x: List[String] = List(1) --- [E007] Type Mismatch Error: ------------------------------------------------------------------------------- +-- [E007] Type Mismatch Error: --------------------------------------- 4 |val x: List[String] = List(1) | ^ | found: Int(1) | required: String | scala> val y: List[List[String]] = List(List(1)) --- [E007] Type Mismatch Error: ------------------------------------------------------------------------------- +-- [E007] Type Mismatch Error: --------------------------------------- 4 |val y: List[List[String]] = List(List(1)) | ^ | found: Int(1) | required: String | scala> val z: (List[String], List[Int]) = (List(1), List("a")) --- [E007] Type Mismatch Error: ------------------------------------------------------------------------------- +-- [E007] Type Mismatch Error: --------------------------------------- 4 |val z: (List[String], List[Int]) = (List(1), List("a")) | ^ | found: Int(1) | required: String | --- [E007] Type Mismatch Error: ------------------------------------------------------------------------------- +-- [E007] Type Mismatch Error: --------------------------------------- 4 |val z: (List[String], List[Int]) = (List(1), List("a")) | ^^^ | found: String("a") | required: Int | scala> val a: Inv[String] = new Inv(new Inv(1)) --- [E007] Type Mismatch Error: ------------------------------------------------------------------------------- +-- [E007] Type Mismatch Error: --------------------------------------- 5 |val a: Inv[String] = new Inv(new Inv(1)) | ^^^^^ - | found: Inv[T] - | required: String - | - | where: T is a type variable with constraint >: Int(1) + | found: Inv[T] + | required: String + | + | where: T is a type variable with constraint >: Int(1) scala> val b: Inv[String] = new Inv(1) --- [E007] Type Mismatch Error: ------------------------------------------------------------------------------- +-- [E007] Type Mismatch Error: --------------------------------------- 5 |val b: Inv[String] = new Inv(1) | ^ | found: Int(1) @@ -57,25 +57,25 @@ scala> abstract class C { } } } --- [E007] Type Mismatch Error: ------------------------------------------------------------------------------- +-- [E007] Type Mismatch Error: --------------------------------------- 9 | var y: T = x | ^ - | found: C.this.T(C.this.x) - | required: T' - | - | where: T is a type in class C - | T' is a type in the initalizer of value s which is an alias of String --- [E007] Type Mismatch Error: ------------------------------------------------------------------------------- + |found: C.this.T(C.this.x) + |required: T' + | + |where: T is a type in class C + | T' is a type in the initalizer of value s which is an alias of String +-- [E007] Type Mismatch Error: --------------------------------------- 13 | val z: T = y | ^ - | found: T(y) - | required: T' - | - | where: T is a type in the initalizer of value s which is an alias of String - | T' is a type in method f which is an alias of Int + |found: T(y) + |required: T' + | + |where: T is a type in the initalizer of value s which is an alias of String + | T' is a type in method f which is an alias of Int scala> class Foo() { def bar: Int = 1 }; val foo = new Foo(); foo.barr --- [E008] Member Not Found Error: ---------------------------------------------------------------------------- +-- [E008] Member Not Found Error: ------------------------------------ 4 |class Foo() { def bar: Int = 1 }; val foo = new Foo(); foo.barr | ^^^^^^^^ - | value `barr` is not a member of Foo(foo) - did you mean `foo.bar`? + | value `barr` is not a member of Foo(foo) - did you mean `foo.bar`? scala> :quit diff --git a/tests/repl/imports.check b/tests/repl/imports.check index b6d9ae8a7b01..4ca59e4ee1e7 100644 --- a/tests/repl/imports.check +++ b/tests/repl/imports.check @@ -7,7 +7,7 @@ defined module o scala> import o._ import o._ scala> buf += xs --- [E007] Type Mismatch Error: ------------------------------------------------------------------------------- +-- [E007] Type Mismatch Error: --------------------------------------- 11 |buf += xs | ^^ | found: scala.collection.immutable.List[Int](o.xs) From 0bd959813d94edd01d44513b57f633594805c9d7 Mon Sep 17 00:00:00 2001 From: Felix Mulder Date: Tue, 25 Oct 2016 15:46:58 +0200 Subject: [PATCH 06/55] Add tags file to gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 9bee7afb8154..9d9f8fa3b797 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,7 @@ *.log *.swp *~ +tags # sbt specific dist/* From 0da788c52121e44de6be0cdc7a0c4c6e1b125ff9 Mon Sep 17 00:00:00 2001 From: Felix Mulder Date: Tue, 25 Oct 2016 17:01:53 +0200 Subject: [PATCH 07/55] Add bin project to separate scripted tests from compiler tests --- .../test/TestScripts.scala | 26 ++++++++++--------- project/Build.scala | 23 +++++++++++----- 2 files changed, 31 insertions(+), 18 deletions(-) rename test/scripts/TestDotc.scala => bin/test/TestScripts.scala (72%) diff --git a/test/scripts/TestDotc.scala b/bin/test/TestScripts.scala similarity index 72% rename from test/scripts/TestDotc.scala rename to bin/test/TestScripts.scala index f662a269501d..1a200c1b93a2 100644 --- a/test/scripts/TestDotc.scala +++ b/bin/test/TestScripts.scala @@ -7,7 +7,7 @@ import scala.io.Source import scala.sys.process.{Process, ProcessLogger} import java.io.{File => JFile, FileNotFoundException} -class TestDotc { +class TestScripts { private val lineSep = util.Properties.lineSeparator private def doUnlessWindows(op: => Unit) = if (!System.getProperty("os.name").toLowerCase.contains("windows")) @@ -28,11 +28,13 @@ class TestDotc { } try { - for (jar <- Source.fromFile(".packages").getLines()) + for (jar <- Source.fromFile("../.packages").getLines()) delete(jar) - delete(".packages") - delete("src/dotty/tools/dotc/Dummy.scala") + delete("../.packages") + delete("./src/dotty/tools/dotc/Dummy.scala") + delete("HelloWorld.class") + delete("HelloWorld$.class") } catch { case _: FileNotFoundException => () } @@ -45,7 +47,7 @@ class TestDotc { * execute it using dotr */ @Test def buildAndRunHelloWorld = doUnlessWindows { - val (retDotc, dotcOutput) = executeScript("bin/dotc tests/pos/HelloWorld.scala") + val (retDotc, dotcOutput) = executeScript("./bin/dotc ./tests/pos/HelloWorld.scala") // Check correct output of building and running dotc assert( @@ -53,7 +55,7 @@ class TestDotc { s"bin/dotc script did not run properly. Output:$lineSep$dotcOutput" ) - val (retDotr, dotrOutput) = executeScript("bin/dotr HelloWorld") + val (retDotr, dotrOutput) = executeScript("./bin/dotr HelloWorld") assert( retDotr == 0 && dotrOutput == "hello world", s"Running hello world exited with status: $retDotr and output: $dotrOutput" @@ -64,13 +66,13 @@ class TestDotc { * rebuild dotty if needed */ @Test def rebuildIfNecessary = doUnlessWindows { - val (retFirstBuild, _) = executeScript("bin/dotc tests/pos/HelloWorld.scala") + val (retFirstBuild, _) = executeScript("./bin/dotc ./tests/pos/HelloWorld.scala") assert(retFirstBuild == 0, "building dotc failed") - // Create a new file - new JFile("src/dotty/tools/dotc/Dummy.scala").createNewFile() + // Create a new file to force rebuild + new JFile("./src/dotty/tools/dotc/Dummy.scala").createNewFile() - val (retSecondBuild, output) = executeScript("bin/dotc tests/pos/HelloWorld.scala") + val (retSecondBuild, output) = executeScript("./bin/dotc ./tests/pos/HelloWorld.scala") assert( retSecondBuild == 0 && output.contains("rebuilding"), s"Rebuilding the tool should result in jar files being rebuilt. Status: $retSecondBuild, output:$lineSep$output") @@ -78,10 +80,10 @@ class TestDotc { /** if no changes to dotty, dotc script should be fast */ @Test def beFastOnNoChanges = doUnlessWindows { - val (retFirstBuild, _) = executeScript("bin/dotc tests/pos/HelloWorld.scala") + val (retFirstBuild, _) = executeScript("./bin/dotc ./tests/pos/HelloWorld.scala") assert(retFirstBuild == 0, "building dotc failed") - val (ret, output) = executeScript("bin/dotc tests/pos/HelloWorld.scala") + val (ret, output) = executeScript("./bin/dotc ./tests/pos/HelloWorld.scala") assert( ret == 0 && !output.contains("rebuilding"), s"Project recompiled when it didn't need to be. Status $ret, output:$lineSep$output") diff --git a/project/Build.scala b/project/Build.scala index e650325d4050..e7fab03ebf95 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -216,33 +216,44 @@ object DottyBuild extends Build { ";dotty-interfaces/package" + ";dotty-compiler/package" + ";dotty-library/package" + - ";test:package" + ";dotty-compiler/test:package" ) ++ addCommandAlias( "partest", ";packageAll" + ";test:runMain dotc.build" + ";lockPartestFile" + - ";test:test" + - ";runPartestRunner" + ";dotty-compiler/test:test" + + ";runPartestRunner" + + ";bin/test" // script tests need to run after the unit tests ) ++ - addCommandAlias("partest-only", + addCommandAlias( + "partest-only", ";packageAll" + ";test:runMain dotc.build" + ";lockPartestFile" + - ";test:test-only dotc.tests" + + ";dotty-compiler/test:test-only dotc.tests" + ";runPartestRunner" ) ++ addCommandAlias( "partest-only-no-bootstrap", ";packageAll" + ";lockPartestFile" + - ";test:test-only dotc.tests" + + ";dotty-compiler/test:test-only dotc.tests" + ";runPartestRunner" ) ). settings(publishing) + /* Contains unit tests for the scripts */ + lazy val bin = project.in(file("bin")). + settings(sourceStructure). + settings( + parallelExecution in Test := false, + libraryDependencies += + "com.novocode" % "junit-interface" % "0.11" % "test" + ) + lazy val `dotty-library` = project.in(file("library")). settings(sourceStructure). settings( From 06a3d47ea9fd1b67b3acba9d115a16d18549e377 Mon Sep 17 00:00:00 2001 From: Felix Mulder Date: Wed, 26 Oct 2016 16:19:35 +0200 Subject: [PATCH 08/55] Move sjs, make sure that partest compiles everything in dirs --- .../src}/scalaShadowing/language.scala | 14 +-- project/Build.scala | 86 ++++++++------- .../tools => sjs}/backend/sjs/GenSJSIR.scala | 0 .../tools => sjs}/backend/sjs/JSCodeGen.scala | 0 .../backend/sjs/JSDefinitions.scala | 0 .../backend/sjs/JSEncoding.scala | 0 .../tools => sjs}/backend/sjs/JSInterop.scala | 0 .../backend/sjs/JSPositions.scala | 0 .../backend/sjs/JSPrimitives.scala | 0 .../tools => sjs}/backend/sjs/ScopedVar.scala | 0 .../tools/dotc/config/SJSPlatform.scala | 0 src/dotty/tools/dotc/Compiler.scala | 17 +-- .../tools/dotc/config/PathResolver.scala | 24 ++--- src/dotty/tools/dotc/core/Contexts.scala | 5 +- test/dotc/tests.scala | 55 +++++----- test/dotty/partest/DPConsoleRunner.scala | 102 +++++++----------- test/test/CompilerTest.scala | 27 +++-- tests/repl/imports.check | 6 +- 18 files changed, 149 insertions(+), 187 deletions(-) rename {src => library/src}/scalaShadowing/language.scala (99%) rename {src/dotty/tools => sjs}/backend/sjs/GenSJSIR.scala (100%) rename {src/dotty/tools => sjs}/backend/sjs/JSCodeGen.scala (100%) rename {src/dotty/tools => sjs}/backend/sjs/JSDefinitions.scala (100%) rename {src/dotty/tools => sjs}/backend/sjs/JSEncoding.scala (100%) rename {src/dotty/tools => sjs}/backend/sjs/JSInterop.scala (100%) rename {src/dotty/tools => sjs}/backend/sjs/JSPositions.scala (100%) rename {src/dotty/tools => sjs}/backend/sjs/JSPrimitives.scala (100%) rename {src/dotty/tools => sjs}/backend/sjs/ScopedVar.scala (100%) rename {src/dotty => sjs}/tools/dotc/config/SJSPlatform.scala (100%) diff --git a/src/scalaShadowing/language.scala b/library/src/scalaShadowing/language.scala similarity index 99% rename from src/scalaShadowing/language.scala rename to library/src/scalaShadowing/language.scala index a74c9c67190a..e2fc5ec61bf9 100644 --- a/src/scalaShadowing/language.scala +++ b/library/src/scalaShadowing/language.scala @@ -25,18 +25,18 @@ package scalaShadowing * - [[higherKinds `higherKinds`]] enables writing higher-kinded types * - [[existentials `existentials`]] enables writing existential types * - [[experimental `experimental`]] contains newer features that have not yet been tested in production - * + * * and, for dotty: - * + * * - [[Scala2 `Scala2`] backwards compatibility mode for Scala2 - * - [[noAtoTupling `noAutoTupling`]] disable auto-tupling + * - [[noAtoTupling `noAutoTupling`]] disable auto-tupling * * @groupname production Language Features * @groupname experimental Experimental Language Features * @groupprio experimental 10 - * + * * Dotty-specific features come at the end. - * + * * Note: Due to the more restricted language import mechanism in dotty (only * imports count, implicits are disregarded) we don't need the constructions * of the inherited language features. A simple object for each feature is @@ -189,10 +189,10 @@ object language { */ @volatile implicit lazy val macros: macros = languageFeature.experimental.macros } - + /** Where imported, a backwards compatibility mode for Scala2 is enabled */ object Scala2 - + /** Where imported, auto-tupling is disabled */ object noAutoTupling } diff --git a/project/Build.scala b/project/Build.scala index e7fab03ebf95..6341f08c4f83 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -135,9 +135,13 @@ object DottyBuild extends Build { // command line arguments get passed to the last task in an aliased // sequence (see partest alias below), so this works. val args = Def.spaceDelimited("").parsed - val jars = Seq((packageBin in Compile).value.getAbsolutePath) ++ - getJarPaths(partestDeps.value, ivyPaths.value.ivyHome) - val dottyJars = "-dottyJars " + (jars.length + 1) + " dotty-lib.jar" + " " + jars.mkString(" ") + val jars = List( + (packageBin in Compile).value.getAbsolutePath, + (packageBin in (`dotty-library`, Compile)).value.getAbsolutePath, + (packageBin in (`dotty-interfaces`, Compile)).value.getAbsolutePath + ) ++ getJarPaths(partestDeps.value, ivyPaths.value.ivyHome) + val dottyJars = + s"""-dottyJars ${jars.length + 2} dotty.jar dotty-lib.jar ${jars.mkString(" ")}""" // Provide the jars required on the classpath of run tests runTask(Test, "dotty.partest.DPConsoleRunner", dottyJars + " " + args.mkString(" ")) }, @@ -147,32 +151,33 @@ object DottyBuild extends Build { * of scalajs-ir built with a different Scala compiler, we add its * sources instead of depending on the binaries. */ - ivyConfigurations += config("sourcedeps").hide, - libraryDependencies += - "org.scala-js" %% "scalajs-ir" % scalaJSVersion % "sourcedeps", - sourceGenerators in Compile += Def.task { - val s = streams.value - val cacheDir = s.cacheDirectory - val trgDir = (sourceManaged in Compile).value / "scalajs-ir-src" - - val report = updateClassifiers.value - val scalaJSIRSourcesJar = report.select( - configuration = Set("sourcedeps"), - module = (_: ModuleID).name.startsWith("scalajs-ir_"), - artifact = artifactFilter(`type` = "src")).headOption.getOrElse { - sys.error(s"Could not fetch scalajs-ir sources") - } - - FileFunction.cached(cacheDir / s"fetchScalaJSIRSource", - FilesInfo.lastModified, FilesInfo.exists) { dependencies => - s.log.info(s"Unpacking scalajs-ir sources to $trgDir...") - if (trgDir.exists) - IO.delete(trgDir) - IO.createDirectory(trgDir) - IO.unzip(scalaJSIRSourcesJar, trgDir) - (trgDir ** "*.scala").get.toSet - } (Set(scalaJSIRSourcesJar)).toSeq - }.taskValue, + //TODO: disabling until moved to separate project + //ivyConfigurations += config("sourcedeps").hide, + //libraryDependencies += + // "org.scala-js" %% "scalajs-ir" % scalaJSVersion % "sourcedeps", + //sourceGenerators in Compile += Def.task { + // val s = streams.value + // val cacheDir = s.cacheDirectory + // val trgDir = (sourceManaged in Compile).value / "scalajs-ir-src" + + // val report = updateClassifiers.value + // val scalaJSIRSourcesJar = report.select( + // configuration = Set("sourcedeps"), + // module = (_: ModuleID).name.startsWith("scalajs-ir_"), + // artifact = artifactFilter(`type` = "src")).headOption.getOrElse { + // sys.error(s"Could not fetch scalajs-ir sources") + // } + + // FileFunction.cached(cacheDir / s"fetchScalaJSIRSource", + // FilesInfo.lastModified, FilesInfo.exists) { dependencies => + // s.log.info(s"Unpacking scalajs-ir sources to $trgDir...") + // if (trgDir.exists) + // IO.delete(trgDir) + // IO.createDirectory(trgDir) + // IO.unzip(scalaJSIRSourcesJar, trgDir) + // (trgDir ** "*.scala").get.toSet + // } (Set(scalaJSIRSourcesJar)).toSeq + //}.taskValue, // Adjust classpath for running dotty mainClass in (Compile, run) := Some("dotty.tools.dotc.Main"), @@ -185,29 +190,34 @@ object DottyBuild extends Build { // http://grokbase.com/t/gg/simple-build-tool/135ke5y90p/sbt-setting-jvm-boot-paramaters-for-scala javaOptions <++= (dependencyClasspath in Runtime, packageBin in Compile) map { (attList, bin) => - // put the Scala {library, reflect} in the classpath + // put needed dependencies on classpath: val path = for { file <- attList.map(_.data) path = file.getAbsolutePath + // FIXME: when we snip the cord, this should go bye-bye + if path.contains("scala-library") || + // FIXME: currently needed for tests referencing scalac internals + path.contains("scala-reflect") || + // FIXME: currently needed for tests referencing scalac internals + path.contains("scala-compile") || + // FIXME: should go away when xml literal parsing is removed + path.contains("scala-xml") || + // needed for the xsbti interface + path.contains("sbt-interface") } yield "-Xbootclasspath/p:" + path - // dotty itself needs to be in the bootclasspath - val fullpath = /*("-Xbootclasspath/p:" + "dotty.jar") ::*/ ("-Xbootclasspath/a:" + bin) :: path.toList - // System.err.println("BOOTPATH: " + fullpath) val travis_build = // propagate if this is a travis build if (sys.props.isDefinedAt(JENKINS_BUILD)) List(s"-D$JENKINS_BUILD=${sys.props(JENKINS_BUILD)}") ::: jenkinsMemLimit - else - List() + else List() val tuning = if (sys.props.isDefinedAt("Oshort")) // Optimize for short-running applications, see https://github.com/lampepfl/dotty/issues/222 List("-XX:+TieredCompilation", "-XX:TieredStopAtLevel=1") - else - List() + else List() - ("-DpartestParentID=" + pid) :: tuning ::: agentOptions ::: travis_build ::: fullpath + ("-DpartestParentID=" + pid) :: tuning ::: agentOptions ::: travis_build ::: path.toList } ). settings( diff --git a/src/dotty/tools/backend/sjs/GenSJSIR.scala b/sjs/backend/sjs/GenSJSIR.scala similarity index 100% rename from src/dotty/tools/backend/sjs/GenSJSIR.scala rename to sjs/backend/sjs/GenSJSIR.scala diff --git a/src/dotty/tools/backend/sjs/JSCodeGen.scala b/sjs/backend/sjs/JSCodeGen.scala similarity index 100% rename from src/dotty/tools/backend/sjs/JSCodeGen.scala rename to sjs/backend/sjs/JSCodeGen.scala diff --git a/src/dotty/tools/backend/sjs/JSDefinitions.scala b/sjs/backend/sjs/JSDefinitions.scala similarity index 100% rename from src/dotty/tools/backend/sjs/JSDefinitions.scala rename to sjs/backend/sjs/JSDefinitions.scala diff --git a/src/dotty/tools/backend/sjs/JSEncoding.scala b/sjs/backend/sjs/JSEncoding.scala similarity index 100% rename from src/dotty/tools/backend/sjs/JSEncoding.scala rename to sjs/backend/sjs/JSEncoding.scala diff --git a/src/dotty/tools/backend/sjs/JSInterop.scala b/sjs/backend/sjs/JSInterop.scala similarity index 100% rename from src/dotty/tools/backend/sjs/JSInterop.scala rename to sjs/backend/sjs/JSInterop.scala diff --git a/src/dotty/tools/backend/sjs/JSPositions.scala b/sjs/backend/sjs/JSPositions.scala similarity index 100% rename from src/dotty/tools/backend/sjs/JSPositions.scala rename to sjs/backend/sjs/JSPositions.scala diff --git a/src/dotty/tools/backend/sjs/JSPrimitives.scala b/sjs/backend/sjs/JSPrimitives.scala similarity index 100% rename from src/dotty/tools/backend/sjs/JSPrimitives.scala rename to sjs/backend/sjs/JSPrimitives.scala diff --git a/src/dotty/tools/backend/sjs/ScopedVar.scala b/sjs/backend/sjs/ScopedVar.scala similarity index 100% rename from src/dotty/tools/backend/sjs/ScopedVar.scala rename to sjs/backend/sjs/ScopedVar.scala diff --git a/src/dotty/tools/dotc/config/SJSPlatform.scala b/sjs/tools/dotc/config/SJSPlatform.scala similarity index 100% rename from src/dotty/tools/dotc/config/SJSPlatform.scala rename to sjs/tools/dotc/config/SJSPlatform.scala diff --git a/src/dotty/tools/dotc/Compiler.scala b/src/dotty/tools/dotc/Compiler.scala index 4bc5263e901e..ad3249be2427 100644 --- a/src/dotty/tools/dotc/Compiler.scala +++ b/src/dotty/tools/dotc/Compiler.scala @@ -17,7 +17,6 @@ import core.DenotTransformers.DenotTransformer import core.Denotations.SingleDenotation import dotty.tools.backend.jvm.{LabelDefs, GenBCode, CollectSuperCalls} -import dotty.tools.backend.sjs.GenSJSIR /** The central class of the dotc compiler. The job of a compiler is to create * runs, which process given `phases` in a given `rootContext`. @@ -98,7 +97,6 @@ class Compiler { new DropInlined, // Drop Inlined nodes, since backend has no use for them new MoveStatics, // Move static methods to companion classes new LabelDefs), // Converts calls to labels to jumps - List(new GenSJSIR), // Generate .js code List(new GenBCode) // Generate JVM bytecode ) @@ -117,20 +115,7 @@ class Compiler { */ def rootContext(implicit ctx: Context): Context = { ctx.initialize()(ctx) - val actualPhases = if (ctx.settings.scalajs.value) { - // Remove phases that Scala.js does not want - phases.mapConserve(_.filter { - case _: FunctionalInterfaces => false - case _ => true - }).filter(_.nonEmpty) - } else { - // Remove Scala.js-related phases - phases.mapConserve(_.filter { - case _: GenSJSIR => false - case _ => true - }).filter(_.nonEmpty) - } - ctx.setPhasePlan(actualPhases) + ctx.setPhasePlan(phases) val rootScope = new MutableScope val bootstrap = ctx.fresh .setPeriod(Period(nextRunId, FirstPhaseId)) diff --git a/src/dotty/tools/dotc/config/PathResolver.scala b/src/dotty/tools/dotc/config/PathResolver.scala index 1f9ee7eecc01..14a44531a573 100644 --- a/src/dotty/tools/dotc/config/PathResolver.scala +++ b/src/dotty/tools/dotc/config/PathResolver.scala @@ -46,18 +46,7 @@ object PathResolver { def classPathEnv = envOrElse("CLASSPATH", "") def sourcePathEnv = envOrElse("SOURCEPATH", "") - def javaBootClassPath = - propOrElse("sun.boot.class.path", searchForBootClasspath) - .split(":") - .filterNot { jar => - // let's blacklist locally compiled classes: - jar.contains("/dotty/library/target/classes") || - jar.contains("/dotty/library/target/scala-2.11/classes") || - jar.contains("/dotty/interfaces/target/classes") || - jar.contains("/dotty/target/scala-2.11/classes") || - jar.contains("/dotty/target/classes") - } - .mkString(":") + def javaBootClassPath = propOrElse("sun.boot.class.path", searchForBootClasspath) def javaExtDirs = propOrEmpty("java.ext.dirs") def scalaHome = propOrEmpty("scala.home") @@ -266,8 +255,15 @@ class PathResolver(implicit ctx: Context) { def containers = Calculated.containers lazy val result: JavaClassPath = { - val (dottyJars, others) = containers.partition(_.name.contains("dotty")) - val cp = new JavaClassPath((dottyJars ++ others).toIndexedSeq, context) + // Prioritize `dotty.jar` and `dotty-lib.jar` to shadow others + val (dottyJars, others) = + containers.partition(x => x.name.contains("dotty-lib.jar") || x.name.contains("dotty.jar")) + // Then any jars with `dotty` in the name - putting them before scala-library + val (dottyCp, remaining) = + others.partition(_.name.contains("dotty-")) + + val cp = new JavaClassPath((dottyJars ++ dottyCp ++ remaining).toIndexedSeq, context) + if (settings.Ylogcp.value) { Console.println("Classpath built from " + settings.toConciseString(ctx.sstate)) Console.println("Defaults: " + PathResolver.Defaults) diff --git a/src/dotty/tools/dotc/core/Contexts.scala b/src/dotty/tools/dotc/core/Contexts.scala index edc68588d6f7..639c4d111097 100644 --- a/src/dotty/tools/dotc/core/Contexts.scala +++ b/src/dotty/tools/dotc/core/Contexts.scala @@ -27,7 +27,7 @@ import reporting._ import collection.mutable import collection.immutable.BitSet import printing._ -import config.{Settings, ScalaSettings, Platform, JavaPlatform, SJSPlatform} +import config.{Settings, ScalaSettings, Platform, JavaPlatform} import language.implicitConversions import DenotTransformers.DenotTransformer import util.Property.Key @@ -550,8 +550,7 @@ object Contexts { } protected def newPlatform(implicit ctx: Context): Platform = - if (settings.scalajs.value) new SJSPlatform - else new JavaPlatform + new JavaPlatform /** The loader that loads the members of _root_ */ def rootLoader(root: TermSymbol)(implicit ctx: Context): SymbolLoader = platform.rootLoader(root) diff --git a/test/dotc/tests.scala b/test/dotc/tests.scala index 747396c73a81..d96111dee58e 100644 --- a/test/dotc/tests.scala +++ b/test/dotc/tests.scala @@ -3,6 +3,7 @@ package dotc import test._ import org.junit.{Before, Test} +import java.io.{ File => JFile } import scala.reflect.io.Directory import scala.io.Source @@ -23,20 +24,34 @@ class tests extends CompilerTest { "-d", defaultOutputDir ) - val classPath = List( + val checkOptions = List( "-Yno-deep-subtypes", "-Yno-double-bindings", "-Yforce-sbt-phases", - "-color:never", - "-classpath", - "./library/target/scala-2.11/dotty-library_2.11-0.1-SNAPSHOT.jar" + - ":./interfaces/target/dotty-interfaces-0.1-SNAPSHOT.jar" + "-color:never" ) + val classPath = { + val paths = List( + "./library/target/scala-2.11/dotty-library_2.11-0.1-SNAPSHOT.jar", + "./target/scala-2.11/dotty-compiler_2.11-0.1-SNAPSHOT.jar", + "./interfaces/target/dotty-interfaces-0.1-SNAPSHOT.jar" + ).map { p => + val file = new JFile(p) + assert( + file.exists, + s"""File "$p" couldn't be found. Run `packageAll` from build tool before testing""" + ) + file.getAbsolutePath + }.mkString(":") + + List("-classpath", paths) + } + implicit val defaultOptions = noCheckOptions ++ { if (isRunByJenkins) List("-Ycheck:tailrec,resolveSuper,mixin,restoreScopes,labelDef") // should be Ycheck:all, but #725 else List("-Ycheck:tailrec,resolveSuper,mixin,restoreScopes,labelDef") - } ++ classPath + } ++ checkOptions ++ classPath val testPickling = List("-Xprint-types", "-Ytest-pickler", "-Ystop-after:pickler", "-Yprintpos") @@ -189,32 +204,10 @@ class tests extends CompilerTest { @Test def compileIndexedSeq = compileLine("./scala-scala/src/library/scala/collection/immutable/IndexedSeq.scala") // Not a junit test anymore since it is order dependent - def dottyBootedLib = compileDir( - libDir, - ".", - List( - "-deep", "-Ycheck-reentrant", "-strict", "-classpath", defaultOutputDir + - ":./target/scala-2.11/dotty-compiler_2.11-0.1-SNAPSHOT.jar" + - ":./interfaces/target/dotty-interfaces-0.1-SNAPSHOT.jar" + - ":./library/target/scala-2.11/dotty-library_2.11-0.1-SNAPSHOT.jar" - ) - )(allowDeepSubtypes) // note the -deep argument + def dottyBootedLib = compileDir(libDir, ".")(allowDeepSubtypes) // note the -deep argument // Not a junit test anymore since it is order dependent - def dottyDependsOnBootedLib = compileDir( - dottyDir, - ".", - List( - "-deep", "-Ycheck-reentrant", "-strict", "-classpath", defaultOutputDir + - ":./dotty-lib.jar" + - ":./interfaces/target/dotty-interfaces-0.1-SNAPSHOT.jar" + - // this needs to get compiled together with the compiler: - //":./target/scala-2.11/src_managed/main/scalajs-ir-src/" - // but falling back to: - ":/home/fixel/.ivy2/cache/org.scala-js/scalajs-ir_2.11/jars/scalajs-ir_2.11-0.6.8.jar" - // for the time being. - ) - )(allowDeepSubtypes) // note the -deep argument + @Test def dottyDependsOnBootedLib = compileDir(dottyDir, ".")(allowDeepSubtypes) // note the -deep argument @Test def dotc_ast = compileDir(dotcDir, "ast") @Test def dotc_config = compileDir(dotcDir, "config") @@ -279,7 +272,7 @@ class tests extends CompilerTest { "scalaPrimitives.scala" ) map (s"${backendDir}jvm/" + _), testPickling) - @Test def tasty_backend_sjs = compileDir(s"${backendDir}", "sjs", testPickling) + //@Test def tasty_backend_sjs = compileDir(s"${backendDir}", "sjs", testPickling) @Test def tasty_dotc = compileDir(toolsDir, "dotc", testPickling) @Test def tasty_dotc_ast = compileDir(dotcDir, "ast", testPickling) diff --git a/test/dotty/partest/DPConsoleRunner.scala b/test/dotty/partest/DPConsoleRunner.scala index 27d53159b968..4552d1137e6f 100644 --- a/test/dotty/partest/DPConsoleRunner.scala +++ b/test/dotty/partest/DPConsoleRunner.scala @@ -30,10 +30,6 @@ object DPConsoleRunner { case Nil => sys.error("Error: DPConsoleRunner needs \"-dottyJars *\".") case jarFinder(nr, jarString) :: Nil => val jars = jarString.split(" ").toList - println("------------------------------------------------------------") - println("jars:") - jars.foreach(println) - println("------------------------------------------------------------") val count = nr.toInt if (jars.length < count) sys.error("Error: DPConsoleRunner found wrong number of dottyJars: " + jars + ", expected: " + nr) @@ -155,11 +151,7 @@ class DPTestRunner(testFile: File, suiteRunner: DPSuiteRunner) extends nest.Runn "-d", outDir.getAbsolutePath, "-classpath", - joinPaths(outDir :: extraClasspath.filter { fp => - fp.endsWith("dotty-lib.jar") || - fp.endsWith("scala-library-2.11.5.jar") || - fp.endsWith("scala-reflect-2.11.5.jar") - }) + joinPaths(outDir :: extraClasspath ++ testClassPath) ) ++ files.map(_.getAbsolutePath) pushTranscript(args mkString " ") @@ -172,58 +164,35 @@ class DPTestRunner(testFile: File, suiteRunner: DPSuiteRunner) extends nest.Runn } } - override def run(): TestState = { - if (kind == "run") { - // javac runner, for one, would merely append to an existing log file, so - // just delete it before we start - logFile.delete() - runTestCommon(execTest(outDir, logFile) && diffIsOk) - lastState - } else super.run() - } - - // Re-implemented for running tests - def execTest(outDir: File, logFile: File): Boolean = { - val argsFile = testFile changeExtension "javaopts" - val argString = file2String(argsFile) - if (argString != "") NestUI.verbose( - "Found javaopts file '%s', using options: '%s'".format(argsFile, argString) - ) - - val classpath = joinPaths { - val sep = sys.props("path.separator") - val fps = extraClasspath.filter { fp => - fp.endsWith("dotty-lib.jar") || - fp.endsWith("scala-library-2.11.5.jar") || - fp.endsWith("scala-reflect-2.11.5.jar") + // Overriden in order to recursively get all sources that should be handed to + // the compiler. Otherwise only sources in the top dir is compiled - works + // because the compiler is on the classpath. + override def sources(file: File): List[File] = + if (file.isDirectory) + file.listFiles.toList.flatMap { f => + if (f.isDirectory) sources(f) + else if (f.isJavaOrScala) List(f) + else Nil } - - fps ++ fileManager.testClassPath - } - - val javaOpts: List[String] = ( - suiteRunner.javaOpts.split(' ') ++ - extraJavaOptions ++ - argString.split(' ') - ).map(_.trim).filter(_ != "").toList - - val cmd: List[String] = (suiteRunner.javaCmdPath :: javaOpts) ++ ( - "-classpath" :: join(outDir.toString, classpath) :: - "Test" :: "jvm" :: // default argument to Test class in super is "jvm" - Nil - ) - - pushTranscript((cmd mkString s" \\$EOL ") + " > " + logFile.getName) - nextTestAction(runCommand(cmd, logFile)) { - case false => - //_transcript append EOL + logFile.fileContents - // think this is equivalent: - val contents = logFile.fileContents - println(contents) - pushTranscript(contents) - genFail("non-zero exit code") - } - } + else List(file) + + // Enable me to "fix" the depth issue - remove once completed + //override def compilationRounds(file: File): List[CompileRound] = { + // val srcs = sources(file) match { + // case Nil => + // System.err.println { + // s"""|================================================================================ + // |Warning! You attempted to compile sources from: + // | $file + // |but partest was unable to find any sources - uncomment DPConsoleRunner#sources + // |================================================================================""".stripMargin + // } + // List(new File("./examples/hello.scala")) // "just compile some crap" - Guillaume + // case xs => + // xs + // } + // (groupedFiles(srcs) map mixedCompileGroup).flatten + //} // FIXME: This is copy-pasted from nest.Runner where it is private // Remove this once https://github.com/scala/scala-partest/pull/61 is merged @@ -371,16 +340,17 @@ class DPTestRunner(testFile: File, suiteRunner: DPSuiteRunner) extends nest.Runn } // override to add dotty and scala jars to classpath - override def extraClasspath = { - val cp = suiteRunner.fileManager.asInstanceOf[DottyFileManager].extraJarList ::: super.extraClasspath - //println(s"extraClasspath: $cp") - cp - } + override def extraClasspath = + suiteRunner.fileManager.asInstanceOf[DottyFileManager].extraJarList ::: super.extraClasspath // override to keep class files if failed and delete clog if ok - override def cleanup = if (lastState.isOk) { + override def cleanup = if (lastState.isOk) try { logFile.delete cLogFile.delete Directory(outDir).deleteRecursively + } catch { + case t: Throwable => + println("whhhhhhhhhhhhhhhhhhhhhhhhhhhaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaat") + throw t } } diff --git a/test/test/CompilerTest.scala b/test/test/CompilerTest.scala index 5a4a9830a787..05a7d62b8230 100644 --- a/test/test/CompilerTest.scala +++ b/test/test/CompilerTest.scala @@ -442,8 +442,14 @@ abstract class CompilerTest { nr: Int = 0, oldOutput: String = defaultOutputDir): Unit = { val partestOutput = dest.jfile.getParentFile + JFile.separator + dest.stripExtension + "-" + kind + ".obj" - val flags = oldFlags.map(f => if (f == oldOutput) partestOutput else f) ++ - List(s"-classpath $partestOutput") // Required for separate compilation tests + + val altOutput = + source.getParentFile.getAbsolutePath.map(x => if (x == JFile.separatorChar) '_' else x) + + val (beforeCp, remaining) = oldFlags + .map(f => if (f == oldOutput) partestOutput else f) + .span(_ != "-classpath") + val flags = beforeCp ++ List("-classpath", (partestOutput :: remaining.drop(1)).mkString(":")) val difference = getExisting(dest).isDifferent(source, flags, nerr) difference match { @@ -451,8 +457,12 @@ abstract class CompilerTest { case ExistsSame => // nothing else to do case ExistsDifferent => val nextDest = dest.parent / (dest match { - case d: Directory => Directory(replaceVersion(d.name, nr)) - case f => SFile(replaceVersion(f.stripExtension, nr)).addExtension(f.extension) + case d: Directory => + val newVersion = replaceVersion(d.name, nr).getOrElse(altOutput) + Directory(newVersion) + case f => + val newVersion = replaceVersion(f.stripExtension, nr).getOrElse(altOutput) + SFile(newVersion).addExtension(f.extension) }) computeDestAndCopyFiles(source, nextDest, kind, flags, nerr, nr + 1, partestOutput) } @@ -555,13 +565,12 @@ abstract class CompilerTest { import scala.util.matching.Regex val nrFinder = """(.*_v)(\d+)""".r /** Changes the version number suffix in the name (without extension). */ - private def replaceVersion(name: String, nr: Int): String = { + private def replaceVersion(name: String, nr: Int): Option[String] = { val nrString = nr.toString name match { - case nrFinder(prefix, `nrString`) => prefix + (nr + 1) - case _ => - assert(nr == 0, "DPCompilerTest couldn't create new version of files, match error") - name + "_v1" + case nrFinder(prefix, `nrString`) => Some(prefix + (nr + 1)) + case _ if nr != 0 => None + case _ => Some(name + "_v1") } } diff --git a/tests/repl/imports.check b/tests/repl/imports.check index 4ca59e4ee1e7..7e078fe001b8 100644 --- a/tests/repl/imports.check +++ b/tests/repl/imports.check @@ -16,13 +16,13 @@ scala> buf += xs scala> buf ++= xs res1: scala.collection.mutable.ListBuffer[Int] = ListBuffer(1, 2, 3) scala> import util.foo --- Error: ---------------------------------------------------------------------------------------------------- +-- Error: ------------------------------------------------------------ 8 |import util.foo | ^^^ | foo is not a member of util scala> import util.foo.bar --- [E008] Member Not Found Error: ---------------------------------------------------------------------------- +-- [E008] Member Not Found Error: ------------------------------------ 8 |import util.foo.bar | ^^^^^^^^ - | value `foo` is not a member of util.type - did you mean `util.Left`? + | value `foo` is not a member of util.type - did you mean `util.Left`? scala> :quit From aa700b65916c16ec9dce6d9d8bafd2bd426d8c83 Mon Sep 17 00:00:00 2001 From: Guillaume Martres Date: Fri, 28 Oct 2016 22:17:28 +0200 Subject: [PATCH 09/55] Fix JUnit tests by always packaging everything Running `packageAll` is now required before running the tests, this commit enforces this, by making `javaOptions` depend on `packageAll`, this requires rewriting `packageAll` to be a task instead of a command alias. --- project/Build.scala | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/project/Build.scala b/project/Build.scala index 6341f08c4f83..6e2844897d6d 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -26,6 +26,8 @@ object DottyBuild extends Build { // "-XX:+HeapDumpOnOutOfMemoryError", "-Xmx1g", "-Xss2m" ) + lazy val packageAll = taskKey[Unit]("Package everything needed to run tests") + override def settings: Seq[Setting[_]] = { super.settings ++ Seq( scalaVersion in Global := "2.11.5", @@ -115,6 +117,14 @@ object DottyBuild extends Build { // enable improved incremental compilation algorithm incOptions := incOptions.value.withNameHashing(true), + + packageAll := { + val p1 = (packageBin in (`dotty-interfaces`, Compile)).value + val p2 = (packageBin in Compile).value + val p3 = (packageBin in (`dotty-library`, Compile)).value + val p4 = (packageBin in Test).value + }, + // enable verbose exception messages for JUnit testOptions in Test += Tests.Argument(TestFrameworks.JUnit, "-a", "-v", "--run-listener=test.ContextEscapeDetector"), testOptions in Test += Tests.Cleanup({ () => partestLockFile.delete }), @@ -189,7 +199,8 @@ object DottyBuild extends Build { packageOptions += ManifestAttributes(("Git-Hash", VersionUtil.gitHash)), // http://grokbase.com/t/gg/simple-build-tool/135ke5y90p/sbt-setting-jvm-boot-paramaters-for-scala - javaOptions <++= (dependencyClasspath in Runtime, packageBin in Compile) map { (attList, bin) => + // packageAll should always be run before tests + javaOptions <++= (dependencyClasspath in Runtime, packageAll) map { (attList, _) => // put needed dependencies on classpath: val path = for { file <- attList.map(_.data) @@ -221,13 +232,6 @@ object DottyBuild extends Build { } ). settings( - addCommandAlias( - "packageAll", - ";dotty-interfaces/package" + - ";dotty-compiler/package" + - ";dotty-library/package" + - ";dotty-compiler/test:package" - ) ++ addCommandAlias( "partest", ";packageAll" + From 02a29c9f2127ea7b0cb0b05facd3afe8e2ec256a Mon Sep 17 00:00:00 2001 From: Guillaume Martres Date: Fri, 28 Oct 2016 22:27:54 +0200 Subject: [PATCH 10/55] Increanse Jenkins max heap for 1.3G to 1.5G The fix to partest to make it compile files in subdirectories means that we're compiling more things and using more heap and has resulted in tests failing with OutOfMemoryError. Hopefully this fixes that. --- project/Build.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Build.scala b/project/Build.scala index 6e2844897d6d..44ac58efa0e3 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -13,7 +13,7 @@ object DottyBuild extends Build { val baseVersion = "0.1" val isNightly = sys.env.get("NIGHTLYBUILD") == Some("yes") - val jenkinsMemLimit = List("-Xmx1300m") + val jenkinsMemLimit = List("-Xmx1500m") val JENKINS_BUILD = "dotty.jenkins.build" From 0dc738dd1377577a4004bfe158b11bfb1fa59a9d Mon Sep 17 00:00:00 2001 From: Guillaume Martres Date: Fri, 28 Oct 2016 22:52:16 +0200 Subject: [PATCH 11/55] Fix partest compilation of java-interop tests by moving them Previously, the tests where all in tests/pos/java-interop which means that partest would try to run them as one single test, this failed because some of these tests define classes with the same name. We could fix this by putting them all in separate packages but for now it's simple to move them to tests/pos-java-interop (they will still be run individually as they should thanks to the `java_all` test defined in tests.scala) --- test/dotc/tests.scala | 2 +- .../java-interop => pos-java-interop}/1576/TagAnnotation.java | 0 tests/{pos/java-interop => pos-java-interop}/1576/Test.scala | 0 tests/{pos/java-interop => pos-java-interop}/i879.java | 0 tests/{pos/java-interop => pos-java-interop}/t0288/Foo.scala | 0 tests/{pos/java-interop => pos-java-interop}/t0288/Outer.java | 0 .../{pos/java-interop => pos-java-interop}/t0695/JavaClass.java | 0 tests/{pos/java-interop => pos-java-interop}/t0695/Test.scala | 0 tests/{pos/java-interop => pos-java-interop}/t1101/J.java | 0 tests/{pos/java-interop => pos-java-interop}/t1101/S.scala | 0 tests/{pos/java-interop => pos-java-interop}/t1102/J.java | 0 tests/{pos/java-interop => pos-java-interop}/t1102/S.scala | 0 tests/{pos/java-interop => pos-java-interop}/t1150/J.java | 0 tests/{pos/java-interop => pos-java-interop}/t1150/S.scala | 0 tests/{pos/java-interop => pos-java-interop}/t1152/J.java | 0 tests/{pos/java-interop => pos-java-interop}/t1152/S.scala | 0 tests/{pos/java-interop => pos-java-interop}/t1176/J.java | 0 tests/{pos/java-interop => pos-java-interop}/t1176/S.scala | 0 tests/{pos/java-interop => pos-java-interop}/t1186/t1186.java | 0 tests/{pos/java-interop => pos-java-interop}/t1196/J.java | 0 tests/{pos/java-interop => pos-java-interop}/t1196/S.scala | 0 tests/{pos/java-interop => pos-java-interop}/t1197/J.java | 0 tests/{pos/java-interop => pos-java-interop}/t1197/S.scala | 0 tests/{pos/java-interop => pos-java-interop}/t1203b/J.java | 0 tests/{pos/java-interop => pos-java-interop}/t1203b/S.scala | 0 tests/{pos/java-interop => pos-java-interop}/t1230/J.java | 0 tests/{pos/java-interop => pos-java-interop}/t1230/S.scala | 0 tests/{pos/java-interop => pos-java-interop}/t1231/J.java | 0 tests/{pos/java-interop => pos-java-interop}/t1231/S.scala | 0 tests/{pos/java-interop => pos-java-interop}/t1232/J.java | 0 tests/{pos/java-interop => pos-java-interop}/t1232/J2.java | 0 tests/{pos/java-interop => pos-java-interop}/t1232/S.scala | 0 tests/{pos/java-interop => pos-java-interop}/t1235/Test.java | 0 tests/{pos/java-interop => pos-java-interop}/t1254/t1254.java | 0 .../java-interop => pos-java-interop}/t1409/AbstractImpl.java | 0 .../java-interop => pos-java-interop}/t1409/ConcreteImpl.scala | 0 .../java-interop => pos-java-interop}/t1409/OuterInterface.java | 0 .../t1642/JavaCallingScalaHashMap.java | 0 tests/{pos/java-interop => pos-java-interop}/t1711/Seq.scala | 0 tests/{pos/java-interop => pos-java-interop}/t1711/Test.java | 0 tests/{pos/java-interop => pos-java-interop}/t1751/A1_2.scala | 0 tests/{pos/java-interop => pos-java-interop}/t1751/A2_1.scala | 0 .../java-interop => pos-java-interop}/t1751/SuiteClasses.java | 0 tests/{pos/java-interop => pos-java-interop}/t1782/Ann.java | 0 tests/{pos/java-interop => pos-java-interop}/t1782/Days.java | 0 .../java-interop => pos-java-interop}/t1782/ImplementedBy.java | 0 tests/{pos/java-interop => pos-java-interop}/t1782/Test_1.scala | 0 tests/{pos/java-interop => pos-java-interop}/t1836/J.java | 0 tests/{pos/java-interop => pos-java-interop}/t1836/S.scala | 0 tests/{pos/java-interop => pos-java-interop}/t1840/J.java | 0 tests/{pos/java-interop => pos-java-interop}/t1840/S.scala | 0 .../t1937/NumberGenerator.java | 0 tests/{pos/java-interop => pos-java-interop}/t2377/Q.java | 0 tests/{pos/java-interop => pos-java-interop}/t2377/a.scala | 0 tests/{pos/java-interop => pos-java-interop}/t2409/J.java | 0 tests/{pos/java-interop => pos-java-interop}/t2409/t2409.scala | 0 .../{pos/java-interop => pos-java-interop}/t2413/TestJava.java | 0 .../java-interop => pos-java-interop}/t2413/TestScalac.scala | 0 tests/{pos/java-interop => pos-java-interop}/t2433/A.java | 0 tests/{pos/java-interop => pos-java-interop}/t2433/B.java | 0 tests/{pos/java-interop => pos-java-interop}/t2433/Test.scala | 0 tests/{pos/java-interop => pos-java-interop}/t2464/JavaOne.java | 0 .../java-interop => pos-java-interop}/t2464/ScalaOne_1.scala | 0 .../{pos/java-interop => pos-java-interop}/t2464/t2464_2.scala | 0 tests/{pos/java-interop => pos-java-interop}/t2764/Ann.java | 0 tests/{pos/java-interop => pos-java-interop}/t2764/Enum.java | 0 tests/{pos/java-interop => pos-java-interop}/t2764/Use.scala | 0 tests/{pos/java-interop => pos-java-interop}/t294/Ann.java | 0 tests/{pos/java-interop => pos-java-interop}/t294/Ann2.java | 0 tests/{pos/java-interop => pos-java-interop}/t294/Test_1.scala | 0 tests/{pos/java-interop => pos-java-interop}/t294/Test_2.scala | 0 tests/{pos/java-interop => pos-java-interop}/t2940/Cycle.java | 0 tests/{pos/java-interop => pos-java-interop}/t2940/Error.scala | 0 .../t2956/BeanDefinitionVisitor.java | 0 tests/{pos/java-interop => pos-java-interop}/t2956/t2956.scala | 0 tests/{pos/java-interop => pos-java-interop}/volatile/Foo.java | 0 76 files changed, 1 insertion(+), 1 deletion(-) rename tests/{pos/java-interop => pos-java-interop}/1576/TagAnnotation.java (100%) rename tests/{pos/java-interop => pos-java-interop}/1576/Test.scala (100%) rename tests/{pos/java-interop => pos-java-interop}/i879.java (100%) rename tests/{pos/java-interop => pos-java-interop}/t0288/Foo.scala (100%) rename tests/{pos/java-interop => pos-java-interop}/t0288/Outer.java (100%) rename tests/{pos/java-interop => pos-java-interop}/t0695/JavaClass.java (100%) rename tests/{pos/java-interop => pos-java-interop}/t0695/Test.scala (100%) rename tests/{pos/java-interop => pos-java-interop}/t1101/J.java (100%) rename tests/{pos/java-interop => pos-java-interop}/t1101/S.scala (100%) rename tests/{pos/java-interop => pos-java-interop}/t1102/J.java (100%) rename tests/{pos/java-interop => pos-java-interop}/t1102/S.scala (100%) rename tests/{pos/java-interop => pos-java-interop}/t1150/J.java (100%) rename tests/{pos/java-interop => pos-java-interop}/t1150/S.scala (100%) rename tests/{pos/java-interop => pos-java-interop}/t1152/J.java (100%) rename tests/{pos/java-interop => pos-java-interop}/t1152/S.scala (100%) rename tests/{pos/java-interop => pos-java-interop}/t1176/J.java (100%) rename tests/{pos/java-interop => pos-java-interop}/t1176/S.scala (100%) rename tests/{pos/java-interop => pos-java-interop}/t1186/t1186.java (100%) rename tests/{pos/java-interop => pos-java-interop}/t1196/J.java (100%) rename tests/{pos/java-interop => pos-java-interop}/t1196/S.scala (100%) rename tests/{pos/java-interop => pos-java-interop}/t1197/J.java (100%) rename tests/{pos/java-interop => pos-java-interop}/t1197/S.scala (100%) rename tests/{pos/java-interop => pos-java-interop}/t1203b/J.java (100%) rename tests/{pos/java-interop => pos-java-interop}/t1203b/S.scala (100%) rename tests/{pos/java-interop => pos-java-interop}/t1230/J.java (100%) rename tests/{pos/java-interop => pos-java-interop}/t1230/S.scala (100%) rename tests/{pos/java-interop => pos-java-interop}/t1231/J.java (100%) rename tests/{pos/java-interop => pos-java-interop}/t1231/S.scala (100%) rename tests/{pos/java-interop => pos-java-interop}/t1232/J.java (100%) rename tests/{pos/java-interop => pos-java-interop}/t1232/J2.java (100%) rename tests/{pos/java-interop => pos-java-interop}/t1232/S.scala (100%) rename tests/{pos/java-interop => pos-java-interop}/t1235/Test.java (100%) rename tests/{pos/java-interop => pos-java-interop}/t1254/t1254.java (100%) rename tests/{pos/java-interop => pos-java-interop}/t1409/AbstractImpl.java (100%) rename tests/{pos/java-interop => pos-java-interop}/t1409/ConcreteImpl.scala (100%) rename tests/{pos/java-interop => pos-java-interop}/t1409/OuterInterface.java (100%) rename tests/{pos/java-interop => pos-java-interop}/t1642/JavaCallingScalaHashMap.java (100%) rename tests/{pos/java-interop => pos-java-interop}/t1711/Seq.scala (100%) rename tests/{pos/java-interop => pos-java-interop}/t1711/Test.java (100%) rename tests/{pos/java-interop => pos-java-interop}/t1751/A1_2.scala (100%) rename tests/{pos/java-interop => pos-java-interop}/t1751/A2_1.scala (100%) rename tests/{pos/java-interop => pos-java-interop}/t1751/SuiteClasses.java (100%) rename tests/{pos/java-interop => pos-java-interop}/t1782/Ann.java (100%) rename tests/{pos/java-interop => pos-java-interop}/t1782/Days.java (100%) rename tests/{pos/java-interop => pos-java-interop}/t1782/ImplementedBy.java (100%) rename tests/{pos/java-interop => pos-java-interop}/t1782/Test_1.scala (100%) rename tests/{pos/java-interop => pos-java-interop}/t1836/J.java (100%) rename tests/{pos/java-interop => pos-java-interop}/t1836/S.scala (100%) rename tests/{pos/java-interop => pos-java-interop}/t1840/J.java (100%) rename tests/{pos/java-interop => pos-java-interop}/t1840/S.scala (100%) rename tests/{pos/java-interop => pos-java-interop}/t1937/NumberGenerator.java (100%) rename tests/{pos/java-interop => pos-java-interop}/t2377/Q.java (100%) rename tests/{pos/java-interop => pos-java-interop}/t2377/a.scala (100%) rename tests/{pos/java-interop => pos-java-interop}/t2409/J.java (100%) rename tests/{pos/java-interop => pos-java-interop}/t2409/t2409.scala (100%) rename tests/{pos/java-interop => pos-java-interop}/t2413/TestJava.java (100%) rename tests/{pos/java-interop => pos-java-interop}/t2413/TestScalac.scala (100%) rename tests/{pos/java-interop => pos-java-interop}/t2433/A.java (100%) rename tests/{pos/java-interop => pos-java-interop}/t2433/B.java (100%) rename tests/{pos/java-interop => pos-java-interop}/t2433/Test.scala (100%) rename tests/{pos/java-interop => pos-java-interop}/t2464/JavaOne.java (100%) rename tests/{pos/java-interop => pos-java-interop}/t2464/ScalaOne_1.scala (100%) rename tests/{pos/java-interop => pos-java-interop}/t2464/t2464_2.scala (100%) rename tests/{pos/java-interop => pos-java-interop}/t2764/Ann.java (100%) rename tests/{pos/java-interop => pos-java-interop}/t2764/Enum.java (100%) rename tests/{pos/java-interop => pos-java-interop}/t2764/Use.scala (100%) rename tests/{pos/java-interop => pos-java-interop}/t294/Ann.java (100%) rename tests/{pos/java-interop => pos-java-interop}/t294/Ann2.java (100%) rename tests/{pos/java-interop => pos-java-interop}/t294/Test_1.scala (100%) rename tests/{pos/java-interop => pos-java-interop}/t294/Test_2.scala (100%) rename tests/{pos/java-interop => pos-java-interop}/t2940/Cycle.java (100%) rename tests/{pos/java-interop => pos-java-interop}/t2940/Error.scala (100%) rename tests/{pos/java-interop => pos-java-interop}/t2956/BeanDefinitionVisitor.java (100%) rename tests/{pos/java-interop => pos-java-interop}/t2956/t2956.scala (100%) rename tests/{pos/java-interop => pos-java-interop}/volatile/Foo.java (100%) diff --git a/test/dotc/tests.scala b/test/dotc/tests.scala index d96111dee58e..fd990c599fe8 100644 --- a/test/dotc/tests.scala +++ b/test/dotc/tests.scala @@ -249,7 +249,7 @@ class tests extends CompilerTest { dotcDir + "config/PathResolver.scala" ), List(/* "-Ylog:frontend", */ "-Xprompt") ++ staleSymbolError ++ twice) - val javaDir = "./tests/pos/java-interop/" + val javaDir = "./tests/pos-java-interop/" @Test def java_all = compileFiles(javaDir, twice) //@Test def dotc_compilercommand = compileFile(dotcDir + "config/", "CompilerCommand") diff --git a/tests/pos/java-interop/1576/TagAnnotation.java b/tests/pos-java-interop/1576/TagAnnotation.java similarity index 100% rename from tests/pos/java-interop/1576/TagAnnotation.java rename to tests/pos-java-interop/1576/TagAnnotation.java diff --git a/tests/pos/java-interop/1576/Test.scala b/tests/pos-java-interop/1576/Test.scala similarity index 100% rename from tests/pos/java-interop/1576/Test.scala rename to tests/pos-java-interop/1576/Test.scala diff --git a/tests/pos/java-interop/i879.java b/tests/pos-java-interop/i879.java similarity index 100% rename from tests/pos/java-interop/i879.java rename to tests/pos-java-interop/i879.java diff --git a/tests/pos/java-interop/t0288/Foo.scala b/tests/pos-java-interop/t0288/Foo.scala similarity index 100% rename from tests/pos/java-interop/t0288/Foo.scala rename to tests/pos-java-interop/t0288/Foo.scala diff --git a/tests/pos/java-interop/t0288/Outer.java b/tests/pos-java-interop/t0288/Outer.java similarity index 100% rename from tests/pos/java-interop/t0288/Outer.java rename to tests/pos-java-interop/t0288/Outer.java diff --git a/tests/pos/java-interop/t0695/JavaClass.java b/tests/pos-java-interop/t0695/JavaClass.java similarity index 100% rename from tests/pos/java-interop/t0695/JavaClass.java rename to tests/pos-java-interop/t0695/JavaClass.java diff --git a/tests/pos/java-interop/t0695/Test.scala b/tests/pos-java-interop/t0695/Test.scala similarity index 100% rename from tests/pos/java-interop/t0695/Test.scala rename to tests/pos-java-interop/t0695/Test.scala diff --git a/tests/pos/java-interop/t1101/J.java b/tests/pos-java-interop/t1101/J.java similarity index 100% rename from tests/pos/java-interop/t1101/J.java rename to tests/pos-java-interop/t1101/J.java diff --git a/tests/pos/java-interop/t1101/S.scala b/tests/pos-java-interop/t1101/S.scala similarity index 100% rename from tests/pos/java-interop/t1101/S.scala rename to tests/pos-java-interop/t1101/S.scala diff --git a/tests/pos/java-interop/t1102/J.java b/tests/pos-java-interop/t1102/J.java similarity index 100% rename from tests/pos/java-interop/t1102/J.java rename to tests/pos-java-interop/t1102/J.java diff --git a/tests/pos/java-interop/t1102/S.scala b/tests/pos-java-interop/t1102/S.scala similarity index 100% rename from tests/pos/java-interop/t1102/S.scala rename to tests/pos-java-interop/t1102/S.scala diff --git a/tests/pos/java-interop/t1150/J.java b/tests/pos-java-interop/t1150/J.java similarity index 100% rename from tests/pos/java-interop/t1150/J.java rename to tests/pos-java-interop/t1150/J.java diff --git a/tests/pos/java-interop/t1150/S.scala b/tests/pos-java-interop/t1150/S.scala similarity index 100% rename from tests/pos/java-interop/t1150/S.scala rename to tests/pos-java-interop/t1150/S.scala diff --git a/tests/pos/java-interop/t1152/J.java b/tests/pos-java-interop/t1152/J.java similarity index 100% rename from tests/pos/java-interop/t1152/J.java rename to tests/pos-java-interop/t1152/J.java diff --git a/tests/pos/java-interop/t1152/S.scala b/tests/pos-java-interop/t1152/S.scala similarity index 100% rename from tests/pos/java-interop/t1152/S.scala rename to tests/pos-java-interop/t1152/S.scala diff --git a/tests/pos/java-interop/t1176/J.java b/tests/pos-java-interop/t1176/J.java similarity index 100% rename from tests/pos/java-interop/t1176/J.java rename to tests/pos-java-interop/t1176/J.java diff --git a/tests/pos/java-interop/t1176/S.scala b/tests/pos-java-interop/t1176/S.scala similarity index 100% rename from tests/pos/java-interop/t1176/S.scala rename to tests/pos-java-interop/t1176/S.scala diff --git a/tests/pos/java-interop/t1186/t1186.java b/tests/pos-java-interop/t1186/t1186.java similarity index 100% rename from tests/pos/java-interop/t1186/t1186.java rename to tests/pos-java-interop/t1186/t1186.java diff --git a/tests/pos/java-interop/t1196/J.java b/tests/pos-java-interop/t1196/J.java similarity index 100% rename from tests/pos/java-interop/t1196/J.java rename to tests/pos-java-interop/t1196/J.java diff --git a/tests/pos/java-interop/t1196/S.scala b/tests/pos-java-interop/t1196/S.scala similarity index 100% rename from tests/pos/java-interop/t1196/S.scala rename to tests/pos-java-interop/t1196/S.scala diff --git a/tests/pos/java-interop/t1197/J.java b/tests/pos-java-interop/t1197/J.java similarity index 100% rename from tests/pos/java-interop/t1197/J.java rename to tests/pos-java-interop/t1197/J.java diff --git a/tests/pos/java-interop/t1197/S.scala b/tests/pos-java-interop/t1197/S.scala similarity index 100% rename from tests/pos/java-interop/t1197/S.scala rename to tests/pos-java-interop/t1197/S.scala diff --git a/tests/pos/java-interop/t1203b/J.java b/tests/pos-java-interop/t1203b/J.java similarity index 100% rename from tests/pos/java-interop/t1203b/J.java rename to tests/pos-java-interop/t1203b/J.java diff --git a/tests/pos/java-interop/t1203b/S.scala b/tests/pos-java-interop/t1203b/S.scala similarity index 100% rename from tests/pos/java-interop/t1203b/S.scala rename to tests/pos-java-interop/t1203b/S.scala diff --git a/tests/pos/java-interop/t1230/J.java b/tests/pos-java-interop/t1230/J.java similarity index 100% rename from tests/pos/java-interop/t1230/J.java rename to tests/pos-java-interop/t1230/J.java diff --git a/tests/pos/java-interop/t1230/S.scala b/tests/pos-java-interop/t1230/S.scala similarity index 100% rename from tests/pos/java-interop/t1230/S.scala rename to tests/pos-java-interop/t1230/S.scala diff --git a/tests/pos/java-interop/t1231/J.java b/tests/pos-java-interop/t1231/J.java similarity index 100% rename from tests/pos/java-interop/t1231/J.java rename to tests/pos-java-interop/t1231/J.java diff --git a/tests/pos/java-interop/t1231/S.scala b/tests/pos-java-interop/t1231/S.scala similarity index 100% rename from tests/pos/java-interop/t1231/S.scala rename to tests/pos-java-interop/t1231/S.scala diff --git a/tests/pos/java-interop/t1232/J.java b/tests/pos-java-interop/t1232/J.java similarity index 100% rename from tests/pos/java-interop/t1232/J.java rename to tests/pos-java-interop/t1232/J.java diff --git a/tests/pos/java-interop/t1232/J2.java b/tests/pos-java-interop/t1232/J2.java similarity index 100% rename from tests/pos/java-interop/t1232/J2.java rename to tests/pos-java-interop/t1232/J2.java diff --git a/tests/pos/java-interop/t1232/S.scala b/tests/pos-java-interop/t1232/S.scala similarity index 100% rename from tests/pos/java-interop/t1232/S.scala rename to tests/pos-java-interop/t1232/S.scala diff --git a/tests/pos/java-interop/t1235/Test.java b/tests/pos-java-interop/t1235/Test.java similarity index 100% rename from tests/pos/java-interop/t1235/Test.java rename to tests/pos-java-interop/t1235/Test.java diff --git a/tests/pos/java-interop/t1254/t1254.java b/tests/pos-java-interop/t1254/t1254.java similarity index 100% rename from tests/pos/java-interop/t1254/t1254.java rename to tests/pos-java-interop/t1254/t1254.java diff --git a/tests/pos/java-interop/t1409/AbstractImpl.java b/tests/pos-java-interop/t1409/AbstractImpl.java similarity index 100% rename from tests/pos/java-interop/t1409/AbstractImpl.java rename to tests/pos-java-interop/t1409/AbstractImpl.java diff --git a/tests/pos/java-interop/t1409/ConcreteImpl.scala b/tests/pos-java-interop/t1409/ConcreteImpl.scala similarity index 100% rename from tests/pos/java-interop/t1409/ConcreteImpl.scala rename to tests/pos-java-interop/t1409/ConcreteImpl.scala diff --git a/tests/pos/java-interop/t1409/OuterInterface.java b/tests/pos-java-interop/t1409/OuterInterface.java similarity index 100% rename from tests/pos/java-interop/t1409/OuterInterface.java rename to tests/pos-java-interop/t1409/OuterInterface.java diff --git a/tests/pos/java-interop/t1642/JavaCallingScalaHashMap.java b/tests/pos-java-interop/t1642/JavaCallingScalaHashMap.java similarity index 100% rename from tests/pos/java-interop/t1642/JavaCallingScalaHashMap.java rename to tests/pos-java-interop/t1642/JavaCallingScalaHashMap.java diff --git a/tests/pos/java-interop/t1711/Seq.scala b/tests/pos-java-interop/t1711/Seq.scala similarity index 100% rename from tests/pos/java-interop/t1711/Seq.scala rename to tests/pos-java-interop/t1711/Seq.scala diff --git a/tests/pos/java-interop/t1711/Test.java b/tests/pos-java-interop/t1711/Test.java similarity index 100% rename from tests/pos/java-interop/t1711/Test.java rename to tests/pos-java-interop/t1711/Test.java diff --git a/tests/pos/java-interop/t1751/A1_2.scala b/tests/pos-java-interop/t1751/A1_2.scala similarity index 100% rename from tests/pos/java-interop/t1751/A1_2.scala rename to tests/pos-java-interop/t1751/A1_2.scala diff --git a/tests/pos/java-interop/t1751/A2_1.scala b/tests/pos-java-interop/t1751/A2_1.scala similarity index 100% rename from tests/pos/java-interop/t1751/A2_1.scala rename to tests/pos-java-interop/t1751/A2_1.scala diff --git a/tests/pos/java-interop/t1751/SuiteClasses.java b/tests/pos-java-interop/t1751/SuiteClasses.java similarity index 100% rename from tests/pos/java-interop/t1751/SuiteClasses.java rename to tests/pos-java-interop/t1751/SuiteClasses.java diff --git a/tests/pos/java-interop/t1782/Ann.java b/tests/pos-java-interop/t1782/Ann.java similarity index 100% rename from tests/pos/java-interop/t1782/Ann.java rename to tests/pos-java-interop/t1782/Ann.java diff --git a/tests/pos/java-interop/t1782/Days.java b/tests/pos-java-interop/t1782/Days.java similarity index 100% rename from tests/pos/java-interop/t1782/Days.java rename to tests/pos-java-interop/t1782/Days.java diff --git a/tests/pos/java-interop/t1782/ImplementedBy.java b/tests/pos-java-interop/t1782/ImplementedBy.java similarity index 100% rename from tests/pos/java-interop/t1782/ImplementedBy.java rename to tests/pos-java-interop/t1782/ImplementedBy.java diff --git a/tests/pos/java-interop/t1782/Test_1.scala b/tests/pos-java-interop/t1782/Test_1.scala similarity index 100% rename from tests/pos/java-interop/t1782/Test_1.scala rename to tests/pos-java-interop/t1782/Test_1.scala diff --git a/tests/pos/java-interop/t1836/J.java b/tests/pos-java-interop/t1836/J.java similarity index 100% rename from tests/pos/java-interop/t1836/J.java rename to tests/pos-java-interop/t1836/J.java diff --git a/tests/pos/java-interop/t1836/S.scala b/tests/pos-java-interop/t1836/S.scala similarity index 100% rename from tests/pos/java-interop/t1836/S.scala rename to tests/pos-java-interop/t1836/S.scala diff --git a/tests/pos/java-interop/t1840/J.java b/tests/pos-java-interop/t1840/J.java similarity index 100% rename from tests/pos/java-interop/t1840/J.java rename to tests/pos-java-interop/t1840/J.java diff --git a/tests/pos/java-interop/t1840/S.scala b/tests/pos-java-interop/t1840/S.scala similarity index 100% rename from tests/pos/java-interop/t1840/S.scala rename to tests/pos-java-interop/t1840/S.scala diff --git a/tests/pos/java-interop/t1937/NumberGenerator.java b/tests/pos-java-interop/t1937/NumberGenerator.java similarity index 100% rename from tests/pos/java-interop/t1937/NumberGenerator.java rename to tests/pos-java-interop/t1937/NumberGenerator.java diff --git a/tests/pos/java-interop/t2377/Q.java b/tests/pos-java-interop/t2377/Q.java similarity index 100% rename from tests/pos/java-interop/t2377/Q.java rename to tests/pos-java-interop/t2377/Q.java diff --git a/tests/pos/java-interop/t2377/a.scala b/tests/pos-java-interop/t2377/a.scala similarity index 100% rename from tests/pos/java-interop/t2377/a.scala rename to tests/pos-java-interop/t2377/a.scala diff --git a/tests/pos/java-interop/t2409/J.java b/tests/pos-java-interop/t2409/J.java similarity index 100% rename from tests/pos/java-interop/t2409/J.java rename to tests/pos-java-interop/t2409/J.java diff --git a/tests/pos/java-interop/t2409/t2409.scala b/tests/pos-java-interop/t2409/t2409.scala similarity index 100% rename from tests/pos/java-interop/t2409/t2409.scala rename to tests/pos-java-interop/t2409/t2409.scala diff --git a/tests/pos/java-interop/t2413/TestJava.java b/tests/pos-java-interop/t2413/TestJava.java similarity index 100% rename from tests/pos/java-interop/t2413/TestJava.java rename to tests/pos-java-interop/t2413/TestJava.java diff --git a/tests/pos/java-interop/t2413/TestScalac.scala b/tests/pos-java-interop/t2413/TestScalac.scala similarity index 100% rename from tests/pos/java-interop/t2413/TestScalac.scala rename to tests/pos-java-interop/t2413/TestScalac.scala diff --git a/tests/pos/java-interop/t2433/A.java b/tests/pos-java-interop/t2433/A.java similarity index 100% rename from tests/pos/java-interop/t2433/A.java rename to tests/pos-java-interop/t2433/A.java diff --git a/tests/pos/java-interop/t2433/B.java b/tests/pos-java-interop/t2433/B.java similarity index 100% rename from tests/pos/java-interop/t2433/B.java rename to tests/pos-java-interop/t2433/B.java diff --git a/tests/pos/java-interop/t2433/Test.scala b/tests/pos-java-interop/t2433/Test.scala similarity index 100% rename from tests/pos/java-interop/t2433/Test.scala rename to tests/pos-java-interop/t2433/Test.scala diff --git a/tests/pos/java-interop/t2464/JavaOne.java b/tests/pos-java-interop/t2464/JavaOne.java similarity index 100% rename from tests/pos/java-interop/t2464/JavaOne.java rename to tests/pos-java-interop/t2464/JavaOne.java diff --git a/tests/pos/java-interop/t2464/ScalaOne_1.scala b/tests/pos-java-interop/t2464/ScalaOne_1.scala similarity index 100% rename from tests/pos/java-interop/t2464/ScalaOne_1.scala rename to tests/pos-java-interop/t2464/ScalaOne_1.scala diff --git a/tests/pos/java-interop/t2464/t2464_2.scala b/tests/pos-java-interop/t2464/t2464_2.scala similarity index 100% rename from tests/pos/java-interop/t2464/t2464_2.scala rename to tests/pos-java-interop/t2464/t2464_2.scala diff --git a/tests/pos/java-interop/t2764/Ann.java b/tests/pos-java-interop/t2764/Ann.java similarity index 100% rename from tests/pos/java-interop/t2764/Ann.java rename to tests/pos-java-interop/t2764/Ann.java diff --git a/tests/pos/java-interop/t2764/Enum.java b/tests/pos-java-interop/t2764/Enum.java similarity index 100% rename from tests/pos/java-interop/t2764/Enum.java rename to tests/pos-java-interop/t2764/Enum.java diff --git a/tests/pos/java-interop/t2764/Use.scala b/tests/pos-java-interop/t2764/Use.scala similarity index 100% rename from tests/pos/java-interop/t2764/Use.scala rename to tests/pos-java-interop/t2764/Use.scala diff --git a/tests/pos/java-interop/t294/Ann.java b/tests/pos-java-interop/t294/Ann.java similarity index 100% rename from tests/pos/java-interop/t294/Ann.java rename to tests/pos-java-interop/t294/Ann.java diff --git a/tests/pos/java-interop/t294/Ann2.java b/tests/pos-java-interop/t294/Ann2.java similarity index 100% rename from tests/pos/java-interop/t294/Ann2.java rename to tests/pos-java-interop/t294/Ann2.java diff --git a/tests/pos/java-interop/t294/Test_1.scala b/tests/pos-java-interop/t294/Test_1.scala similarity index 100% rename from tests/pos/java-interop/t294/Test_1.scala rename to tests/pos-java-interop/t294/Test_1.scala diff --git a/tests/pos/java-interop/t294/Test_2.scala b/tests/pos-java-interop/t294/Test_2.scala similarity index 100% rename from tests/pos/java-interop/t294/Test_2.scala rename to tests/pos-java-interop/t294/Test_2.scala diff --git a/tests/pos/java-interop/t2940/Cycle.java b/tests/pos-java-interop/t2940/Cycle.java similarity index 100% rename from tests/pos/java-interop/t2940/Cycle.java rename to tests/pos-java-interop/t2940/Cycle.java diff --git a/tests/pos/java-interop/t2940/Error.scala b/tests/pos-java-interop/t2940/Error.scala similarity index 100% rename from tests/pos/java-interop/t2940/Error.scala rename to tests/pos-java-interop/t2940/Error.scala diff --git a/tests/pos/java-interop/t2956/BeanDefinitionVisitor.java b/tests/pos-java-interop/t2956/BeanDefinitionVisitor.java similarity index 100% rename from tests/pos/java-interop/t2956/BeanDefinitionVisitor.java rename to tests/pos-java-interop/t2956/BeanDefinitionVisitor.java diff --git a/tests/pos/java-interop/t2956/t2956.scala b/tests/pos-java-interop/t2956/t2956.scala similarity index 100% rename from tests/pos/java-interop/t2956/t2956.scala rename to tests/pos-java-interop/t2956/t2956.scala diff --git a/tests/pos/java-interop/volatile/Foo.java b/tests/pos-java-interop/volatile/Foo.java similarity index 100% rename from tests/pos/java-interop/volatile/Foo.java rename to tests/pos-java-interop/volatile/Foo.java From c65591c3672837588f318db2652a9001f674f8f7 Mon Sep 17 00:00:00 2001 From: Guillaume Martres Date: Fri, 28 Oct 2016 23:41:28 +0200 Subject: [PATCH 12/55] PathResolver: fix priorityClassPath It was wrongly defined before with respect to `commandLineFor` (this is what happens when you rely on strings instead of types!) --- src/dotty/tools/dotc/config/PathResolver.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/dotty/tools/dotc/config/PathResolver.scala b/src/dotty/tools/dotc/config/PathResolver.scala index 14a44531a573..aa4d8aeb05e6 100644 --- a/src/dotty/tools/dotc/config/PathResolver.scala +++ b/src/dotty/tools/dotc/config/PathResolver.scala @@ -189,7 +189,7 @@ class PathResolver(implicit ctx: Context) { def javaUserClassPath = if (useJavaClassPath) Defaults.javaUserClassPath else "" def scalaBootClassPath = cmdLineOrElse("bootclasspath", Defaults.scalaBootClassPath) def scalaExtDirs = cmdLineOrElse("extdirs", Defaults.scalaExtDirs) - def priorityClassPath = cmdLineOrElse("prioritypath", "") + def priorityClassPath = cmdLineOrElse("priorityclasspath", "") /** Scaladoc doesn't need any bootstrapping, otherwise will create errors such as: * [scaladoc] ../scala-trunk/src/reflect/scala/reflect/macros/Reifiers.scala:89: error: object api is not a member of package reflect * [scaladoc] case class ReificationException(val pos: reflect.api.PositionApi, val msg: String) extends Throwable(msg) From 5c34122645a6e3a75459de9cf381bb20ca2d67dd Mon Sep 17 00:00:00 2001 From: Guillaume Martres Date: Sat, 29 Oct 2016 00:08:02 +0200 Subject: [PATCH 13/55] Fix "sbt run" Broken since the dotty jars were removed from the JVM bootclasspath. I think the proper solution is to use the Scala bootclasspath to pass all the necessary jars but this will do for now. --- project/Build.scala | 3 +++ 1 file changed, 3 insertions(+) diff --git a/project/Build.scala b/project/Build.scala index 44ac58efa0e3..9eb8cb894b0e 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -198,6 +198,9 @@ object DottyBuild extends Build { // Add git-hash used to package the distribution to the manifest to know it in runtime and report it in REPL packageOptions += ManifestAttributes(("Git-Hash", VersionUtil.gitHash)), + // FIXME: Do something more sensible, like using the Scala bootclasspath + run <<= (run in Compile).partialInput(" -usejavacp"), + // http://grokbase.com/t/gg/simple-build-tool/135ke5y90p/sbt-setting-jvm-boot-paramaters-for-scala // packageAll should always be run before tests javaOptions <++= (dependencyClasspath in Runtime, packageAll) map { (attList, _) => From 0c8e2a38684ca4f449115d3e01db7bc3fc3393d2 Mon Sep 17 00:00:00 2001 From: Guillaume Martres Date: Sat, 29 Oct 2016 00:26:38 +0200 Subject: [PATCH 14/55] Fix pickle_pickleOK test It failed because two files in the same package compiled at the same time defined respectively a class Test and an object Test. I'm guessing this did not fail before because failure depends on the order of the files on the command line. --- tests/pickling/i1202a.scala | 2 ++ tests/pickling/zoo.scala | 2 ++ 2 files changed, 4 insertions(+) diff --git a/tests/pickling/i1202a.scala b/tests/pickling/i1202a.scala index 0bc19f4e3c5c..a8134720f794 100644 --- a/tests/pickling/i1202a.scala +++ b/tests/pickling/i1202a.scala @@ -1,3 +1,5 @@ +package i1202a + class Test[T] { def testMethod: Unit = new Foo(this) diff --git a/tests/pickling/zoo.scala b/tests/pickling/zoo.scala index 02dac8f5bf32..e6bde86b1174 100644 --- a/tests/pickling/zoo.scala +++ b/tests/pickling/zoo.scala @@ -1,3 +1,5 @@ +package zoo + object Test { trait FoodStuff trait Meat extends FoodStuff { From 8654ce8c6347933996f274088c558f2b863cf094 Mon Sep 17 00:00:00 2001 From: Guillaume Martres Date: Sat, 29 Oct 2016 00:57:32 +0200 Subject: [PATCH 15/55] dottyDependsOnBootedLib should not be a JUnit test As indicated by the comment right above it. --- test/dotc/tests.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/dotc/tests.scala b/test/dotc/tests.scala index fd990c599fe8..e0bcbea7ebe0 100644 --- a/test/dotc/tests.scala +++ b/test/dotc/tests.scala @@ -207,7 +207,7 @@ class tests extends CompilerTest { def dottyBootedLib = compileDir(libDir, ".")(allowDeepSubtypes) // note the -deep argument // Not a junit test anymore since it is order dependent - @Test def dottyDependsOnBootedLib = compileDir(dottyDir, ".")(allowDeepSubtypes) // note the -deep argument + def dottyDependsOnBootedLib = compileDir(dottyDir, ".")(allowDeepSubtypes) // note the -deep argument @Test def dotc_ast = compileDir(dotcDir, "ast") @Test def dotc_config = compileDir(dotcDir, "config") From f4d46f3457a6f63bf83c6a0f2edac73b465ac929 Mon Sep 17 00:00:00 2001 From: Guillaume Martres Date: Sat, 29 Oct 2016 15:33:59 +0200 Subject: [PATCH 16/55] TastyPrinter: fix RefinedType printing --- src/dotty/tools/dotc/core/tasty/TastyPrinter.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/dotty/tools/dotc/core/tasty/TastyPrinter.scala b/src/dotty/tools/dotc/core/tasty/TastyPrinter.scala index 7fcd7c29eff1..0dc8d8feadcd 100644 --- a/src/dotty/tools/dotc/core/tasty/TastyPrinter.scala +++ b/src/dotty/tools/dotc/core/tasty/TastyPrinter.scala @@ -69,7 +69,7 @@ class TastyPrinter(bytes: Array[Byte])(implicit ctx: Context) { case VALDEF | DEFDEF | TYPEDEF | TYPEPARAM | PARAM | NAMEDARG | BIND => printName(); printTrees() case REFINEDtype => - printTree(); printName(); printTrees() + printName(); printTree(); printTrees() case RETURN => printNat(); printTrees() case METHODtype | POLYtype => From b3855424280a821601f126b6b4c6a731b72540ea Mon Sep 17 00:00:00 2001 From: Felix Mulder Date: Tue, 1 Nov 2016 12:50:53 +0100 Subject: [PATCH 17/55] Make homogenize apply HKApplys The pickler doesn't unpickle to HKApply, as such - we need to print them in their applied form. --- src/dotty/tools/dotc/printing/PlainPrinter.scala | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/dotty/tools/dotc/printing/PlainPrinter.scala b/src/dotty/tools/dotc/printing/PlainPrinter.scala index 4894fa019563..15c382bb09ad 100644 --- a/src/dotty/tools/dotc/printing/PlainPrinter.scala +++ b/src/dotty/tools/dotc/printing/PlainPrinter.scala @@ -55,6 +55,8 @@ class PlainPrinter(_ctx: Context) extends Printer { homogenize(tp.info) case tp: LazyRef => homogenize(tp.ref) + case HKApply(tycon, args) => + tycon.dealias.appliedTo(args) case _ => tp } From 6a455fe6da5ff9c741d91279a2dc6fe2fb1b472f Mon Sep 17 00:00:00 2001 From: Felix Mulder Date: Tue, 1 Nov 2016 18:34:29 +0100 Subject: [PATCH 18/55] Move (most) unit tests to correct locations Should still perhaps move `test/dotc/tests.scala` and the others in the same directory to a better more cohesive location. Would like to delete the worksheets as well - but maybe they hold sentimental value... --- project/Build.scala | 5 +- test/dotc/comptest.scala | 2 +- test/dotc/tests.scala | 2 +- .../tools}/ContextEscapeDetection.java | 6 +- .../tools}/ContextEscapeDetector.java | 3 +- test/{test => dotty/tools}/DottyTest.scala | 26 ++--- .../tools}/DottyTypeStealer.scala | 14 +-- .../tools}/ShowClassTests.scala | 16 +-- test/{test => dotty/tools}/TypeStealer.scala | 8 +- .../tools/backend/jvm}/AsmConverters.scala | 2 +- .../tools/backend/jvm}/AsmNode.scala | 2 +- .../backend/jvm}/DottyBytecodeTest.scala | 12 +- .../backend/jvm}/DottyBytecodeTests.scala | 2 +- .../backend/jvm}/InlineBytecodeTests.scala | 2 +- .../tools/dotc}/CompilerTest.scala | 14 +-- .../tools/dotc/EntryPointsTest.scala} | 12 +- .../tools/dotc}/InterfaceEntryPointTest.scala | 4 +- test/dotty/tools/dotc/ast/TreeInfoTest.scala | 4 +- .../tools/dotc/parsing}/DeSugarTest.scala | 12 +- .../tools/dotc/parsing/DocstringTest.scala} | 10 +- .../tools/dotc/parsing/DocstringTests.scala} | 6 +- .../dotc/parsing}/ModifiersParsingTest.scala | 18 +-- .../tools/dotc/parsing}/ParserTest.scala | 11 +- .../tools/dotc/parsing}/ScannerTest.scala | 7 +- .../tools/dotc/parsing}/desugarPackage.scala | 5 +- .../tools/dotc/parsing}/parseFile.scala | 2 +- .../tools/dotc/parsing}/parsePackage.scala | 4 +- .../tools/dotc/parsing}/showTree.scala | 6 +- .../tools/dotc/repl}/TestREPL.scala | 6 +- .../CreateCompanionObjectsTest.scala | 12 +- .../tools/dotc}/transform/LazyValsTest.scala | 5 +- .../transform/PostTyperTransformerTest.scala | 12 +- .../dotc}/transform/TreeTransformerTest.scala | 15 ++- test/{test => dotty/tools}/showClass.scala | 4 +- test/test/ContravariantTrees.scala | 65 ----------- test/test/SamplePhaseTest.scala | 16 --- test/{test => worksheets}/baseTypetest.sc | 0 test/{test => worksheets}/denotTest.sc | 0 test/{test => worksheets}/flagtest.sc | 0 test/{test => worksheets}/nesting.sc | 0 test/{test => worksheets}/periodtest.sc | 0 test/{test => worksheets}/positiontest.sc | 0 test/{test => worksheets}/sigtest.sc | 0 test/{test => worksheets}/testnames.sc | 0 test/x/PatMat.scala | 16 --- test/x/cakes.scala | 49 --------- test/x/names.scala | 21 ---- test/x/xplore.sc | 70 ------------ test/x/xplore2.sc | 104 ------------------ 49 files changed, 139 insertions(+), 473 deletions(-) rename test/{test => dotty/tools}/ContextEscapeDetection.java (97%) rename test/{test => dotty/tools}/ContextEscapeDetector.java (99%) rename test/{test => dotty/tools}/DottyTest.scala (81%) rename test/{test => dotty/tools}/DottyTypeStealer.scala (78%) rename test/{test => dotty/tools}/ShowClassTests.scala (94%) rename test/{test => dotty/tools}/TypeStealer.scala (70%) rename test/{test => dotty/tools/backend/jvm}/AsmConverters.scala (99%) rename test/{test => dotty/tools/backend/jvm}/AsmNode.scala (98%) rename test/{test => dotty/tools/backend/jvm}/DottyBytecodeTest.scala (96%) rename test/{test => dotty/tools/backend/jvm}/DottyBytecodeTests.scala (99%) rename test/{test => dotty/tools/backend/jvm}/InlineBytecodeTests.scala (96%) rename test/{test => dotty/tools/dotc}/CompilerTest.scala (99%) rename test/{test/OtherEntryPointsTest.scala => dotty/tools/dotc/EntryPointsTest.scala} (91%) rename test/{test => dotty/tools/dotc}/InterfaceEntryPointTest.scala (97%) rename test/{test => dotty/tools/dotc/parsing}/DeSugarTest.scala (96%) rename test/{test/DottyDocTest.scala => dotty/tools/dotc/parsing/DocstringTest.scala} (88%) rename test/{test/DottyDocParsingTests.scala => dotty/tools/dotc/parsing/DocstringTests.scala} (99%) rename test/{test => dotty/tools/dotc/parsing}/ModifiersParsingTest.scala (93%) rename test/{test => dotty/tools/dotc/parsing}/ParserTest.scala (85%) rename test/{test => dotty/tools/dotc/parsing}/ScannerTest.scala (95%) rename test/{test => dotty/tools/dotc/parsing}/desugarPackage.scala (94%) rename test/{test => dotty/tools/dotc/parsing}/parseFile.scala (89%) rename test/{test => dotty/tools/dotc/parsing}/parsePackage.scala (98%) rename test/{test => dotty/tools/dotc/parsing}/showTree.scala (90%) rename test/{test => dotty/tools/dotc/repl}/TestREPL.scala (95%) rename test/{test => dotty/tools/dotc}/transform/CreateCompanionObjectsTest.scala (95%) rename test/{test => dotty/tools/dotc}/transform/LazyValsTest.scala (99%) rename test/{test => dotty/tools/dotc}/transform/PostTyperTransformerTest.scala (95%) rename test/{test => dotty/tools/dotc}/transform/TreeTransformerTest.scala (96%) rename test/{test => dotty/tools}/showClass.scala (87%) delete mode 100644 test/test/ContravariantTrees.scala delete mode 100644 test/test/SamplePhaseTest.scala rename test/{test => worksheets}/baseTypetest.sc (100%) rename test/{test => worksheets}/denotTest.sc (100%) rename test/{test => worksheets}/flagtest.sc (100%) rename test/{test => worksheets}/nesting.sc (100%) rename test/{test => worksheets}/periodtest.sc (100%) rename test/{test => worksheets}/positiontest.sc (100%) rename test/{test => worksheets}/sigtest.sc (100%) rename test/{test => worksheets}/testnames.sc (100%) delete mode 100644 test/x/PatMat.scala delete mode 100644 test/x/cakes.scala delete mode 100644 test/x/names.scala delete mode 100644 test/x/xplore.sc delete mode 100644 test/x/xplore2.sc diff --git a/project/Build.scala b/project/Build.scala index 9eb8cb894b0e..ead692b1def8 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -126,7 +126,10 @@ object DottyBuild extends Build { }, // enable verbose exception messages for JUnit - testOptions in Test += Tests.Argument(TestFrameworks.JUnit, "-a", "-v", "--run-listener=test.ContextEscapeDetector"), + testOptions in Test += Tests.Argument( + TestFrameworks.JUnit, "-a", "-v", + "--run-listener=dotty.tools.ContextEscapeDetector" + ), testOptions in Test += Tests.Cleanup({ () => partestLockFile.delete }), lockPartestFile := { diff --git a/test/dotc/comptest.scala b/test/dotc/comptest.scala index 5b6646f39465..5ae1823e8cfa 100644 --- a/test/dotc/comptest.scala +++ b/test/dotc/comptest.scala @@ -1,6 +1,6 @@ package dotc -import test._ +import dotty.tools.dotc.CompilerTest object comptest extends CompilerTest { diff --git a/test/dotc/tests.scala b/test/dotc/tests.scala index e0bcbea7ebe0..842236b167ac 100644 --- a/test/dotc/tests.scala +++ b/test/dotc/tests.scala @@ -1,6 +1,6 @@ package dotc -import test._ +import dotty.tools.dotc.CompilerTest import org.junit.{Before, Test} import java.io.{ File => JFile } diff --git a/test/test/ContextEscapeDetection.java b/test/dotty/tools/ContextEscapeDetection.java similarity index 97% rename from test/test/ContextEscapeDetection.java rename to test/dotty/tools/ContextEscapeDetection.java index 8852c9fe9d1d..6a47de5c658e 100644 --- a/test/test/ContextEscapeDetection.java +++ b/test/dotty/tools/ContextEscapeDetection.java @@ -1,4 +1,4 @@ -package test; +package dotty.tools; import dotty.tools.dotc.core.Contexts; import org.junit.*; @@ -7,7 +7,6 @@ import java.util.LinkedList; import java.util.List; - public abstract class ContextEscapeDetection { public static class TestContext{ public TestContext(WeakReference context, String testName) { @@ -34,7 +33,4 @@ public synchronized void stealContext() { public synchronized void clearContext() { this.clearCtx(); } - - } - diff --git a/test/test/ContextEscapeDetector.java b/test/dotty/tools/ContextEscapeDetector.java similarity index 99% rename from test/test/ContextEscapeDetector.java rename to test/dotty/tools/ContextEscapeDetector.java index 78d293a5df89..e19fc5a64432 100644 --- a/test/test/ContextEscapeDetector.java +++ b/test/dotty/tools/ContextEscapeDetector.java @@ -1,9 +1,8 @@ -package test; +package dotty.tools; import org.junit.runner.Result; import org.junit.runner.notification.RunListener; import org.junit.Assert; - import java.lang.ref.WeakReference; public class ContextEscapeDetector extends RunListener { diff --git a/test/test/DottyTest.scala b/test/dotty/tools/DottyTest.scala similarity index 81% rename from test/test/DottyTest.scala rename to test/dotty/tools/DottyTest.scala index 57bd9bbc4b4a..9e7b6fccb510 100644 --- a/test/test/DottyTest.scala +++ b/test/dotty/tools/DottyTest.scala @@ -1,22 +1,22 @@ -package test +package dotty +package tools -import dotty.tools.dotc.core._ -import dotty.tools.dotc.core.Contexts._ -import dotty.tools.dotc.core.Symbols._ -import dotty.tools.dotc.core.Flags._ +import dotc.core._ +import dotc.core.Contexts._ +import dotc.core.Symbols._ +import dotc.core.Flags._ import Types._, Symbols._, Decorators._ -import dotty.tools.dotc.printing.Texts._ -import dotty.tools.dotc.reporting.ConsoleReporter -import dotty.tools.dotc.core.Decorators._ -import dotty.tools.dotc.ast.tpd -import dotty.tools.dotc.Compiler +import dotc.printing.Texts._ +import dotc.reporting.ConsoleReporter +import dotc.core.Decorators._ +import dotc.ast.tpd +import dotc.Compiler -import dotty.tools.dotc -import dotty.tools.dotc.core.Phases.Phase +import dotc.core.Phases.Phase class DottyTest extends ContextEscapeDetection{ - dotty.tools.dotc.parsing.Scanners // initialize keywords + dotc.parsing.Scanners // initialize keywords implicit var ctx: Contexts.Context = { val base = new ContextBase {} diff --git a/test/test/DottyTypeStealer.scala b/test/dotty/tools/DottyTypeStealer.scala similarity index 78% rename from test/test/DottyTypeStealer.scala rename to test/dotty/tools/DottyTypeStealer.scala index fed14499a6f2..819f19d25ca0 100644 --- a/test/test/DottyTypeStealer.scala +++ b/test/dotty/tools/DottyTypeStealer.scala @@ -1,11 +1,11 @@ -package test +package dotty.tools -import dotty.tools.dotc.ast.tpd -import dotty.tools.dotc.core.Names._ -import dotty.tools.dotc.ast.tpd._ -import dotty.tools.dotc.core.Contexts.Context -import dotty.tools.dotc.core.Decorators._ -import dotty.tools.dotc.core.Types.Type +import dotc.ast.tpd +import dotc.core.Names._ +import dotc.ast.tpd._ +import dotc.core.Contexts.Context +import dotc.core.Decorators._ +import dotc.core.Types.Type object DottyTypeStealer { def stealType(source: String, typeStrings: String*): (Context, List[Type]) = { diff --git a/test/test/ShowClassTests.scala b/test/dotty/tools/ShowClassTests.scala similarity index 94% rename from test/test/ShowClassTests.scala rename to test/dotty/tools/ShowClassTests.scala index 81e304296fe7..96ab6080c974 100644 --- a/test/test/ShowClassTests.scala +++ b/test/dotty/tools/ShowClassTests.scala @@ -1,13 +1,13 @@ -package test +package dotty.tools -import dotty.tools.dotc.core._ -import dotty.tools.dotc.core.Contexts._ -import dotty.tools.dotc.core.Symbols._ -import dotty.tools.dotc.core.Flags._ -import dotty.tools.dotc.core.Types._ -import dotty.tools.dotc.printing.Texts._ +import dotc.core._ +import dotc.core.Contexts._ +import dotc.core.Symbols._ +import dotc.core.Flags._ +import dotc.core.Types._ +import dotc.printing.Texts._ import NameOps._ -import dotty.tools.dotc.core.Decorators._ +import dotc.core.Decorators._ import org.junit.Test class ShowClassTests extends DottyTest { diff --git a/test/test/TypeStealer.scala b/test/dotty/tools/TypeStealer.scala similarity index 70% rename from test/test/TypeStealer.scala rename to test/dotty/tools/TypeStealer.scala index ae48d9a5b9af..ccaf2d41ef47 100644 --- a/test/test/TypeStealer.scala +++ b/test/dotty/tools/TypeStealer.scala @@ -1,11 +1,8 @@ -package test +package dotty.tools + import scala.tools.nsc.interpreter._ import scala.tools.nsc.Settings -/** - * Dotty requires a mangled bootclasspath to start. It means that `console` mode of sbt doesn't work for us. - * At least I(Dmitry) wasn't able to make sbt fork in console - */ object TypeStealer { def main(args: Array[String]): Unit = { def repl = new ILoop {} @@ -13,7 +10,6 @@ object TypeStealer { val settings = new Settings settings.Yreplsync.value = true - //use when launching normally outside SBT settings.usejavacp.value = true diff --git a/test/test/AsmConverters.scala b/test/dotty/tools/backend/jvm/AsmConverters.scala similarity index 99% rename from test/test/AsmConverters.scala rename to test/dotty/tools/backend/jvm/AsmConverters.scala index 5734e8660e02..499037c471e5 100644 --- a/test/test/AsmConverters.scala +++ b/test/dotty/tools/backend/jvm/AsmConverters.scala @@ -1,4 +1,4 @@ -package test +package dotty.tools.backend.jvm import scala.tools.asm import asm._ diff --git a/test/test/AsmNode.scala b/test/dotty/tools/backend/jvm/AsmNode.scala similarity index 98% rename from test/test/AsmNode.scala rename to test/dotty/tools/backend/jvm/AsmNode.scala index 80211e2afe3d..ac3f34258d67 100644 --- a/test/test/AsmNode.scala +++ b/test/dotty/tools/backend/jvm/AsmNode.scala @@ -1,4 +1,4 @@ -package test +package dotty.tools.backend.jvm import java.lang.reflect.Modifier import scala.tools.asm diff --git a/test/test/DottyBytecodeTest.scala b/test/dotty/tools/backend/jvm/DottyBytecodeTest.scala similarity index 96% rename from test/test/DottyBytecodeTest.scala rename to test/dotty/tools/backend/jvm/DottyBytecodeTest.scala index dbf86bf8eb89..fc98536911c8 100644 --- a/test/test/DottyBytecodeTest.scala +++ b/test/dotty/tools/backend/jvm/DottyBytecodeTest.scala @@ -1,9 +1,9 @@ -package test +package dotty.tools +package backend.jvm -import dotty.tools.dotc.core.Contexts.{Context, ContextBase} -import dotty.tools.dotc.core.Phases.Phase -import dotty.tools.backend.jvm.GenBCode -import dotty.tools.dotc.Compiler +import dotc.core.Contexts.{Context, ContextBase} +import dotc.core.Phases.Phase +import dotc.Compiler import scala.reflect.io.{VirtualDirectory => Directory} import scala.tools.asm @@ -17,7 +17,7 @@ import scala.tools.asm.{ClassWriter, ClassReader} import scala.tools.asm.tree._ import java.io.{File => JFile, InputStream} -private[test] class TestGenBCode(val outDir: String) extends GenBCode { +class TestGenBCode(val outDir: String) extends GenBCode { override def phaseName: String = "testGenBCode" val virtualDir = new Directory(outDir, None) override def outputDir(implicit ctx: Context) = virtualDir diff --git a/test/test/DottyBytecodeTests.scala b/test/dotty/tools/backend/jvm/DottyBytecodeTests.scala similarity index 99% rename from test/test/DottyBytecodeTests.scala rename to test/dotty/tools/backend/jvm/DottyBytecodeTests.scala index 5b5989474763..ce71ef3cbc1f 100644 --- a/test/test/DottyBytecodeTests.scala +++ b/test/dotty/tools/backend/jvm/DottyBytecodeTests.scala @@ -1,4 +1,4 @@ -package test +package dotty.tools.backend.jvm import org.junit.Assert._ import org.junit.Test diff --git a/test/test/InlineBytecodeTests.scala b/test/dotty/tools/backend/jvm/InlineBytecodeTests.scala similarity index 96% rename from test/test/InlineBytecodeTests.scala rename to test/dotty/tools/backend/jvm/InlineBytecodeTests.scala index f7dc35305709..033783303df0 100644 --- a/test/test/InlineBytecodeTests.scala +++ b/test/dotty/tools/backend/jvm/InlineBytecodeTests.scala @@ -1,4 +1,4 @@ -package test +package dotty.tools.backend.jvm import org.junit.Assert._ import org.junit.Test diff --git a/test/test/CompilerTest.scala b/test/dotty/tools/dotc/CompilerTest.scala similarity index 99% rename from test/test/CompilerTest.scala rename to test/dotty/tools/dotc/CompilerTest.scala index 05a7d62b8230..e0d2251690a5 100644 --- a/test/test/CompilerTest.scala +++ b/test/dotty/tools/dotc/CompilerTest.scala @@ -1,13 +1,13 @@ -package test +package dotty.tools.dotc -import dotty.tools.dotc.core.Contexts._ +import repl.TestREPL +import core.Contexts._ import dotty.partest.DPConfig -import dotty.tools.dotc.{Main, Bench, Driver} -import dotty.tools.dotc.interfaces.Diagnostic.ERROR -import dotty.tools.dotc.reporting._ +import interfaces.Diagnostic.ERROR +import reporting._ import diagnostic.MessageContainer -import dotty.tools.dotc.util.SourcePosition -import dotty.tools.dotc.config.CompilerCommand +import util.SourcePosition +import config.CompilerCommand import dotty.tools.io.PlainFile import scala.collection.mutable.ListBuffer import scala.reflect.io.{ Path, Directory, File => SFile, AbstractFile } diff --git a/test/test/OtherEntryPointsTest.scala b/test/dotty/tools/dotc/EntryPointsTest.scala similarity index 91% rename from test/test/OtherEntryPointsTest.scala rename to test/dotty/tools/dotc/EntryPointsTest.scala index ae46fa36f931..4673ffd3c2f1 100644 --- a/test/test/OtherEntryPointsTest.scala +++ b/test/dotty/tools/dotc/EntryPointsTest.scala @@ -1,12 +1,12 @@ -package test +package dotty.tools +package dotc import org.junit.Test import org.junit.Assert._ -import dotty.tools.dotc.Main import dotty.tools.dotc.interfaces.{CompilerCallback, SourceFile} -import dotty.tools.dotc.reporting._ -import dotty.tools.dotc.reporting.diagnostic.MessageContainer -import dotty.tools.dotc.core.Contexts._ +import reporting._ +import reporting.diagnostic.MessageContainer +import core.Contexts._ import java.io.File import scala.collection.mutable.ListBuffer @@ -16,7 +16,7 @@ import scala.collection.mutable.ListBuffer * * @see [[InterfaceEntryPointTest]] */ -class OtherEntryPointsTest { +class EntryPointsTest { private val sources = List("./tests/pos/HelloWorld.scala").map(p => new java.io.File(p).getPath()) private val dottyInterfaces = diff --git a/test/test/InterfaceEntryPointTest.scala b/test/dotty/tools/dotc/InterfaceEntryPointTest.scala similarity index 97% rename from test/test/InterfaceEntryPointTest.scala rename to test/dotty/tools/dotc/InterfaceEntryPointTest.scala index a1a8433d7cbd..6624b45dde06 100644 --- a/test/test/InterfaceEntryPointTest.scala +++ b/test/dotty/tools/dotc/InterfaceEntryPointTest.scala @@ -1,8 +1,8 @@ -package test +package dotty.tools.dotc import org.junit.Test import org.junit.Assert._ -import dotty.tools.dotc.interfaces._ +import interfaces._ import scala.collection.mutable.ListBuffer /** Test that demonstrates how to use dotty-interfaces diff --git a/test/dotty/tools/dotc/ast/TreeInfoTest.scala b/test/dotty/tools/dotc/ast/TreeInfoTest.scala index 6e02ee81387d..a55973c43db4 100644 --- a/test/dotty/tools/dotc/ast/TreeInfoTest.scala +++ b/test/dotty/tools/dotc/ast/TreeInfoTest.scala @@ -1,8 +1,8 @@ -package dotty.tools.dotc +package dotty.tools +package dotc package ast import org.junit.Test -import test.DottyTest import core.Names._ import core.Types._ import core.Symbols._ diff --git a/test/test/DeSugarTest.scala b/test/dotty/tools/dotc/parsing/DeSugarTest.scala similarity index 96% rename from test/test/DeSugarTest.scala rename to test/dotty/tools/dotc/parsing/DeSugarTest.scala index d7a056e425fb..1f79c2cf66dd 100644 --- a/test/test/DeSugarTest.scala +++ b/test/dotty/tools/dotc/parsing/DeSugarTest.scala @@ -1,11 +1,11 @@ -package test +package dotty.tools +package dotc +package parsing -import scala.reflect.io._ -import dotty.tools.dotc.util._ -import dotty.tools.dotc.core._ -import dotty.tools.dotc.parsing._ import Tokens._, Parsers._ -import dotty.tools.dotc._ +import scala.reflect.io._ +import util._ +import core._ import ast.Trees._ import ast.desugar import ast.desugar._ diff --git a/test/test/DottyDocTest.scala b/test/dotty/tools/dotc/parsing/DocstringTest.scala similarity index 88% rename from test/test/DottyDocTest.scala rename to test/dotty/tools/dotc/parsing/DocstringTest.scala index 34269ec64c7b..30e885f70fa5 100644 --- a/test/test/DottyDocTest.scala +++ b/test/dotty/tools/dotc/parsing/DocstringTest.scala @@ -1,9 +1,11 @@ -package test +package dotty.tools +package dotc +package parsing -import dotty.tools.dotc.ast.Trees._ -import dotty.tools.dotc.core.Contexts.Context +import ast.Trees._ +import core.Contexts.Context -trait DottyDocTest extends DottyTest { +trait DocstringTest extends DottyTest { ctx = ctx.fresh.setSetting(ctx.settings.YkeepComments, true) def checkDocString(actual: Option[String], expected: String): Unit = actual match { diff --git a/test/test/DottyDocParsingTests.scala b/test/dotty/tools/dotc/parsing/DocstringTests.scala similarity index 99% rename from test/test/DottyDocParsingTests.scala rename to test/dotty/tools/dotc/parsing/DocstringTests.scala index 8522cdae32f9..930ec117a6b8 100644 --- a/test/test/DottyDocParsingTests.scala +++ b/test/dotty/tools/dotc/parsing/DocstringTests.scala @@ -1,4 +1,6 @@ -package test +package dotty.tools +package dotc +package parsing import dotty.tools.dotc.core.Contexts.Context import dotty.tools.dotc.ast.Trees._ @@ -6,7 +8,7 @@ import dotty.tools.dotc.ast.Trees._ import org.junit.Assert._ import org.junit.Test -class DottyDocParsingTests extends DottyDocTest { +class DocstringTests extends DocstringTest { @Test def noComment = { import dotty.tools.dotc.ast.untpd._ diff --git a/test/test/ModifiersParsingTest.scala b/test/dotty/tools/dotc/parsing/ModifiersParsingTest.scala similarity index 93% rename from test/test/ModifiersParsingTest.scala rename to test/dotty/tools/dotc/parsing/ModifiersParsingTest.scala index 82aa33281ba6..e31ef2160682 100644 --- a/test/test/ModifiersParsingTest.scala +++ b/test/dotty/tools/dotc/parsing/ModifiersParsingTest.scala @@ -1,15 +1,17 @@ -package test +package dotty.tools +package dotc +package parsing import org.junit.Test import org.junit.Assert._ -import dotty.tools.dotc.ast.untpd.modsDeco -import dotty.tools.dotc.ast.untpd._ -import dotty.tools.dotc.ast.{ Trees => d } -import dotty.tools.dotc.parsing.Parsers.Parser -import dotty.tools.dotc.util.SourceFile -import dotty.tools.dotc.core.Contexts.ContextBase -import dotty.tools.dotc.core.Flags +import ast.untpd.modsDeco +import ast.untpd._ +import ast.{ Trees => d } +import Parsers.Parser +import util.SourceFile +import core.Contexts.ContextBase +import core.Flags object ModifiersParsingTest { implicit val ctx = (new ContextBase).initialCtx diff --git a/test/test/ParserTest.scala b/test/dotty/tools/dotc/parsing/ParserTest.scala similarity index 85% rename from test/test/ParserTest.scala rename to test/dotty/tools/dotc/parsing/ParserTest.scala index f66dbf55d21a..a89b34512f58 100644 --- a/test/test/ParserTest.scala +++ b/test/dotty/tools/dotc/parsing/ParserTest.scala @@ -1,12 +1,13 @@ -package test +package dotty.tools +package dotc +package parsing import scala.reflect.io._ -import dotty.tools.dotc.util._ -import dotty.tools.dotc.core._ -import dotty.tools.dotc.parsing._ +import util._ +import core._ import scala.io.Codec import Tokens._, Parsers._ -import dotty.tools.dotc.ast.untpd._ +import ast.untpd._ import org.junit.Test import scala.collection.mutable.ListBuffer diff --git a/test/test/ScannerTest.scala b/test/dotty/tools/dotc/parsing/ScannerTest.scala similarity index 95% rename from test/test/ScannerTest.scala rename to test/dotty/tools/dotc/parsing/ScannerTest.scala index 5ff9bba0cc38..2177b99a400f 100644 --- a/test/test/ScannerTest.scala +++ b/test/dotty/tools/dotc/parsing/ScannerTest.scala @@ -1,9 +1,10 @@ -package test +package dotty.tools +package dotc +package parsing import scala.reflect.io._ import scala.io.Codec -import dotty.tools.dotc.util._ -import dotty.tools.dotc.parsing._ +import util._ import Tokens._, Scanners._ import org.junit.Test diff --git a/test/test/desugarPackage.scala b/test/dotty/tools/dotc/parsing/desugarPackage.scala similarity index 94% rename from test/test/desugarPackage.scala rename to test/dotty/tools/dotc/parsing/desugarPackage.scala index 7f56e470bede..84bf7a2d174e 100644 --- a/test/test/desugarPackage.scala +++ b/test/dotty/tools/dotc/parsing/desugarPackage.scala @@ -1,6 +1,7 @@ -package test +package dotty.tools +package dotc +package parsing -import dotty.tools.dotc._ import core._, ast._ import Trees._ diff --git a/test/test/parseFile.scala b/test/dotty/tools/dotc/parsing/parseFile.scala similarity index 89% rename from test/test/parseFile.scala rename to test/dotty/tools/dotc/parsing/parseFile.scala index c82fe22e7ea0..c41a286cb6b9 100644 --- a/test/test/parseFile.scala +++ b/test/dotty/tools/dotc/parsing/parseFile.scala @@ -1,4 +1,4 @@ -package test +package dotty.tools.dotc.parsing object parseFile extends ParserTest { diff --git a/test/test/parsePackage.scala b/test/dotty/tools/dotc/parsing/parsePackage.scala similarity index 98% rename from test/test/parsePackage.scala rename to test/dotty/tools/dotc/parsing/parsePackage.scala index 6fa5c0f863af..df5368ffe337 100644 --- a/test/test/parsePackage.scala +++ b/test/dotty/tools/dotc/parsing/parsePackage.scala @@ -1,4 +1,6 @@ -package test +package dotty.tools +package dotc +package parsing import dotty.tools.dotc._ import core._, ast._ diff --git a/test/test/showTree.scala b/test/dotty/tools/dotc/parsing/showTree.scala similarity index 90% rename from test/test/showTree.scala rename to test/dotty/tools/dotc/parsing/showTree.scala index 8d5a5ad7c5f3..18b2203d51ed 100644 --- a/test/test/showTree.scala +++ b/test/dotty/tools/dotc/parsing/showTree.scala @@ -1,5 +1,7 @@ -package test -import dotty.tools.dotc._ +package dotty.tools +package dotc +package parsing + import ast.Trees._ import ast.desugar import ast.desugar._ diff --git a/test/test/TestREPL.scala b/test/dotty/tools/dotc/repl/TestREPL.scala similarity index 95% rename from test/test/TestREPL.scala rename to test/dotty/tools/dotc/repl/TestREPL.scala index cccfacc41abe..7be8dc13e92a 100644 --- a/test/test/TestREPL.scala +++ b/test/dotty/tools/dotc/repl/TestREPL.scala @@ -1,7 +1,7 @@ -package test +package dotty.tools.dotc +package repl -import dotty.tools.dotc.repl._ -import dotty.tools.dotc.core.Contexts.Context +import core.Contexts.Context import collection.mutable import java.io.StringWriter diff --git a/test/test/transform/CreateCompanionObjectsTest.scala b/test/dotty/tools/dotc/transform/CreateCompanionObjectsTest.scala similarity index 95% rename from test/test/transform/CreateCompanionObjectsTest.scala rename to test/dotty/tools/dotc/transform/CreateCompanionObjectsTest.scala index 82830781c90b..18acb21057df 100644 --- a/test/test/transform/CreateCompanionObjectsTest.scala +++ b/test/dotty/tools/dotc/transform/CreateCompanionObjectsTest.scala @@ -1,10 +1,10 @@ -package test.transform - +package dotty.tools +package dotc +package transform import org.junit.{Assert, Test} -import test.DottyTest -import dotty.tools.dotc.core._ -import dotty.tools.dotc.ast.{tpd, Trees} +import core._ +import ast.{tpd, Trees} import Contexts._ import Flags._ import Denotations._ @@ -13,7 +13,7 @@ import Symbols._ import Types._ import Decorators._ import Trees._ -import dotty.tools.dotc.transform.TreeTransforms.{TreeTransform, TreeTransformer} +import TreeTransforms.{TreeTransform, TreeTransformer} class CreateCompanionObjectsTest extends DottyTest { diff --git a/test/test/transform/LazyValsTest.scala b/test/dotty/tools/dotc/transform/LazyValsTest.scala similarity index 99% rename from test/test/transform/LazyValsTest.scala rename to test/dotty/tools/dotc/transform/LazyValsTest.scala index 5b8a659fa96f..96298c571749 100644 --- a/test/test/transform/LazyValsTest.scala +++ b/test/dotty/tools/dotc/transform/LazyValsTest.scala @@ -1,7 +1,8 @@ -package test.transform +package dotty.tools +package dotc +package transform import org.junit.Test -import test.DottyTest import org.junit.Assert class LazyValsTest extends DottyTest { diff --git a/test/test/transform/PostTyperTransformerTest.scala b/test/dotty/tools/dotc/transform/PostTyperTransformerTest.scala similarity index 95% rename from test/test/transform/PostTyperTransformerTest.scala rename to test/dotty/tools/dotc/transform/PostTyperTransformerTest.scala index 9886c30232f1..03d6d9b36e92 100644 --- a/test/test/transform/PostTyperTransformerTest.scala +++ b/test/dotty/tools/dotc/transform/PostTyperTransformerTest.scala @@ -1,10 +1,10 @@ -package test.transform - +package dotty.tools +package dotc +package transform import org.junit.{Assert, Test} -import test.DottyTest -import dotty.tools.dotc.core._ -import dotty.tools.dotc.ast.Trees +import core._ +import ast.Trees import Contexts._ import Flags._ import Denotations._ @@ -13,7 +13,7 @@ import Symbols._ import Types._ import Decorators._ import Trees._ -import dotty.tools.dotc.transform.TreeTransforms.{TreeTransform, TreeTransformer} +import TreeTransforms.{TreeTransform, TreeTransformer} class PostTyperTransformerTest extends DottyTest { /* FIXME: re-enable after adapting to new scheme diff --git a/test/test/transform/TreeTransformerTest.scala b/test/dotty/tools/dotc/transform/TreeTransformerTest.scala similarity index 96% rename from test/test/transform/TreeTransformerTest.scala rename to test/dotty/tools/dotc/transform/TreeTransformerTest.scala index df6175735d05..d72980d80b64 100644 --- a/test/test/transform/TreeTransformerTest.scala +++ b/test/dotty/tools/dotc/transform/TreeTransformerTest.scala @@ -1,13 +1,12 @@ -package test.transform - +package dotty.tools +package dotc +package transform import org.junit.{Assert, Test} -import test.DottyTest -import dotty.tools.dotc.transform.TreeTransforms.{TransformerInfo, TreeTransformer, MiniPhaseTransform} -import dotty.tools.dotc.ast.tpd -import dotty.tools.dotc.core.Constants.Constant -import dotty.tools.dotc.core.Contexts.Context - +import TreeTransforms.{TransformerInfo, TreeTransformer, MiniPhaseTransform} +import ast.tpd +import core.Constants.Constant +import core.Contexts.Context class TreeTransformerTest extends DottyTest { diff --git a/test/test/showClass.scala b/test/dotty/tools/showClass.scala similarity index 87% rename from test/test/showClass.scala rename to test/dotty/tools/showClass.scala index 78751ad6edaa..012f5f59eac7 100644 --- a/test/test/showClass.scala +++ b/test/dotty/tools/showClass.scala @@ -1,6 +1,6 @@ -package test +package dotty.tools -import dotty.tools.dotc.core.Decorators._ +import dotc.core.Decorators._ object showClass extends ShowClassTests { diff --git a/test/test/ContravariantTrees.scala b/test/test/ContravariantTrees.scala deleted file mode 100644 index 999224042caa..000000000000 --- a/test/test/ContravariantTrees.scala +++ /dev/null @@ -1,65 +0,0 @@ -package test - -import language.higherKinds -import dotty.tools.dotc.core._ -import Flags._, Names._, StdNames._ -import annotation.unchecked.uncheckedVariance - -object ContravariantTrees { - - type Untyped = Null - - case class Modifiers[-T >: Untyped] ( - flags: FlagSet = EmptyFlags, - privateWithin: TypeName = tpnme.EMPTY, - annotations: List[Tree[T]] = Nil) { - - def is(fs: FlagSet): Boolean = flags is fs - def is(fc: FlagConjunction): Boolean = flags is fc - - def | (fs: FlagSet): Modifiers[T] = withFlags(flags | fs) - def & (fs: FlagSet): Modifiers[T] = withFlags(flags & fs) - def &~(fs: FlagSet): Modifiers[T] = withFlags(flags &~ fs) - - def toTypeFlags: Modifiers[T] = withFlags(flags.toTypeFlags) - def toTermFlags: Modifiers[T] = withFlags(flags.toTermFlags) - - private def withFlags(flags: FlagSet) = - if (this.flags == flags) this - else copy(flags = flags) - - def withPrivateWithin(pw: TypeName) = - if (pw.isEmpty) this - else copy(privateWithin = pw) - - def hasFlags = flags != EmptyFlags - def hasAnnotations = annotations.nonEmpty - def hasPrivateWithin = privateWithin != tpnme.EMPTY - } - - abstract class Tree[-T >: Untyped] { - private[this] var myTpe: T = _ - private def setMyTpe(tpe: T) = myTpe = tpe - - def tpe: T @uncheckedVariance = { - if (myTpe == null) throw new Error() - myTpe - } - } - - trait TermTree[-T >: Untyped] extends Tree[T] { - type ThisTree[T >: Untyped] <: TermTree[T] - } - - case class Select[-T >: Untyped](qualifier: Tree[T], name: Name) - extends TermTree[T] { - type ThisTree[T >: Untyped] = Select[T] - } - - /** mods def name[tparams](vparams_1)...(vparams_n): tpt = rhs */ - case class DefDef[-T >: Untyped](mods: Modifiers[T], name: TermName, tparams: List[Tree[T]], vparamss: List[List[Tree[T]]], tpt: Tree[T], rhs: Tree[T]) - extends Tree[T] { - type ThisTree[T >: Untyped] = DefDef[T] - } - -} diff --git a/test/test/SamplePhaseTest.scala b/test/test/SamplePhaseTest.scala deleted file mode 100644 index 47037f1d83c7..000000000000 --- a/test/test/SamplePhaseTest.scala +++ /dev/null @@ -1,16 +0,0 @@ -package test - -import org.junit.{Assert, Test} - -class SamplePhaseTest extends DottyTest { - - // Disabled, awaiting resolution: @Test - def testTypechekingSimpleClass = checkCompile("frontend", "class A{}") { - (tree, context) => - implicit val ctx = context - Assert.assertTrue("can typecheck simple class", - tree.toString == "PackageDef(Ident(),List(TypeDef(Modifiers(,,List()),A,Template(DefDef(Modifiers(,,List()),,List(),List(List()),TypeTree[TypeRef(ThisType(module class scala),Unit)],EmptyTree),List(Apply(Select(New(TypeTree[TypeRef(ThisType(module class lang),Object)]),),List())),ValDef(Modifiers(private,,List()),_,EmptyTree,EmptyTree),List()))))" - ) - } - -} diff --git a/test/test/baseTypetest.sc b/test/worksheets/baseTypetest.sc similarity index 100% rename from test/test/baseTypetest.sc rename to test/worksheets/baseTypetest.sc diff --git a/test/test/denotTest.sc b/test/worksheets/denotTest.sc similarity index 100% rename from test/test/denotTest.sc rename to test/worksheets/denotTest.sc diff --git a/test/test/flagtest.sc b/test/worksheets/flagtest.sc similarity index 100% rename from test/test/flagtest.sc rename to test/worksheets/flagtest.sc diff --git a/test/test/nesting.sc b/test/worksheets/nesting.sc similarity index 100% rename from test/test/nesting.sc rename to test/worksheets/nesting.sc diff --git a/test/test/periodtest.sc b/test/worksheets/periodtest.sc similarity index 100% rename from test/test/periodtest.sc rename to test/worksheets/periodtest.sc diff --git a/test/test/positiontest.sc b/test/worksheets/positiontest.sc similarity index 100% rename from test/test/positiontest.sc rename to test/worksheets/positiontest.sc diff --git a/test/test/sigtest.sc b/test/worksheets/sigtest.sc similarity index 100% rename from test/test/sigtest.sc rename to test/worksheets/sigtest.sc diff --git a/test/test/testnames.sc b/test/worksheets/testnames.sc similarity index 100% rename from test/test/testnames.sc rename to test/worksheets/testnames.sc diff --git a/test/x/PatMat.scala b/test/x/PatMat.scala deleted file mode 100644 index 131136a1e114..000000000000 --- a/test/x/PatMat.scala +++ /dev/null @@ -1,16 +0,0 @@ -package x - -trait PatMat { - - trait A - type TT <: B1 - trait B2 - trait B1 extends B - case class B() - - def foo[T <: Any](x: TT) = x match { - case x: B => println("!!!") - case "hi" => ??? - } - -} diff --git a/test/x/cakes.scala b/test/x/cakes.scala deleted file mode 100644 index ff5e5d64f72a..000000000000 --- a/test/x/cakes.scala +++ /dev/null @@ -1,49 +0,0 @@ -package test - -trait API { - - type Name >: Null <: NameAPI - type Symbol >: Null <: SymbolAPI - type ScopeEntry >: Null <: ScopeEntryAPI - - class NameAPI - class SymbolAPI - class ScopeEntryAPI - -} - -trait Names { self: SymTab => - - class Name extends NameAPI - -} - -trait Symbols { self: SymTab => - - class Symbol extends SymbolAPI - -} - -trait Scopes { self: SymTab => - - class ScopeEntry extends ScopeEntryAPI - class Scope { - def unlink(e: ScopeEntry): Unit = ??? - def unlink(e: Symbol): Unit = ??? - } - -} - -trait SymTab extends API with Names with Scopes { - -} - - -trait SyncOps extends SymTab { - - trait SyncScope extends Scope { - override def unlink(e: ScopeEntry): Unit = ??? - override def unlink(e: Symbol): Unit = ??? - } - -} diff --git a/test/x/names.scala b/test/x/names.scala deleted file mode 100644 index c80c3e51d659..000000000000 --- a/test/x/names.scala +++ /dev/null @@ -1,21 +0,0 @@ -package test - -object Foo { - def foo = 1 -} - -object Bar { - def foo = 2 -} - -object Test123 { - - import Foo.foo - - object Inner { - - import Bar._ -//!! println(foo) - } - -} diff --git a/test/x/xplore.sc b/test/x/xplore.sc deleted file mode 100644 index 15b4316371a7..000000000000 --- a/test/x/xplore.sc +++ /dev/null @@ -1,70 +0,0 @@ -package x -import dotty.tools.dotc._ -import core._ -import Contexts._ -import Symbols._ -import Decorators._ - -object xplore { - println("Welcome to the Scala worksheet") //> Welcome to the Scala worksheet - val c = Main.newCompiler //> c : dotty.tools.dotc.Compiler = dotty.tools.dotc.Compiler@36ff057f - val base = new ContextBase //> base : dotty.tools.dotc.core.Contexts.ContextBase = dotty.tools.dotc.core.C - //| ontexts$ContextBase@2980f96c - implicit val ctx = c.rootContext(base.initialCtx) - //> ctx : dotty.tools.dotc.core.Contexts.Context = dotty.tools.dotc.core.Contex - //| ts$InitialContext@6aadae91 - val strClass = defn.StringClass //> strClass : dotty.tools.dotc.core.Symbols.ClassSymbol = class String#213 - strClass.baseClasses //> res0: List[dotty.tools.dotc.core.Symbols.ClassSymbol] = List(class String#21 - //| 3, class CharSequence#531, class Comparable#102, class Serializable#3816, cl - //| ass Object#129, class Any#2133) - strClass.typeRef <:< defn.AnyType //> res1: Boolean = true - val predef = defn.PredefModule //> predef : dotty.tools.dotc.core.Symbols.TermSymbol = module Predef#1515 - val strd = predef.info.member("String".toTypeName) - //> strd : dotty.tools.dotc.core.Denotations.Denotation = type String - strd.info //> res2: dotty.tools.dotc.core.Types.Type = TypeAlias(TypeRef(ThisType(module c - //| lass lang#57),String)) - val strType = strd.symbol.typeRef //> strType : dotty.tools.dotc.core.Types.TypeRef = TypeRef(ThisType(module cla - //| ss Predef$#1516),String) - strType <:< defn.AnyType //> res3: Boolean = true - val prdef = defn.PredefModule //> prdef : dotty.tools.dotc.core.Symbols.TermSymbol = module Predef#1515 - predef.isCompleted //> res4: Boolean = true - predef.info.parents //> res5: List[dotty.tools.dotc.core.Types.TypeRef] = List(TypeRef(ThisType(modu - //| le class scala#35),LowPriorityImplicits), TypeRef(ThisType(module class scal - //| a#35),DeprecatedPredef)) - predef.info //> res6: dotty.tools.dotc.core.Types.Type = TypeRef(ThisType(module class scala - //| #35),Predef$) - predef.info.typeSymbol //> res7: dotty.tools.dotc.core.Symbols.Symbol = module class Predef$#1516 - val scala = defn.ScalaPackageClass //> scala : dotty.tools.dotc.core.Symbols.ClassSymbol = module class scala#35 - scala.info.decl("Predef$".toTypeName) //> res8: dotty.tools.dotc.core.Denotations.Denotation = module class Predef$ - predef.info.decls //> res9: dotty.tools.dotc.core.Scopes.Scope = Scopes(val #4979, val class - //| Of#4980, type Class#4981, type String#4984, type Function#4985, type Map#498 - //| 8, type Set#4991, val Map#4993, val Map #4994, val Set#4995, val Set #4996, - //| type ClassManifest#4997, type OptManifest#4999, type Manifest#5001, val Clas - //| sManifest#5003, val ClassManifest #5004, val Manifest#5005, val Manifest #50 - //| 06, val NoManifest#5007, val NoManifest #5008, val manifest#5009, val classM - //| anifest#5012, val optManifest#5015, val identity#5018, val implicitly#5021, - //| val locally#5024, val error#5027, val assert#5029, val assert#5031, val assu - //| me#5034, val assume#5036, val require#5039, val require#5041, val $qmark$qma - //| rk$qmark#5044, type Pair#5045, module Pair#5048, type Triple#5060, module Tr - //| iple#5064, class ArrowAssoc#5079, val ArrowAssoc#5094, class Ensuring#5097, - //| val Ensuring#5116, class StringFormat#5119, val StringFormat#5130, class Str - //| ingAdd#5133, val StringAdd#5144, class RichException#5147, val RichException - //| #5156, class SeqCharSequence#5158, val SeqCharSequence#5170, class ArrayChar - //| Sequence#5172, val ArrayCharSequence#5184, val StringCanBuildFrom#5186, val - //| StringCanBuildFrom #5187, val augmentString#5188, val unaugmentString#5190, - //| val print#5192, val println#5194, val println#5195, val printf#5197, val tup - //| le2ToZippedOps#5200, val tuple3ToZippedOps#5204, val genericArrayOps#5209, v - //| al booleanArrayOps#5212, val byteArrayOps#5214, val charArrayOps#5216, val d - //| oubleArrayOps#5218, val floatArrayOps#5220, val intArrayOps#5222, val longAr - //| rayOps#5224, val refArrayOps#5226, val shortArrayOps#5229, val unitArrayOps# - //| 5231, val byte2Byte#5233, val short2Short#5235, val char2Character#5237, val - //| int2Integer#5239, val long2Long#5241, val float2Float#5243, val double2Doub - //| le#5245, val boolean2Boolean#5247, val Byte2byte#5249, val Short2short#5251, - //| val Character2char#5253, val Integer2int#5255, val Long2long#5257, val Floa - //| t2float#5259, val Double2double#5261, val Boolean2boolean#5263, class $less$ - //| colon$less#5265, val singleton_$less$colon$less#5270, val conforms#5271, cla - //| ss $eq$colon$eq#5273, val singleton_$eq$colon$eq#5278, module $eq$colon$eq#5 - //| 279, class DummyImplicit#5285, module DummyImplicit#5287, module RichExcepti - //| on#5291, module StringAdd#5301, module StringFormat#5315, module Ensuring#53 - //| 29, module ArrowAssoc#5357) -} \ No newline at end of file diff --git a/test/x/xplore2.sc b/test/x/xplore2.sc deleted file mode 100644 index 5a33b2519d29..000000000000 --- a/test/x/xplore2.sc +++ /dev/null @@ -1,104 +0,0 @@ -package x -import dotty.tools.dotc._ -import core._ -import Contexts._ -import Symbols._ -import Decorators._ // should always import to get useful implicit decorators. -import Flags._ -import Types._ -import ast.Trees._ -import ast.tpd -import ast.untpd -import Constants._ - -object xplore2 { - import ast.tpd._ - println("Welcome to the Scala worksheet") //> Welcome to the Scala worksheet - val c = Main.newCompiler //> c : dotty.tools.dotc.Compiler = dotty.tools.dotc.Compiler@d8d9850 - val base = new ContextBase //> base : dotty.tools.dotc.core.Contexts.ContextBase = dotty.tools.dotc.core.C - //| ontexts$ContextBase@31ad98ef - implicit val ctx = c.rootContext(base.initialCtx) - //> ctx : dotty.tools.dotc.core.Contexts.Context = Context( - //| owner = module class , scope = Scopes() - //| owner = module class , scope = Scopes() - //| owner = module class , scope = Scopes() - //| owner = module class , scope = Scopes() - //| owner = module class , scope = Scopes() - //| owner = val , scope = null - - val SerializableClass = ctx.requiredClass("scala.Serializable") - //> SerializableClass : dotty.tools.dotc.core.Symbols.ClassSymbol = class Seria - //| lizable - val SystemModule = ctx.requiredModule("java.lang.System") - //> SystemModule : dotty.tools.dotc.core.Symbols.TermSymbol = module System - - val scope = new Scopes.MutableScope //> scope : dotty.tools.dotc.core.Scopes.MutableScope = Scopes() - val bla = ctx.newClassSymbol( // suggestion: Use newCompleteClassSymbol instead! - owner = defn.EmptyPackageClass, - name = "Bia".toTypeName, - flags = EmptyFlags, - infoFn = cls => ClassInfo( - prefix = defn.EmptyPackageClass.thisType, - cls = cls, - classParents = List(defn.ObjectClass.typeRef, SerializableClass.typeRef), - decls = scope, - selfInfo = NoType)).entered //> bla : dotty.tools.dotc.core.Symbols.ClassSymbol = class Bia - val constr = ctx.newConstructor(bla, EmptyFlags, List("p".toTermName, "r".toTermName), List(defn.AnyRefType, defn.IntType)).entered - //> constr : dotty.tools.dotc.core.Symbols.Symbol{type ThisName = dotty.tools. - //| dotc.core.Names.TermName} = method - val foo = ctx.newSymbol( - owner = bla, - name = "foo".toTermName, - flags = Final, - info = MethodType(List("s".toTermName), List(defn.IntType), defn.UnitType)).entered - //> foo : dotty.tools.dotc.core.Symbols.Symbol{type ThisName = dotty.tools.dot - //| c.core.Names.TermName} = val foo - val rep = ctx.newSymbol(bla, "rep".toTermName, flags = Lazy, info = defn.IntType).entered - //> rep : dotty.tools.dotc.core.Symbols.Symbol{type ThisName = dotty.tools.dot - //| c.core.Names.TermName} = val rep - val tostr = ctx.newSymbol(bla, "toString".toTermName, flags = Override, info = defn.UnitType).entered - //> tostr : dotty.tools.dotc.core.Symbols.Symbol{type ThisName = dotty.tools.d - //| otc.core.Names.TermName} = val toString -// val repTree = ValDef(rep, Literal(Constant(3))) - "==".toTermName.encode //> res0: dotty.tools.dotc.core.Names.Name = $eq$eq - val b = ctx.newSymbol(tostr, "b".toTermName, EmptyFlags, bla.typeRef) - //> b : dotty.tools.dotc.core.Symbols.Symbol{type ThisName = dotty.tools.dotc. - //| core.Names.TermName} = val b - - val bTree = ValDef(b, New(bla.typeRef, List(This(bla), Literal(Constant(3))))) - //> bTree : dotty.tools.dotc.ast.tpd.ValDef = ValDef(Modifiers(,,List()),b,Typ - //| eTree[TypeRef(ThisType(module class ),Bia)],Apply(Select(New(TypeTre - //| e[TypeRef(ThisType(module class ),Bia)]),),List(This(Bia), Lit - //| eral(Constant(3))))) - val system = tpd.Ident(SystemModule.termRef) //> system : dotty.tools.dotc.ast.tpd.Ident = Ident(System) - - val ref @ TermRef(_, _) = system.tpe //> ref : dotty.tools.dotc.core.Types.TermRef = TermRef(ThisType(module class - //| lang),System) - ref.symbol //> res1: dotty.tools.dotc.core.Symbols.Symbol = module System - val idHash = Select(system, "identityHashCode".toTermName) - //> idHash : dotty.tools.dotc.ast.tpd.Select = Select(Ident(System),identityHa - //| shCode) - val idHashApp = Apply(idHash, Ident(b.termRef) :: Nil) - //> idHashApp : dotty.tools.dotc.ast.tpd.Apply = Apply(Select(Ident(System),id - //| entityHashCode),List(Ident(b))) - val eqlref = defn.IntType.member("==".toTermName) - //> eqlref : dotty.tools.dotc.core.Denotations.Denotation = val - - /* - val tostrTree = { - Block( - List( - ValDef(b, New(bla.typeRef, List(This(bla), Literal(Constant(3))))), - If( - Apply( - Select( - Apply( - Select(Ident(SystemModule.termRef), "identityHashCode".toTermName), - Ident(b.termRef) :: Nil), - "==".toTermName.encode), - Literal(Constant(0)) :: Nil), - Apply(Select(Ident(b.termRef), foo.termRef), Literal(Constant(3)) :: Nil), - EmptyTree)), - Literal(Constant(()))) - }*/ -} \ No newline at end of file From 8a61ff432543a29234193cd1f7c14abd3f3d31a0 Mon Sep 17 00:00:00 2001 From: Felix Mulder Date: Wed, 2 Nov 2016 11:08:28 +0100 Subject: [PATCH 19/55] Move compiler and compiler tests to compiler dir --- bench/src/test/scala/Benchmarks.scala | 7 ++- bin/common | 12 ++-- bin/test/TestScripts.scala | 16 ++--- .../backend/jvm/CollectEntryPoints.scala | 0 .../tools/backend/jvm/CollectSuperCalls.scala | 0 .../backend/jvm/DottyBackendInterface.scala | 0 .../dotty/tools/backend/jvm/GenBCode.scala | 0 .../dotty/tools/backend/jvm/LabelDefs.scala | 0 .../tools/backend/jvm/scalaPrimitives.scala | 0 .../src}/dotty/tools/dotc/Bench.scala | 0 .../dotty/tools/dotc/CompilationUnit.scala | 0 .../src}/dotty/tools/dotc/Compiler.scala | 0 .../src}/dotty/tools/dotc/Driver.scala | 0 .../src}/dotty/tools/dotc/FromTasty.scala | 0 .../src}/dotty/tools/dotc/Main.scala | 0 .../src}/dotty/tools/dotc/Resident.scala | 0 .../src}/dotty/tools/dotc/Run.scala | 0 .../tools/dotc/ast/CheckTrees.scala.disabled | 0 .../src}/dotty/tools/dotc/ast/Desugar.scala | 0 .../dotty/tools/dotc/ast/NavigateAST.scala | 0 .../dotc/ast/PluggableTransformers.scala | 0 .../dotty/tools/dotc/ast/Positioned.scala | 0 .../src}/dotty/tools/dotc/ast/TreeInfo.scala | 0 .../dotty/tools/dotc/ast/TreeTypeMap.scala | 0 .../src}/dotty/tools/dotc/ast/Trees.scala | 0 .../src}/dotty/tools/dotc/ast/tpd.scala | 0 .../src}/dotty/tools/dotc/ast/untpd.scala | 0 .../tools/dotc/config/CompilerCommand.scala | 0 .../src}/dotty/tools/dotc/config/Config.scala | 0 .../tools/dotc/config/JavaPlatform.scala | 0 .../dotty/tools/dotc/config/OutputDirs.scala | 0 .../tools/dotc/config/PathResolver.scala | 0 .../dotty/tools/dotc/config/Platform.scala | 0 .../dotty/tools/dotc/config/Printers.scala | 0 .../dotty/tools/dotc/config/Properties.scala | 0 .../tools/dotc/config/ScalaSettings.scala | 0 .../tools/dotc/config/ScalaVersion.scala | 0 .../dotty/tools/dotc/config/Settings.scala | 0 .../tools/dotc/config/WrappedProperties.scala | 0 .../dotty/tools/dotc/core/Annotations.scala | 0 .../tools/dotc/core/CheckRealizable.scala | 0 .../src}/dotty/tools/dotc/core/Comments.scala | 0 .../dotty/tools/dotc/core/Constants.scala | 0 .../dotty/tools/dotc/core/Constraint.scala | 0 .../tools/dotc/core/ConstraintHandling.scala | 0 .../tools/dotc/core/ConstraintRunInfo.scala | 0 .../src}/dotty/tools/dotc/core/Contexts.scala | 0 .../dotty/tools/dotc/core/Decorators.scala | 0 .../dotty/tools/dotc/core/Definitions.scala | 0 .../tools/dotc/core/DenotTransformers.scala | 0 .../dotty/tools/dotc/core/Denotations.scala | 0 .../src}/dotty/tools/dotc/core/Flags.scala | 0 .../src}/dotty/tools/dotc/core/Hashable.scala | 0 .../src}/dotty/tools/dotc/core/Mode.scala | 0 .../src}/dotty/tools/dotc/core/NameOps.scala | 0 .../src}/dotty/tools/dotc/core/Names.scala | 0 .../tools/dotc/core/OrderingConstraint.scala | 0 .../src}/dotty/tools/dotc/core/Periods.scala | 0 .../src}/dotty/tools/dotc/core/Phases.scala | 0 .../src}/dotty/tools/dotc/core/Scopes.scala | 0 .../dotty/tools/dotc/core/Signature.scala | 0 .../src}/dotty/tools/dotc/core/StdNames.scala | 0 .../dotty/tools/dotc/core/Substituters.scala | 0 .../tools/dotc/core/SymDenotations.scala | 0 .../dotty/tools/dotc/core/SymbolLoaders.scala | 0 .../src}/dotty/tools/dotc/core/Symbols.scala | 0 .../tools/dotc/core/TypeApplications.scala | 0 .../dotty/tools/dotc/core/TypeComparer.scala | 0 .../dotty/tools/dotc/core/TypeErasure.scala | 0 .../src}/dotty/tools/dotc/core/TypeOps.scala | 0 .../dotty/tools/dotc/core/TypeParamInfo.scala | 0 .../dotty/tools/dotc/core/TyperState.scala | 0 .../src}/dotty/tools/dotc/core/Types.overflow | 0 .../src}/dotty/tools/dotc/core/Types.scala | 0 .../src}/dotty/tools/dotc/core/Uniques.scala | 0 .../core/classfile/AbstractFileReader.scala | 0 .../dotc/core/classfile/ByteCodecs.scala | 0 .../core/classfile/ClassfileConstants.scala | 0 .../dotc/core/classfile/ClassfileParser.scala | 0 .../dotc/core/tasty/DottyUnpickler.scala | 0 .../tools/dotc/core/tasty/NameBuffer.scala | 0 .../dotc/core/tasty/PositionPickler.scala | 0 .../dotc/core/tasty/PositionUnpickler.scala | 0 .../tools/dotc/core/tasty/TastyBuffer.scala | 0 .../tools/dotc/core/tasty/TastyFormat.scala | 0 .../tools/dotc/core/tasty/TastyName.scala | 0 .../tools/dotc/core/tasty/TastyPickler.scala | 0 .../tools/dotc/core/tasty/TastyPrinter.scala | 0 .../tools/dotc/core/tasty/TastyReader.scala | 0 .../dotc/core/tasty/TastyUnpickler.scala | 0 .../tools/dotc/core/tasty/TreeBuffer.scala | 0 .../tools/dotc/core/tasty/TreePickler.scala | 0 .../tools/dotc/core/tasty/TreeUnpickler.scala | 0 .../core/unpickleScala2/PickleBuffer.scala | 0 .../core/unpickleScala2/Scala2Unpickler.scala | 0 .../tools/dotc/parsing/CharArrayReader.scala | 0 .../tools/dotc/parsing/JavaParsers.scala | 0 .../tools/dotc/parsing/JavaScanners.scala | 0 .../dotty/tools/dotc/parsing/JavaTokens.scala | 0 .../dotc/parsing/MarkupParserCommon.scala | 0 .../tools/dotc/parsing/MarkupParsers.scala | 0 .../dotty/tools/dotc/parsing/Parsers.scala | 0 .../dotty/tools/dotc/parsing/Scanners.scala | 0 .../tools/dotc/parsing/ScriptParsers.scala | 0 .../dotc/parsing/SymbolicXMLBuilder.scala | 0 .../dotty/tools/dotc/parsing/Tokens.scala | 0 .../dotc/parsing/TreeBuilder.scala.unused | 0 .../dotty/tools/dotc/parsing/Utility.scala | 0 .../dotty/tools/dotc/parsing/package.scala | 0 .../tools/dotc/printing/Formatting.scala | 0 .../tools/dotc/printing/Highlighting.scala | 0 .../tools/dotc/printing/PlainPrinter.scala | 0 .../dotty/tools/dotc/printing/Printer.scala | 0 .../dotty/tools/dotc/printing/Printers.scala | 0 .../tools/dotc/printing/RefinedPrinter.scala | 0 .../dotty/tools/dotc/printing/Showable.scala | 0 .../dotc/printing/SyntaxHighlighting.scala | 0 .../dotty/tools/dotc/printing/Texts.scala | 0 .../dotty/tools/dotc/printing/package.scala | 0 .../dotc/repl/AbstractFileClassLoader.scala | 0 .../tools/dotc/repl/AmmoniteReader.scala | 0 .../dotc/repl/CompilingInterpreter.scala | 0 .../dotty/tools/dotc/repl/ConsoleWriter.scala | 0 .../tools/dotc/repl/InteractiveReader.scala | 0 .../dotty/tools/dotc/repl/Interpreter.scala | 0 .../tools/dotc/repl/InterpreterLoop.scala | 0 .../src}/dotty/tools/dotc/repl/Main.scala | 0 .../dotty/tools/dotc/repl/ManifestInfo.scala | 0 .../tools/dotc/repl/NewLinePrintWriter.scala | 0 .../src}/dotty/tools/dotc/repl/REPL.scala | 0 .../dotty/tools/dotc/repl/SimpleReader.scala | 0 .../dotty/tools/dotc/repl/ammonite/Ansi.scala | 0 .../tools/dotc/repl/ammonite/Filter.scala | 0 .../dotc/repl/ammonite/FilterTools.scala | 0 .../dotty/tools/dotc/repl/ammonite/LICENSE | 0 .../tools/dotc/repl/ammonite/Protocol.scala | 0 .../dotc/repl/ammonite/SpecialKeys.scala | 0 .../tools/dotc/repl/ammonite/Terminal.scala | 0 .../tools/dotc/repl/ammonite/Utils.scala | 0 .../repl/ammonite/filters/BasicFilters.scala | 0 .../ammonite/filters/GUILikeFilters.scala | 0 .../repl/ammonite/filters/HistoryFilter.scala | 0 .../ammonite/filters/ReadlineFilters.scala | 0 .../repl/ammonite/filters/UndoFilter.scala | 0 .../dotc/reporting/ConsoleReporter.scala | 0 .../reporting/HideNonSensicalMessages.scala | 0 .../dotc/reporting/MessageRendering.scala | 0 .../dotty/tools/dotc/reporting/Reporter.scala | 0 .../tools/dotc/reporting/StoreReporter.scala | 0 .../dotc/reporting/ThrowingReporter.scala | 0 .../reporting/UniqueMessagePositions.scala | 0 .../dotc/reporting/diagnostic/Message.scala | 0 .../diagnostic/MessageContainer.scala | 0 .../dotc/reporting/diagnostic/messages.scala | 0 .../dotty/tools/dotc/rewrite/Rewrites.scala | 0 .../dotty/tools/dotc/sbt/ExtractAPI.scala | 0 .../tools/dotc/sbt/ExtractDependencies.scala | 0 .../src}/dotty/tools/dotc/sbt/ShowAPI.scala | 0 .../dotty/tools/dotc/sbt/ThunkHolder.scala | 0 .../dotc/transform/ArrayConstructors.scala | 0 .../dotc/transform/AugmentScala2Traits.scala | 0 .../tools/dotc/transform/CapturedVars.scala | 0 .../tools/dotc/transform/CheckReentrant.scala | 0 .../tools/dotc/transform/CheckStatic.scala | 0 .../dotty/tools/dotc/transform/ClassOf.scala | 0 .../dotc/transform/CollectEntryPoints.scala | 0 .../tools/dotc/transform/Constructors.scala | 0 .../tools/dotc/transform/CrossCastAnd.scala | 0 .../dotty/tools/dotc/transform/CtxLazy.scala | 0 .../DropEmptyCompanions.scala.disabled | 0 .../tools/dotc/transform/DropInlined.scala | 0 .../tools/dotc/transform/ElimByName.scala | 0 .../dotc/transform/ElimErasedValueType.scala | 0 .../tools/dotc/transform/ElimRepeated.scala | 0 .../tools/dotc/transform/ElimStaticThis.scala | 0 .../dotty/tools/dotc/transform/Erasure.scala | 0 .../tools/dotc/transform/ExpandPrivate.scala | 0 .../tools/dotc/transform/ExpandSAMs.scala | 0 .../tools/dotc/transform/ExplicitOuter.scala | 0 .../tools/dotc/transform/ExplicitSelf.scala | 0 .../dotc/transform/ExtensionMethods.scala | 0 .../tools/dotc/transform/FirstTransform.scala | 0 .../dotty/tools/dotc/transform/Flatten.scala | 0 .../dotc/transform/FullParameterization.scala | 0 .../dotc/transform/FunctionalInterfaces.scala | 0 .../dotty/tools/dotc/transform/GetClass.scala | 0 .../dotty/tools/dotc/transform/Getters.scala | 0 .../dotc/transform/InterceptedMethods.scala | 0 .../transform/IsInstanceOfEvaluator.scala | 0 .../tools/dotc/transform/LambdaLift.scala | 0 .../dotty/tools/dotc/transform/LazyVals.scala | 0 .../dotty/tools/dotc/transform/LiftTry.scala | 0 .../transform/LinkScala2ImplClasses.scala | 0 .../dotc/transform/Literalize.scala.disabled | 0 .../tools/dotc/transform/MacroTransform.scala | 0 .../dotty/tools/dotc/transform/Memoize.scala | 0 .../dotty/tools/dotc/transform/Mixin.scala | 0 .../dotty/tools/dotc/transform/MixinOps.scala | 0 .../tools/dotc/transform/MoveStatics.scala | 0 .../dotc/transform/NonLocalReturns.scala | 0 .../tools/dotc/transform/NormalizeFlags.scala | 0 .../dotc/transform/OverridingPairs.scala | 0 .../dotc/transform/ParamForwarding.scala | 0 .../tools/dotc/transform/PatternMatcher.scala | 0 .../dotty/tools/dotc/transform/Pickler.scala | 0 .../tools/dotc/transform/PostTyper.scala | 0 .../transform/PrivateToStatic.scala.disabled | 0 .../tools/dotc/transform/ResolveSuper.scala | 0 .../tools/dotc/transform/RestoreScopes.scala | 0 .../tools/dotc/transform/SelectStatic.scala | 0 .../tools/dotc/transform/SeqLiterals.scala | 0 .../dotty/tools/dotc/transform/Splitter.scala | 0 .../tools/dotc/transform/SuperAccessors.scala | 0 .../dotty/tools/dotc/transform/SymUtils.scala | 0 .../dotc/transform/SyntheticMethods.scala | 0 .../dotty/tools/dotc/transform/TailRec.scala | 0 .../tools/dotc/transform/TreeChecker.scala | 0 .../tools/dotc/transform/TreeExtractors.scala | 0 .../dotty/tools/dotc/transform/TreeGen.scala | 0 .../tools/dotc/transform/TreeTransform.scala | 0 .../dotc/transform/TryCatchPatterns.scala | 0 .../tools/dotc/transform/TypeTestsCasts.scala | 0 .../tools/dotc/transform/TypeUtils.scala | 0 .../dotc/transform/VCElideAllocations.scala | 0 .../dotc/transform/VCInlineMethods.scala | 0 .../tools/dotc/transform/ValueClasses.scala | 0 .../tools/dotc/transform/patmat/Space.scala | 0 .../dotty/tools/dotc/typer/Applications.scala | 0 .../dotty/tools/dotc/typer/Checking.scala | 0 .../dotty/tools/dotc/typer/ConstFold.scala | 0 .../dotty/tools/dotc/typer/Docstrings.scala | 0 .../src}/dotty/tools/dotc/typer/Dynamic.scala | 0 .../tools/dotc/typer/ErrorReporting.scala | 0 .../dotty/tools/dotc/typer/EtaExpansion.scala | 0 .../dotty/tools/dotc/typer/FrontEnd.scala | 0 .../dotty/tools/dotc/typer/Implicits.scala | 0 .../dotty/tools/dotc/typer/ImportInfo.scala | 0 .../dotty/tools/dotc/typer/Inferencing.scala | 0 .../src}/dotty/tools/dotc/typer/Inliner.scala | 0 .../src}/dotty/tools/dotc/typer/Namer.scala | 0 .../dotty/tools/dotc/typer/ProtoTypes.scala | 0 .../src}/dotty/tools/dotc/typer/ReTyper.scala | 0 .../dotty/tools/dotc/typer/RefChecks.scala | 0 .../dotty/tools/dotc/typer/TypeAssigner.scala | 0 .../src}/dotty/tools/dotc/typer/Typer.scala | 0 .../tools/dotc/typer/VarianceChecker.scala | 0 .../dotty/tools/dotc/typer/Variances.scala | 0 .../dotty/tools/dotc/util/Attachment.scala | 0 .../src}/dotty/tools/dotc/util/Chars.scala | 0 .../tools/dotc/util/CommentParsing.scala | 0 .../src}/dotty/tools/dotc/util/DiffUtil.scala | 0 .../src}/dotty/tools/dotc/util/DotClass.scala | 0 .../tools/dotc/util/FreshNameCreator.scala | 0 .../src}/dotty/tools/dotc/util/HashSet.scala | 0 .../src}/dotty/tools/dotc/util/LRUCache.scala | 0 .../tools/dotc/util/NameTransformer.scala | 0 .../dotty/tools/dotc/util/Positions.scala | 0 .../src}/dotty/tools/dotc/util/Property.scala | 0 .../src}/dotty/tools/dotc/util/Set.scala | 0 .../dotty/tools/dotc/util/ShowPickled.scala | 0 .../dotty/tools/dotc/util/SimpleMap.scala | 0 .../tools/dotc/util/SixteenNibbles.scala | 0 .../dotty/tools/dotc/util/SourceFile.scala | 0 .../tools/dotc/util/SourcePosition.scala | 0 .../src}/dotty/tools/dotc/util/Stats.scala | 0 .../src}/dotty/tools/dotc/util/Util.scala | 0 .../src}/dotty/tools/dotc/util/common.scala | 0 .../src}/dotty/tools/dotc/util/kwords.sc | 0 .../src}/dotty/tools/dotc/util/lrutest.sc | 0 .../src}/dotty/tools/io/ClassPath.scala | 0 .../dotty/tools/io/DaemonThreadFactory.scala | 0 .../src}/dotty/tools/io/Fileish.scala | 0 .../src}/dotty/tools/io/Jar.scala | 0 .../src}/dotty/tools/io/package.scala | 0 .../src}/dotty/tools/package.scala | 0 .../collections/CollectionStrawMan1.scala | 0 .../collections/CollectionStrawMan4.scala | 0 .../collections/CollectionStrawMan5.scala | 0 .../collections/CollectionStrawMan6.scala | 0 {test => compiler/test}/dotc/build.scala | 0 {test => compiler/test}/dotc/comptest.scala | 0 .../test}/dotc/scala-collections.whitelist | 0 {test => compiler/test}/dotc/tests.scala | 27 ++++---- .../test}/dotty/partest/DPConfig.scala | 2 +- .../test}/dotty/partest/DPConsoleRunner.scala | 0 .../dotty/partest/DPDirectCompiler.scala | 0 .../dotty/tools/ContextEscapeDetection.java | 0 .../dotty/tools/ContextEscapeDetector.java | 0 .../test}/dotty/tools/DottyTest.scala | 2 +- .../test}/dotty/tools/DottyTypeStealer.scala | 0 .../test}/dotty/tools/ShowClassTests.scala | 4 +- .../test}/dotty/tools/TypeStealer.scala | 0 .../tools/backend/jvm/AsmConverters.scala | 0 .../dotty/tools/backend/jvm/AsmNode.scala | 0 .../tools/backend/jvm/DottyBytecodeTest.scala | 0 .../backend/jvm/DottyBytecodeTests.scala | 0 .../backend/jvm/InlineBytecodeTests.scala | 0 .../test}/dotty/tools/dotc/CompilerTest.scala | 2 +- .../dotty/tools/dotc/EntryPointsTest.scala | 8 +-- .../tools/dotc/InterfaceEntryPointTest.scala | 8 +-- .../dotty/tools/dotc/ast/TreeInfoTest.scala | 0 .../tools/dotc/parsing/DeSugarTest.scala | 0 .../tools/dotc/parsing/DocstringTest.scala | 0 .../tools/dotc/parsing/DocstringTests.scala | 0 .../dotc/parsing/ModifiersParsingTest.scala | 0 .../dotty/tools/dotc/parsing/ParserTest.scala | 0 .../tools/dotc/parsing/ScannerTest.scala | 6 +- .../tools/dotc/parsing/desugarPackage.scala | 0 .../dotty/tools/dotc/parsing/parseFile.scala | 0 .../tools/dotc/parsing/parsePackage.scala | 0 .../dotty/tools/dotc/parsing/showTree.scala | 0 .../dotty/tools/dotc/repl/TestREPL.scala | 2 +- .../dotc/reporting/TestMessageLaziness.scala | 0 .../tools/dotc/reporting/TestReporter.scala | 0 .../CreateCompanionObjectsTest.scala | 0 .../tools/dotc/transform/LazyValsTest.scala | 0 .../transform/PostTyperTransformerTest.scala | 0 .../dotc/transform/TreeTransformerTest.scala | 0 .../test}/dotty/tools/showClass.scala | 0 {test => compiler/test}/partest | 0 .../test}/worksheets/baseTypetest.sc | 0 .../test}/worksheets/denotTest.sc | 0 .../test}/worksheets/flagtest.sc | 0 {test => compiler/test}/worksheets/nesting.sc | 0 .../test}/worksheets/periodtest.sc | 0 .../test}/worksheets/positiontest.sc | 0 {test => compiler/test}/worksheets/sigtest.sc | 0 .../test}/worksheets/testnames.sc | 0 project/Build.scala | 62 +++++++++++-------- 329 files changed, 84 insertions(+), 74 deletions(-) rename {src => compiler/src}/dotty/tools/backend/jvm/CollectEntryPoints.scala (100%) rename {src => compiler/src}/dotty/tools/backend/jvm/CollectSuperCalls.scala (100%) rename {src => compiler/src}/dotty/tools/backend/jvm/DottyBackendInterface.scala (100%) rename {src => compiler/src}/dotty/tools/backend/jvm/GenBCode.scala (100%) rename {src => compiler/src}/dotty/tools/backend/jvm/LabelDefs.scala (100%) rename {src => compiler/src}/dotty/tools/backend/jvm/scalaPrimitives.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/Bench.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/CompilationUnit.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/Compiler.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/Driver.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/FromTasty.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/Main.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/Resident.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/Run.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/ast/CheckTrees.scala.disabled (100%) rename {src => compiler/src}/dotty/tools/dotc/ast/Desugar.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/ast/NavigateAST.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/ast/PluggableTransformers.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/ast/Positioned.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/ast/TreeInfo.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/ast/TreeTypeMap.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/ast/Trees.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/ast/tpd.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/ast/untpd.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/config/CompilerCommand.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/config/Config.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/config/JavaPlatform.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/config/OutputDirs.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/config/PathResolver.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/config/Platform.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/config/Printers.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/config/Properties.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/config/ScalaSettings.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/config/ScalaVersion.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/config/Settings.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/config/WrappedProperties.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/core/Annotations.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/core/CheckRealizable.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/core/Comments.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/core/Constants.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/core/Constraint.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/core/ConstraintHandling.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/core/ConstraintRunInfo.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/core/Contexts.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/core/Decorators.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/core/Definitions.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/core/DenotTransformers.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/core/Denotations.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/core/Flags.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/core/Hashable.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/core/Mode.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/core/NameOps.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/core/Names.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/core/OrderingConstraint.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/core/Periods.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/core/Phases.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/core/Scopes.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/core/Signature.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/core/StdNames.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/core/Substituters.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/core/SymDenotations.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/core/SymbolLoaders.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/core/Symbols.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/core/TypeApplications.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/core/TypeComparer.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/core/TypeErasure.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/core/TypeOps.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/core/TypeParamInfo.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/core/TyperState.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/core/Types.overflow (100%) rename {src => compiler/src}/dotty/tools/dotc/core/Types.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/core/Uniques.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/core/classfile/AbstractFileReader.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/core/classfile/ByteCodecs.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/core/classfile/ClassfileConstants.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/core/classfile/ClassfileParser.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/core/tasty/DottyUnpickler.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/core/tasty/NameBuffer.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/core/tasty/PositionPickler.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/core/tasty/PositionUnpickler.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/core/tasty/TastyBuffer.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/core/tasty/TastyFormat.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/core/tasty/TastyName.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/core/tasty/TastyPickler.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/core/tasty/TastyPrinter.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/core/tasty/TastyReader.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/core/tasty/TastyUnpickler.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/core/tasty/TreeBuffer.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/core/tasty/TreePickler.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/core/tasty/TreeUnpickler.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/core/unpickleScala2/PickleBuffer.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/core/unpickleScala2/Scala2Unpickler.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/parsing/CharArrayReader.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/parsing/JavaParsers.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/parsing/JavaScanners.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/parsing/JavaTokens.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/parsing/MarkupParserCommon.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/parsing/MarkupParsers.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/parsing/Parsers.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/parsing/Scanners.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/parsing/ScriptParsers.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/parsing/SymbolicXMLBuilder.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/parsing/Tokens.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/parsing/TreeBuilder.scala.unused (100%) rename {src => compiler/src}/dotty/tools/dotc/parsing/Utility.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/parsing/package.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/printing/Formatting.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/printing/Highlighting.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/printing/PlainPrinter.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/printing/Printer.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/printing/Printers.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/printing/RefinedPrinter.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/printing/Showable.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/printing/SyntaxHighlighting.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/printing/Texts.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/printing/package.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/repl/AbstractFileClassLoader.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/repl/AmmoniteReader.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/repl/CompilingInterpreter.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/repl/ConsoleWriter.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/repl/InteractiveReader.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/repl/Interpreter.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/repl/InterpreterLoop.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/repl/Main.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/repl/ManifestInfo.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/repl/NewLinePrintWriter.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/repl/REPL.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/repl/SimpleReader.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/repl/ammonite/Ansi.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/repl/ammonite/Filter.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/repl/ammonite/FilterTools.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/repl/ammonite/LICENSE (100%) rename {src => compiler/src}/dotty/tools/dotc/repl/ammonite/Protocol.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/repl/ammonite/SpecialKeys.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/repl/ammonite/Terminal.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/repl/ammonite/Utils.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/repl/ammonite/filters/BasicFilters.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/repl/ammonite/filters/GUILikeFilters.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/repl/ammonite/filters/HistoryFilter.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/repl/ammonite/filters/ReadlineFilters.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/repl/ammonite/filters/UndoFilter.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/reporting/ConsoleReporter.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/reporting/HideNonSensicalMessages.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/reporting/MessageRendering.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/reporting/Reporter.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/reporting/StoreReporter.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/reporting/ThrowingReporter.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/reporting/UniqueMessagePositions.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/reporting/diagnostic/Message.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/reporting/diagnostic/MessageContainer.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/reporting/diagnostic/messages.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/rewrite/Rewrites.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/sbt/ExtractAPI.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/sbt/ExtractDependencies.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/sbt/ShowAPI.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/sbt/ThunkHolder.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/transform/ArrayConstructors.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/transform/AugmentScala2Traits.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/transform/CapturedVars.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/transform/CheckReentrant.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/transform/CheckStatic.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/transform/ClassOf.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/transform/CollectEntryPoints.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/transform/Constructors.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/transform/CrossCastAnd.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/transform/CtxLazy.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/transform/DropEmptyCompanions.scala.disabled (100%) rename {src => compiler/src}/dotty/tools/dotc/transform/DropInlined.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/transform/ElimByName.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/transform/ElimErasedValueType.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/transform/ElimRepeated.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/transform/ElimStaticThis.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/transform/Erasure.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/transform/ExpandPrivate.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/transform/ExpandSAMs.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/transform/ExplicitOuter.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/transform/ExplicitSelf.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/transform/ExtensionMethods.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/transform/FirstTransform.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/transform/Flatten.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/transform/FullParameterization.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/transform/FunctionalInterfaces.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/transform/GetClass.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/transform/Getters.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/transform/InterceptedMethods.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/transform/IsInstanceOfEvaluator.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/transform/LambdaLift.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/transform/LazyVals.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/transform/LiftTry.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/transform/LinkScala2ImplClasses.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/transform/Literalize.scala.disabled (100%) rename {src => compiler/src}/dotty/tools/dotc/transform/MacroTransform.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/transform/Memoize.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/transform/Mixin.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/transform/MixinOps.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/transform/MoveStatics.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/transform/NonLocalReturns.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/transform/NormalizeFlags.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/transform/OverridingPairs.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/transform/ParamForwarding.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/transform/PatternMatcher.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/transform/Pickler.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/transform/PostTyper.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/transform/PrivateToStatic.scala.disabled (100%) rename {src => compiler/src}/dotty/tools/dotc/transform/ResolveSuper.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/transform/RestoreScopes.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/transform/SelectStatic.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/transform/SeqLiterals.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/transform/Splitter.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/transform/SuperAccessors.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/transform/SymUtils.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/transform/SyntheticMethods.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/transform/TailRec.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/transform/TreeChecker.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/transform/TreeExtractors.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/transform/TreeGen.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/transform/TreeTransform.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/transform/TryCatchPatterns.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/transform/TypeTestsCasts.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/transform/TypeUtils.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/transform/VCElideAllocations.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/transform/VCInlineMethods.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/transform/ValueClasses.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/transform/patmat/Space.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/typer/Applications.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/typer/Checking.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/typer/ConstFold.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/typer/Docstrings.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/typer/Dynamic.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/typer/ErrorReporting.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/typer/EtaExpansion.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/typer/FrontEnd.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/typer/Implicits.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/typer/ImportInfo.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/typer/Inferencing.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/typer/Inliner.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/typer/Namer.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/typer/ProtoTypes.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/typer/ReTyper.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/typer/RefChecks.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/typer/TypeAssigner.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/typer/Typer.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/typer/VarianceChecker.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/typer/Variances.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/util/Attachment.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/util/Chars.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/util/CommentParsing.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/util/DiffUtil.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/util/DotClass.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/util/FreshNameCreator.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/util/HashSet.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/util/LRUCache.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/util/NameTransformer.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/util/Positions.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/util/Property.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/util/Set.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/util/ShowPickled.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/util/SimpleMap.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/util/SixteenNibbles.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/util/SourceFile.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/util/SourcePosition.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/util/Stats.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/util/Util.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/util/common.scala (100%) rename {src => compiler/src}/dotty/tools/dotc/util/kwords.sc (100%) rename {src => compiler/src}/dotty/tools/dotc/util/lrutest.sc (100%) rename {src => compiler/src}/dotty/tools/io/ClassPath.scala (100%) rename {src => compiler/src}/dotty/tools/io/DaemonThreadFactory.scala (100%) rename {src => compiler/src}/dotty/tools/io/Fileish.scala (100%) rename {src => compiler/src}/dotty/tools/io/Jar.scala (100%) rename {src => compiler/src}/dotty/tools/io/package.scala (100%) rename {src => compiler/src}/dotty/tools/package.scala (100%) rename {src => compiler/src}/strawman/collections/CollectionStrawMan1.scala (100%) rename {src => compiler/src}/strawman/collections/CollectionStrawMan4.scala (100%) rename {src => compiler/src}/strawman/collections/CollectionStrawMan5.scala (100%) rename {src => compiler/src}/strawman/collections/CollectionStrawMan6.scala (100%) rename {test => compiler/test}/dotc/build.scala (100%) rename {test => compiler/test}/dotc/comptest.scala (100%) rename {test => compiler/test}/dotc/scala-collections.whitelist (100%) rename {test => compiler/test}/dotc/tests.scala (95%) rename {test => compiler/test}/dotty/partest/DPConfig.scala (94%) rename {test => compiler/test}/dotty/partest/DPConsoleRunner.scala (100%) rename {test => compiler/test}/dotty/partest/DPDirectCompiler.scala (100%) rename {test => compiler/test}/dotty/tools/ContextEscapeDetection.java (100%) rename {test => compiler/test}/dotty/tools/ContextEscapeDetector.java (100%) rename {test => compiler/test}/dotty/tools/DottyTest.scala (96%) rename {test => compiler/test}/dotty/tools/DottyTypeStealer.scala (100%) rename {test => compiler/test}/dotty/tools/ShowClassTests.scala (97%) rename {test => compiler/test}/dotty/tools/TypeStealer.scala (100%) rename {test => compiler/test}/dotty/tools/backend/jvm/AsmConverters.scala (100%) rename {test => compiler/test}/dotty/tools/backend/jvm/AsmNode.scala (100%) rename {test => compiler/test}/dotty/tools/backend/jvm/DottyBytecodeTest.scala (100%) rename {test => compiler/test}/dotty/tools/backend/jvm/DottyBytecodeTests.scala (100%) rename {test => compiler/test}/dotty/tools/backend/jvm/InlineBytecodeTests.scala (100%) rename {test => compiler/test}/dotty/tools/dotc/CompilerTest.scala (99%) rename {test => compiler/test}/dotty/tools/dotc/EntryPointsTest.scala (87%) rename {test => compiler/test}/dotty/tools/dotc/InterfaceEntryPointTest.scala (87%) rename {test => compiler/test}/dotty/tools/dotc/ast/TreeInfoTest.scala (100%) rename {test => compiler/test}/dotty/tools/dotc/parsing/DeSugarTest.scala (100%) rename {test => compiler/test}/dotty/tools/dotc/parsing/DocstringTest.scala (100%) rename {test => compiler/test}/dotty/tools/dotc/parsing/DocstringTests.scala (100%) rename {test => compiler/test}/dotty/tools/dotc/parsing/ModifiersParsingTest.scala (100%) rename {test => compiler/test}/dotty/tools/dotc/parsing/ParserTest.scala (100%) rename {test => compiler/test}/dotty/tools/dotc/parsing/ScannerTest.scala (91%) rename {test => compiler/test}/dotty/tools/dotc/parsing/desugarPackage.scala (100%) rename {test => compiler/test}/dotty/tools/dotc/parsing/parseFile.scala (100%) rename {test => compiler/test}/dotty/tools/dotc/parsing/parsePackage.scala (100%) rename {test => compiler/test}/dotty/tools/dotc/parsing/showTree.scala (100%) rename {test => compiler/test}/dotty/tools/dotc/repl/TestREPL.scala (96%) rename {test => compiler/test}/dotty/tools/dotc/reporting/TestMessageLaziness.scala (100%) rename {test => compiler/test}/dotty/tools/dotc/reporting/TestReporter.scala (100%) rename {test => compiler/test}/dotty/tools/dotc/transform/CreateCompanionObjectsTest.scala (100%) rename {test => compiler/test}/dotty/tools/dotc/transform/LazyValsTest.scala (100%) rename {test => compiler/test}/dotty/tools/dotc/transform/PostTyperTransformerTest.scala (100%) rename {test => compiler/test}/dotty/tools/dotc/transform/TreeTransformerTest.scala (100%) rename {test => compiler/test}/dotty/tools/showClass.scala (100%) rename {test => compiler/test}/partest (100%) rename {test => compiler/test}/worksheets/baseTypetest.sc (100%) rename {test => compiler/test}/worksheets/denotTest.sc (100%) rename {test => compiler/test}/worksheets/flagtest.sc (100%) rename {test => compiler/test}/worksheets/nesting.sc (100%) rename {test => compiler/test}/worksheets/periodtest.sc (100%) rename {test => compiler/test}/worksheets/positiontest.sc (100%) rename {test => compiler/test}/worksheets/sigtest.sc (100%) rename {test => compiler/test}/worksheets/testnames.sc (100%) diff --git a/bench/src/test/scala/Benchmarks.scala b/bench/src/test/scala/Benchmarks.scala index b85f95d6eb32..8c1b18e661df 100644 --- a/bench/src/test/scala/Benchmarks.scala +++ b/bench/src/test/scala/Benchmarks.scala @@ -6,7 +6,7 @@ import org.scalameter.PerformanceTest.OnlineRegressionReport import org.scalameter.api._ import org.scalameter.{Context, History, currentContext, persistence} import org.scalameter.reporting.RegressionReporter.Tester -import test.CompilerTest +import dotty.tools.dotc.CompilerTest import scala.io.Source @@ -46,13 +46,14 @@ object BenchTests extends OnlineRegressionReport { implicit val defaultOptions = List("-d", outputDir) val scala2mode = List("-language:Scala2") - val dottyDir = "./src/dotty/" + val dottyDir = "../compiler/src/dotty/" - val stdlibFiles = Source.fromFile("./test/dotc/scala-collections.whitelist", "UTF8").getLines() + val stdlibFiles = Source.fromFile("../compiler/test/dotc/scala-collections.whitelist", "UTF8").getLines() .map(_.trim) // allow identation .filter(!_.startsWith("#")) // allow comment lines prefixed by # .map(_.takeWhile(_ != '#').trim) // allow comments in the end of line .filter(_.nonEmpty) + .map("." + _) .toList def stdLib = compiler.compileList("compileStdLib", stdlibFiles, "-migration" :: scala2mode) diff --git a/bin/common b/bin/common index cbefc33f851d..4dd2b57163d3 100755 --- a/bin/common +++ b/bin/common @@ -86,7 +86,7 @@ function build_all { printf "done\n" printf "Building dotty-compiler..." - MAIN_JAR=$(build_jar dotty-compiler/package "target/scala-$SCALA_BINARY_VERSION") + MAIN_JAR=$(build_jar dotty-compiler/package "compiler/target/scala-$SCALA_BINARY_VERSION") printf "done\n" printf "Building dotty library..." @@ -94,7 +94,7 @@ function build_all { printf "done\n" printf "Building tests..." - TEST_JAR=$(build_jar test:package "target/scala-$SCALA_BINARY_VERSION" '/dotty.*-tests\.jar/p') + TEST_JAR=$(build_jar test:package "compiler/target/scala-$SCALA_BINARY_VERSION" '/dotty.*-tests\.jar/p') printf "done\n" update_packages @@ -130,10 +130,10 @@ function check_jar { fi } -check_jar "dotty-interfaces" $INTERFACES_JAR "interfaces" 'INTERFACES_JAR=$(build_jar dotty-interfaces/package interfaces/target)' -check_jar "dotty" $MAIN_JAR "src" 'MAIN_JAR=$(build_jar dotty-compiler/package target/scala-$SCALA_BINARY_VERSION)' -check_jar "dotty-library" $DOTTY_LIB_JAR "library" 'DOTTY_LIB_JAR=$(build_jar dotty-library/package library/target/scala-$SCALA_BINARY_VERSION)' -check_jar "dotty-tests" $TEST_JAR "test" 'TEST_JAR=$(build_jar test:package target/scala-$SCALA_BINARY_VERSION /dotty.*-tests\.jar/p)' +check_jar "dotty-interfaces" $INTERFACES_JAR "interfaces/src" 'INTERFACES_JAR=$(build_jar dotty-interfaces/package interfaces/target)' +check_jar "dotty" $MAIN_JAR "compiler/src" 'MAIN_JAR=$(build_jar dotty-compiler/package compiler/target/scala-$SCALA_BINARY_VERSION)' +check_jar "dotty-library" $DOTTY_LIB_JAR "library/src" 'DOTTY_LIB_JAR=$(build_jar dotty-library/package library/target/scala-$SCALA_BINARY_VERSION)' +check_jar "dotty-tests" $TEST_JAR "compiler/test" 'TEST_JAR=$(build_jar dotty-compiler/test:package compiler/target/scala-$SCALA_BINARY_VERSION /dotty.*-tests\.jar/p)' # Autodetecting the scala-library location, in case it wasn't provided by an environment variable if [ "$SCALA_LIBRARY_JAR" == "" ]; then diff --git a/bin/test/TestScripts.scala b/bin/test/TestScripts.scala index 1a200c1b93a2..0558c0480ccf 100644 --- a/bin/test/TestScripts.scala +++ b/bin/test/TestScripts.scala @@ -28,13 +28,13 @@ class TestScripts { } try { - for (jar <- Source.fromFile("../.packages").getLines()) + for (jar <- Source.fromFile("./.packages").getLines()) delete(jar) - delete("../.packages") - delete("./src/dotty/tools/dotc/Dummy.scala") - delete("HelloWorld.class") - delete("HelloWorld$.class") + delete("./.packages") + delete("./compiler/src/dotty/tools/dotc/Dummy.scala") + delete("./HelloWorld.class") + delete("./HelloWorld$.class") } catch { case _: FileNotFoundException => () } @@ -66,11 +66,11 @@ class TestScripts { * rebuild dotty if needed */ @Test def rebuildIfNecessary = doUnlessWindows { - val (retFirstBuild, _) = executeScript("./bin/dotc ./tests/pos/HelloWorld.scala") - assert(retFirstBuild == 0, "building dotc failed") + val (retFirstBuild, out1) = executeScript("./bin/dotc ./tests/pos/HelloWorld.scala") + assert(retFirstBuild == 0, s"building dotc failed: $out1") // Create a new file to force rebuild - new JFile("./src/dotty/tools/dotc/Dummy.scala").createNewFile() + new JFile("./compiler/src/dotty/tools/dotc/Dummy.scala").createNewFile() val (retSecondBuild, output) = executeScript("./bin/dotc ./tests/pos/HelloWorld.scala") assert( diff --git a/src/dotty/tools/backend/jvm/CollectEntryPoints.scala b/compiler/src/dotty/tools/backend/jvm/CollectEntryPoints.scala similarity index 100% rename from src/dotty/tools/backend/jvm/CollectEntryPoints.scala rename to compiler/src/dotty/tools/backend/jvm/CollectEntryPoints.scala diff --git a/src/dotty/tools/backend/jvm/CollectSuperCalls.scala b/compiler/src/dotty/tools/backend/jvm/CollectSuperCalls.scala similarity index 100% rename from src/dotty/tools/backend/jvm/CollectSuperCalls.scala rename to compiler/src/dotty/tools/backend/jvm/CollectSuperCalls.scala diff --git a/src/dotty/tools/backend/jvm/DottyBackendInterface.scala b/compiler/src/dotty/tools/backend/jvm/DottyBackendInterface.scala similarity index 100% rename from src/dotty/tools/backend/jvm/DottyBackendInterface.scala rename to compiler/src/dotty/tools/backend/jvm/DottyBackendInterface.scala diff --git a/src/dotty/tools/backend/jvm/GenBCode.scala b/compiler/src/dotty/tools/backend/jvm/GenBCode.scala similarity index 100% rename from src/dotty/tools/backend/jvm/GenBCode.scala rename to compiler/src/dotty/tools/backend/jvm/GenBCode.scala diff --git a/src/dotty/tools/backend/jvm/LabelDefs.scala b/compiler/src/dotty/tools/backend/jvm/LabelDefs.scala similarity index 100% rename from src/dotty/tools/backend/jvm/LabelDefs.scala rename to compiler/src/dotty/tools/backend/jvm/LabelDefs.scala diff --git a/src/dotty/tools/backend/jvm/scalaPrimitives.scala b/compiler/src/dotty/tools/backend/jvm/scalaPrimitives.scala similarity index 100% rename from src/dotty/tools/backend/jvm/scalaPrimitives.scala rename to compiler/src/dotty/tools/backend/jvm/scalaPrimitives.scala diff --git a/src/dotty/tools/dotc/Bench.scala b/compiler/src/dotty/tools/dotc/Bench.scala similarity index 100% rename from src/dotty/tools/dotc/Bench.scala rename to compiler/src/dotty/tools/dotc/Bench.scala diff --git a/src/dotty/tools/dotc/CompilationUnit.scala b/compiler/src/dotty/tools/dotc/CompilationUnit.scala similarity index 100% rename from src/dotty/tools/dotc/CompilationUnit.scala rename to compiler/src/dotty/tools/dotc/CompilationUnit.scala diff --git a/src/dotty/tools/dotc/Compiler.scala b/compiler/src/dotty/tools/dotc/Compiler.scala similarity index 100% rename from src/dotty/tools/dotc/Compiler.scala rename to compiler/src/dotty/tools/dotc/Compiler.scala diff --git a/src/dotty/tools/dotc/Driver.scala b/compiler/src/dotty/tools/dotc/Driver.scala similarity index 100% rename from src/dotty/tools/dotc/Driver.scala rename to compiler/src/dotty/tools/dotc/Driver.scala diff --git a/src/dotty/tools/dotc/FromTasty.scala b/compiler/src/dotty/tools/dotc/FromTasty.scala similarity index 100% rename from src/dotty/tools/dotc/FromTasty.scala rename to compiler/src/dotty/tools/dotc/FromTasty.scala diff --git a/src/dotty/tools/dotc/Main.scala b/compiler/src/dotty/tools/dotc/Main.scala similarity index 100% rename from src/dotty/tools/dotc/Main.scala rename to compiler/src/dotty/tools/dotc/Main.scala diff --git a/src/dotty/tools/dotc/Resident.scala b/compiler/src/dotty/tools/dotc/Resident.scala similarity index 100% rename from src/dotty/tools/dotc/Resident.scala rename to compiler/src/dotty/tools/dotc/Resident.scala diff --git a/src/dotty/tools/dotc/Run.scala b/compiler/src/dotty/tools/dotc/Run.scala similarity index 100% rename from src/dotty/tools/dotc/Run.scala rename to compiler/src/dotty/tools/dotc/Run.scala diff --git a/src/dotty/tools/dotc/ast/CheckTrees.scala.disabled b/compiler/src/dotty/tools/dotc/ast/CheckTrees.scala.disabled similarity index 100% rename from src/dotty/tools/dotc/ast/CheckTrees.scala.disabled rename to compiler/src/dotty/tools/dotc/ast/CheckTrees.scala.disabled diff --git a/src/dotty/tools/dotc/ast/Desugar.scala b/compiler/src/dotty/tools/dotc/ast/Desugar.scala similarity index 100% rename from src/dotty/tools/dotc/ast/Desugar.scala rename to compiler/src/dotty/tools/dotc/ast/Desugar.scala diff --git a/src/dotty/tools/dotc/ast/NavigateAST.scala b/compiler/src/dotty/tools/dotc/ast/NavigateAST.scala similarity index 100% rename from src/dotty/tools/dotc/ast/NavigateAST.scala rename to compiler/src/dotty/tools/dotc/ast/NavigateAST.scala diff --git a/src/dotty/tools/dotc/ast/PluggableTransformers.scala b/compiler/src/dotty/tools/dotc/ast/PluggableTransformers.scala similarity index 100% rename from src/dotty/tools/dotc/ast/PluggableTransformers.scala rename to compiler/src/dotty/tools/dotc/ast/PluggableTransformers.scala diff --git a/src/dotty/tools/dotc/ast/Positioned.scala b/compiler/src/dotty/tools/dotc/ast/Positioned.scala similarity index 100% rename from src/dotty/tools/dotc/ast/Positioned.scala rename to compiler/src/dotty/tools/dotc/ast/Positioned.scala diff --git a/src/dotty/tools/dotc/ast/TreeInfo.scala b/compiler/src/dotty/tools/dotc/ast/TreeInfo.scala similarity index 100% rename from src/dotty/tools/dotc/ast/TreeInfo.scala rename to compiler/src/dotty/tools/dotc/ast/TreeInfo.scala diff --git a/src/dotty/tools/dotc/ast/TreeTypeMap.scala b/compiler/src/dotty/tools/dotc/ast/TreeTypeMap.scala similarity index 100% rename from src/dotty/tools/dotc/ast/TreeTypeMap.scala rename to compiler/src/dotty/tools/dotc/ast/TreeTypeMap.scala diff --git a/src/dotty/tools/dotc/ast/Trees.scala b/compiler/src/dotty/tools/dotc/ast/Trees.scala similarity index 100% rename from src/dotty/tools/dotc/ast/Trees.scala rename to compiler/src/dotty/tools/dotc/ast/Trees.scala diff --git a/src/dotty/tools/dotc/ast/tpd.scala b/compiler/src/dotty/tools/dotc/ast/tpd.scala similarity index 100% rename from src/dotty/tools/dotc/ast/tpd.scala rename to compiler/src/dotty/tools/dotc/ast/tpd.scala diff --git a/src/dotty/tools/dotc/ast/untpd.scala b/compiler/src/dotty/tools/dotc/ast/untpd.scala similarity index 100% rename from src/dotty/tools/dotc/ast/untpd.scala rename to compiler/src/dotty/tools/dotc/ast/untpd.scala diff --git a/src/dotty/tools/dotc/config/CompilerCommand.scala b/compiler/src/dotty/tools/dotc/config/CompilerCommand.scala similarity index 100% rename from src/dotty/tools/dotc/config/CompilerCommand.scala rename to compiler/src/dotty/tools/dotc/config/CompilerCommand.scala diff --git a/src/dotty/tools/dotc/config/Config.scala b/compiler/src/dotty/tools/dotc/config/Config.scala similarity index 100% rename from src/dotty/tools/dotc/config/Config.scala rename to compiler/src/dotty/tools/dotc/config/Config.scala diff --git a/src/dotty/tools/dotc/config/JavaPlatform.scala b/compiler/src/dotty/tools/dotc/config/JavaPlatform.scala similarity index 100% rename from src/dotty/tools/dotc/config/JavaPlatform.scala rename to compiler/src/dotty/tools/dotc/config/JavaPlatform.scala diff --git a/src/dotty/tools/dotc/config/OutputDirs.scala b/compiler/src/dotty/tools/dotc/config/OutputDirs.scala similarity index 100% rename from src/dotty/tools/dotc/config/OutputDirs.scala rename to compiler/src/dotty/tools/dotc/config/OutputDirs.scala diff --git a/src/dotty/tools/dotc/config/PathResolver.scala b/compiler/src/dotty/tools/dotc/config/PathResolver.scala similarity index 100% rename from src/dotty/tools/dotc/config/PathResolver.scala rename to compiler/src/dotty/tools/dotc/config/PathResolver.scala diff --git a/src/dotty/tools/dotc/config/Platform.scala b/compiler/src/dotty/tools/dotc/config/Platform.scala similarity index 100% rename from src/dotty/tools/dotc/config/Platform.scala rename to compiler/src/dotty/tools/dotc/config/Platform.scala diff --git a/src/dotty/tools/dotc/config/Printers.scala b/compiler/src/dotty/tools/dotc/config/Printers.scala similarity index 100% rename from src/dotty/tools/dotc/config/Printers.scala rename to compiler/src/dotty/tools/dotc/config/Printers.scala diff --git a/src/dotty/tools/dotc/config/Properties.scala b/compiler/src/dotty/tools/dotc/config/Properties.scala similarity index 100% rename from src/dotty/tools/dotc/config/Properties.scala rename to compiler/src/dotty/tools/dotc/config/Properties.scala diff --git a/src/dotty/tools/dotc/config/ScalaSettings.scala b/compiler/src/dotty/tools/dotc/config/ScalaSettings.scala similarity index 100% rename from src/dotty/tools/dotc/config/ScalaSettings.scala rename to compiler/src/dotty/tools/dotc/config/ScalaSettings.scala diff --git a/src/dotty/tools/dotc/config/ScalaVersion.scala b/compiler/src/dotty/tools/dotc/config/ScalaVersion.scala similarity index 100% rename from src/dotty/tools/dotc/config/ScalaVersion.scala rename to compiler/src/dotty/tools/dotc/config/ScalaVersion.scala diff --git a/src/dotty/tools/dotc/config/Settings.scala b/compiler/src/dotty/tools/dotc/config/Settings.scala similarity index 100% rename from src/dotty/tools/dotc/config/Settings.scala rename to compiler/src/dotty/tools/dotc/config/Settings.scala diff --git a/src/dotty/tools/dotc/config/WrappedProperties.scala b/compiler/src/dotty/tools/dotc/config/WrappedProperties.scala similarity index 100% rename from src/dotty/tools/dotc/config/WrappedProperties.scala rename to compiler/src/dotty/tools/dotc/config/WrappedProperties.scala diff --git a/src/dotty/tools/dotc/core/Annotations.scala b/compiler/src/dotty/tools/dotc/core/Annotations.scala similarity index 100% rename from src/dotty/tools/dotc/core/Annotations.scala rename to compiler/src/dotty/tools/dotc/core/Annotations.scala diff --git a/src/dotty/tools/dotc/core/CheckRealizable.scala b/compiler/src/dotty/tools/dotc/core/CheckRealizable.scala similarity index 100% rename from src/dotty/tools/dotc/core/CheckRealizable.scala rename to compiler/src/dotty/tools/dotc/core/CheckRealizable.scala diff --git a/src/dotty/tools/dotc/core/Comments.scala b/compiler/src/dotty/tools/dotc/core/Comments.scala similarity index 100% rename from src/dotty/tools/dotc/core/Comments.scala rename to compiler/src/dotty/tools/dotc/core/Comments.scala diff --git a/src/dotty/tools/dotc/core/Constants.scala b/compiler/src/dotty/tools/dotc/core/Constants.scala similarity index 100% rename from src/dotty/tools/dotc/core/Constants.scala rename to compiler/src/dotty/tools/dotc/core/Constants.scala diff --git a/src/dotty/tools/dotc/core/Constraint.scala b/compiler/src/dotty/tools/dotc/core/Constraint.scala similarity index 100% rename from src/dotty/tools/dotc/core/Constraint.scala rename to compiler/src/dotty/tools/dotc/core/Constraint.scala diff --git a/src/dotty/tools/dotc/core/ConstraintHandling.scala b/compiler/src/dotty/tools/dotc/core/ConstraintHandling.scala similarity index 100% rename from src/dotty/tools/dotc/core/ConstraintHandling.scala rename to compiler/src/dotty/tools/dotc/core/ConstraintHandling.scala diff --git a/src/dotty/tools/dotc/core/ConstraintRunInfo.scala b/compiler/src/dotty/tools/dotc/core/ConstraintRunInfo.scala similarity index 100% rename from src/dotty/tools/dotc/core/ConstraintRunInfo.scala rename to compiler/src/dotty/tools/dotc/core/ConstraintRunInfo.scala diff --git a/src/dotty/tools/dotc/core/Contexts.scala b/compiler/src/dotty/tools/dotc/core/Contexts.scala similarity index 100% rename from src/dotty/tools/dotc/core/Contexts.scala rename to compiler/src/dotty/tools/dotc/core/Contexts.scala diff --git a/src/dotty/tools/dotc/core/Decorators.scala b/compiler/src/dotty/tools/dotc/core/Decorators.scala similarity index 100% rename from src/dotty/tools/dotc/core/Decorators.scala rename to compiler/src/dotty/tools/dotc/core/Decorators.scala diff --git a/src/dotty/tools/dotc/core/Definitions.scala b/compiler/src/dotty/tools/dotc/core/Definitions.scala similarity index 100% rename from src/dotty/tools/dotc/core/Definitions.scala rename to compiler/src/dotty/tools/dotc/core/Definitions.scala diff --git a/src/dotty/tools/dotc/core/DenotTransformers.scala b/compiler/src/dotty/tools/dotc/core/DenotTransformers.scala similarity index 100% rename from src/dotty/tools/dotc/core/DenotTransformers.scala rename to compiler/src/dotty/tools/dotc/core/DenotTransformers.scala diff --git a/src/dotty/tools/dotc/core/Denotations.scala b/compiler/src/dotty/tools/dotc/core/Denotations.scala similarity index 100% rename from src/dotty/tools/dotc/core/Denotations.scala rename to compiler/src/dotty/tools/dotc/core/Denotations.scala diff --git a/src/dotty/tools/dotc/core/Flags.scala b/compiler/src/dotty/tools/dotc/core/Flags.scala similarity index 100% rename from src/dotty/tools/dotc/core/Flags.scala rename to compiler/src/dotty/tools/dotc/core/Flags.scala diff --git a/src/dotty/tools/dotc/core/Hashable.scala b/compiler/src/dotty/tools/dotc/core/Hashable.scala similarity index 100% rename from src/dotty/tools/dotc/core/Hashable.scala rename to compiler/src/dotty/tools/dotc/core/Hashable.scala diff --git a/src/dotty/tools/dotc/core/Mode.scala b/compiler/src/dotty/tools/dotc/core/Mode.scala similarity index 100% rename from src/dotty/tools/dotc/core/Mode.scala rename to compiler/src/dotty/tools/dotc/core/Mode.scala diff --git a/src/dotty/tools/dotc/core/NameOps.scala b/compiler/src/dotty/tools/dotc/core/NameOps.scala similarity index 100% rename from src/dotty/tools/dotc/core/NameOps.scala rename to compiler/src/dotty/tools/dotc/core/NameOps.scala diff --git a/src/dotty/tools/dotc/core/Names.scala b/compiler/src/dotty/tools/dotc/core/Names.scala similarity index 100% rename from src/dotty/tools/dotc/core/Names.scala rename to compiler/src/dotty/tools/dotc/core/Names.scala diff --git a/src/dotty/tools/dotc/core/OrderingConstraint.scala b/compiler/src/dotty/tools/dotc/core/OrderingConstraint.scala similarity index 100% rename from src/dotty/tools/dotc/core/OrderingConstraint.scala rename to compiler/src/dotty/tools/dotc/core/OrderingConstraint.scala diff --git a/src/dotty/tools/dotc/core/Periods.scala b/compiler/src/dotty/tools/dotc/core/Periods.scala similarity index 100% rename from src/dotty/tools/dotc/core/Periods.scala rename to compiler/src/dotty/tools/dotc/core/Periods.scala diff --git a/src/dotty/tools/dotc/core/Phases.scala b/compiler/src/dotty/tools/dotc/core/Phases.scala similarity index 100% rename from src/dotty/tools/dotc/core/Phases.scala rename to compiler/src/dotty/tools/dotc/core/Phases.scala diff --git a/src/dotty/tools/dotc/core/Scopes.scala b/compiler/src/dotty/tools/dotc/core/Scopes.scala similarity index 100% rename from src/dotty/tools/dotc/core/Scopes.scala rename to compiler/src/dotty/tools/dotc/core/Scopes.scala diff --git a/src/dotty/tools/dotc/core/Signature.scala b/compiler/src/dotty/tools/dotc/core/Signature.scala similarity index 100% rename from src/dotty/tools/dotc/core/Signature.scala rename to compiler/src/dotty/tools/dotc/core/Signature.scala diff --git a/src/dotty/tools/dotc/core/StdNames.scala b/compiler/src/dotty/tools/dotc/core/StdNames.scala similarity index 100% rename from src/dotty/tools/dotc/core/StdNames.scala rename to compiler/src/dotty/tools/dotc/core/StdNames.scala diff --git a/src/dotty/tools/dotc/core/Substituters.scala b/compiler/src/dotty/tools/dotc/core/Substituters.scala similarity index 100% rename from src/dotty/tools/dotc/core/Substituters.scala rename to compiler/src/dotty/tools/dotc/core/Substituters.scala diff --git a/src/dotty/tools/dotc/core/SymDenotations.scala b/compiler/src/dotty/tools/dotc/core/SymDenotations.scala similarity index 100% rename from src/dotty/tools/dotc/core/SymDenotations.scala rename to compiler/src/dotty/tools/dotc/core/SymDenotations.scala diff --git a/src/dotty/tools/dotc/core/SymbolLoaders.scala b/compiler/src/dotty/tools/dotc/core/SymbolLoaders.scala similarity index 100% rename from src/dotty/tools/dotc/core/SymbolLoaders.scala rename to compiler/src/dotty/tools/dotc/core/SymbolLoaders.scala diff --git a/src/dotty/tools/dotc/core/Symbols.scala b/compiler/src/dotty/tools/dotc/core/Symbols.scala similarity index 100% rename from src/dotty/tools/dotc/core/Symbols.scala rename to compiler/src/dotty/tools/dotc/core/Symbols.scala diff --git a/src/dotty/tools/dotc/core/TypeApplications.scala b/compiler/src/dotty/tools/dotc/core/TypeApplications.scala similarity index 100% rename from src/dotty/tools/dotc/core/TypeApplications.scala rename to compiler/src/dotty/tools/dotc/core/TypeApplications.scala diff --git a/src/dotty/tools/dotc/core/TypeComparer.scala b/compiler/src/dotty/tools/dotc/core/TypeComparer.scala similarity index 100% rename from src/dotty/tools/dotc/core/TypeComparer.scala rename to compiler/src/dotty/tools/dotc/core/TypeComparer.scala diff --git a/src/dotty/tools/dotc/core/TypeErasure.scala b/compiler/src/dotty/tools/dotc/core/TypeErasure.scala similarity index 100% rename from src/dotty/tools/dotc/core/TypeErasure.scala rename to compiler/src/dotty/tools/dotc/core/TypeErasure.scala diff --git a/src/dotty/tools/dotc/core/TypeOps.scala b/compiler/src/dotty/tools/dotc/core/TypeOps.scala similarity index 100% rename from src/dotty/tools/dotc/core/TypeOps.scala rename to compiler/src/dotty/tools/dotc/core/TypeOps.scala diff --git a/src/dotty/tools/dotc/core/TypeParamInfo.scala b/compiler/src/dotty/tools/dotc/core/TypeParamInfo.scala similarity index 100% rename from src/dotty/tools/dotc/core/TypeParamInfo.scala rename to compiler/src/dotty/tools/dotc/core/TypeParamInfo.scala diff --git a/src/dotty/tools/dotc/core/TyperState.scala b/compiler/src/dotty/tools/dotc/core/TyperState.scala similarity index 100% rename from src/dotty/tools/dotc/core/TyperState.scala rename to compiler/src/dotty/tools/dotc/core/TyperState.scala diff --git a/src/dotty/tools/dotc/core/Types.overflow b/compiler/src/dotty/tools/dotc/core/Types.overflow similarity index 100% rename from src/dotty/tools/dotc/core/Types.overflow rename to compiler/src/dotty/tools/dotc/core/Types.overflow diff --git a/src/dotty/tools/dotc/core/Types.scala b/compiler/src/dotty/tools/dotc/core/Types.scala similarity index 100% rename from src/dotty/tools/dotc/core/Types.scala rename to compiler/src/dotty/tools/dotc/core/Types.scala diff --git a/src/dotty/tools/dotc/core/Uniques.scala b/compiler/src/dotty/tools/dotc/core/Uniques.scala similarity index 100% rename from src/dotty/tools/dotc/core/Uniques.scala rename to compiler/src/dotty/tools/dotc/core/Uniques.scala diff --git a/src/dotty/tools/dotc/core/classfile/AbstractFileReader.scala b/compiler/src/dotty/tools/dotc/core/classfile/AbstractFileReader.scala similarity index 100% rename from src/dotty/tools/dotc/core/classfile/AbstractFileReader.scala rename to compiler/src/dotty/tools/dotc/core/classfile/AbstractFileReader.scala diff --git a/src/dotty/tools/dotc/core/classfile/ByteCodecs.scala b/compiler/src/dotty/tools/dotc/core/classfile/ByteCodecs.scala similarity index 100% rename from src/dotty/tools/dotc/core/classfile/ByteCodecs.scala rename to compiler/src/dotty/tools/dotc/core/classfile/ByteCodecs.scala diff --git a/src/dotty/tools/dotc/core/classfile/ClassfileConstants.scala b/compiler/src/dotty/tools/dotc/core/classfile/ClassfileConstants.scala similarity index 100% rename from src/dotty/tools/dotc/core/classfile/ClassfileConstants.scala rename to compiler/src/dotty/tools/dotc/core/classfile/ClassfileConstants.scala diff --git a/src/dotty/tools/dotc/core/classfile/ClassfileParser.scala b/compiler/src/dotty/tools/dotc/core/classfile/ClassfileParser.scala similarity index 100% rename from src/dotty/tools/dotc/core/classfile/ClassfileParser.scala rename to compiler/src/dotty/tools/dotc/core/classfile/ClassfileParser.scala diff --git a/src/dotty/tools/dotc/core/tasty/DottyUnpickler.scala b/compiler/src/dotty/tools/dotc/core/tasty/DottyUnpickler.scala similarity index 100% rename from src/dotty/tools/dotc/core/tasty/DottyUnpickler.scala rename to compiler/src/dotty/tools/dotc/core/tasty/DottyUnpickler.scala diff --git a/src/dotty/tools/dotc/core/tasty/NameBuffer.scala b/compiler/src/dotty/tools/dotc/core/tasty/NameBuffer.scala similarity index 100% rename from src/dotty/tools/dotc/core/tasty/NameBuffer.scala rename to compiler/src/dotty/tools/dotc/core/tasty/NameBuffer.scala diff --git a/src/dotty/tools/dotc/core/tasty/PositionPickler.scala b/compiler/src/dotty/tools/dotc/core/tasty/PositionPickler.scala similarity index 100% rename from src/dotty/tools/dotc/core/tasty/PositionPickler.scala rename to compiler/src/dotty/tools/dotc/core/tasty/PositionPickler.scala diff --git a/src/dotty/tools/dotc/core/tasty/PositionUnpickler.scala b/compiler/src/dotty/tools/dotc/core/tasty/PositionUnpickler.scala similarity index 100% rename from src/dotty/tools/dotc/core/tasty/PositionUnpickler.scala rename to compiler/src/dotty/tools/dotc/core/tasty/PositionUnpickler.scala diff --git a/src/dotty/tools/dotc/core/tasty/TastyBuffer.scala b/compiler/src/dotty/tools/dotc/core/tasty/TastyBuffer.scala similarity index 100% rename from src/dotty/tools/dotc/core/tasty/TastyBuffer.scala rename to compiler/src/dotty/tools/dotc/core/tasty/TastyBuffer.scala diff --git a/src/dotty/tools/dotc/core/tasty/TastyFormat.scala b/compiler/src/dotty/tools/dotc/core/tasty/TastyFormat.scala similarity index 100% rename from src/dotty/tools/dotc/core/tasty/TastyFormat.scala rename to compiler/src/dotty/tools/dotc/core/tasty/TastyFormat.scala diff --git a/src/dotty/tools/dotc/core/tasty/TastyName.scala b/compiler/src/dotty/tools/dotc/core/tasty/TastyName.scala similarity index 100% rename from src/dotty/tools/dotc/core/tasty/TastyName.scala rename to compiler/src/dotty/tools/dotc/core/tasty/TastyName.scala diff --git a/src/dotty/tools/dotc/core/tasty/TastyPickler.scala b/compiler/src/dotty/tools/dotc/core/tasty/TastyPickler.scala similarity index 100% rename from src/dotty/tools/dotc/core/tasty/TastyPickler.scala rename to compiler/src/dotty/tools/dotc/core/tasty/TastyPickler.scala diff --git a/src/dotty/tools/dotc/core/tasty/TastyPrinter.scala b/compiler/src/dotty/tools/dotc/core/tasty/TastyPrinter.scala similarity index 100% rename from src/dotty/tools/dotc/core/tasty/TastyPrinter.scala rename to compiler/src/dotty/tools/dotc/core/tasty/TastyPrinter.scala diff --git a/src/dotty/tools/dotc/core/tasty/TastyReader.scala b/compiler/src/dotty/tools/dotc/core/tasty/TastyReader.scala similarity index 100% rename from src/dotty/tools/dotc/core/tasty/TastyReader.scala rename to compiler/src/dotty/tools/dotc/core/tasty/TastyReader.scala diff --git a/src/dotty/tools/dotc/core/tasty/TastyUnpickler.scala b/compiler/src/dotty/tools/dotc/core/tasty/TastyUnpickler.scala similarity index 100% rename from src/dotty/tools/dotc/core/tasty/TastyUnpickler.scala rename to compiler/src/dotty/tools/dotc/core/tasty/TastyUnpickler.scala diff --git a/src/dotty/tools/dotc/core/tasty/TreeBuffer.scala b/compiler/src/dotty/tools/dotc/core/tasty/TreeBuffer.scala similarity index 100% rename from src/dotty/tools/dotc/core/tasty/TreeBuffer.scala rename to compiler/src/dotty/tools/dotc/core/tasty/TreeBuffer.scala diff --git a/src/dotty/tools/dotc/core/tasty/TreePickler.scala b/compiler/src/dotty/tools/dotc/core/tasty/TreePickler.scala similarity index 100% rename from src/dotty/tools/dotc/core/tasty/TreePickler.scala rename to compiler/src/dotty/tools/dotc/core/tasty/TreePickler.scala diff --git a/src/dotty/tools/dotc/core/tasty/TreeUnpickler.scala b/compiler/src/dotty/tools/dotc/core/tasty/TreeUnpickler.scala similarity index 100% rename from src/dotty/tools/dotc/core/tasty/TreeUnpickler.scala rename to compiler/src/dotty/tools/dotc/core/tasty/TreeUnpickler.scala diff --git a/src/dotty/tools/dotc/core/unpickleScala2/PickleBuffer.scala b/compiler/src/dotty/tools/dotc/core/unpickleScala2/PickleBuffer.scala similarity index 100% rename from src/dotty/tools/dotc/core/unpickleScala2/PickleBuffer.scala rename to compiler/src/dotty/tools/dotc/core/unpickleScala2/PickleBuffer.scala diff --git a/src/dotty/tools/dotc/core/unpickleScala2/Scala2Unpickler.scala b/compiler/src/dotty/tools/dotc/core/unpickleScala2/Scala2Unpickler.scala similarity index 100% rename from src/dotty/tools/dotc/core/unpickleScala2/Scala2Unpickler.scala rename to compiler/src/dotty/tools/dotc/core/unpickleScala2/Scala2Unpickler.scala diff --git a/src/dotty/tools/dotc/parsing/CharArrayReader.scala b/compiler/src/dotty/tools/dotc/parsing/CharArrayReader.scala similarity index 100% rename from src/dotty/tools/dotc/parsing/CharArrayReader.scala rename to compiler/src/dotty/tools/dotc/parsing/CharArrayReader.scala diff --git a/src/dotty/tools/dotc/parsing/JavaParsers.scala b/compiler/src/dotty/tools/dotc/parsing/JavaParsers.scala similarity index 100% rename from src/dotty/tools/dotc/parsing/JavaParsers.scala rename to compiler/src/dotty/tools/dotc/parsing/JavaParsers.scala diff --git a/src/dotty/tools/dotc/parsing/JavaScanners.scala b/compiler/src/dotty/tools/dotc/parsing/JavaScanners.scala similarity index 100% rename from src/dotty/tools/dotc/parsing/JavaScanners.scala rename to compiler/src/dotty/tools/dotc/parsing/JavaScanners.scala diff --git a/src/dotty/tools/dotc/parsing/JavaTokens.scala b/compiler/src/dotty/tools/dotc/parsing/JavaTokens.scala similarity index 100% rename from src/dotty/tools/dotc/parsing/JavaTokens.scala rename to compiler/src/dotty/tools/dotc/parsing/JavaTokens.scala diff --git a/src/dotty/tools/dotc/parsing/MarkupParserCommon.scala b/compiler/src/dotty/tools/dotc/parsing/MarkupParserCommon.scala similarity index 100% rename from src/dotty/tools/dotc/parsing/MarkupParserCommon.scala rename to compiler/src/dotty/tools/dotc/parsing/MarkupParserCommon.scala diff --git a/src/dotty/tools/dotc/parsing/MarkupParsers.scala b/compiler/src/dotty/tools/dotc/parsing/MarkupParsers.scala similarity index 100% rename from src/dotty/tools/dotc/parsing/MarkupParsers.scala rename to compiler/src/dotty/tools/dotc/parsing/MarkupParsers.scala diff --git a/src/dotty/tools/dotc/parsing/Parsers.scala b/compiler/src/dotty/tools/dotc/parsing/Parsers.scala similarity index 100% rename from src/dotty/tools/dotc/parsing/Parsers.scala rename to compiler/src/dotty/tools/dotc/parsing/Parsers.scala diff --git a/src/dotty/tools/dotc/parsing/Scanners.scala b/compiler/src/dotty/tools/dotc/parsing/Scanners.scala similarity index 100% rename from src/dotty/tools/dotc/parsing/Scanners.scala rename to compiler/src/dotty/tools/dotc/parsing/Scanners.scala diff --git a/src/dotty/tools/dotc/parsing/ScriptParsers.scala b/compiler/src/dotty/tools/dotc/parsing/ScriptParsers.scala similarity index 100% rename from src/dotty/tools/dotc/parsing/ScriptParsers.scala rename to compiler/src/dotty/tools/dotc/parsing/ScriptParsers.scala diff --git a/src/dotty/tools/dotc/parsing/SymbolicXMLBuilder.scala b/compiler/src/dotty/tools/dotc/parsing/SymbolicXMLBuilder.scala similarity index 100% rename from src/dotty/tools/dotc/parsing/SymbolicXMLBuilder.scala rename to compiler/src/dotty/tools/dotc/parsing/SymbolicXMLBuilder.scala diff --git a/src/dotty/tools/dotc/parsing/Tokens.scala b/compiler/src/dotty/tools/dotc/parsing/Tokens.scala similarity index 100% rename from src/dotty/tools/dotc/parsing/Tokens.scala rename to compiler/src/dotty/tools/dotc/parsing/Tokens.scala diff --git a/src/dotty/tools/dotc/parsing/TreeBuilder.scala.unused b/compiler/src/dotty/tools/dotc/parsing/TreeBuilder.scala.unused similarity index 100% rename from src/dotty/tools/dotc/parsing/TreeBuilder.scala.unused rename to compiler/src/dotty/tools/dotc/parsing/TreeBuilder.scala.unused diff --git a/src/dotty/tools/dotc/parsing/Utility.scala b/compiler/src/dotty/tools/dotc/parsing/Utility.scala similarity index 100% rename from src/dotty/tools/dotc/parsing/Utility.scala rename to compiler/src/dotty/tools/dotc/parsing/Utility.scala diff --git a/src/dotty/tools/dotc/parsing/package.scala b/compiler/src/dotty/tools/dotc/parsing/package.scala similarity index 100% rename from src/dotty/tools/dotc/parsing/package.scala rename to compiler/src/dotty/tools/dotc/parsing/package.scala diff --git a/src/dotty/tools/dotc/printing/Formatting.scala b/compiler/src/dotty/tools/dotc/printing/Formatting.scala similarity index 100% rename from src/dotty/tools/dotc/printing/Formatting.scala rename to compiler/src/dotty/tools/dotc/printing/Formatting.scala diff --git a/src/dotty/tools/dotc/printing/Highlighting.scala b/compiler/src/dotty/tools/dotc/printing/Highlighting.scala similarity index 100% rename from src/dotty/tools/dotc/printing/Highlighting.scala rename to compiler/src/dotty/tools/dotc/printing/Highlighting.scala diff --git a/src/dotty/tools/dotc/printing/PlainPrinter.scala b/compiler/src/dotty/tools/dotc/printing/PlainPrinter.scala similarity index 100% rename from src/dotty/tools/dotc/printing/PlainPrinter.scala rename to compiler/src/dotty/tools/dotc/printing/PlainPrinter.scala diff --git a/src/dotty/tools/dotc/printing/Printer.scala b/compiler/src/dotty/tools/dotc/printing/Printer.scala similarity index 100% rename from src/dotty/tools/dotc/printing/Printer.scala rename to compiler/src/dotty/tools/dotc/printing/Printer.scala diff --git a/src/dotty/tools/dotc/printing/Printers.scala b/compiler/src/dotty/tools/dotc/printing/Printers.scala similarity index 100% rename from src/dotty/tools/dotc/printing/Printers.scala rename to compiler/src/dotty/tools/dotc/printing/Printers.scala diff --git a/src/dotty/tools/dotc/printing/RefinedPrinter.scala b/compiler/src/dotty/tools/dotc/printing/RefinedPrinter.scala similarity index 100% rename from src/dotty/tools/dotc/printing/RefinedPrinter.scala rename to compiler/src/dotty/tools/dotc/printing/RefinedPrinter.scala diff --git a/src/dotty/tools/dotc/printing/Showable.scala b/compiler/src/dotty/tools/dotc/printing/Showable.scala similarity index 100% rename from src/dotty/tools/dotc/printing/Showable.scala rename to compiler/src/dotty/tools/dotc/printing/Showable.scala diff --git a/src/dotty/tools/dotc/printing/SyntaxHighlighting.scala b/compiler/src/dotty/tools/dotc/printing/SyntaxHighlighting.scala similarity index 100% rename from src/dotty/tools/dotc/printing/SyntaxHighlighting.scala rename to compiler/src/dotty/tools/dotc/printing/SyntaxHighlighting.scala diff --git a/src/dotty/tools/dotc/printing/Texts.scala b/compiler/src/dotty/tools/dotc/printing/Texts.scala similarity index 100% rename from src/dotty/tools/dotc/printing/Texts.scala rename to compiler/src/dotty/tools/dotc/printing/Texts.scala diff --git a/src/dotty/tools/dotc/printing/package.scala b/compiler/src/dotty/tools/dotc/printing/package.scala similarity index 100% rename from src/dotty/tools/dotc/printing/package.scala rename to compiler/src/dotty/tools/dotc/printing/package.scala diff --git a/src/dotty/tools/dotc/repl/AbstractFileClassLoader.scala b/compiler/src/dotty/tools/dotc/repl/AbstractFileClassLoader.scala similarity index 100% rename from src/dotty/tools/dotc/repl/AbstractFileClassLoader.scala rename to compiler/src/dotty/tools/dotc/repl/AbstractFileClassLoader.scala diff --git a/src/dotty/tools/dotc/repl/AmmoniteReader.scala b/compiler/src/dotty/tools/dotc/repl/AmmoniteReader.scala similarity index 100% rename from src/dotty/tools/dotc/repl/AmmoniteReader.scala rename to compiler/src/dotty/tools/dotc/repl/AmmoniteReader.scala diff --git a/src/dotty/tools/dotc/repl/CompilingInterpreter.scala b/compiler/src/dotty/tools/dotc/repl/CompilingInterpreter.scala similarity index 100% rename from src/dotty/tools/dotc/repl/CompilingInterpreter.scala rename to compiler/src/dotty/tools/dotc/repl/CompilingInterpreter.scala diff --git a/src/dotty/tools/dotc/repl/ConsoleWriter.scala b/compiler/src/dotty/tools/dotc/repl/ConsoleWriter.scala similarity index 100% rename from src/dotty/tools/dotc/repl/ConsoleWriter.scala rename to compiler/src/dotty/tools/dotc/repl/ConsoleWriter.scala diff --git a/src/dotty/tools/dotc/repl/InteractiveReader.scala b/compiler/src/dotty/tools/dotc/repl/InteractiveReader.scala similarity index 100% rename from src/dotty/tools/dotc/repl/InteractiveReader.scala rename to compiler/src/dotty/tools/dotc/repl/InteractiveReader.scala diff --git a/src/dotty/tools/dotc/repl/Interpreter.scala b/compiler/src/dotty/tools/dotc/repl/Interpreter.scala similarity index 100% rename from src/dotty/tools/dotc/repl/Interpreter.scala rename to compiler/src/dotty/tools/dotc/repl/Interpreter.scala diff --git a/src/dotty/tools/dotc/repl/InterpreterLoop.scala b/compiler/src/dotty/tools/dotc/repl/InterpreterLoop.scala similarity index 100% rename from src/dotty/tools/dotc/repl/InterpreterLoop.scala rename to compiler/src/dotty/tools/dotc/repl/InterpreterLoop.scala diff --git a/src/dotty/tools/dotc/repl/Main.scala b/compiler/src/dotty/tools/dotc/repl/Main.scala similarity index 100% rename from src/dotty/tools/dotc/repl/Main.scala rename to compiler/src/dotty/tools/dotc/repl/Main.scala diff --git a/src/dotty/tools/dotc/repl/ManifestInfo.scala b/compiler/src/dotty/tools/dotc/repl/ManifestInfo.scala similarity index 100% rename from src/dotty/tools/dotc/repl/ManifestInfo.scala rename to compiler/src/dotty/tools/dotc/repl/ManifestInfo.scala diff --git a/src/dotty/tools/dotc/repl/NewLinePrintWriter.scala b/compiler/src/dotty/tools/dotc/repl/NewLinePrintWriter.scala similarity index 100% rename from src/dotty/tools/dotc/repl/NewLinePrintWriter.scala rename to compiler/src/dotty/tools/dotc/repl/NewLinePrintWriter.scala diff --git a/src/dotty/tools/dotc/repl/REPL.scala b/compiler/src/dotty/tools/dotc/repl/REPL.scala similarity index 100% rename from src/dotty/tools/dotc/repl/REPL.scala rename to compiler/src/dotty/tools/dotc/repl/REPL.scala diff --git a/src/dotty/tools/dotc/repl/SimpleReader.scala b/compiler/src/dotty/tools/dotc/repl/SimpleReader.scala similarity index 100% rename from src/dotty/tools/dotc/repl/SimpleReader.scala rename to compiler/src/dotty/tools/dotc/repl/SimpleReader.scala diff --git a/src/dotty/tools/dotc/repl/ammonite/Ansi.scala b/compiler/src/dotty/tools/dotc/repl/ammonite/Ansi.scala similarity index 100% rename from src/dotty/tools/dotc/repl/ammonite/Ansi.scala rename to compiler/src/dotty/tools/dotc/repl/ammonite/Ansi.scala diff --git a/src/dotty/tools/dotc/repl/ammonite/Filter.scala b/compiler/src/dotty/tools/dotc/repl/ammonite/Filter.scala similarity index 100% rename from src/dotty/tools/dotc/repl/ammonite/Filter.scala rename to compiler/src/dotty/tools/dotc/repl/ammonite/Filter.scala diff --git a/src/dotty/tools/dotc/repl/ammonite/FilterTools.scala b/compiler/src/dotty/tools/dotc/repl/ammonite/FilterTools.scala similarity index 100% rename from src/dotty/tools/dotc/repl/ammonite/FilterTools.scala rename to compiler/src/dotty/tools/dotc/repl/ammonite/FilterTools.scala diff --git a/src/dotty/tools/dotc/repl/ammonite/LICENSE b/compiler/src/dotty/tools/dotc/repl/ammonite/LICENSE similarity index 100% rename from src/dotty/tools/dotc/repl/ammonite/LICENSE rename to compiler/src/dotty/tools/dotc/repl/ammonite/LICENSE diff --git a/src/dotty/tools/dotc/repl/ammonite/Protocol.scala b/compiler/src/dotty/tools/dotc/repl/ammonite/Protocol.scala similarity index 100% rename from src/dotty/tools/dotc/repl/ammonite/Protocol.scala rename to compiler/src/dotty/tools/dotc/repl/ammonite/Protocol.scala diff --git a/src/dotty/tools/dotc/repl/ammonite/SpecialKeys.scala b/compiler/src/dotty/tools/dotc/repl/ammonite/SpecialKeys.scala similarity index 100% rename from src/dotty/tools/dotc/repl/ammonite/SpecialKeys.scala rename to compiler/src/dotty/tools/dotc/repl/ammonite/SpecialKeys.scala diff --git a/src/dotty/tools/dotc/repl/ammonite/Terminal.scala b/compiler/src/dotty/tools/dotc/repl/ammonite/Terminal.scala similarity index 100% rename from src/dotty/tools/dotc/repl/ammonite/Terminal.scala rename to compiler/src/dotty/tools/dotc/repl/ammonite/Terminal.scala diff --git a/src/dotty/tools/dotc/repl/ammonite/Utils.scala b/compiler/src/dotty/tools/dotc/repl/ammonite/Utils.scala similarity index 100% rename from src/dotty/tools/dotc/repl/ammonite/Utils.scala rename to compiler/src/dotty/tools/dotc/repl/ammonite/Utils.scala diff --git a/src/dotty/tools/dotc/repl/ammonite/filters/BasicFilters.scala b/compiler/src/dotty/tools/dotc/repl/ammonite/filters/BasicFilters.scala similarity index 100% rename from src/dotty/tools/dotc/repl/ammonite/filters/BasicFilters.scala rename to compiler/src/dotty/tools/dotc/repl/ammonite/filters/BasicFilters.scala diff --git a/src/dotty/tools/dotc/repl/ammonite/filters/GUILikeFilters.scala b/compiler/src/dotty/tools/dotc/repl/ammonite/filters/GUILikeFilters.scala similarity index 100% rename from src/dotty/tools/dotc/repl/ammonite/filters/GUILikeFilters.scala rename to compiler/src/dotty/tools/dotc/repl/ammonite/filters/GUILikeFilters.scala diff --git a/src/dotty/tools/dotc/repl/ammonite/filters/HistoryFilter.scala b/compiler/src/dotty/tools/dotc/repl/ammonite/filters/HistoryFilter.scala similarity index 100% rename from src/dotty/tools/dotc/repl/ammonite/filters/HistoryFilter.scala rename to compiler/src/dotty/tools/dotc/repl/ammonite/filters/HistoryFilter.scala diff --git a/src/dotty/tools/dotc/repl/ammonite/filters/ReadlineFilters.scala b/compiler/src/dotty/tools/dotc/repl/ammonite/filters/ReadlineFilters.scala similarity index 100% rename from src/dotty/tools/dotc/repl/ammonite/filters/ReadlineFilters.scala rename to compiler/src/dotty/tools/dotc/repl/ammonite/filters/ReadlineFilters.scala diff --git a/src/dotty/tools/dotc/repl/ammonite/filters/UndoFilter.scala b/compiler/src/dotty/tools/dotc/repl/ammonite/filters/UndoFilter.scala similarity index 100% rename from src/dotty/tools/dotc/repl/ammonite/filters/UndoFilter.scala rename to compiler/src/dotty/tools/dotc/repl/ammonite/filters/UndoFilter.scala diff --git a/src/dotty/tools/dotc/reporting/ConsoleReporter.scala b/compiler/src/dotty/tools/dotc/reporting/ConsoleReporter.scala similarity index 100% rename from src/dotty/tools/dotc/reporting/ConsoleReporter.scala rename to compiler/src/dotty/tools/dotc/reporting/ConsoleReporter.scala diff --git a/src/dotty/tools/dotc/reporting/HideNonSensicalMessages.scala b/compiler/src/dotty/tools/dotc/reporting/HideNonSensicalMessages.scala similarity index 100% rename from src/dotty/tools/dotc/reporting/HideNonSensicalMessages.scala rename to compiler/src/dotty/tools/dotc/reporting/HideNonSensicalMessages.scala diff --git a/src/dotty/tools/dotc/reporting/MessageRendering.scala b/compiler/src/dotty/tools/dotc/reporting/MessageRendering.scala similarity index 100% rename from src/dotty/tools/dotc/reporting/MessageRendering.scala rename to compiler/src/dotty/tools/dotc/reporting/MessageRendering.scala diff --git a/src/dotty/tools/dotc/reporting/Reporter.scala b/compiler/src/dotty/tools/dotc/reporting/Reporter.scala similarity index 100% rename from src/dotty/tools/dotc/reporting/Reporter.scala rename to compiler/src/dotty/tools/dotc/reporting/Reporter.scala diff --git a/src/dotty/tools/dotc/reporting/StoreReporter.scala b/compiler/src/dotty/tools/dotc/reporting/StoreReporter.scala similarity index 100% rename from src/dotty/tools/dotc/reporting/StoreReporter.scala rename to compiler/src/dotty/tools/dotc/reporting/StoreReporter.scala diff --git a/src/dotty/tools/dotc/reporting/ThrowingReporter.scala b/compiler/src/dotty/tools/dotc/reporting/ThrowingReporter.scala similarity index 100% rename from src/dotty/tools/dotc/reporting/ThrowingReporter.scala rename to compiler/src/dotty/tools/dotc/reporting/ThrowingReporter.scala diff --git a/src/dotty/tools/dotc/reporting/UniqueMessagePositions.scala b/compiler/src/dotty/tools/dotc/reporting/UniqueMessagePositions.scala similarity index 100% rename from src/dotty/tools/dotc/reporting/UniqueMessagePositions.scala rename to compiler/src/dotty/tools/dotc/reporting/UniqueMessagePositions.scala diff --git a/src/dotty/tools/dotc/reporting/diagnostic/Message.scala b/compiler/src/dotty/tools/dotc/reporting/diagnostic/Message.scala similarity index 100% rename from src/dotty/tools/dotc/reporting/diagnostic/Message.scala rename to compiler/src/dotty/tools/dotc/reporting/diagnostic/Message.scala diff --git a/src/dotty/tools/dotc/reporting/diagnostic/MessageContainer.scala b/compiler/src/dotty/tools/dotc/reporting/diagnostic/MessageContainer.scala similarity index 100% rename from src/dotty/tools/dotc/reporting/diagnostic/MessageContainer.scala rename to compiler/src/dotty/tools/dotc/reporting/diagnostic/MessageContainer.scala diff --git a/src/dotty/tools/dotc/reporting/diagnostic/messages.scala b/compiler/src/dotty/tools/dotc/reporting/diagnostic/messages.scala similarity index 100% rename from src/dotty/tools/dotc/reporting/diagnostic/messages.scala rename to compiler/src/dotty/tools/dotc/reporting/diagnostic/messages.scala diff --git a/src/dotty/tools/dotc/rewrite/Rewrites.scala b/compiler/src/dotty/tools/dotc/rewrite/Rewrites.scala similarity index 100% rename from src/dotty/tools/dotc/rewrite/Rewrites.scala rename to compiler/src/dotty/tools/dotc/rewrite/Rewrites.scala diff --git a/src/dotty/tools/dotc/sbt/ExtractAPI.scala b/compiler/src/dotty/tools/dotc/sbt/ExtractAPI.scala similarity index 100% rename from src/dotty/tools/dotc/sbt/ExtractAPI.scala rename to compiler/src/dotty/tools/dotc/sbt/ExtractAPI.scala diff --git a/src/dotty/tools/dotc/sbt/ExtractDependencies.scala b/compiler/src/dotty/tools/dotc/sbt/ExtractDependencies.scala similarity index 100% rename from src/dotty/tools/dotc/sbt/ExtractDependencies.scala rename to compiler/src/dotty/tools/dotc/sbt/ExtractDependencies.scala diff --git a/src/dotty/tools/dotc/sbt/ShowAPI.scala b/compiler/src/dotty/tools/dotc/sbt/ShowAPI.scala similarity index 100% rename from src/dotty/tools/dotc/sbt/ShowAPI.scala rename to compiler/src/dotty/tools/dotc/sbt/ShowAPI.scala diff --git a/src/dotty/tools/dotc/sbt/ThunkHolder.scala b/compiler/src/dotty/tools/dotc/sbt/ThunkHolder.scala similarity index 100% rename from src/dotty/tools/dotc/sbt/ThunkHolder.scala rename to compiler/src/dotty/tools/dotc/sbt/ThunkHolder.scala diff --git a/src/dotty/tools/dotc/transform/ArrayConstructors.scala b/compiler/src/dotty/tools/dotc/transform/ArrayConstructors.scala similarity index 100% rename from src/dotty/tools/dotc/transform/ArrayConstructors.scala rename to compiler/src/dotty/tools/dotc/transform/ArrayConstructors.scala diff --git a/src/dotty/tools/dotc/transform/AugmentScala2Traits.scala b/compiler/src/dotty/tools/dotc/transform/AugmentScala2Traits.scala similarity index 100% rename from src/dotty/tools/dotc/transform/AugmentScala2Traits.scala rename to compiler/src/dotty/tools/dotc/transform/AugmentScala2Traits.scala diff --git a/src/dotty/tools/dotc/transform/CapturedVars.scala b/compiler/src/dotty/tools/dotc/transform/CapturedVars.scala similarity index 100% rename from src/dotty/tools/dotc/transform/CapturedVars.scala rename to compiler/src/dotty/tools/dotc/transform/CapturedVars.scala diff --git a/src/dotty/tools/dotc/transform/CheckReentrant.scala b/compiler/src/dotty/tools/dotc/transform/CheckReentrant.scala similarity index 100% rename from src/dotty/tools/dotc/transform/CheckReentrant.scala rename to compiler/src/dotty/tools/dotc/transform/CheckReentrant.scala diff --git a/src/dotty/tools/dotc/transform/CheckStatic.scala b/compiler/src/dotty/tools/dotc/transform/CheckStatic.scala similarity index 100% rename from src/dotty/tools/dotc/transform/CheckStatic.scala rename to compiler/src/dotty/tools/dotc/transform/CheckStatic.scala diff --git a/src/dotty/tools/dotc/transform/ClassOf.scala b/compiler/src/dotty/tools/dotc/transform/ClassOf.scala similarity index 100% rename from src/dotty/tools/dotc/transform/ClassOf.scala rename to compiler/src/dotty/tools/dotc/transform/ClassOf.scala diff --git a/src/dotty/tools/dotc/transform/CollectEntryPoints.scala b/compiler/src/dotty/tools/dotc/transform/CollectEntryPoints.scala similarity index 100% rename from src/dotty/tools/dotc/transform/CollectEntryPoints.scala rename to compiler/src/dotty/tools/dotc/transform/CollectEntryPoints.scala diff --git a/src/dotty/tools/dotc/transform/Constructors.scala b/compiler/src/dotty/tools/dotc/transform/Constructors.scala similarity index 100% rename from src/dotty/tools/dotc/transform/Constructors.scala rename to compiler/src/dotty/tools/dotc/transform/Constructors.scala diff --git a/src/dotty/tools/dotc/transform/CrossCastAnd.scala b/compiler/src/dotty/tools/dotc/transform/CrossCastAnd.scala similarity index 100% rename from src/dotty/tools/dotc/transform/CrossCastAnd.scala rename to compiler/src/dotty/tools/dotc/transform/CrossCastAnd.scala diff --git a/src/dotty/tools/dotc/transform/CtxLazy.scala b/compiler/src/dotty/tools/dotc/transform/CtxLazy.scala similarity index 100% rename from src/dotty/tools/dotc/transform/CtxLazy.scala rename to compiler/src/dotty/tools/dotc/transform/CtxLazy.scala diff --git a/src/dotty/tools/dotc/transform/DropEmptyCompanions.scala.disabled b/compiler/src/dotty/tools/dotc/transform/DropEmptyCompanions.scala.disabled similarity index 100% rename from src/dotty/tools/dotc/transform/DropEmptyCompanions.scala.disabled rename to compiler/src/dotty/tools/dotc/transform/DropEmptyCompanions.scala.disabled diff --git a/src/dotty/tools/dotc/transform/DropInlined.scala b/compiler/src/dotty/tools/dotc/transform/DropInlined.scala similarity index 100% rename from src/dotty/tools/dotc/transform/DropInlined.scala rename to compiler/src/dotty/tools/dotc/transform/DropInlined.scala diff --git a/src/dotty/tools/dotc/transform/ElimByName.scala b/compiler/src/dotty/tools/dotc/transform/ElimByName.scala similarity index 100% rename from src/dotty/tools/dotc/transform/ElimByName.scala rename to compiler/src/dotty/tools/dotc/transform/ElimByName.scala diff --git a/src/dotty/tools/dotc/transform/ElimErasedValueType.scala b/compiler/src/dotty/tools/dotc/transform/ElimErasedValueType.scala similarity index 100% rename from src/dotty/tools/dotc/transform/ElimErasedValueType.scala rename to compiler/src/dotty/tools/dotc/transform/ElimErasedValueType.scala diff --git a/src/dotty/tools/dotc/transform/ElimRepeated.scala b/compiler/src/dotty/tools/dotc/transform/ElimRepeated.scala similarity index 100% rename from src/dotty/tools/dotc/transform/ElimRepeated.scala rename to compiler/src/dotty/tools/dotc/transform/ElimRepeated.scala diff --git a/src/dotty/tools/dotc/transform/ElimStaticThis.scala b/compiler/src/dotty/tools/dotc/transform/ElimStaticThis.scala similarity index 100% rename from src/dotty/tools/dotc/transform/ElimStaticThis.scala rename to compiler/src/dotty/tools/dotc/transform/ElimStaticThis.scala diff --git a/src/dotty/tools/dotc/transform/Erasure.scala b/compiler/src/dotty/tools/dotc/transform/Erasure.scala similarity index 100% rename from src/dotty/tools/dotc/transform/Erasure.scala rename to compiler/src/dotty/tools/dotc/transform/Erasure.scala diff --git a/src/dotty/tools/dotc/transform/ExpandPrivate.scala b/compiler/src/dotty/tools/dotc/transform/ExpandPrivate.scala similarity index 100% rename from src/dotty/tools/dotc/transform/ExpandPrivate.scala rename to compiler/src/dotty/tools/dotc/transform/ExpandPrivate.scala diff --git a/src/dotty/tools/dotc/transform/ExpandSAMs.scala b/compiler/src/dotty/tools/dotc/transform/ExpandSAMs.scala similarity index 100% rename from src/dotty/tools/dotc/transform/ExpandSAMs.scala rename to compiler/src/dotty/tools/dotc/transform/ExpandSAMs.scala diff --git a/src/dotty/tools/dotc/transform/ExplicitOuter.scala b/compiler/src/dotty/tools/dotc/transform/ExplicitOuter.scala similarity index 100% rename from src/dotty/tools/dotc/transform/ExplicitOuter.scala rename to compiler/src/dotty/tools/dotc/transform/ExplicitOuter.scala diff --git a/src/dotty/tools/dotc/transform/ExplicitSelf.scala b/compiler/src/dotty/tools/dotc/transform/ExplicitSelf.scala similarity index 100% rename from src/dotty/tools/dotc/transform/ExplicitSelf.scala rename to compiler/src/dotty/tools/dotc/transform/ExplicitSelf.scala diff --git a/src/dotty/tools/dotc/transform/ExtensionMethods.scala b/compiler/src/dotty/tools/dotc/transform/ExtensionMethods.scala similarity index 100% rename from src/dotty/tools/dotc/transform/ExtensionMethods.scala rename to compiler/src/dotty/tools/dotc/transform/ExtensionMethods.scala diff --git a/src/dotty/tools/dotc/transform/FirstTransform.scala b/compiler/src/dotty/tools/dotc/transform/FirstTransform.scala similarity index 100% rename from src/dotty/tools/dotc/transform/FirstTransform.scala rename to compiler/src/dotty/tools/dotc/transform/FirstTransform.scala diff --git a/src/dotty/tools/dotc/transform/Flatten.scala b/compiler/src/dotty/tools/dotc/transform/Flatten.scala similarity index 100% rename from src/dotty/tools/dotc/transform/Flatten.scala rename to compiler/src/dotty/tools/dotc/transform/Flatten.scala diff --git a/src/dotty/tools/dotc/transform/FullParameterization.scala b/compiler/src/dotty/tools/dotc/transform/FullParameterization.scala similarity index 100% rename from src/dotty/tools/dotc/transform/FullParameterization.scala rename to compiler/src/dotty/tools/dotc/transform/FullParameterization.scala diff --git a/src/dotty/tools/dotc/transform/FunctionalInterfaces.scala b/compiler/src/dotty/tools/dotc/transform/FunctionalInterfaces.scala similarity index 100% rename from src/dotty/tools/dotc/transform/FunctionalInterfaces.scala rename to compiler/src/dotty/tools/dotc/transform/FunctionalInterfaces.scala diff --git a/src/dotty/tools/dotc/transform/GetClass.scala b/compiler/src/dotty/tools/dotc/transform/GetClass.scala similarity index 100% rename from src/dotty/tools/dotc/transform/GetClass.scala rename to compiler/src/dotty/tools/dotc/transform/GetClass.scala diff --git a/src/dotty/tools/dotc/transform/Getters.scala b/compiler/src/dotty/tools/dotc/transform/Getters.scala similarity index 100% rename from src/dotty/tools/dotc/transform/Getters.scala rename to compiler/src/dotty/tools/dotc/transform/Getters.scala diff --git a/src/dotty/tools/dotc/transform/InterceptedMethods.scala b/compiler/src/dotty/tools/dotc/transform/InterceptedMethods.scala similarity index 100% rename from src/dotty/tools/dotc/transform/InterceptedMethods.scala rename to compiler/src/dotty/tools/dotc/transform/InterceptedMethods.scala diff --git a/src/dotty/tools/dotc/transform/IsInstanceOfEvaluator.scala b/compiler/src/dotty/tools/dotc/transform/IsInstanceOfEvaluator.scala similarity index 100% rename from src/dotty/tools/dotc/transform/IsInstanceOfEvaluator.scala rename to compiler/src/dotty/tools/dotc/transform/IsInstanceOfEvaluator.scala diff --git a/src/dotty/tools/dotc/transform/LambdaLift.scala b/compiler/src/dotty/tools/dotc/transform/LambdaLift.scala similarity index 100% rename from src/dotty/tools/dotc/transform/LambdaLift.scala rename to compiler/src/dotty/tools/dotc/transform/LambdaLift.scala diff --git a/src/dotty/tools/dotc/transform/LazyVals.scala b/compiler/src/dotty/tools/dotc/transform/LazyVals.scala similarity index 100% rename from src/dotty/tools/dotc/transform/LazyVals.scala rename to compiler/src/dotty/tools/dotc/transform/LazyVals.scala diff --git a/src/dotty/tools/dotc/transform/LiftTry.scala b/compiler/src/dotty/tools/dotc/transform/LiftTry.scala similarity index 100% rename from src/dotty/tools/dotc/transform/LiftTry.scala rename to compiler/src/dotty/tools/dotc/transform/LiftTry.scala diff --git a/src/dotty/tools/dotc/transform/LinkScala2ImplClasses.scala b/compiler/src/dotty/tools/dotc/transform/LinkScala2ImplClasses.scala similarity index 100% rename from src/dotty/tools/dotc/transform/LinkScala2ImplClasses.scala rename to compiler/src/dotty/tools/dotc/transform/LinkScala2ImplClasses.scala diff --git a/src/dotty/tools/dotc/transform/Literalize.scala.disabled b/compiler/src/dotty/tools/dotc/transform/Literalize.scala.disabled similarity index 100% rename from src/dotty/tools/dotc/transform/Literalize.scala.disabled rename to compiler/src/dotty/tools/dotc/transform/Literalize.scala.disabled diff --git a/src/dotty/tools/dotc/transform/MacroTransform.scala b/compiler/src/dotty/tools/dotc/transform/MacroTransform.scala similarity index 100% rename from src/dotty/tools/dotc/transform/MacroTransform.scala rename to compiler/src/dotty/tools/dotc/transform/MacroTransform.scala diff --git a/src/dotty/tools/dotc/transform/Memoize.scala b/compiler/src/dotty/tools/dotc/transform/Memoize.scala similarity index 100% rename from src/dotty/tools/dotc/transform/Memoize.scala rename to compiler/src/dotty/tools/dotc/transform/Memoize.scala diff --git a/src/dotty/tools/dotc/transform/Mixin.scala b/compiler/src/dotty/tools/dotc/transform/Mixin.scala similarity index 100% rename from src/dotty/tools/dotc/transform/Mixin.scala rename to compiler/src/dotty/tools/dotc/transform/Mixin.scala diff --git a/src/dotty/tools/dotc/transform/MixinOps.scala b/compiler/src/dotty/tools/dotc/transform/MixinOps.scala similarity index 100% rename from src/dotty/tools/dotc/transform/MixinOps.scala rename to compiler/src/dotty/tools/dotc/transform/MixinOps.scala diff --git a/src/dotty/tools/dotc/transform/MoveStatics.scala b/compiler/src/dotty/tools/dotc/transform/MoveStatics.scala similarity index 100% rename from src/dotty/tools/dotc/transform/MoveStatics.scala rename to compiler/src/dotty/tools/dotc/transform/MoveStatics.scala diff --git a/src/dotty/tools/dotc/transform/NonLocalReturns.scala b/compiler/src/dotty/tools/dotc/transform/NonLocalReturns.scala similarity index 100% rename from src/dotty/tools/dotc/transform/NonLocalReturns.scala rename to compiler/src/dotty/tools/dotc/transform/NonLocalReturns.scala diff --git a/src/dotty/tools/dotc/transform/NormalizeFlags.scala b/compiler/src/dotty/tools/dotc/transform/NormalizeFlags.scala similarity index 100% rename from src/dotty/tools/dotc/transform/NormalizeFlags.scala rename to compiler/src/dotty/tools/dotc/transform/NormalizeFlags.scala diff --git a/src/dotty/tools/dotc/transform/OverridingPairs.scala b/compiler/src/dotty/tools/dotc/transform/OverridingPairs.scala similarity index 100% rename from src/dotty/tools/dotc/transform/OverridingPairs.scala rename to compiler/src/dotty/tools/dotc/transform/OverridingPairs.scala diff --git a/src/dotty/tools/dotc/transform/ParamForwarding.scala b/compiler/src/dotty/tools/dotc/transform/ParamForwarding.scala similarity index 100% rename from src/dotty/tools/dotc/transform/ParamForwarding.scala rename to compiler/src/dotty/tools/dotc/transform/ParamForwarding.scala diff --git a/src/dotty/tools/dotc/transform/PatternMatcher.scala b/compiler/src/dotty/tools/dotc/transform/PatternMatcher.scala similarity index 100% rename from src/dotty/tools/dotc/transform/PatternMatcher.scala rename to compiler/src/dotty/tools/dotc/transform/PatternMatcher.scala diff --git a/src/dotty/tools/dotc/transform/Pickler.scala b/compiler/src/dotty/tools/dotc/transform/Pickler.scala similarity index 100% rename from src/dotty/tools/dotc/transform/Pickler.scala rename to compiler/src/dotty/tools/dotc/transform/Pickler.scala diff --git a/src/dotty/tools/dotc/transform/PostTyper.scala b/compiler/src/dotty/tools/dotc/transform/PostTyper.scala similarity index 100% rename from src/dotty/tools/dotc/transform/PostTyper.scala rename to compiler/src/dotty/tools/dotc/transform/PostTyper.scala diff --git a/src/dotty/tools/dotc/transform/PrivateToStatic.scala.disabled b/compiler/src/dotty/tools/dotc/transform/PrivateToStatic.scala.disabled similarity index 100% rename from src/dotty/tools/dotc/transform/PrivateToStatic.scala.disabled rename to compiler/src/dotty/tools/dotc/transform/PrivateToStatic.scala.disabled diff --git a/src/dotty/tools/dotc/transform/ResolveSuper.scala b/compiler/src/dotty/tools/dotc/transform/ResolveSuper.scala similarity index 100% rename from src/dotty/tools/dotc/transform/ResolveSuper.scala rename to compiler/src/dotty/tools/dotc/transform/ResolveSuper.scala diff --git a/src/dotty/tools/dotc/transform/RestoreScopes.scala b/compiler/src/dotty/tools/dotc/transform/RestoreScopes.scala similarity index 100% rename from src/dotty/tools/dotc/transform/RestoreScopes.scala rename to compiler/src/dotty/tools/dotc/transform/RestoreScopes.scala diff --git a/src/dotty/tools/dotc/transform/SelectStatic.scala b/compiler/src/dotty/tools/dotc/transform/SelectStatic.scala similarity index 100% rename from src/dotty/tools/dotc/transform/SelectStatic.scala rename to compiler/src/dotty/tools/dotc/transform/SelectStatic.scala diff --git a/src/dotty/tools/dotc/transform/SeqLiterals.scala b/compiler/src/dotty/tools/dotc/transform/SeqLiterals.scala similarity index 100% rename from src/dotty/tools/dotc/transform/SeqLiterals.scala rename to compiler/src/dotty/tools/dotc/transform/SeqLiterals.scala diff --git a/src/dotty/tools/dotc/transform/Splitter.scala b/compiler/src/dotty/tools/dotc/transform/Splitter.scala similarity index 100% rename from src/dotty/tools/dotc/transform/Splitter.scala rename to compiler/src/dotty/tools/dotc/transform/Splitter.scala diff --git a/src/dotty/tools/dotc/transform/SuperAccessors.scala b/compiler/src/dotty/tools/dotc/transform/SuperAccessors.scala similarity index 100% rename from src/dotty/tools/dotc/transform/SuperAccessors.scala rename to compiler/src/dotty/tools/dotc/transform/SuperAccessors.scala diff --git a/src/dotty/tools/dotc/transform/SymUtils.scala b/compiler/src/dotty/tools/dotc/transform/SymUtils.scala similarity index 100% rename from src/dotty/tools/dotc/transform/SymUtils.scala rename to compiler/src/dotty/tools/dotc/transform/SymUtils.scala diff --git a/src/dotty/tools/dotc/transform/SyntheticMethods.scala b/compiler/src/dotty/tools/dotc/transform/SyntheticMethods.scala similarity index 100% rename from src/dotty/tools/dotc/transform/SyntheticMethods.scala rename to compiler/src/dotty/tools/dotc/transform/SyntheticMethods.scala diff --git a/src/dotty/tools/dotc/transform/TailRec.scala b/compiler/src/dotty/tools/dotc/transform/TailRec.scala similarity index 100% rename from src/dotty/tools/dotc/transform/TailRec.scala rename to compiler/src/dotty/tools/dotc/transform/TailRec.scala diff --git a/src/dotty/tools/dotc/transform/TreeChecker.scala b/compiler/src/dotty/tools/dotc/transform/TreeChecker.scala similarity index 100% rename from src/dotty/tools/dotc/transform/TreeChecker.scala rename to compiler/src/dotty/tools/dotc/transform/TreeChecker.scala diff --git a/src/dotty/tools/dotc/transform/TreeExtractors.scala b/compiler/src/dotty/tools/dotc/transform/TreeExtractors.scala similarity index 100% rename from src/dotty/tools/dotc/transform/TreeExtractors.scala rename to compiler/src/dotty/tools/dotc/transform/TreeExtractors.scala diff --git a/src/dotty/tools/dotc/transform/TreeGen.scala b/compiler/src/dotty/tools/dotc/transform/TreeGen.scala similarity index 100% rename from src/dotty/tools/dotc/transform/TreeGen.scala rename to compiler/src/dotty/tools/dotc/transform/TreeGen.scala diff --git a/src/dotty/tools/dotc/transform/TreeTransform.scala b/compiler/src/dotty/tools/dotc/transform/TreeTransform.scala similarity index 100% rename from src/dotty/tools/dotc/transform/TreeTransform.scala rename to compiler/src/dotty/tools/dotc/transform/TreeTransform.scala diff --git a/src/dotty/tools/dotc/transform/TryCatchPatterns.scala b/compiler/src/dotty/tools/dotc/transform/TryCatchPatterns.scala similarity index 100% rename from src/dotty/tools/dotc/transform/TryCatchPatterns.scala rename to compiler/src/dotty/tools/dotc/transform/TryCatchPatterns.scala diff --git a/src/dotty/tools/dotc/transform/TypeTestsCasts.scala b/compiler/src/dotty/tools/dotc/transform/TypeTestsCasts.scala similarity index 100% rename from src/dotty/tools/dotc/transform/TypeTestsCasts.scala rename to compiler/src/dotty/tools/dotc/transform/TypeTestsCasts.scala diff --git a/src/dotty/tools/dotc/transform/TypeUtils.scala b/compiler/src/dotty/tools/dotc/transform/TypeUtils.scala similarity index 100% rename from src/dotty/tools/dotc/transform/TypeUtils.scala rename to compiler/src/dotty/tools/dotc/transform/TypeUtils.scala diff --git a/src/dotty/tools/dotc/transform/VCElideAllocations.scala b/compiler/src/dotty/tools/dotc/transform/VCElideAllocations.scala similarity index 100% rename from src/dotty/tools/dotc/transform/VCElideAllocations.scala rename to compiler/src/dotty/tools/dotc/transform/VCElideAllocations.scala diff --git a/src/dotty/tools/dotc/transform/VCInlineMethods.scala b/compiler/src/dotty/tools/dotc/transform/VCInlineMethods.scala similarity index 100% rename from src/dotty/tools/dotc/transform/VCInlineMethods.scala rename to compiler/src/dotty/tools/dotc/transform/VCInlineMethods.scala diff --git a/src/dotty/tools/dotc/transform/ValueClasses.scala b/compiler/src/dotty/tools/dotc/transform/ValueClasses.scala similarity index 100% rename from src/dotty/tools/dotc/transform/ValueClasses.scala rename to compiler/src/dotty/tools/dotc/transform/ValueClasses.scala diff --git a/src/dotty/tools/dotc/transform/patmat/Space.scala b/compiler/src/dotty/tools/dotc/transform/patmat/Space.scala similarity index 100% rename from src/dotty/tools/dotc/transform/patmat/Space.scala rename to compiler/src/dotty/tools/dotc/transform/patmat/Space.scala diff --git a/src/dotty/tools/dotc/typer/Applications.scala b/compiler/src/dotty/tools/dotc/typer/Applications.scala similarity index 100% rename from src/dotty/tools/dotc/typer/Applications.scala rename to compiler/src/dotty/tools/dotc/typer/Applications.scala diff --git a/src/dotty/tools/dotc/typer/Checking.scala b/compiler/src/dotty/tools/dotc/typer/Checking.scala similarity index 100% rename from src/dotty/tools/dotc/typer/Checking.scala rename to compiler/src/dotty/tools/dotc/typer/Checking.scala diff --git a/src/dotty/tools/dotc/typer/ConstFold.scala b/compiler/src/dotty/tools/dotc/typer/ConstFold.scala similarity index 100% rename from src/dotty/tools/dotc/typer/ConstFold.scala rename to compiler/src/dotty/tools/dotc/typer/ConstFold.scala diff --git a/src/dotty/tools/dotc/typer/Docstrings.scala b/compiler/src/dotty/tools/dotc/typer/Docstrings.scala similarity index 100% rename from src/dotty/tools/dotc/typer/Docstrings.scala rename to compiler/src/dotty/tools/dotc/typer/Docstrings.scala diff --git a/src/dotty/tools/dotc/typer/Dynamic.scala b/compiler/src/dotty/tools/dotc/typer/Dynamic.scala similarity index 100% rename from src/dotty/tools/dotc/typer/Dynamic.scala rename to compiler/src/dotty/tools/dotc/typer/Dynamic.scala diff --git a/src/dotty/tools/dotc/typer/ErrorReporting.scala b/compiler/src/dotty/tools/dotc/typer/ErrorReporting.scala similarity index 100% rename from src/dotty/tools/dotc/typer/ErrorReporting.scala rename to compiler/src/dotty/tools/dotc/typer/ErrorReporting.scala diff --git a/src/dotty/tools/dotc/typer/EtaExpansion.scala b/compiler/src/dotty/tools/dotc/typer/EtaExpansion.scala similarity index 100% rename from src/dotty/tools/dotc/typer/EtaExpansion.scala rename to compiler/src/dotty/tools/dotc/typer/EtaExpansion.scala diff --git a/src/dotty/tools/dotc/typer/FrontEnd.scala b/compiler/src/dotty/tools/dotc/typer/FrontEnd.scala similarity index 100% rename from src/dotty/tools/dotc/typer/FrontEnd.scala rename to compiler/src/dotty/tools/dotc/typer/FrontEnd.scala diff --git a/src/dotty/tools/dotc/typer/Implicits.scala b/compiler/src/dotty/tools/dotc/typer/Implicits.scala similarity index 100% rename from src/dotty/tools/dotc/typer/Implicits.scala rename to compiler/src/dotty/tools/dotc/typer/Implicits.scala diff --git a/src/dotty/tools/dotc/typer/ImportInfo.scala b/compiler/src/dotty/tools/dotc/typer/ImportInfo.scala similarity index 100% rename from src/dotty/tools/dotc/typer/ImportInfo.scala rename to compiler/src/dotty/tools/dotc/typer/ImportInfo.scala diff --git a/src/dotty/tools/dotc/typer/Inferencing.scala b/compiler/src/dotty/tools/dotc/typer/Inferencing.scala similarity index 100% rename from src/dotty/tools/dotc/typer/Inferencing.scala rename to compiler/src/dotty/tools/dotc/typer/Inferencing.scala diff --git a/src/dotty/tools/dotc/typer/Inliner.scala b/compiler/src/dotty/tools/dotc/typer/Inliner.scala similarity index 100% rename from src/dotty/tools/dotc/typer/Inliner.scala rename to compiler/src/dotty/tools/dotc/typer/Inliner.scala diff --git a/src/dotty/tools/dotc/typer/Namer.scala b/compiler/src/dotty/tools/dotc/typer/Namer.scala similarity index 100% rename from src/dotty/tools/dotc/typer/Namer.scala rename to compiler/src/dotty/tools/dotc/typer/Namer.scala diff --git a/src/dotty/tools/dotc/typer/ProtoTypes.scala b/compiler/src/dotty/tools/dotc/typer/ProtoTypes.scala similarity index 100% rename from src/dotty/tools/dotc/typer/ProtoTypes.scala rename to compiler/src/dotty/tools/dotc/typer/ProtoTypes.scala diff --git a/src/dotty/tools/dotc/typer/ReTyper.scala b/compiler/src/dotty/tools/dotc/typer/ReTyper.scala similarity index 100% rename from src/dotty/tools/dotc/typer/ReTyper.scala rename to compiler/src/dotty/tools/dotc/typer/ReTyper.scala diff --git a/src/dotty/tools/dotc/typer/RefChecks.scala b/compiler/src/dotty/tools/dotc/typer/RefChecks.scala similarity index 100% rename from src/dotty/tools/dotc/typer/RefChecks.scala rename to compiler/src/dotty/tools/dotc/typer/RefChecks.scala diff --git a/src/dotty/tools/dotc/typer/TypeAssigner.scala b/compiler/src/dotty/tools/dotc/typer/TypeAssigner.scala similarity index 100% rename from src/dotty/tools/dotc/typer/TypeAssigner.scala rename to compiler/src/dotty/tools/dotc/typer/TypeAssigner.scala diff --git a/src/dotty/tools/dotc/typer/Typer.scala b/compiler/src/dotty/tools/dotc/typer/Typer.scala similarity index 100% rename from src/dotty/tools/dotc/typer/Typer.scala rename to compiler/src/dotty/tools/dotc/typer/Typer.scala diff --git a/src/dotty/tools/dotc/typer/VarianceChecker.scala b/compiler/src/dotty/tools/dotc/typer/VarianceChecker.scala similarity index 100% rename from src/dotty/tools/dotc/typer/VarianceChecker.scala rename to compiler/src/dotty/tools/dotc/typer/VarianceChecker.scala diff --git a/src/dotty/tools/dotc/typer/Variances.scala b/compiler/src/dotty/tools/dotc/typer/Variances.scala similarity index 100% rename from src/dotty/tools/dotc/typer/Variances.scala rename to compiler/src/dotty/tools/dotc/typer/Variances.scala diff --git a/src/dotty/tools/dotc/util/Attachment.scala b/compiler/src/dotty/tools/dotc/util/Attachment.scala similarity index 100% rename from src/dotty/tools/dotc/util/Attachment.scala rename to compiler/src/dotty/tools/dotc/util/Attachment.scala diff --git a/src/dotty/tools/dotc/util/Chars.scala b/compiler/src/dotty/tools/dotc/util/Chars.scala similarity index 100% rename from src/dotty/tools/dotc/util/Chars.scala rename to compiler/src/dotty/tools/dotc/util/Chars.scala diff --git a/src/dotty/tools/dotc/util/CommentParsing.scala b/compiler/src/dotty/tools/dotc/util/CommentParsing.scala similarity index 100% rename from src/dotty/tools/dotc/util/CommentParsing.scala rename to compiler/src/dotty/tools/dotc/util/CommentParsing.scala diff --git a/src/dotty/tools/dotc/util/DiffUtil.scala b/compiler/src/dotty/tools/dotc/util/DiffUtil.scala similarity index 100% rename from src/dotty/tools/dotc/util/DiffUtil.scala rename to compiler/src/dotty/tools/dotc/util/DiffUtil.scala diff --git a/src/dotty/tools/dotc/util/DotClass.scala b/compiler/src/dotty/tools/dotc/util/DotClass.scala similarity index 100% rename from src/dotty/tools/dotc/util/DotClass.scala rename to compiler/src/dotty/tools/dotc/util/DotClass.scala diff --git a/src/dotty/tools/dotc/util/FreshNameCreator.scala b/compiler/src/dotty/tools/dotc/util/FreshNameCreator.scala similarity index 100% rename from src/dotty/tools/dotc/util/FreshNameCreator.scala rename to compiler/src/dotty/tools/dotc/util/FreshNameCreator.scala diff --git a/src/dotty/tools/dotc/util/HashSet.scala b/compiler/src/dotty/tools/dotc/util/HashSet.scala similarity index 100% rename from src/dotty/tools/dotc/util/HashSet.scala rename to compiler/src/dotty/tools/dotc/util/HashSet.scala diff --git a/src/dotty/tools/dotc/util/LRUCache.scala b/compiler/src/dotty/tools/dotc/util/LRUCache.scala similarity index 100% rename from src/dotty/tools/dotc/util/LRUCache.scala rename to compiler/src/dotty/tools/dotc/util/LRUCache.scala diff --git a/src/dotty/tools/dotc/util/NameTransformer.scala b/compiler/src/dotty/tools/dotc/util/NameTransformer.scala similarity index 100% rename from src/dotty/tools/dotc/util/NameTransformer.scala rename to compiler/src/dotty/tools/dotc/util/NameTransformer.scala diff --git a/src/dotty/tools/dotc/util/Positions.scala b/compiler/src/dotty/tools/dotc/util/Positions.scala similarity index 100% rename from src/dotty/tools/dotc/util/Positions.scala rename to compiler/src/dotty/tools/dotc/util/Positions.scala diff --git a/src/dotty/tools/dotc/util/Property.scala b/compiler/src/dotty/tools/dotc/util/Property.scala similarity index 100% rename from src/dotty/tools/dotc/util/Property.scala rename to compiler/src/dotty/tools/dotc/util/Property.scala diff --git a/src/dotty/tools/dotc/util/Set.scala b/compiler/src/dotty/tools/dotc/util/Set.scala similarity index 100% rename from src/dotty/tools/dotc/util/Set.scala rename to compiler/src/dotty/tools/dotc/util/Set.scala diff --git a/src/dotty/tools/dotc/util/ShowPickled.scala b/compiler/src/dotty/tools/dotc/util/ShowPickled.scala similarity index 100% rename from src/dotty/tools/dotc/util/ShowPickled.scala rename to compiler/src/dotty/tools/dotc/util/ShowPickled.scala diff --git a/src/dotty/tools/dotc/util/SimpleMap.scala b/compiler/src/dotty/tools/dotc/util/SimpleMap.scala similarity index 100% rename from src/dotty/tools/dotc/util/SimpleMap.scala rename to compiler/src/dotty/tools/dotc/util/SimpleMap.scala diff --git a/src/dotty/tools/dotc/util/SixteenNibbles.scala b/compiler/src/dotty/tools/dotc/util/SixteenNibbles.scala similarity index 100% rename from src/dotty/tools/dotc/util/SixteenNibbles.scala rename to compiler/src/dotty/tools/dotc/util/SixteenNibbles.scala diff --git a/src/dotty/tools/dotc/util/SourceFile.scala b/compiler/src/dotty/tools/dotc/util/SourceFile.scala similarity index 100% rename from src/dotty/tools/dotc/util/SourceFile.scala rename to compiler/src/dotty/tools/dotc/util/SourceFile.scala diff --git a/src/dotty/tools/dotc/util/SourcePosition.scala b/compiler/src/dotty/tools/dotc/util/SourcePosition.scala similarity index 100% rename from src/dotty/tools/dotc/util/SourcePosition.scala rename to compiler/src/dotty/tools/dotc/util/SourcePosition.scala diff --git a/src/dotty/tools/dotc/util/Stats.scala b/compiler/src/dotty/tools/dotc/util/Stats.scala similarity index 100% rename from src/dotty/tools/dotc/util/Stats.scala rename to compiler/src/dotty/tools/dotc/util/Stats.scala diff --git a/src/dotty/tools/dotc/util/Util.scala b/compiler/src/dotty/tools/dotc/util/Util.scala similarity index 100% rename from src/dotty/tools/dotc/util/Util.scala rename to compiler/src/dotty/tools/dotc/util/Util.scala diff --git a/src/dotty/tools/dotc/util/common.scala b/compiler/src/dotty/tools/dotc/util/common.scala similarity index 100% rename from src/dotty/tools/dotc/util/common.scala rename to compiler/src/dotty/tools/dotc/util/common.scala diff --git a/src/dotty/tools/dotc/util/kwords.sc b/compiler/src/dotty/tools/dotc/util/kwords.sc similarity index 100% rename from src/dotty/tools/dotc/util/kwords.sc rename to compiler/src/dotty/tools/dotc/util/kwords.sc diff --git a/src/dotty/tools/dotc/util/lrutest.sc b/compiler/src/dotty/tools/dotc/util/lrutest.sc similarity index 100% rename from src/dotty/tools/dotc/util/lrutest.sc rename to compiler/src/dotty/tools/dotc/util/lrutest.sc diff --git a/src/dotty/tools/io/ClassPath.scala b/compiler/src/dotty/tools/io/ClassPath.scala similarity index 100% rename from src/dotty/tools/io/ClassPath.scala rename to compiler/src/dotty/tools/io/ClassPath.scala diff --git a/src/dotty/tools/io/DaemonThreadFactory.scala b/compiler/src/dotty/tools/io/DaemonThreadFactory.scala similarity index 100% rename from src/dotty/tools/io/DaemonThreadFactory.scala rename to compiler/src/dotty/tools/io/DaemonThreadFactory.scala diff --git a/src/dotty/tools/io/Fileish.scala b/compiler/src/dotty/tools/io/Fileish.scala similarity index 100% rename from src/dotty/tools/io/Fileish.scala rename to compiler/src/dotty/tools/io/Fileish.scala diff --git a/src/dotty/tools/io/Jar.scala b/compiler/src/dotty/tools/io/Jar.scala similarity index 100% rename from src/dotty/tools/io/Jar.scala rename to compiler/src/dotty/tools/io/Jar.scala diff --git a/src/dotty/tools/io/package.scala b/compiler/src/dotty/tools/io/package.scala similarity index 100% rename from src/dotty/tools/io/package.scala rename to compiler/src/dotty/tools/io/package.scala diff --git a/src/dotty/tools/package.scala b/compiler/src/dotty/tools/package.scala similarity index 100% rename from src/dotty/tools/package.scala rename to compiler/src/dotty/tools/package.scala diff --git a/src/strawman/collections/CollectionStrawMan1.scala b/compiler/src/strawman/collections/CollectionStrawMan1.scala similarity index 100% rename from src/strawman/collections/CollectionStrawMan1.scala rename to compiler/src/strawman/collections/CollectionStrawMan1.scala diff --git a/src/strawman/collections/CollectionStrawMan4.scala b/compiler/src/strawman/collections/CollectionStrawMan4.scala similarity index 100% rename from src/strawman/collections/CollectionStrawMan4.scala rename to compiler/src/strawman/collections/CollectionStrawMan4.scala diff --git a/src/strawman/collections/CollectionStrawMan5.scala b/compiler/src/strawman/collections/CollectionStrawMan5.scala similarity index 100% rename from src/strawman/collections/CollectionStrawMan5.scala rename to compiler/src/strawman/collections/CollectionStrawMan5.scala diff --git a/src/strawman/collections/CollectionStrawMan6.scala b/compiler/src/strawman/collections/CollectionStrawMan6.scala similarity index 100% rename from src/strawman/collections/CollectionStrawMan6.scala rename to compiler/src/strawman/collections/CollectionStrawMan6.scala diff --git a/test/dotc/build.scala b/compiler/test/dotc/build.scala similarity index 100% rename from test/dotc/build.scala rename to compiler/test/dotc/build.scala diff --git a/test/dotc/comptest.scala b/compiler/test/dotc/comptest.scala similarity index 100% rename from test/dotc/comptest.scala rename to compiler/test/dotc/comptest.scala diff --git a/test/dotc/scala-collections.whitelist b/compiler/test/dotc/scala-collections.whitelist similarity index 100% rename from test/dotc/scala-collections.whitelist rename to compiler/test/dotc/scala-collections.whitelist diff --git a/test/dotc/tests.scala b/compiler/test/dotc/tests.scala similarity index 95% rename from test/dotc/tests.scala rename to compiler/test/dotc/tests.scala index 842236b167ac..bb3b1e5e006a 100644 --- a/test/dotc/tests.scala +++ b/compiler/test/dotc/tests.scala @@ -12,7 +12,7 @@ class tests extends CompilerTest { def isRunByJenkins: Boolean = sys.props.isDefinedAt("dotty.jenkins.build") - val defaultOutputDir = "./out/" + val defaultOutputDir = "../out/" val noCheckOptions = List( // "-verbose", @@ -33,9 +33,9 @@ class tests extends CompilerTest { val classPath = { val paths = List( - "./library/target/scala-2.11/dotty-library_2.11-0.1-SNAPSHOT.jar", + "../library/target/scala-2.11/dotty-library_2.11-0.1-SNAPSHOT.jar", "./target/scala-2.11/dotty-compiler_2.11-0.1-SNAPSHOT.jar", - "./interfaces/target/dotty-interfaces-0.1-SNAPSHOT.jar" + "../interfaces/target/dotty-interfaces-0.1-SNAPSHOT.jar" ).map { p => val file = new JFile(p) assert( @@ -65,7 +65,7 @@ class tests extends CompilerTest { val explicitUTF8 = List("-encoding", "UTF8") val explicitUTF16 = List("-encoding", "UTF16") - val testsDir = "./tests/" + val testsDir = "../tests/" val posDir = testsDir + "pos/" val posSpecialDir = testsDir + "pos-special/" val posScala2Dir = testsDir + "pos-scala2/" @@ -83,7 +83,7 @@ class tests extends CompilerTest { val parsingDir = dotcDir + "parsing/" val dottyReplDir = dotcDir + "repl/" val typerDir = dotcDir + "typer/" - val libDir = "./library/src/" + val libDir = "../library/src/" @Before def cleanup(): Unit = { // remove class files from stdlib and tests compilation @@ -190,18 +190,19 @@ class tests extends CompilerTest { .filter(!_.startsWith("#")) // allow comment lines prefixed by # .map(_.takeWhile(_ != '#').trim) // allow comments in the end of line .filter(_.nonEmpty) + .map("." + _) // files are contained one dir up .toList @Test def compileStdLib = compileList("compileStdLib", stdlibFiles, "-migration" :: "-Yno-inline" :: scala2mode) @Test def compileMixed = compileLine( - """tests/pos/B.scala - |./scala-scala/src/library/scala/collection/immutable/Seq.scala - |./scala-scala/src/library/scala/collection/parallel/ParSeq.scala - |./scala-scala/src/library/scala/package.scala - |./scala-scala/src/library/scala/collection/GenSeqLike.scala - |./scala-scala/src/library/scala/collection/SeqLike.scala - |./scala-scala/src/library/scala/collection/generic/GenSeqFactory.scala""".stripMargin) - @Test def compileIndexedSeq = compileLine("./scala-scala/src/library/scala/collection/immutable/IndexedSeq.scala") + """../tests/pos/B.scala + |../scala-scala/src/library/scala/collection/immutable/Seq.scala + |../scala-scala/src/library/scala/collection/parallel/ParSeq.scala + |../scala-scala/src/library/scala/package.scala + |../scala-scala/src/library/scala/collection/GenSeqLike.scala + |../scala-scala/src/library/scala/collection/SeqLike.scala + |../scala-scala/src/library/scala/collection/generic/GenSeqFactory.scala""".stripMargin) + @Test def compileIndexedSeq = compileLine("../scala-scala/src/library/scala/collection/immutable/IndexedSeq.scala") // Not a junit test anymore since it is order dependent def dottyBootedLib = compileDir(libDir, ".")(allowDeepSubtypes) // note the -deep argument diff --git a/test/dotty/partest/DPConfig.scala b/compiler/test/dotty/partest/DPConfig.scala similarity index 94% rename from test/dotty/partest/DPConfig.scala rename to compiler/test/dotty/partest/DPConfig.scala index 79f41340cf8f..5c493f465049 100644 --- a/test/dotty/partest/DPConfig.scala +++ b/compiler/test/dotty/partest/DPConfig.scala @@ -23,7 +23,7 @@ object DPConfig { */ val runJVMOpts = s"-Xms64M -Xmx1024M ${PartestDefaults.javaOpts}" - val testRoot = (Path(".") / Path("tests") / Path("partest-generated")).toString + val testRoot = (Path("..") / Path("tests") / Path("partest-generated")).toString val genLog = Path(testRoot) / Path("gen.log") lazy val testDirs = { diff --git a/test/dotty/partest/DPConsoleRunner.scala b/compiler/test/dotty/partest/DPConsoleRunner.scala similarity index 100% rename from test/dotty/partest/DPConsoleRunner.scala rename to compiler/test/dotty/partest/DPConsoleRunner.scala diff --git a/test/dotty/partest/DPDirectCompiler.scala b/compiler/test/dotty/partest/DPDirectCompiler.scala similarity index 100% rename from test/dotty/partest/DPDirectCompiler.scala rename to compiler/test/dotty/partest/DPDirectCompiler.scala diff --git a/test/dotty/tools/ContextEscapeDetection.java b/compiler/test/dotty/tools/ContextEscapeDetection.java similarity index 100% rename from test/dotty/tools/ContextEscapeDetection.java rename to compiler/test/dotty/tools/ContextEscapeDetection.java diff --git a/test/dotty/tools/ContextEscapeDetector.java b/compiler/test/dotty/tools/ContextEscapeDetector.java similarity index 100% rename from test/dotty/tools/ContextEscapeDetector.java rename to compiler/test/dotty/tools/ContextEscapeDetector.java diff --git a/test/dotty/tools/DottyTest.scala b/compiler/test/dotty/tools/DottyTest.scala similarity index 96% rename from test/dotty/tools/DottyTest.scala rename to compiler/test/dotty/tools/DottyTest.scala index 9e7b6fccb510..77dc97becc90 100644 --- a/test/dotty/tools/DottyTest.scala +++ b/compiler/test/dotty/tools/DottyTest.scala @@ -25,7 +25,7 @@ class DottyTest extends ContextEscapeDetection{ ctx.setSetting(ctx.settings.encoding, "UTF8") ctx.setSetting( ctx.settings.classpath, - "./library/target/scala-2.11/dotty-library_2.11-0.1-SNAPSHOT.jar" + "../library/target/scala-2.11/dotty-library_2.11-0.1-SNAPSHOT.jar" ) // when classpath is changed in ctx, we need to re-initialize to get the // correct classpath from PathResolver diff --git a/test/dotty/tools/DottyTypeStealer.scala b/compiler/test/dotty/tools/DottyTypeStealer.scala similarity index 100% rename from test/dotty/tools/DottyTypeStealer.scala rename to compiler/test/dotty/tools/DottyTypeStealer.scala diff --git a/test/dotty/tools/ShowClassTests.scala b/compiler/test/dotty/tools/ShowClassTests.scala similarity index 97% rename from test/dotty/tools/ShowClassTests.scala rename to compiler/test/dotty/tools/ShowClassTests.scala index 96ab6080c974..3c730b716e98 100644 --- a/test/dotty/tools/ShowClassTests.scala +++ b/compiler/test/dotty/tools/ShowClassTests.scala @@ -18,8 +18,8 @@ class ShowClassTests extends DottyTest { ctx.setSetting(ctx.settings.encoding, "UTF8") ctx.setSetting( ctx.settings.classpath, - "./library/target/scala-2.11/dotty-library_2.11-0.1-SNAPSHOT.jar" + - ":./interfaces/target/dotty-interfaces-0.1-SNAPSHOT.jar" + "../library/target/scala-2.11/dotty-library_2.11-0.1-SNAPSHOT.jar" + + ":../interfaces/target/dotty-interfaces-0.1-SNAPSHOT.jar" ) base.initialize()(ctx) ctx diff --git a/test/dotty/tools/TypeStealer.scala b/compiler/test/dotty/tools/TypeStealer.scala similarity index 100% rename from test/dotty/tools/TypeStealer.scala rename to compiler/test/dotty/tools/TypeStealer.scala diff --git a/test/dotty/tools/backend/jvm/AsmConverters.scala b/compiler/test/dotty/tools/backend/jvm/AsmConverters.scala similarity index 100% rename from test/dotty/tools/backend/jvm/AsmConverters.scala rename to compiler/test/dotty/tools/backend/jvm/AsmConverters.scala diff --git a/test/dotty/tools/backend/jvm/AsmNode.scala b/compiler/test/dotty/tools/backend/jvm/AsmNode.scala similarity index 100% rename from test/dotty/tools/backend/jvm/AsmNode.scala rename to compiler/test/dotty/tools/backend/jvm/AsmNode.scala diff --git a/test/dotty/tools/backend/jvm/DottyBytecodeTest.scala b/compiler/test/dotty/tools/backend/jvm/DottyBytecodeTest.scala similarity index 100% rename from test/dotty/tools/backend/jvm/DottyBytecodeTest.scala rename to compiler/test/dotty/tools/backend/jvm/DottyBytecodeTest.scala diff --git a/test/dotty/tools/backend/jvm/DottyBytecodeTests.scala b/compiler/test/dotty/tools/backend/jvm/DottyBytecodeTests.scala similarity index 100% rename from test/dotty/tools/backend/jvm/DottyBytecodeTests.scala rename to compiler/test/dotty/tools/backend/jvm/DottyBytecodeTests.scala diff --git a/test/dotty/tools/backend/jvm/InlineBytecodeTests.scala b/compiler/test/dotty/tools/backend/jvm/InlineBytecodeTests.scala similarity index 100% rename from test/dotty/tools/backend/jvm/InlineBytecodeTests.scala rename to compiler/test/dotty/tools/backend/jvm/InlineBytecodeTests.scala diff --git a/test/dotty/tools/dotc/CompilerTest.scala b/compiler/test/dotty/tools/dotc/CompilerTest.scala similarity index 99% rename from test/dotty/tools/dotc/CompilerTest.scala rename to compiler/test/dotty/tools/dotc/CompilerTest.scala index e0d2251690a5..fbec9003a4fd 100644 --- a/test/dotty/tools/dotc/CompilerTest.scala +++ b/compiler/test/dotty/tools/dotc/CompilerTest.scala @@ -63,7 +63,7 @@ abstract class CompilerTest { if (pid == null) false else - new JFile("." + JFile.separator + "tests" + JFile.separator + "locks" + JFile.separator + s"partest-$pid.lock").exists + new JFile(".." + JFile.separator + "tests" + JFile.separator + "locks" + JFile.separator + s"partest-$pid.lock").exists } // Delete generated files from previous run and create new log diff --git a/test/dotty/tools/dotc/EntryPointsTest.scala b/compiler/test/dotty/tools/dotc/EntryPointsTest.scala similarity index 87% rename from test/dotty/tools/dotc/EntryPointsTest.scala rename to compiler/test/dotty/tools/dotc/EntryPointsTest.scala index 4673ffd3c2f1..4a87bbcb53cc 100644 --- a/test/dotty/tools/dotc/EntryPointsTest.scala +++ b/compiler/test/dotty/tools/dotc/EntryPointsTest.scala @@ -18,14 +18,14 @@ import scala.collection.mutable.ListBuffer */ class EntryPointsTest { private val sources = - List("./tests/pos/HelloWorld.scala").map(p => new java.io.File(p).getPath()) + List("../tests/pos/HelloWorld.scala").map(p => new java.io.File(p).getPath()) private val dottyInterfaces = - new java.io.File("./interfaces/dotty-interfaces-0.1-SNAPSHOT.jar").getPath + new java.io.File("../interfaces/dotty-interfaces-0.1-SNAPSHOT.jar").getPath private val dottyLibrary = - new java.io.File("./library/target/scala-2.11/dotty-library_2.11-0.1-SNAPSHOT.jar").getPath + new java.io.File("../library/target/scala-2.11/dotty-library_2.11-0.1-SNAPSHOT.jar").getPath private val args = sources ++ - List("-d", "./out/") ++ + List("-d", "../out/") ++ List("-classpath", dottyInterfaces + ":" + dottyLibrary) @Test def runCompiler = { diff --git a/test/dotty/tools/dotc/InterfaceEntryPointTest.scala b/compiler/test/dotty/tools/dotc/InterfaceEntryPointTest.scala similarity index 87% rename from test/dotty/tools/dotc/InterfaceEntryPointTest.scala rename to compiler/test/dotty/tools/dotc/InterfaceEntryPointTest.scala index 6624b45dde06..b36ea29555e6 100644 --- a/test/dotty/tools/dotc/InterfaceEntryPointTest.scala +++ b/compiler/test/dotty/tools/dotc/InterfaceEntryPointTest.scala @@ -19,15 +19,15 @@ import scala.collection.mutable.ListBuffer class InterfaceEntryPointTest { @Test def runCompilerFromInterface = { val sources = - List("./tests/pos/HelloWorld.scala").map(p => new java.io.File(p).getPath()) + List("../tests/pos/HelloWorld.scala").map(p => new java.io.File(p).getPath()) val dottyInterfaces = - new java.io.File("./interfaces/dotty-interfaces-0.1-SNAPSHOT.jar").getPath + new java.io.File("../interfaces/dotty-interfaces-0.1-SNAPSHOT.jar").getPath val dottyLibrary = - new java.io.File("./library/target/scala-2.11/dotty-library_2.11-0.1-SNAPSHOT.jar").getPath + new java.io.File("../library/target/scala-2.11/dotty-library_2.11-0.1-SNAPSHOT.jar").getPath val args = sources ++ - List("-d", "./out/") ++ + List("-d", "../out/") ++ List("-classpath", dottyInterfaces + ":" + dottyLibrary) val mainClass = Class.forName("dotty.tools.dotc.Main") diff --git a/test/dotty/tools/dotc/ast/TreeInfoTest.scala b/compiler/test/dotty/tools/dotc/ast/TreeInfoTest.scala similarity index 100% rename from test/dotty/tools/dotc/ast/TreeInfoTest.scala rename to compiler/test/dotty/tools/dotc/ast/TreeInfoTest.scala diff --git a/test/dotty/tools/dotc/parsing/DeSugarTest.scala b/compiler/test/dotty/tools/dotc/parsing/DeSugarTest.scala similarity index 100% rename from test/dotty/tools/dotc/parsing/DeSugarTest.scala rename to compiler/test/dotty/tools/dotc/parsing/DeSugarTest.scala diff --git a/test/dotty/tools/dotc/parsing/DocstringTest.scala b/compiler/test/dotty/tools/dotc/parsing/DocstringTest.scala similarity index 100% rename from test/dotty/tools/dotc/parsing/DocstringTest.scala rename to compiler/test/dotty/tools/dotc/parsing/DocstringTest.scala diff --git a/test/dotty/tools/dotc/parsing/DocstringTests.scala b/compiler/test/dotty/tools/dotc/parsing/DocstringTests.scala similarity index 100% rename from test/dotty/tools/dotc/parsing/DocstringTests.scala rename to compiler/test/dotty/tools/dotc/parsing/DocstringTests.scala diff --git a/test/dotty/tools/dotc/parsing/ModifiersParsingTest.scala b/compiler/test/dotty/tools/dotc/parsing/ModifiersParsingTest.scala similarity index 100% rename from test/dotty/tools/dotc/parsing/ModifiersParsingTest.scala rename to compiler/test/dotty/tools/dotc/parsing/ModifiersParsingTest.scala diff --git a/test/dotty/tools/dotc/parsing/ParserTest.scala b/compiler/test/dotty/tools/dotc/parsing/ParserTest.scala similarity index 100% rename from test/dotty/tools/dotc/parsing/ParserTest.scala rename to compiler/test/dotty/tools/dotc/parsing/ParserTest.scala diff --git a/test/dotty/tools/dotc/parsing/ScannerTest.scala b/compiler/test/dotty/tools/dotc/parsing/ScannerTest.scala similarity index 91% rename from test/dotty/tools/dotc/parsing/ScannerTest.scala rename to compiler/test/dotty/tools/dotc/parsing/ScannerTest.scala index 2177b99a400f..b024a63dba2f 100644 --- a/test/dotty/tools/dotc/parsing/ScannerTest.scala +++ b/compiler/test/dotty/tools/dotc/parsing/ScannerTest.scala @@ -49,8 +49,8 @@ class ScannerTest extends DottyTest { @Test def scanList() = { println(System.getProperty("user.dir")) - scan("src/dotty/tools/dotc/core/Symbols.scala") - scan("src/dotty/tools/dotc/core/Symbols.scala") + scan("./src/dotty/tools/dotc/core/Symbols.scala") + scan("./src/dotty/tools/dotc/core/Symbols.scala") } @Test @@ -60,6 +60,6 @@ class ScannerTest extends DottyTest { @Test def scanScala() = { - scanDir("./scala-scala/src") + scanDir("../scala-scala/src") } } diff --git a/test/dotty/tools/dotc/parsing/desugarPackage.scala b/compiler/test/dotty/tools/dotc/parsing/desugarPackage.scala similarity index 100% rename from test/dotty/tools/dotc/parsing/desugarPackage.scala rename to compiler/test/dotty/tools/dotc/parsing/desugarPackage.scala diff --git a/test/dotty/tools/dotc/parsing/parseFile.scala b/compiler/test/dotty/tools/dotc/parsing/parseFile.scala similarity index 100% rename from test/dotty/tools/dotc/parsing/parseFile.scala rename to compiler/test/dotty/tools/dotc/parsing/parseFile.scala diff --git a/test/dotty/tools/dotc/parsing/parsePackage.scala b/compiler/test/dotty/tools/dotc/parsing/parsePackage.scala similarity index 100% rename from test/dotty/tools/dotc/parsing/parsePackage.scala rename to compiler/test/dotty/tools/dotc/parsing/parsePackage.scala diff --git a/test/dotty/tools/dotc/parsing/showTree.scala b/compiler/test/dotty/tools/dotc/parsing/showTree.scala similarity index 100% rename from test/dotty/tools/dotc/parsing/showTree.scala rename to compiler/test/dotty/tools/dotc/parsing/showTree.scala diff --git a/test/dotty/tools/dotc/repl/TestREPL.scala b/compiler/test/dotty/tools/dotc/repl/TestREPL.scala similarity index 96% rename from test/dotty/tools/dotc/repl/TestREPL.scala rename to compiler/test/dotty/tools/dotc/repl/TestREPL.scala index 7be8dc13e92a..2263e85a0767 100644 --- a/test/dotty/tools/dotc/repl/TestREPL.scala +++ b/compiler/test/dotty/tools/dotc/repl/TestREPL.scala @@ -25,7 +25,7 @@ class TestREPL(script: String) extends REPL { fresh.setSetting(ctx.settings.color, "never") fresh.setSetting( ctx.settings.classpath, - "./library/target/scala-2.11/dotty-library_2.11-0.1-SNAPSHOT.jar" + "../library/target/scala-2.11/dotty-library_2.11-0.1-SNAPSHOT.jar" ) fresh.initialize()(fresh) fresh diff --git a/test/dotty/tools/dotc/reporting/TestMessageLaziness.scala b/compiler/test/dotty/tools/dotc/reporting/TestMessageLaziness.scala similarity index 100% rename from test/dotty/tools/dotc/reporting/TestMessageLaziness.scala rename to compiler/test/dotty/tools/dotc/reporting/TestMessageLaziness.scala diff --git a/test/dotty/tools/dotc/reporting/TestReporter.scala b/compiler/test/dotty/tools/dotc/reporting/TestReporter.scala similarity index 100% rename from test/dotty/tools/dotc/reporting/TestReporter.scala rename to compiler/test/dotty/tools/dotc/reporting/TestReporter.scala diff --git a/test/dotty/tools/dotc/transform/CreateCompanionObjectsTest.scala b/compiler/test/dotty/tools/dotc/transform/CreateCompanionObjectsTest.scala similarity index 100% rename from test/dotty/tools/dotc/transform/CreateCompanionObjectsTest.scala rename to compiler/test/dotty/tools/dotc/transform/CreateCompanionObjectsTest.scala diff --git a/test/dotty/tools/dotc/transform/LazyValsTest.scala b/compiler/test/dotty/tools/dotc/transform/LazyValsTest.scala similarity index 100% rename from test/dotty/tools/dotc/transform/LazyValsTest.scala rename to compiler/test/dotty/tools/dotc/transform/LazyValsTest.scala diff --git a/test/dotty/tools/dotc/transform/PostTyperTransformerTest.scala b/compiler/test/dotty/tools/dotc/transform/PostTyperTransformerTest.scala similarity index 100% rename from test/dotty/tools/dotc/transform/PostTyperTransformerTest.scala rename to compiler/test/dotty/tools/dotc/transform/PostTyperTransformerTest.scala diff --git a/test/dotty/tools/dotc/transform/TreeTransformerTest.scala b/compiler/test/dotty/tools/dotc/transform/TreeTransformerTest.scala similarity index 100% rename from test/dotty/tools/dotc/transform/TreeTransformerTest.scala rename to compiler/test/dotty/tools/dotc/transform/TreeTransformerTest.scala diff --git a/test/dotty/tools/showClass.scala b/compiler/test/dotty/tools/showClass.scala similarity index 100% rename from test/dotty/tools/showClass.scala rename to compiler/test/dotty/tools/showClass.scala diff --git a/test/partest b/compiler/test/partest similarity index 100% rename from test/partest rename to compiler/test/partest diff --git a/test/worksheets/baseTypetest.sc b/compiler/test/worksheets/baseTypetest.sc similarity index 100% rename from test/worksheets/baseTypetest.sc rename to compiler/test/worksheets/baseTypetest.sc diff --git a/test/worksheets/denotTest.sc b/compiler/test/worksheets/denotTest.sc similarity index 100% rename from test/worksheets/denotTest.sc rename to compiler/test/worksheets/denotTest.sc diff --git a/test/worksheets/flagtest.sc b/compiler/test/worksheets/flagtest.sc similarity index 100% rename from test/worksheets/flagtest.sc rename to compiler/test/worksheets/flagtest.sc diff --git a/test/worksheets/nesting.sc b/compiler/test/worksheets/nesting.sc similarity index 100% rename from test/worksheets/nesting.sc rename to compiler/test/worksheets/nesting.sc diff --git a/test/worksheets/periodtest.sc b/compiler/test/worksheets/periodtest.sc similarity index 100% rename from test/worksheets/periodtest.sc rename to compiler/test/worksheets/periodtest.sc diff --git a/test/worksheets/positiontest.sc b/compiler/test/worksheets/positiontest.sc similarity index 100% rename from test/worksheets/positiontest.sc rename to compiler/test/worksheets/positiontest.sc diff --git a/test/worksheets/sigtest.sc b/compiler/test/worksheets/sigtest.sc similarity index 100% rename from test/worksheets/sigtest.sc rename to compiler/test/worksheets/sigtest.sc diff --git a/test/worksheets/testnames.sc b/compiler/test/worksheets/testnames.sc similarity index 100% rename from test/worksheets/testnames.sc rename to compiler/test/worksheets/testnames.sc diff --git a/project/Build.scala b/project/Build.scala index ead692b1def8..68ca8a1d176b 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -62,6 +62,40 @@ object DottyBuild extends Build { resourceDirectory in Compile := baseDirectory.value / "resources" ) + /** Projects -------------------------------------------------------------- */ + lazy val dotty = project.in(file(".")). + dependsOn(`dotty-compiler`). + dependsOn(`dotty-library`). + dependsOn(`dotty-interfaces`). + settings( + addCommandAlias( + "partest", + ";packageAll" + + ";dotty-compiler/test:runMain dotc.build" + + ";lockPartestFile" + + ";dotty-compiler/test:test" + + ";runPartestRunner" + + ";bin/test" // script tests need to run after the unit tests + ) ++ + addCommandAlias( + "partest-only", + ";packageAll" + + ";dotty-compiler/test:runMain dotc.build" + + ";lockPartestFile" + + ";dotty-compiler/test:test-only dotc.tests" + + ";runPartestRunner" + ) ++ + addCommandAlias( + "partest-only-no-bootstrap", + ";packageAll" + + ";lockPartestFile" + + ";dotty-compiler/test:test-only dotc.tests" + + ";runPartestRunner" + ) + ). + settings(publishing) + + lazy val `dotty-interfaces` = project.in(file("interfaces")). settings( // Do not append Scala versions to the generated artifacts @@ -73,7 +107,7 @@ object DottyBuild extends Build { ). settings(publishing) - lazy val `dotty-compiler` = project.in(file(".")). + lazy val `dotty-compiler` = project.in(file("compiler")). dependsOn(`dotty-interfaces`). dependsOn(`dotty-library`). settings(sourceStructure). @@ -237,32 +271,6 @@ object DottyBuild extends Build { ("-DpartestParentID=" + pid) :: tuning ::: agentOptions ::: travis_build ::: path.toList } ). - settings( - addCommandAlias( - "partest", - ";packageAll" + - ";test:runMain dotc.build" + - ";lockPartestFile" + - ";dotty-compiler/test:test" + - ";runPartestRunner" + - ";bin/test" // script tests need to run after the unit tests - ) ++ - addCommandAlias( - "partest-only", - ";packageAll" + - ";test:runMain dotc.build" + - ";lockPartestFile" + - ";dotty-compiler/test:test-only dotc.tests" + - ";runPartestRunner" - ) ++ - addCommandAlias( - "partest-only-no-bootstrap", - ";packageAll" + - ";lockPartestFile" + - ";dotty-compiler/test:test-only dotc.tests" + - ";runPartestRunner" - ) - ). settings(publishing) /* Contains unit tests for the scripts */ From 7879d0f3f98cec6e3198e1f12902888ab281553b Mon Sep 17 00:00:00 2001 From: Felix Mulder Date: Thu, 3 Nov 2016 13:27:34 +0100 Subject: [PATCH 20/55] Fix rebuild on change in scripts --- bin/common | 1 + 1 file changed, 1 insertion(+) diff --git a/bin/common b/bin/common index 4dd2b57163d3..21c957f7a441 100755 --- a/bin/common +++ b/bin/common @@ -124,6 +124,7 @@ function check_jar { local new_files="$(find "$DOTTY_ROOT/$3" \( -iname "*.scala" -o -iname "*.java" \) -newer "$2")" if [ ! -z "$new_files" ]; then printf "New files detected in $1, rebuilding..." + rm $2 eval "$4" printf "done\n" update_packages From 5c293d0c51ca393b721d3588baacc29965157027 Mon Sep 17 00:00:00 2001 From: Felix Mulder Date: Thu, 3 Nov 2016 11:44:27 +0100 Subject: [PATCH 21/55] Add `repl` command --- project/Build.scala | 29 +++++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/project/Build.scala b/project/Build.scala index 68ca8a1d176b..caf79be3711e 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -1,5 +1,6 @@ import sbt.Keys._ import sbt._ +import complete.DefaultParsers._ import java.io.{ RandomAccessFile, File } import java.nio.channels.FileLock import scala.reflect.io.Path @@ -26,7 +27,12 @@ object DottyBuild extends Build { // "-XX:+HeapDumpOnOutOfMemoryError", "-Xmx1g", "-Xss2m" ) - lazy val packageAll = taskKey[Unit]("Package everything needed to run tests") + // Packages all subprojects to their jars + lazy val packageAll = + taskKey[Map[String, String]]("Package everything needed to run tests") + + // Spawns a repl with the correct classpath + lazy val repl = inputKey[Unit]("run the REPL with correct classpath") override def settings: Seq[Setting[_]] = { super.settings ++ Seq( @@ -68,6 +74,7 @@ object DottyBuild extends Build { dependsOn(`dotty-library`). dependsOn(`dotty-interfaces`). settings( + addCommandAlias("repl", "dotty-compiler/repl") ++ addCommandAlias( "partest", ";packageAll" + @@ -151,14 +158,24 @@ object DottyBuild extends Build { // enable improved incremental compilation algorithm incOptions := incOptions.value.withNameHashing(true), - + // packageAll packages all and then returns a map with the abs location packageAll := { - val p1 = (packageBin in (`dotty-interfaces`, Compile)).value - val p2 = (packageBin in Compile).value - val p3 = (packageBin in (`dotty-library`, Compile)).value - val p4 = (packageBin in Test).value + Map( + "dotty-interfaces" -> (packageBin in (`dotty-interfaces`, Compile)).value, + "dotty-compiler" -> (packageBin in Compile).value, + "dotty-library" -> (packageBin in (`dotty-library`, Compile)).value, + "dotty-compiler-test" -> (packageBin in Test).value + ) map { case (k, v) => (k, v.getAbsolutePath) } }, + repl := Def.inputTaskDyn { + val args: Seq[String] = spaceDelimited("").parsed + val dottyLib = packageAll.value("dotty-library") + (runMain in Compile).toTask( + s" dotty.tools.dotc.repl.Main -classpath $dottyLib " + args.mkString(" ") + ) + }.evaluated, + // enable verbose exception messages for JUnit testOptions in Test += Tests.Argument( TestFrameworks.JUnit, "-a", "-v", From ba7d7a36a83a93de363f0032c3395c36e11cb764 Mon Sep 17 00:00:00 2001 From: Felix Mulder Date: Thu, 3 Nov 2016 12:03:47 +0100 Subject: [PATCH 22/55] Add `dotc` command with sane classpath --- project/Build.scala | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/project/Build.scala b/project/Build.scala index caf79be3711e..233030a7247a 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -34,6 +34,10 @@ object DottyBuild extends Build { // Spawns a repl with the correct classpath lazy val repl = inputKey[Unit]("run the REPL with correct classpath") + // Used to compile files similar to ./bin/dotc script + lazy val dotc = + inputKey[Unit]("run the compiler using the correct classpath, or the user supplied classpath") + override def settings: Seq[Setting[_]] = { super.settings ++ Seq( scalaVersion in Global := "2.11.5", @@ -74,6 +78,7 @@ object DottyBuild extends Build { dependsOn(`dotty-library`). dependsOn(`dotty-interfaces`). settings( + addCommandAlias("dotc", "dotty-compiler/dotc") ++ addCommandAlias("repl", "dotty-compiler/repl") ++ addCommandAlias( "partest", @@ -176,6 +181,22 @@ object DottyBuild extends Build { ) }.evaluated, + // Set run baseDir to be root of project, makes dotc saner + baseDirectory in run := baseDirectory.value / "..", + dotc := Def.inputTaskDyn { + val dottyLib = packageAll.value("dotty-library") + val args: Seq[String] = spaceDelimited("").parsed + + val fullArgs = args.span(_ != "-classpath") match { + case (beforeCp, Nil) => beforeCp ++ ("-classpath" :: dottyLib :: Nil) + case (beforeCp, rest) => beforeCp ++ rest + } + + (runMain in Compile).toTask( + s" dotty.tools.dotc.Main " + fullArgs.mkString(" ") + ) + }.evaluated, + // enable verbose exception messages for JUnit testOptions in Test += Tests.Argument( TestFrameworks.JUnit, "-a", "-v", @@ -243,8 +264,7 @@ object DottyBuild extends Build { // } (Set(scalaJSIRSourcesJar)).toSeq //}.taskValue, - // Adjust classpath for running dotty - mainClass in (Compile, run) := Some("dotty.tools.dotc.Main"), + // Spawn new JVM in run and test fork in run := true, fork in Test := true, parallelExecution in Test := false, @@ -252,9 +272,6 @@ object DottyBuild extends Build { // Add git-hash used to package the distribution to the manifest to know it in runtime and report it in REPL packageOptions += ManifestAttributes(("Git-Hash", VersionUtil.gitHash)), - // FIXME: Do something more sensible, like using the Scala bootclasspath - run <<= (run in Compile).partialInput(" -usejavacp"), - // http://grokbase.com/t/gg/simple-build-tool/135ke5y90p/sbt-setting-jvm-boot-paramaters-for-scala // packageAll should always be run before tests javaOptions <++= (dependencyClasspath in Runtime, packageAll) map { (attList, _) => From b2143a1dd44b6a87b8a323c4440a5f2bc6897672 Mon Sep 17 00:00:00 2001 From: Felix Mulder Date: Thu, 3 Nov 2016 15:31:55 +0100 Subject: [PATCH 23/55] Make `dotr` run binaries similar to script in bin --- project/Build.scala | 31 +++++++++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/project/Build.scala b/project/Build.scala index 233030a7247a..4ae9ebf293ae 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -38,6 +38,10 @@ object DottyBuild extends Build { lazy val dotc = inputKey[Unit]("run the compiler using the correct classpath, or the user supplied classpath") + // Used to run binaries similar to ./bin/dotr script + lazy val dotr = + inputKey[Unit]("run compiled binary using the correct classpath, or the user supplied classpath") + override def settings: Seq[Setting[_]] = { super.settings ++ Seq( scalaVersion in Global := "2.11.5", @@ -78,6 +82,7 @@ object DottyBuild extends Build { dependsOn(`dotty-library`). dependsOn(`dotty-interfaces`). settings( + addCommandAlias("dotr", "dotty-compiler/dotr") ++ addCommandAlias("dotc", "dotty-compiler/dotc") ++ addCommandAlias("repl", "dotty-compiler/repl") ++ addCommandAlias( @@ -173,6 +178,9 @@ object DottyBuild extends Build { ) map { case (k, v) => (k, v.getAbsolutePath) } }, + // Set run baseDir to be root of project, makes dotc saner + baseDirectory in run := baseDirectory.value / "..", + repl := Def.inputTaskDyn { val args: Seq[String] = spaceDelimited("").parsed val dottyLib = packageAll.value("dotty-library") @@ -181,8 +189,27 @@ object DottyBuild extends Build { ) }.evaluated, - // Set run baseDir to be root of project, makes dotc saner - baseDirectory in run := baseDirectory.value / "..", + // Override run to be able to run compiled classfiles + dotr := { + val args: Seq[String] = spaceDelimited("").parsed + val java: String = Process("which" :: "java" :: Nil) !! + val scalaLib = (dependencyClasspath in Runtime, packageAll) + .map { (attList, _) => + attList + .map(_.data.getAbsolutePath) + .find(_.contains("scala-library")) + .toList.mkString(":") + }.value + + if (java == "") + println("Couldn't find java executable on path, please install java to a default location") + else if (scalaLib == "") { + println("Couldn't find scala-library on classpath, please run using script in bin dir instead") + } else { + val dottyLib = packageAll.value("dotty-library") + s"""$java -classpath .:$dottyLib:$scalaLib ${args.mkString(" ")}""" ! + } + }, dotc := Def.inputTaskDyn { val dottyLib = packageAll.value("dotty-library") val args: Seq[String] = spaceDelimited("").parsed From 7fbb4513489df11f831d69ca07a58a809493361e Mon Sep 17 00:00:00 2001 From: Felix Mulder Date: Thu, 3 Nov 2016 15:32:34 +0100 Subject: [PATCH 24/55] Update documentation for new sbt commands --- docs/css/main.scss | 7 +++- docs/docs/contributing/getting-started.md | 43 ++++++++++++++++++----- docs/docs/contributing/workflow.md | 30 ++++++++++------ docs/docs/index.md | 4 +-- 4 files changed, 63 insertions(+), 21 deletions(-) diff --git a/docs/css/main.scss b/docs/css/main.scss index dbc5153e2b54..f8354e6deafe 100644 --- a/docs/css/main.scss +++ b/docs/css/main.scss @@ -207,7 +207,7 @@ ul.post-list { } } -pre, code { +pre, code, code.hljs { padding: 0; border: 0; border-radius: 3px; @@ -221,6 +221,11 @@ code { padding-right: 0.1em; } +pre { + padding: 0.5em; + background-color: $grey !important; +} + body { font: 400 16px/1.5 "Helvetica Neue", Helvetica, Arial, sans-serif; color: $text-color; diff --git a/docs/docs/contributing/getting-started.md b/docs/docs/contributing/getting-started.md index bea5b69624bb..4c7299914345 100644 --- a/docs/docs/contributing/getting-started.md +++ b/docs/docs/contributing/getting-started.md @@ -19,21 +19,48 @@ Requirements Make sure that you are using Java 8 or later, the output of `java -version` should contain `1.8`. -Compiling and running code --------------------------- +Compiling and Running +--------------------- +Start by cloning the repository: + +```none +$ git clone https://github.com/lampepfl/dotty.git +$ cd dotty +``` + +Dotty provides a standard sbt build: compiling, running and starting a repl can +all be done from within sbt using + +```none +$ sbt +> dotc tests/pos/HelloWorld.scala +> dotr HelloWorld +hello world +``` + +there is also a bash script that can be used in the same way: + ```bash -git clone https://github.com/lampepfl/dotty.git -cd dotty -# Clone dotty-compatible stdlib. Needed for running the test suite. -git clone -b dotty-library https://github.com/DarkDimius/scala.git scala-scala # Compile code using Dotty ./bin/dotc tests/pos/HelloWorld.scala # Run it with the proper classpath ./bin/dotr HelloWorld ``` + Starting a REPL --------------- -```bash -./bin/dotr +```none +$ sbt +> repl +Welcome to Scala.next (pre-alpha) (Java HotSpot(TM) 64-Bit Server VM, Java 1.8.0_101). +Type in expressions to have them evaluated. +Type :help for more information. +scala> +``` + +or via bash: + +```none +$ ./bin/dotr ``` diff --git a/docs/docs/contributing/workflow.md b/docs/docs/contributing/workflow.md index a0b9fd528f88..48f71053ee18 100644 --- a/docs/docs/contributing/workflow.md +++ b/docs/docs/contributing/workflow.md @@ -5,17 +5,27 @@ title: "Workflow" This document details common workflow patterns when working with Dotty. +## Cloning and building ## + +```bash +# Start by cloning the repository: +git clone https://github.com/lampepfl/dotty.git +cd dotty +# Clone dotty-compatible stdlib. Needed for running the test suite. +git clone -b dotty-library https://github.com/DarkDimius/scala.git scala-scala +``` + ## Compiling files with dotc ## From sbt: -```bash -> run +```none +> dotc ``` From terminal: -```bash +```none $ ./bin/dotc ``` @@ -37,7 +47,7 @@ Additional logging information can be obtained by changes some `noPrinter` to ## Running tests ## -```bash +```none $ sbt > partest --show-diff --verbose ``` @@ -45,21 +55,21 @@ $ sbt ## Running single tests ## To test a specific test tests/x/y.scala (for example tests/pos/t210.scala): -```bash +```none > partest-only-no-bootstrap --show-diff --verbose tests/partest-generated/x/y.scala ``` -Currently this will re-run some tests and do some preprocessing because of the -way partest has been set up. +Currently this will re-run some unit tests and do some preprocessing because of +the way partest has been set up. ## Inspecting Trees with Type Stealer ## There is no power mode for the REPL yet, but you can inspect types with the type stealer: -```bash -$ ./bin/dotr -scala> import test.DottyTypeStealer._; import dotty.tools.dotc.core._; import Contexts._,Types._ +```none +> repl +scala> import dotty.tools.DottyTypeStealer._; import dotty.tools.dotc.core._; import Contexts._,Types._ ``` Now, you can define types and access their representation. For example: diff --git a/docs/docs/index.md b/docs/docs/index.md index 699fcecb17b6..8fceedbd036d 100644 --- a/docs/docs/index.md +++ b/docs/docs/index.md @@ -11,8 +11,8 @@ Index ----- * Usage - [Migrating from Scala 2](usage/migrating.md) - - [Using Dotty with cbt](usage/cbt-projects.md) - - [Using Dotty with sbt](usage/sbt-projects.md) + - [Dotty projects with cbt](usage/cbt-projects.md) + - [Dotty projects with sbt](usage/sbt-projects.md) * Contributing - [Getting Started](contributing/getting-started.md) details on how to run tests, use the cli scripts From fcdb1c984c4b32c0c1b13337d9bd50a3883cb3b3 Mon Sep 17 00:00:00 2001 From: Felix Mulder Date: Thu, 3 Nov 2016 15:59:30 +0100 Subject: [PATCH 25/55] Remove unused examples dir, duplicate contained in tests/pos --- compiler/test/dotty/partest/DPConsoleRunner.scala | 2 +- .../dotty/tools/dotc/reporting/TestMessageLaziness.scala | 2 -- docs/docs/contributing/eclipse.md | 4 ++-- examples/hello.scala | 5 ----- 4 files changed, 3 insertions(+), 10 deletions(-) delete mode 100644 examples/hello.scala diff --git a/compiler/test/dotty/partest/DPConsoleRunner.scala b/compiler/test/dotty/partest/DPConsoleRunner.scala index 4552d1137e6f..310cba44d0d1 100644 --- a/compiler/test/dotty/partest/DPConsoleRunner.scala +++ b/compiler/test/dotty/partest/DPConsoleRunner.scala @@ -187,7 +187,7 @@ class DPTestRunner(testFile: File, suiteRunner: DPSuiteRunner) extends nest.Runn // |but partest was unable to find any sources - uncomment DPConsoleRunner#sources // |================================================================================""".stripMargin // } - // List(new File("./examples/hello.scala")) // "just compile some crap" - Guillaume + // List(new File("./tests/pos/HelloWorld.scala")) // "just compile some crap" - Guillaume // case xs => // xs // } diff --git a/compiler/test/dotty/tools/dotc/reporting/TestMessageLaziness.scala b/compiler/test/dotty/tools/dotc/reporting/TestMessageLaziness.scala index 6892739e8f1c..bf727d51a701 100644 --- a/compiler/test/dotty/tools/dotc/reporting/TestMessageLaziness.scala +++ b/compiler/test/dotty/tools/dotc/reporting/TestMessageLaziness.scala @@ -7,8 +7,6 @@ import org.junit.Test import core.Contexts._ -import test.DottyTest - import diagnostic.{ Message, MessageContainer, ExtendMessage } class TestMessageLaziness extends DottyTest { diff --git a/docs/docs/contributing/eclipse.md b/docs/docs/contributing/eclipse.md index 9afe2835500f..0e4125df0579 100644 --- a/docs/docs/contributing/eclipse.md +++ b/docs/docs/contributing/eclipse.md @@ -27,7 +27,7 @@ You may need to redo these steps when the build changes. If you have `CLASSPATH` defined: 4. Update your classpath to contain any new required external libraries to run - `./bin/dotc`, `./bin/doti` outside of Eclipse. + `./bin/dotc`, `./bin/dotr` outside of Eclipse. 5. Open the `Run Configurations` tab, and edit the `tests` configuration so that it contains a `CLASSPATH` variable which reflects the current @@ -44,4 +44,4 @@ Running the compiler Main class from Eclipse - Add the Scala library (`Advanced...` > `Add library...` > `Scala library`) - Add the Dotty classfiles (`Add projects...` > `[x] dotty`) 4. `Run Configurations > Main$ > Arguments` and add - `${project_loc}/examples/hello.scala` + `${project_loc}/tests/pos/HelloWorld.scala` diff --git a/examples/hello.scala b/examples/hello.scala deleted file mode 100644 index 87e0b1e5e5ca..000000000000 --- a/examples/hello.scala +++ /dev/null @@ -1,5 +0,0 @@ -package hello - -object world extends App { - println("hello dotty!") -} From 94a8177f208418682b86934eb3f0b8edab99b1f0 Mon Sep 17 00:00:00 2001 From: Felix Mulder Date: Thu, 3 Nov 2016 16:20:28 +0100 Subject: [PATCH 26/55] Move `dottydoc` -> `doc-tool` --- {sjs => compiler/sjs}/backend/sjs/GenSJSIR.scala | 0 {sjs => compiler/sjs}/backend/sjs/JSCodeGen.scala | 0 {sjs => compiler/sjs}/backend/sjs/JSDefinitions.scala | 0 {sjs => compiler/sjs}/backend/sjs/JSEncoding.scala | 0 {sjs => compiler/sjs}/backend/sjs/JSInterop.scala | 0 {sjs => compiler/sjs}/backend/sjs/JSPositions.scala | 0 {sjs => compiler/sjs}/backend/sjs/JSPrimitives.scala | 0 {sjs => compiler/sjs}/backend/sjs/ScopedVar.scala | 0 {sjs => compiler/sjs}/tools/dotc/config/SJSPlatform.scala | 0 .../src/dotty/tools/dottydoc/DottyDoc.scala | 0 .../src/dotty/tools/dottydoc/api/java/Dottydoc.java | 0 .../src/dotty/tools/dottydoc/api/scala/Dottydoc.scala | 0 .../tools/dottydoc/core/AlternateConstructorsPhase.scala | 0 .../src/dotty/tools/dottydoc/core/ContextDottydoc.scala | 0 .../src/dotty/tools/dottydoc/core/DocASTPhase.scala | 0 .../src/dotty/tools/dottydoc/core/DocImplicitsPhase.scala | 0 .../src/dotty/tools/dottydoc/core/DocstringPhase.scala | 0 .../src/dotty/tools/dottydoc/core/MiniPhaseTransform.scala | 0 .../src/dotty/tools/dottydoc/core/SortMembersPhase.scala | 0 .../src/dotty/tools/dottydoc/core/TypeLinkingPhases.scala | 0 .../src/dotty/tools/dottydoc/core/UsecasePhase.scala | 0 .../src/dotty/tools/dottydoc/model/comment/BodyEntities.scala | 0 .../src/dotty/tools/dottydoc/model/comment/BodyParsers.scala | 0 .../src/dotty/tools/dottydoc/model/comment/Comment.scala | 0 .../dotty/tools/dottydoc/model/comment/CommentCleaner.scala | 0 .../dotty/tools/dottydoc/model/comment/CommentParser.scala | 0 .../src/dotty/tools/dottydoc/model/comment/CommentRegex.scala | 0 .../src/dotty/tools/dottydoc/model/entities.scala | 0 .../src/dotty/tools/dottydoc/model/factories.scala | 0 .../src/dotty/tools/dottydoc/model/internal.scala | 0 .../src/dotty/tools/dottydoc/model/java.scala | 0 .../src/dotty/tools/dottydoc/model/json.scala | 0 .../src/dotty/tools/dottydoc/model/references.scala | 0 .../src/dotty/tools/dottydoc/util/MemberLookup.scala | 0 .../src/dotty/tools/dottydoc/util/OutputWriter.scala | 0 .../src/dotty/tools/dottydoc/util/Traversing.scala | 0 .../src/dotty/tools/dottydoc/util/mutate.scala | 0 .../src/dotty/tools/dottydoc/util/syntax.scala | 0 {dottydoc => doc-tool}/test/BaseTest.scala | 0 {dottydoc => doc-tool}/test/ConstructorTest.scala | 0 {dottydoc => doc-tool}/test/PackageStructure.scala | 0 {dottydoc => doc-tool}/test/SimpleComments.scala | 0 {dottydoc => doc-tool}/test/UsecaseTest.scala | 0 {dottydoc => doc-tool}/test/WhitelistedStdLib.scala | 0 project/Build.scala | 4 ++-- 45 files changed, 2 insertions(+), 2 deletions(-) rename {sjs => compiler/sjs}/backend/sjs/GenSJSIR.scala (100%) rename {sjs => compiler/sjs}/backend/sjs/JSCodeGen.scala (100%) rename {sjs => compiler/sjs}/backend/sjs/JSDefinitions.scala (100%) rename {sjs => compiler/sjs}/backend/sjs/JSEncoding.scala (100%) rename {sjs => compiler/sjs}/backend/sjs/JSInterop.scala (100%) rename {sjs => compiler/sjs}/backend/sjs/JSPositions.scala (100%) rename {sjs => compiler/sjs}/backend/sjs/JSPrimitives.scala (100%) rename {sjs => compiler/sjs}/backend/sjs/ScopedVar.scala (100%) rename {sjs => compiler/sjs}/tools/dotc/config/SJSPlatform.scala (100%) rename {dottydoc => doc-tool}/src/dotty/tools/dottydoc/DottyDoc.scala (100%) rename {dottydoc => doc-tool}/src/dotty/tools/dottydoc/api/java/Dottydoc.java (100%) rename {dottydoc => doc-tool}/src/dotty/tools/dottydoc/api/scala/Dottydoc.scala (100%) rename {dottydoc => doc-tool}/src/dotty/tools/dottydoc/core/AlternateConstructorsPhase.scala (100%) rename {dottydoc => doc-tool}/src/dotty/tools/dottydoc/core/ContextDottydoc.scala (100%) rename {dottydoc => doc-tool}/src/dotty/tools/dottydoc/core/DocASTPhase.scala (100%) rename {dottydoc => doc-tool}/src/dotty/tools/dottydoc/core/DocImplicitsPhase.scala (100%) rename {dottydoc => doc-tool}/src/dotty/tools/dottydoc/core/DocstringPhase.scala (100%) rename {dottydoc => doc-tool}/src/dotty/tools/dottydoc/core/MiniPhaseTransform.scala (100%) rename {dottydoc => doc-tool}/src/dotty/tools/dottydoc/core/SortMembersPhase.scala (100%) rename {dottydoc => doc-tool}/src/dotty/tools/dottydoc/core/TypeLinkingPhases.scala (100%) rename {dottydoc => doc-tool}/src/dotty/tools/dottydoc/core/UsecasePhase.scala (100%) rename {dottydoc => doc-tool}/src/dotty/tools/dottydoc/model/comment/BodyEntities.scala (100%) rename {dottydoc => doc-tool}/src/dotty/tools/dottydoc/model/comment/BodyParsers.scala (100%) rename {dottydoc => doc-tool}/src/dotty/tools/dottydoc/model/comment/Comment.scala (100%) rename {dottydoc => doc-tool}/src/dotty/tools/dottydoc/model/comment/CommentCleaner.scala (100%) rename {dottydoc => doc-tool}/src/dotty/tools/dottydoc/model/comment/CommentParser.scala (100%) rename {dottydoc => doc-tool}/src/dotty/tools/dottydoc/model/comment/CommentRegex.scala (100%) rename {dottydoc => doc-tool}/src/dotty/tools/dottydoc/model/entities.scala (100%) rename {dottydoc => doc-tool}/src/dotty/tools/dottydoc/model/factories.scala (100%) rename {dottydoc => doc-tool}/src/dotty/tools/dottydoc/model/internal.scala (100%) rename {dottydoc => doc-tool}/src/dotty/tools/dottydoc/model/java.scala (100%) rename {dottydoc => doc-tool}/src/dotty/tools/dottydoc/model/json.scala (100%) rename {dottydoc => doc-tool}/src/dotty/tools/dottydoc/model/references.scala (100%) rename {dottydoc => doc-tool}/src/dotty/tools/dottydoc/util/MemberLookup.scala (100%) rename {dottydoc => doc-tool}/src/dotty/tools/dottydoc/util/OutputWriter.scala (100%) rename {dottydoc => doc-tool}/src/dotty/tools/dottydoc/util/Traversing.scala (100%) rename {dottydoc => doc-tool}/src/dotty/tools/dottydoc/util/mutate.scala (100%) rename {dottydoc => doc-tool}/src/dotty/tools/dottydoc/util/syntax.scala (100%) rename {dottydoc => doc-tool}/test/BaseTest.scala (100%) rename {dottydoc => doc-tool}/test/ConstructorTest.scala (100%) rename {dottydoc => doc-tool}/test/PackageStructure.scala (100%) rename {dottydoc => doc-tool}/test/SimpleComments.scala (100%) rename {dottydoc => doc-tool}/test/UsecaseTest.scala (100%) rename {dottydoc => doc-tool}/test/WhitelistedStdLib.scala (100%) diff --git a/sjs/backend/sjs/GenSJSIR.scala b/compiler/sjs/backend/sjs/GenSJSIR.scala similarity index 100% rename from sjs/backend/sjs/GenSJSIR.scala rename to compiler/sjs/backend/sjs/GenSJSIR.scala diff --git a/sjs/backend/sjs/JSCodeGen.scala b/compiler/sjs/backend/sjs/JSCodeGen.scala similarity index 100% rename from sjs/backend/sjs/JSCodeGen.scala rename to compiler/sjs/backend/sjs/JSCodeGen.scala diff --git a/sjs/backend/sjs/JSDefinitions.scala b/compiler/sjs/backend/sjs/JSDefinitions.scala similarity index 100% rename from sjs/backend/sjs/JSDefinitions.scala rename to compiler/sjs/backend/sjs/JSDefinitions.scala diff --git a/sjs/backend/sjs/JSEncoding.scala b/compiler/sjs/backend/sjs/JSEncoding.scala similarity index 100% rename from sjs/backend/sjs/JSEncoding.scala rename to compiler/sjs/backend/sjs/JSEncoding.scala diff --git a/sjs/backend/sjs/JSInterop.scala b/compiler/sjs/backend/sjs/JSInterop.scala similarity index 100% rename from sjs/backend/sjs/JSInterop.scala rename to compiler/sjs/backend/sjs/JSInterop.scala diff --git a/sjs/backend/sjs/JSPositions.scala b/compiler/sjs/backend/sjs/JSPositions.scala similarity index 100% rename from sjs/backend/sjs/JSPositions.scala rename to compiler/sjs/backend/sjs/JSPositions.scala diff --git a/sjs/backend/sjs/JSPrimitives.scala b/compiler/sjs/backend/sjs/JSPrimitives.scala similarity index 100% rename from sjs/backend/sjs/JSPrimitives.scala rename to compiler/sjs/backend/sjs/JSPrimitives.scala diff --git a/sjs/backend/sjs/ScopedVar.scala b/compiler/sjs/backend/sjs/ScopedVar.scala similarity index 100% rename from sjs/backend/sjs/ScopedVar.scala rename to compiler/sjs/backend/sjs/ScopedVar.scala diff --git a/sjs/tools/dotc/config/SJSPlatform.scala b/compiler/sjs/tools/dotc/config/SJSPlatform.scala similarity index 100% rename from sjs/tools/dotc/config/SJSPlatform.scala rename to compiler/sjs/tools/dotc/config/SJSPlatform.scala diff --git a/dottydoc/src/dotty/tools/dottydoc/DottyDoc.scala b/doc-tool/src/dotty/tools/dottydoc/DottyDoc.scala similarity index 100% rename from dottydoc/src/dotty/tools/dottydoc/DottyDoc.scala rename to doc-tool/src/dotty/tools/dottydoc/DottyDoc.scala diff --git a/dottydoc/src/dotty/tools/dottydoc/api/java/Dottydoc.java b/doc-tool/src/dotty/tools/dottydoc/api/java/Dottydoc.java similarity index 100% rename from dottydoc/src/dotty/tools/dottydoc/api/java/Dottydoc.java rename to doc-tool/src/dotty/tools/dottydoc/api/java/Dottydoc.java diff --git a/dottydoc/src/dotty/tools/dottydoc/api/scala/Dottydoc.scala b/doc-tool/src/dotty/tools/dottydoc/api/scala/Dottydoc.scala similarity index 100% rename from dottydoc/src/dotty/tools/dottydoc/api/scala/Dottydoc.scala rename to doc-tool/src/dotty/tools/dottydoc/api/scala/Dottydoc.scala diff --git a/dottydoc/src/dotty/tools/dottydoc/core/AlternateConstructorsPhase.scala b/doc-tool/src/dotty/tools/dottydoc/core/AlternateConstructorsPhase.scala similarity index 100% rename from dottydoc/src/dotty/tools/dottydoc/core/AlternateConstructorsPhase.scala rename to doc-tool/src/dotty/tools/dottydoc/core/AlternateConstructorsPhase.scala diff --git a/dottydoc/src/dotty/tools/dottydoc/core/ContextDottydoc.scala b/doc-tool/src/dotty/tools/dottydoc/core/ContextDottydoc.scala similarity index 100% rename from dottydoc/src/dotty/tools/dottydoc/core/ContextDottydoc.scala rename to doc-tool/src/dotty/tools/dottydoc/core/ContextDottydoc.scala diff --git a/dottydoc/src/dotty/tools/dottydoc/core/DocASTPhase.scala b/doc-tool/src/dotty/tools/dottydoc/core/DocASTPhase.scala similarity index 100% rename from dottydoc/src/dotty/tools/dottydoc/core/DocASTPhase.scala rename to doc-tool/src/dotty/tools/dottydoc/core/DocASTPhase.scala diff --git a/dottydoc/src/dotty/tools/dottydoc/core/DocImplicitsPhase.scala b/doc-tool/src/dotty/tools/dottydoc/core/DocImplicitsPhase.scala similarity index 100% rename from dottydoc/src/dotty/tools/dottydoc/core/DocImplicitsPhase.scala rename to doc-tool/src/dotty/tools/dottydoc/core/DocImplicitsPhase.scala diff --git a/dottydoc/src/dotty/tools/dottydoc/core/DocstringPhase.scala b/doc-tool/src/dotty/tools/dottydoc/core/DocstringPhase.scala similarity index 100% rename from dottydoc/src/dotty/tools/dottydoc/core/DocstringPhase.scala rename to doc-tool/src/dotty/tools/dottydoc/core/DocstringPhase.scala diff --git a/dottydoc/src/dotty/tools/dottydoc/core/MiniPhaseTransform.scala b/doc-tool/src/dotty/tools/dottydoc/core/MiniPhaseTransform.scala similarity index 100% rename from dottydoc/src/dotty/tools/dottydoc/core/MiniPhaseTransform.scala rename to doc-tool/src/dotty/tools/dottydoc/core/MiniPhaseTransform.scala diff --git a/dottydoc/src/dotty/tools/dottydoc/core/SortMembersPhase.scala b/doc-tool/src/dotty/tools/dottydoc/core/SortMembersPhase.scala similarity index 100% rename from dottydoc/src/dotty/tools/dottydoc/core/SortMembersPhase.scala rename to doc-tool/src/dotty/tools/dottydoc/core/SortMembersPhase.scala diff --git a/dottydoc/src/dotty/tools/dottydoc/core/TypeLinkingPhases.scala b/doc-tool/src/dotty/tools/dottydoc/core/TypeLinkingPhases.scala similarity index 100% rename from dottydoc/src/dotty/tools/dottydoc/core/TypeLinkingPhases.scala rename to doc-tool/src/dotty/tools/dottydoc/core/TypeLinkingPhases.scala diff --git a/dottydoc/src/dotty/tools/dottydoc/core/UsecasePhase.scala b/doc-tool/src/dotty/tools/dottydoc/core/UsecasePhase.scala similarity index 100% rename from dottydoc/src/dotty/tools/dottydoc/core/UsecasePhase.scala rename to doc-tool/src/dotty/tools/dottydoc/core/UsecasePhase.scala diff --git a/dottydoc/src/dotty/tools/dottydoc/model/comment/BodyEntities.scala b/doc-tool/src/dotty/tools/dottydoc/model/comment/BodyEntities.scala similarity index 100% rename from dottydoc/src/dotty/tools/dottydoc/model/comment/BodyEntities.scala rename to doc-tool/src/dotty/tools/dottydoc/model/comment/BodyEntities.scala diff --git a/dottydoc/src/dotty/tools/dottydoc/model/comment/BodyParsers.scala b/doc-tool/src/dotty/tools/dottydoc/model/comment/BodyParsers.scala similarity index 100% rename from dottydoc/src/dotty/tools/dottydoc/model/comment/BodyParsers.scala rename to doc-tool/src/dotty/tools/dottydoc/model/comment/BodyParsers.scala diff --git a/dottydoc/src/dotty/tools/dottydoc/model/comment/Comment.scala b/doc-tool/src/dotty/tools/dottydoc/model/comment/Comment.scala similarity index 100% rename from dottydoc/src/dotty/tools/dottydoc/model/comment/Comment.scala rename to doc-tool/src/dotty/tools/dottydoc/model/comment/Comment.scala diff --git a/dottydoc/src/dotty/tools/dottydoc/model/comment/CommentCleaner.scala b/doc-tool/src/dotty/tools/dottydoc/model/comment/CommentCleaner.scala similarity index 100% rename from dottydoc/src/dotty/tools/dottydoc/model/comment/CommentCleaner.scala rename to doc-tool/src/dotty/tools/dottydoc/model/comment/CommentCleaner.scala diff --git a/dottydoc/src/dotty/tools/dottydoc/model/comment/CommentParser.scala b/doc-tool/src/dotty/tools/dottydoc/model/comment/CommentParser.scala similarity index 100% rename from dottydoc/src/dotty/tools/dottydoc/model/comment/CommentParser.scala rename to doc-tool/src/dotty/tools/dottydoc/model/comment/CommentParser.scala diff --git a/dottydoc/src/dotty/tools/dottydoc/model/comment/CommentRegex.scala b/doc-tool/src/dotty/tools/dottydoc/model/comment/CommentRegex.scala similarity index 100% rename from dottydoc/src/dotty/tools/dottydoc/model/comment/CommentRegex.scala rename to doc-tool/src/dotty/tools/dottydoc/model/comment/CommentRegex.scala diff --git a/dottydoc/src/dotty/tools/dottydoc/model/entities.scala b/doc-tool/src/dotty/tools/dottydoc/model/entities.scala similarity index 100% rename from dottydoc/src/dotty/tools/dottydoc/model/entities.scala rename to doc-tool/src/dotty/tools/dottydoc/model/entities.scala diff --git a/dottydoc/src/dotty/tools/dottydoc/model/factories.scala b/doc-tool/src/dotty/tools/dottydoc/model/factories.scala similarity index 100% rename from dottydoc/src/dotty/tools/dottydoc/model/factories.scala rename to doc-tool/src/dotty/tools/dottydoc/model/factories.scala diff --git a/dottydoc/src/dotty/tools/dottydoc/model/internal.scala b/doc-tool/src/dotty/tools/dottydoc/model/internal.scala similarity index 100% rename from dottydoc/src/dotty/tools/dottydoc/model/internal.scala rename to doc-tool/src/dotty/tools/dottydoc/model/internal.scala diff --git a/dottydoc/src/dotty/tools/dottydoc/model/java.scala b/doc-tool/src/dotty/tools/dottydoc/model/java.scala similarity index 100% rename from dottydoc/src/dotty/tools/dottydoc/model/java.scala rename to doc-tool/src/dotty/tools/dottydoc/model/java.scala diff --git a/dottydoc/src/dotty/tools/dottydoc/model/json.scala b/doc-tool/src/dotty/tools/dottydoc/model/json.scala similarity index 100% rename from dottydoc/src/dotty/tools/dottydoc/model/json.scala rename to doc-tool/src/dotty/tools/dottydoc/model/json.scala diff --git a/dottydoc/src/dotty/tools/dottydoc/model/references.scala b/doc-tool/src/dotty/tools/dottydoc/model/references.scala similarity index 100% rename from dottydoc/src/dotty/tools/dottydoc/model/references.scala rename to doc-tool/src/dotty/tools/dottydoc/model/references.scala diff --git a/dottydoc/src/dotty/tools/dottydoc/util/MemberLookup.scala b/doc-tool/src/dotty/tools/dottydoc/util/MemberLookup.scala similarity index 100% rename from dottydoc/src/dotty/tools/dottydoc/util/MemberLookup.scala rename to doc-tool/src/dotty/tools/dottydoc/util/MemberLookup.scala diff --git a/dottydoc/src/dotty/tools/dottydoc/util/OutputWriter.scala b/doc-tool/src/dotty/tools/dottydoc/util/OutputWriter.scala similarity index 100% rename from dottydoc/src/dotty/tools/dottydoc/util/OutputWriter.scala rename to doc-tool/src/dotty/tools/dottydoc/util/OutputWriter.scala diff --git a/dottydoc/src/dotty/tools/dottydoc/util/Traversing.scala b/doc-tool/src/dotty/tools/dottydoc/util/Traversing.scala similarity index 100% rename from dottydoc/src/dotty/tools/dottydoc/util/Traversing.scala rename to doc-tool/src/dotty/tools/dottydoc/util/Traversing.scala diff --git a/dottydoc/src/dotty/tools/dottydoc/util/mutate.scala b/doc-tool/src/dotty/tools/dottydoc/util/mutate.scala similarity index 100% rename from dottydoc/src/dotty/tools/dottydoc/util/mutate.scala rename to doc-tool/src/dotty/tools/dottydoc/util/mutate.scala diff --git a/dottydoc/src/dotty/tools/dottydoc/util/syntax.scala b/doc-tool/src/dotty/tools/dottydoc/util/syntax.scala similarity index 100% rename from dottydoc/src/dotty/tools/dottydoc/util/syntax.scala rename to doc-tool/src/dotty/tools/dottydoc/util/syntax.scala diff --git a/dottydoc/test/BaseTest.scala b/doc-tool/test/BaseTest.scala similarity index 100% rename from dottydoc/test/BaseTest.scala rename to doc-tool/test/BaseTest.scala diff --git a/dottydoc/test/ConstructorTest.scala b/doc-tool/test/ConstructorTest.scala similarity index 100% rename from dottydoc/test/ConstructorTest.scala rename to doc-tool/test/ConstructorTest.scala diff --git a/dottydoc/test/PackageStructure.scala b/doc-tool/test/PackageStructure.scala similarity index 100% rename from dottydoc/test/PackageStructure.scala rename to doc-tool/test/PackageStructure.scala diff --git a/dottydoc/test/SimpleComments.scala b/doc-tool/test/SimpleComments.scala similarity index 100% rename from dottydoc/test/SimpleComments.scala rename to doc-tool/test/SimpleComments.scala diff --git a/dottydoc/test/UsecaseTest.scala b/doc-tool/test/UsecaseTest.scala similarity index 100% rename from dottydoc/test/UsecaseTest.scala rename to doc-tool/test/UsecaseTest.scala diff --git a/dottydoc/test/WhitelistedStdLib.scala b/doc-tool/test/WhitelistedStdLib.scala similarity index 100% rename from dottydoc/test/WhitelistedStdLib.scala rename to doc-tool/test/WhitelistedStdLib.scala diff --git a/project/Build.scala b/project/Build.scala index 4ae9ebf293ae..49f996a42b6f 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -134,9 +134,9 @@ object DottyBuild extends Build { // necessary evil: dottydoc currently needs to be included in the dotty // project, for sbt integration unmanagedSourceDirectories in Compile := Seq((scalaSource in Compile).value), - unmanagedSourceDirectories in Compile += baseDirectory.value / "dottydoc" / "src", + unmanagedSourceDirectories in Compile += baseDirectory.value / "doc-tool" / "src", unmanagedSourceDirectories in Test := Seq((scalaSource in Test).value), - unmanagedSourceDirectories in Test += baseDirectory.value / "dottydoc" / "test", + unmanagedSourceDirectories in Test += baseDirectory.value / "doc-tool" / "test", // set system in/out for repl connectInput in run := true, From 8488557471dd6b75dcaec73e843c2115e59241cd Mon Sep 17 00:00:00 2001 From: Guillaume Martres Date: Mon, 14 Nov 2016 17:48:26 +0100 Subject: [PATCH 27/55] Add packageAll alias in root project Otherwise `packageAll` by itself as used in aliases like `partest` won't work. --- project/Build.scala | 1 + 1 file changed, 1 insertion(+) diff --git a/project/Build.scala b/project/Build.scala index 49f996a42b6f..e0878061349f 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -85,6 +85,7 @@ object DottyBuild extends Build { addCommandAlias("dotr", "dotty-compiler/dotr") ++ addCommandAlias("dotc", "dotty-compiler/dotc") ++ addCommandAlias("repl", "dotty-compiler/repl") ++ + addCommandAlias("packageAll", "dotty-compiler/packageAll") ++ addCommandAlias( "partest", ";packageAll" + From cc56d3d977eab5fa88f0a1b0ced5bd4f99accae9 Mon Sep 17 00:00:00 2001 From: Guillaume Martres Date: Mon, 14 Nov 2016 17:52:32 +0100 Subject: [PATCH 28/55] Fix partest commands --- project/Build.scala | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/project/Build.scala b/project/Build.scala index e0878061349f..0f8594556a29 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -90,25 +90,25 @@ object DottyBuild extends Build { "partest", ";packageAll" + ";dotty-compiler/test:runMain dotc.build" + - ";lockPartestFile" + + ";dotty-compiler/lockPartestFile" + ";dotty-compiler/test:test" + - ";runPartestRunner" + + ";dotty-compiler/runPartestRunner" + ";bin/test" // script tests need to run after the unit tests ) ++ addCommandAlias( "partest-only", ";packageAll" + ";dotty-compiler/test:runMain dotc.build" + - ";lockPartestFile" + + ";dotty-compiler/lockPartestFile" + ";dotty-compiler/test:test-only dotc.tests" + - ";runPartestRunner" + ";dotty-compiler/runPartestRunner" ) ++ addCommandAlias( "partest-only-no-bootstrap", ";packageAll" + - ";lockPartestFile" + + ";dotty-compiler/lockPartestFile" + ";dotty-compiler/test:test-only dotc.tests" + - ";runPartestRunner" + ";dotty-compiler/runPartestRunner" ) ). settings(publishing) From 1b19afa6184a0237a803f13e8491bfcb51b7585e Mon Sep 17 00:00:00 2001 From: Guillaume Martres Date: Mon, 14 Nov 2016 20:04:24 +0100 Subject: [PATCH 29/55] Run dotty tests with the correct baseDirectory Before this commit, Build.scala contained: baseDirectory in run := baseDirectory.value / "..", The goal of this line is that when invoking the compiler using `run` or `dotc`, the working directory is the root of the dotty project, which is convenient for testing. However, this line also affects the working directory of `dotty-compiler/runPartestRunner`, but not of `dotty-compiler/test`. The result was that `dotty-compiler/test` was broken, and fixing the paths in the code would break `partest`. We solve this by using a different baseDirectory when running partest. --- project/Build.scala | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/project/Build.scala b/project/Build.scala index 0f8594556a29..c241f77bdc6a 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -179,8 +179,10 @@ object DottyBuild extends Build { ) map { case (k, v) => (k, v.getAbsolutePath) } }, - // Set run baseDir to be root of project, makes dotc saner - baseDirectory in run := baseDirectory.value / "..", + // For convenience, change the baseDirectory when running the compiler + baseDirectory in (Compile, run) := baseDirectory.value / "..", + // .. but not when running partest + baseDirectory in (Test, run) := baseDirectory.value, repl := Def.inputTaskDyn { val args: Seq[String] = spaceDelimited("").parsed From c061baf8c4a81f2b1505c30a5240857411981f62 Mon Sep 17 00:00:00 2001 From: Guillaume Martres Date: Mon, 14 Nov 2016 21:19:36 +0100 Subject: [PATCH 30/55] The root project now aggregates the other projects Before this commit, commands such as "test" would not run anything, which means that the JUnit tests were never run. --- project/Build.scala | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/project/Build.scala b/project/Build.scala index c241f77bdc6a..745c29960f10 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -77,10 +77,15 @@ object DottyBuild extends Build { ) /** Projects -------------------------------------------------------------- */ + // The root project: + // - aggregates other projects so that "compile", "test", etc are run on all projects at once. + // - publishes its own empty artifact "dotty" that depends on "dotty-library" and "dotty-compiler", + // this is only necessary for compatibility with sbt which currently hardcodes the "dotty" artifact name lazy val dotty = project.in(file(".")). + // FIXME: we do not aggregate `bin` because its tests delete jars, thus breaking other tests + aggregate(`dotty-interfaces`, `dotty-library`, `dotty-compiler`, `dotty-sbt-bridge`, `scala-library`). dependsOn(`dotty-compiler`). dependsOn(`dotty-library`). - dependsOn(`dotty-interfaces`). settings( addCommandAlias("dotr", "dotty-compiler/dotr") ++ addCommandAlias("dotc", "dotty-compiler/dotc") ++ @@ -341,6 +346,7 @@ object DottyBuild extends Build { lazy val bin = project.in(file("bin")). settings(sourceStructure). settings( + publishArtifact := false, parallelExecution in Test := false, libraryDependencies += "com.novocode" % "junit-interface" % "0.11" % "test" From 6acdc1e85f04cc3a240ddb91983588897786d8ca Mon Sep 17 00:00:00 2001 From: Felix Mulder Date: Thu, 17 Nov 2016 11:51:08 +0100 Subject: [PATCH 31/55] Move bridge to correct location, fix unmanaged sources in build --- project/Build.scala | 4 ++-- .../src/main/scala/xsbt/CompilerClassLoader.scala | 0 .../src/main/scala/xsbt/CompilerInterface.scala | 0 .../src/main/scala/xsbt/ConsoleInterface.scala | 0 .../src/main/scala/xsbt/DelegatingReporter.scala | 0 .../{bridge => }/src/main/scala/xsbt/Log.scala | 0 .../{bridge => }/src/main/scala/xsbt/Message.scala | 0 .../src/main/scala/xsbt/ScaladocInterface.scala | 0 .../sbt-test/compilerReporter/simple/Source.scala | 0 .../src/sbt-test/compilerReporter/simple/build.sbt | 0 .../simple/project/DottyInjectedPlugin.scala | 0 .../compilerReporter/simple/project/Reporter.scala | 0 .../src/sbt-test/compilerReporter/simple/test | 0 .../source-dependencies/abstract-override/A.scala | 0 .../source-dependencies/abstract-override/B.scala | 0 .../source-dependencies/abstract-override/C.scala | 0 .../source-dependencies/abstract-override/D.scala | 0 .../abstract-override/changes/C2.scala | 0 .../project/DottyInjectedPlugin.scala | 0 .../source-dependencies/abstract-override/test | 0 .../abstract-type-override/build.sbt | 0 .../abstract-type-override/changes/Bar1.scala | 0 .../project/DottyInjectedPlugin.scala | 0 .../abstract-type-override/src/main/scala/Bar.scala | 0 .../abstract-type-override/src/main/scala/Foo.scala | 0 .../src/main/scala/Impl.scala | 0 .../source-dependencies/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 .../abstract-type/project/DottyInjectedPlugin.scala | 0 .../sbt-test/source-dependencies/abstract-type/test | 0 .../source-dependencies/added/changes/A1.scala | 0 .../source-dependencies/added/changes/A2.scala | 0 .../source-dependencies/added/changes/A3.scala | 0 .../source-dependencies/added/changes/B1.scala | 0 .../source-dependencies/added/changes/B2.scala | 0 .../added/project/DottyInjectedPlugin.scala | 0 .../src/sbt-test/source-dependencies/added/test | 0 .../source-dependencies/as-seen-from-a/A.scala | 0 .../source-dependencies/as-seen-from-a/B.scala | 0 .../source-dependencies/as-seen-from-a/C.scala | 0 .../source-dependencies/as-seen-from-a/D.scala | 0 .../as-seen-from-a/changes/B2.scala | 0 .../project/DottyInjectedPlugin.scala | 0 .../source-dependencies/as-seen-from-a/test | 0 .../source-dependencies/as-seen-from-b/A.scala | 0 .../source-dependencies/as-seen-from-b/B.scala | 0 .../source-dependencies/as-seen-from-b/C.scala | 0 .../source-dependencies/as-seen-from-b/D.scala | 0 .../as-seen-from-b/changes/B2.scala | 0 .../project/DottyInjectedPlugin.scala | 0 .../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 | 0 .../source-dependencies/backtick-quoted-names/test | 0 .../source-dependencies/binary/changes/Break.scala | 0 .../sbt-test/source-dependencies/binary/dep/A.scala | 0 .../binary/project/DottyInjectedPlugin.scala | 0 .../source-dependencies/binary/project/P.scala | 0 .../src/sbt-test/source-dependencies/binary/test | 0 .../sbt-test/source-dependencies/binary/use/B.scala | 0 .../sbt-test/source-dependencies/by-name/A.scala | 0 .../sbt-test/source-dependencies/by-name/B.scala | 0 .../source-dependencies/by-name/changes/A.scala | 0 .../by-name/project/DottyInjectedPlugin.scala | 0 .../src/sbt-test/source-dependencies/by-name/test | 0 .../sbt-test/source-dependencies/canon/Use.scala | 0 .../source-dependencies/canon/actual/A.java | 0 .../sbt-test/source-dependencies/canon/actual/a.jar | Bin .../sbt-test/source-dependencies/canon/build.sbt | 0 .../sbt-test/source-dependencies/canon/lib/a.jar | 0 .../canon/project/DottyInjectedPlugin.scala | 0 .../src/sbt-test/source-dependencies/canon/test | 0 .../source-dependencies/compactify/build.sbt | 0 .../compactify/project/DottyInjectedPlugin.scala | 0 .../compactify/src/main/scala/For.scala | 0 .../compactify/src/main/scala/Nested.scala | 0 .../sbt-test/source-dependencies/compactify/test | 0 .../source-dependencies/constants/changes/A1.scala | 0 .../source-dependencies/constants/changes/A2.scala | 0 .../source-dependencies/constants/changes/B.scala | 0 .../constants/project/DottyInjectedPlugin.scala | 0 .../src/sbt-test/source-dependencies/constants/test | 0 .../source-dependencies/default-params/A.scala | 0 .../source-dependencies/default-params/B.scala | 0 .../default-params/changes/A.scala | 0 .../project/DottyInjectedPlugin.scala | 0 .../source-dependencies/default-params/test | 0 .../source-dependencies/dup-class/changes/A.scala | 0 .../source-dependencies/dup-class/changes/A2.scala | 0 .../source-dependencies/dup-class/changes/B.scala | 0 .../dup-class/project/DottyInjectedPlugin.scala | 0 .../src/sbt-test/source-dependencies/dup-class/test | 0 .../source-dependencies/empty-a/changes/A.scala | 0 .../source-dependencies/empty-a/changes/A2.scala | 0 .../source-dependencies/empty-a/changes/B.scala | 0 .../empty-a/project/DottyInjectedPlugin.scala | 0 .../src/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 .../empty-package/project/DottyInjectedPlugin.scala | 0 .../sbt-test/source-dependencies/empty-package/test | 0 .../sbt-test/source-dependencies/erasure/A.scala | 0 .../sbt-test/source-dependencies/erasure/B.scala | 0 .../source-dependencies/erasure/changes/A.scala | 0 .../erasure/project/DottyInjectedPlugin.scala | 0 .../src/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 .../source-dependencies/export-jars/changes/B.scala | 0 .../export-jars/changes/build2.sbt | 0 .../export-jars/project/Build.scala | 0 .../export-jars/project/DottyInjectedPlugin.scala | 0 .../sbt-test/source-dependencies/export-jars/test | 0 .../src/sbt-test/source-dependencies/ext/A.scala | 0 .../src/sbt-test/source-dependencies/ext/build.sbt | 0 .../ext/project/DottyInjectedPlugin.scala | 0 .../src/sbt-test/source-dependencies/ext/test | 0 .../source-dependencies/false-error/A.scala | 0 .../source-dependencies/false-error/B.scala | 0 .../source-dependencies/false-error/changes/A.scala | 0 .../source-dependencies/false-error/pending | 0 .../false-error/project/DottyInjectedPlugin.scala | 0 .../fbounded-existentials/fbounds.scala | 0 .../project/DottyInjectedPlugin.scala | 0 .../source-dependencies/fbounded-existentials/test | 0 .../source-dependencies/implicit-params/A.scala | 0 .../source-dependencies/implicit-params/B.scala | 0 .../implicit-params/changes/A.scala | 0 .../project/DottyInjectedPlugin.scala | 0 .../source-dependencies/implicit-params/test | 0 .../changes/A1.scala | 0 .../changes/A2.scala | 0 .../implicit-search-companion-scope/changes/B.scala | 0 .../implicit-search-companion-scope/changes/C.scala | 0 .../implicit-search-companion-scope/changes/M.scala | 0 .../project/DottyInjectedPlugin.scala | 0 .../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 | 0 .../source-dependencies/implicit-search/test | 0 .../sbt-test/source-dependencies/implicit/A.scala | 0 .../sbt-test/source-dependencies/implicit/B.scala | 0 .../source-dependencies/implicit/changes/A.scala | 0 .../implicit/project/DottyInjectedPlugin.scala | 0 .../src/sbt-test/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 .../import-class/project/DottyInjectedPlugin.scala | 0 .../sbt-test/source-dependencies/import-class/test | 0 .../source-dependencies/import-package/A.scala | 0 .../source-dependencies/import-package/B.scala | 0 .../import-package/changes/A.scala | 0 .../source-dependencies/import-package/pending | 0 .../project/DottyInjectedPlugin.scala | 0 .../source-dependencies/inherited-deps-java/A.java | 0 .../source-dependencies/inherited-deps-java/B.java | 0 .../source-dependencies/inherited-deps-java/C.java | 0 .../source-dependencies/inherited-deps-java/D.java | 0 .../source-dependencies/inherited-deps-java/E.java | 0 .../source-dependencies/inherited-deps-java/F.java | 0 .../source-dependencies/inherited-deps-java/G.java | 0 .../source-dependencies/inherited-deps-java/J.java | 0 .../inherited-deps-java/build.sbt | 0 .../project/DottyInjectedPlugin.scala | 0 .../source-dependencies/inherited-deps-java/test | 0 .../inherited_type_params/A.scala | 0 .../inherited_type_params/build.sbt | 0 .../project/DottyInjectedPlugin.scala | 0 .../source-dependencies/inherited_type_params/test | 0 .../src/sbt-test/source-dependencies/inline/A.scala | 0 .../src/sbt-test/source-dependencies/inline/C.scala | 0 .../source-dependencies/inline/changes/B1.scala | 0 .../source-dependencies/inline/changes/B2.scala | 0 .../source-dependencies/inline/changes/B3.scala | 0 .../inline/project/DottyInjectedPlugin.scala | 0 .../src/sbt-test/source-dependencies/inline/test | 0 .../source-dependencies/intermediate-error/A.scala | 0 .../source-dependencies/intermediate-error/B.scala | 0 .../intermediate-error/changes/A2.scala | 0 .../intermediate-error/changes/A3.scala | 0 .../project/DottyInjectedPlugin.scala | 0 .../source-dependencies/intermediate-error/test | 0 .../java-analysis-serialization-error/Outer.java | 0 .../java-analysis-serialization-error/build.sbt | 0 .../project/DottyInjectedPlugin.scala | 0 .../java-analysis-serialization-error/test | 0 .../source-dependencies/java-basic/changes/A.java | 0 .../source-dependencies/java-basic/changes/A2.java | 0 .../source-dependencies/java-basic/changes/B1.java | 0 .../source-dependencies/java-basic/changes/B2.java | 0 .../source-dependencies/java-basic/changes/B3.java | 0 .../java-basic/project/DottyInjectedPlugin.scala | 0 .../sbt-test/source-dependencies/java-basic/test | 0 .../java-generic-workaround/A.java | 0 .../DefaultTreeTableSorter.java | 0 .../java-generic-workaround/TreeColumnModel.java | 0 .../java-generic-workaround/TreeTableSorter.java | 0 .../project/DottyInjectedPlugin.scala | 0 .../java-generic-workaround/test | 0 .../sbt-test/source-dependencies/java-mixed/JJ.java | 0 .../source-dependencies/java-mixed/build.sbt | 0 .../source-dependencies/java-mixed/changes/S1.scala | 0 .../source-dependencies/java-mixed/changes/S2.scala | 0 .../java-mixed/changes/build.sbt | 0 .../java-mixed/project/DottyInjectedPlugin.scala | 0 .../sbt-test/source-dependencies/java-mixed/test | 0 .../source-dependencies/java-static/changes/J1.java | 0 .../source-dependencies/java-static/changes/J2.java | 0 .../source-dependencies/java-static/changes/S.scala | 0 .../java-static/project/DottyInjectedPlugin.scala | 0 .../sbt-test/source-dependencies/java-static/test | 0 .../sbt-test/source-dependencies/lazy-val/A.scala | 0 .../sbt-test/source-dependencies/lazy-val/B.scala | 0 .../source-dependencies/lazy-val/changes/A.scala | 0 .../lazy-val/project/DottyInjectedPlugin.scala | 0 .../src/sbt-test/source-dependencies/lazy-val/test | 0 .../source-dependencies/less-inter-inv-java/A.java | 0 .../source-dependencies/less-inter-inv-java/B.java | 0 .../source-dependencies/less-inter-inv-java/C.java | 0 .../source-dependencies/less-inter-inv-java/D.java | 0 .../source-dependencies/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 | 0 .../source-dependencies/less-inter-inv-java/test | 0 .../source-dependencies/less-inter-inv/A.scala | 0 .../source-dependencies/less-inter-inv/B.scala | 0 .../source-dependencies/less-inter-inv/C.scala | 0 .../source-dependencies/less-inter-inv/D.scala | 0 .../source-dependencies/less-inter-inv/E.scala | 0 .../source-dependencies/less-inter-inv/build.sbt | 0 .../less-inter-inv/changes/A2.scala | 0 .../project/DottyInjectedPlugin.scala | 0 .../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 .../linearization/project/DottyInjectedPlugin.scala | 0 .../sbt-test/source-dependencies/linearization/test | 0 .../src/sbt-test/source-dependencies/named/A.scala | 0 .../src/sbt-test/source-dependencies/named/B.scala | 0 .../source-dependencies/named/changes/A.scala | 0 .../named/project/DottyInjectedPlugin.scala | 0 .../src/sbt-test/source-dependencies/named/test | 0 .../nested-case-class/changes/A0.scala | 0 .../nested-case-class/changes/A1.scala | 0 .../project/DottyInjectedPlugin.scala | 0 .../source-dependencies/nested-case-class/test | 0 .../source-dependencies/new-cyclic/changes/A2.scala | 0 .../sbt-test/source-dependencies/new-cyclic/pending | 0 .../new-cyclic/project/DottyInjectedPlugin.scala | 0 .../new-cyclic/src/main/scala/A.scala | 0 .../new-cyclic/src/main/scala/B.scala | 0 .../source-dependencies/new-pkg-dep/changes/A1.java | 0 .../new-pkg-dep/changes/B0.scala | 0 .../new-pkg-dep/changes/B1.scala | 0 .../new-pkg-dep/project/DottyInjectedPlugin.scala | 0 .../sbt-test/source-dependencies/new-pkg-dep/test | 0 .../sbt-test/source-dependencies/override/A.scala | 0 .../sbt-test/source-dependencies/override/B.scala | 0 .../sbt-test/source-dependencies/override/C.scala | 0 .../sbt-test/source-dependencies/override/D.scala | 0 .../source-dependencies/override/changes/B2.scala | 0 .../override/project/DottyInjectedPlugin.scala | 0 .../src/sbt-test/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 .../parent-change/project/DottyInjectedPlugin.scala | 0 .../sbt-test/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 | 0 .../source-dependencies/parent-member-change/test | 0 .../source-dependencies/pkg-self/changes/A1.scala | 0 .../source-dependencies/pkg-self/changes/A2.scala | 0 .../source-dependencies/pkg-self/changes/B.scala | 0 .../pkg-self/changes/package.scala | 0 .../pkg-self/project/DottyInjectedPlugin.scala | 0 .../src/sbt-test/source-dependencies/pkg-self/test | 0 .../source-dependencies/qualified-access/A.scala | 0 .../source-dependencies/qualified-access/B.scala | 0 .../qualified-access/changes/A.scala | 0 .../project/DottyInjectedPlugin.scala | 0 .../source-dependencies/qualified-access/test | 0 .../relative-source-error/changes/absolute.sbt | 0 .../relative-source-error/changes/relative.sbt | 0 .../project/DottyInjectedPlugin.scala | 0 .../relative-source-error/src/A.scala | 0 .../source-dependencies/relative-source-error/test | 0 .../remove-test-a/changes/1.scala | 0 .../remove-test-a/project/DottyInjectedPlugin.scala | 0 .../sbt-test/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 .../remove-test-b/project/DottyInjectedPlugin.scala | 0 .../remove-test-b/src/main/scala/A.scala | 0 .../remove-test-b/src/main/scala/B.scala | 0 .../sbt-test/source-dependencies/remove-test-b/test | 0 .../source-dependencies/repeated-parameters/A.scala | 0 .../source-dependencies/repeated-parameters/B.scala | 0 .../repeated-parameters/changes/A.scala | 0 .../project/DottyInjectedPlugin.scala | 0 .../source-dependencies/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 | 0 .../source-dependencies/replace-test-a/test | 0 .../source-dependencies/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 .../resident-java/project/DottyInjectedPlugin.scala | 0 .../sbt-test/source-dependencies/resident-java/test | 0 .../resident-package-object/changes/A.scala | 0 .../resident-package-object/changes/package.scala | 0 .../resident-package-object/changes/package2.scala | 0 .../project/DottyInjectedPlugin.scala | 0 .../resident-package-object/test | 0 .../source-dependencies/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 | 0 .../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 | 0 .../source-dependencies/same-file-used-names/test | 0 .../src/sbt-test/source-dependencies/sealed/A.scala | 0 .../src/sbt-test/source-dependencies/sealed/D.scala | 0 .../source-dependencies/sealed/changes/A.scala | 0 .../src/sbt-test/source-dependencies/sealed/pending | 0 .../sealed/project/DottyInjectedPlugin.scala | 0 .../source-dependencies/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 | 0 .../source-dependencies/signature-change/test | 0 .../source-dependencies/specialized/A.scala | 0 .../source-dependencies/specialized/B.scala | 0 .../source-dependencies/specialized/changes/A.scala | 0 .../specialized/project/DottyInjectedPlugin.scala | 0 .../sbt-test/source-dependencies/specialized/test | 0 .../source-dependencies/stability-change/A.scala | 0 .../source-dependencies/stability-change/B.scala | 0 .../source-dependencies/stability-change/C.scala | 0 .../stability-change/changes/A.scala | 0 .../project/DottyInjectedPlugin.scala | 0 .../source-dependencies/stability-change/test | 0 .../source-dependencies/synthetic-companion/A.scala | 0 .../source-dependencies/synthetic-companion/B.scala | 0 .../synthetic-companion/changes/A2.scala | 0 .../source-dependencies/synthetic-companion/dbg.sbt | 0 .../project/DottyInjectedPlugin.scala | 0 .../source-dependencies/synthetic-companion/test | 0 .../trait-member-modified/build.sbt | 0 .../trait-member-modified/changes/A1.scala | 0 .../project/DottyInjectedPlugin.scala | 0 .../trait-member-modified/src/main/scala/A.scala | 0 .../trait-member-modified/src/main/scala/B.scala | 0 .../source-dependencies/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 | 0 .../source-dependencies/trait-private-object/test | 0 .../source-dependencies/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 | 0 .../source-dependencies/trait-private-var/test | 0 .../source-dependencies/trait-super/A.scala | 0 .../source-dependencies/trait-super/B.scala | 0 .../source-dependencies/trait-super/Main.scala | 0 .../trait-super/changes/B2.scala | 0 .../trait-super/changes/B3.scala | 0 .../trait-super/project/DottyInjectedPlugin.scala | 0 .../sbt-test/source-dependencies/trait-super/test | 0 .../transitive-a/changes/A2.scala | 0 .../transitive-a/project/DottyInjectedPlugin.scala | 0 .../transitive-a/src/main/scala/A.scala | 0 .../transitive-a/src/main/scala/B.scala | 0 .../transitive-a/src/main/scala/C.scala | 0 .../sbt-test/source-dependencies/transitive-a/test | 0 .../transitive-b/changes/A2.scala | 0 .../transitive-b/project/DottyInjectedPlugin.scala | 0 .../transitive-b/src/main/scala/A.scala | 0 .../transitive-b/src/main/scala/B.scala | 0 .../transitive-b/src/main/scala/C.scala | 0 .../sbt-test/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 | 0 .../transitive-inherit-java/test | 0 .../source-dependencies/transitive-inherit/A.scala | 0 .../source-dependencies/transitive-inherit/B.scala | 0 .../source-dependencies/transitive-inherit/C.scala | 0 .../transitive-inherit/changes/A2.scala | 0 .../project/DottyInjectedPlugin.scala | 0 .../source-dependencies/transitive-inherit/test | 0 .../transitive-memberRef/build.sbt | 0 .../transitive-memberRef/changes/A1.scala | 0 .../project/DottyInjectedPlugin.scala | 0 .../transitive-memberRef/src/main/scala/A.scala | 0 .../transitive-memberRef/src/main/scala/B.scala | 0 .../transitive-memberRef/src/main/scala/C.scala | 0 .../transitive-memberRef/src/main/scala/D.scala | 0 .../transitive-memberRef/src/main/scala/X.scala | 0 .../transitive-memberRef/src/main/scala/Y.scala | 0 .../source-dependencies/transitive-memberRef/test | 0 .../sbt-test/source-dependencies/type-alias/A.scala | 0 .../sbt-test/source-dependencies/type-alias/B.scala | 0 .../source-dependencies/type-alias/build.sbt | 0 .../source-dependencies/type-alias/changes/A.scala | 0 .../type-alias/project/DottyInjectedPlugin.scala | 0 .../sbt-test/source-dependencies/type-alias/test | 0 .../source-dependencies/type-parameter/A.scala | 0 .../source-dependencies/type-parameter/B.scala | 0 .../source-dependencies/type-parameter/C.scala | 0 .../source-dependencies/type-parameter/D.scala | 0 .../type-parameter/changes/A.scala | 0 .../project/DottyInjectedPlugin.scala | 0 .../source-dependencies/type-parameter/test | 0 .../source-dependencies/typeref-only/A.scala | 0 .../source-dependencies/typeref-only/B.scala | 0 .../source-dependencies/typeref-only/build.sbt | 0 .../typeref-only/project/DottyInjectedPlugin.scala | 0 .../sbt-test/source-dependencies/typeref-only/test | 0 .../source-dependencies/typeref-return/A.scala | 0 .../source-dependencies/typeref-return/B.scala | 0 .../typeref-return/changes/A.scala | 0 .../project/DottyInjectedPlugin.scala | 0 .../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 | 0 .../source-dependencies/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 | 0 .../source-dependencies/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 .../source-dependencies/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 .../value-class/project/DottyInjectedPlugin.scala | 0 .../sbt-test/source-dependencies/value-class/test | 0 .../src/sbt-test/source-dependencies/var/A.scala | 0 .../src/sbt-test/source-dependencies/var/B.scala | 0 .../source-dependencies/var/changes/A.scala | 0 .../var/project/DottyInjectedPlugin.scala | 0 .../src/sbt-test/source-dependencies/var/test | 0 .../sbt-test/source-dependencies/variance/A.scala | 0 .../sbt-test/source-dependencies/variance/C.scala | 0 .../source-dependencies/variance/changes/A.scala | 0 .../variance/project/DottyInjectedPlugin.scala | 0 .../src/sbt-test/source-dependencies/variance/test | 0 .../test/scala/xsbt/DependencySpecification.scala | 0 .../test/scala/xsbt/ExtractAPISpecification.scala | 0 .../scala/xsbt/ExtractUsedNamesSpecification.scala | 0 .../scala/xsbt/ScalaCompilerForUnitTesting.scala | 0 .../src/test/scala/xsbti/TestCallback.scala | 0 508 files changed, 2 insertions(+), 2 deletions(-) rename sbt-bridge/{bridge => }/src/main/scala/xsbt/CompilerClassLoader.scala (100%) rename sbt-bridge/{bridge => }/src/main/scala/xsbt/CompilerInterface.scala (100%) rename sbt-bridge/{bridge => }/src/main/scala/xsbt/ConsoleInterface.scala (100%) rename sbt-bridge/{bridge => }/src/main/scala/xsbt/DelegatingReporter.scala (100%) rename sbt-bridge/{bridge => }/src/main/scala/xsbt/Log.scala (100%) rename sbt-bridge/{bridge => }/src/main/scala/xsbt/Message.scala (100%) rename sbt-bridge/{bridge => }/src/main/scala/xsbt/ScaladocInterface.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/compilerReporter/simple/Source.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/compilerReporter/simple/build.sbt (100%) rename sbt-bridge/{bridge => }/src/sbt-test/compilerReporter/simple/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/compilerReporter/simple/project/Reporter.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/compilerReporter/simple/test (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/abstract-override/A.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/abstract-override/B.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/abstract-override/C.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/abstract-override/D.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/abstract-override/changes/C2.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/abstract-override/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/abstract-override/test (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/abstract-type-override/build.sbt (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/abstract-type-override/changes/Bar1.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/abstract-type-override/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/abstract-type-override/src/main/scala/Bar.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/abstract-type-override/src/main/scala/Foo.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/abstract-type-override/src/main/scala/Impl.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/abstract-type-override/test (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/abstract-type/A.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/abstract-type/B.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/abstract-type/changes/A.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/abstract-type/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/abstract-type/test (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/added/changes/A1.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/added/changes/A2.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/added/changes/A3.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/added/changes/B1.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/added/changes/B2.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/added/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/added/test (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/as-seen-from-a/A.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/as-seen-from-a/B.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/as-seen-from-a/C.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/as-seen-from-a/D.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/as-seen-from-a/changes/B2.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/as-seen-from-a/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/as-seen-from-a/test (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/as-seen-from-b/A.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/as-seen-from-b/B.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/as-seen-from-b/C.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/as-seen-from-b/D.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/as-seen-from-b/changes/B2.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/as-seen-from-b/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/as-seen-from-b/test (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/backtick-quoted-names/A.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/backtick-quoted-names/B.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/backtick-quoted-names/build.sbt (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/backtick-quoted-names/changes/A.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/backtick-quoted-names/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/backtick-quoted-names/test (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/binary/changes/Break.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/binary/dep/A.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/binary/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/binary/project/P.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/binary/test (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/binary/use/B.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/by-name/A.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/by-name/B.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/by-name/changes/A.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/by-name/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/by-name/test (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/canon/Use.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/canon/actual/A.java (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/canon/actual/a.jar (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/canon/build.sbt (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/canon/lib/a.jar (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/canon/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/canon/test (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/compactify/build.sbt (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/compactify/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/compactify/src/main/scala/For.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/compactify/src/main/scala/Nested.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/compactify/test (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/constants/changes/A1.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/constants/changes/A2.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/constants/changes/B.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/constants/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/constants/test (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/default-params/A.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/default-params/B.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/default-params/changes/A.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/default-params/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/default-params/test (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/dup-class/changes/A.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/dup-class/changes/A2.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/dup-class/changes/B.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/dup-class/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/dup-class/test (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/empty-a/changes/A.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/empty-a/changes/A2.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/empty-a/changes/B.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/empty-a/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/empty-a/test (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/empty-package/changes/Define1.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/empty-package/changes/Define2.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/empty-package/changes/Use.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/empty-package/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/empty-package/test (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/erasure/A.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/erasure/B.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/erasure/changes/A.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/erasure/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/erasure/test (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/export-jars/changes/A1.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/export-jars/changes/A2.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/export-jars/changes/A3.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/export-jars/changes/B.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/export-jars/changes/build2.sbt (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/export-jars/project/Build.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/export-jars/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/export-jars/test (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/ext/A.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/ext/build.sbt (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/ext/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/ext/test (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/false-error/A.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/false-error/B.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/false-error/changes/A.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/false-error/pending (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/false-error/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/fbounded-existentials/fbounds.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/fbounded-existentials/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/fbounded-existentials/test (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/implicit-params/A.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/implicit-params/B.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/implicit-params/changes/A.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/implicit-params/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/implicit-params/test (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/implicit-search-companion-scope/changes/A1.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/implicit-search-companion-scope/changes/A2.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/implicit-search-companion-scope/changes/B.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/implicit-search-companion-scope/changes/C.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/implicit-search-companion-scope/changes/M.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/implicit-search-companion-scope/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/implicit-search-companion-scope/test (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/implicit-search/changes/A1.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/implicit-search/changes/A2.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/implicit-search/changes/B.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/implicit-search/changes/C.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/implicit-search/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/implicit-search/test (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/implicit/A.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/implicit/B.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/implicit/changes/A.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/implicit/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/implicit/test (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/import-class/A.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/import-class/B.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/import-class/changes/A.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/import-class/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/import-class/test (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/import-package/A.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/import-package/B.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/import-package/changes/A.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/import-package/pending (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/import-package/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/inherited-deps-java/A.java (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/inherited-deps-java/B.java (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/inherited-deps-java/C.java (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/inherited-deps-java/D.java (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/inherited-deps-java/E.java (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/inherited-deps-java/F.java (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/inherited-deps-java/G.java (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/inherited-deps-java/J.java (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/inherited-deps-java/build.sbt (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/inherited-deps-java/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/inherited-deps-java/test (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/inherited_type_params/A.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/inherited_type_params/build.sbt (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/inherited_type_params/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/inherited_type_params/test (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/inline/A.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/inline/C.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/inline/changes/B1.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/inline/changes/B2.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/inline/changes/B3.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/inline/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/inline/test (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/intermediate-error/A.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/intermediate-error/B.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/intermediate-error/changes/A2.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/intermediate-error/changes/A3.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/intermediate-error/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/intermediate-error/test (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/java-analysis-serialization-error/Outer.java (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/java-analysis-serialization-error/build.sbt (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/java-analysis-serialization-error/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/java-analysis-serialization-error/test (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/java-basic/changes/A.java (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/java-basic/changes/A2.java (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/java-basic/changes/B1.java (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/java-basic/changes/B2.java (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/java-basic/changes/B3.java (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/java-basic/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/java-basic/test (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/java-generic-workaround/A.java (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/java-generic-workaround/DefaultTreeTableSorter.java (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/java-generic-workaround/TreeColumnModel.java (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/java-generic-workaround/TreeTableSorter.java (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/java-generic-workaround/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/java-generic-workaround/test (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/java-mixed/JJ.java (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/java-mixed/build.sbt (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/java-mixed/changes/S1.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/java-mixed/changes/S2.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/java-mixed/changes/build.sbt (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/java-mixed/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/java-mixed/test (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/java-static/changes/J1.java (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/java-static/changes/J2.java (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/java-static/changes/S.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/java-static/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/java-static/test (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/lazy-val/A.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/lazy-val/B.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/lazy-val/changes/A.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/lazy-val/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/lazy-val/test (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/less-inter-inv-java/A.java (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/less-inter-inv-java/B.java (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/less-inter-inv-java/C.java (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/less-inter-inv-java/D.java (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/less-inter-inv-java/E.java (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/less-inter-inv-java/build.sbt (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/less-inter-inv-java/changes/A2.java (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/less-inter-inv-java/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/less-inter-inv-java/test (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/less-inter-inv/A.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/less-inter-inv/B.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/less-inter-inv/C.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/less-inter-inv/D.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/less-inter-inv/E.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/less-inter-inv/build.sbt (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/less-inter-inv/changes/A2.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/less-inter-inv/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/less-inter-inv/test (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/linearization/A.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/linearization/B.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/linearization/C.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/linearization/D.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/linearization/E.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/linearization/F.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/linearization/changes/D.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/linearization/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/linearization/test (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/named/A.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/named/B.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/named/changes/A.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/named/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/named/test (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/nested-case-class/changes/A0.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/nested-case-class/changes/A1.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/nested-case-class/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/nested-case-class/test (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/new-cyclic/changes/A2.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/new-cyclic/pending (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/new-cyclic/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/new-cyclic/src/main/scala/A.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/new-cyclic/src/main/scala/B.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/new-pkg-dep/changes/A1.java (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/new-pkg-dep/changes/B0.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/new-pkg-dep/changes/B1.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/new-pkg-dep/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/new-pkg-dep/test (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/override/A.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/override/B.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/override/C.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/override/D.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/override/changes/B2.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/override/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/override/test (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/parent-change/W.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/parent-change/Y.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/parent-change/Z.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/parent-change/changes/W.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/parent-change/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/parent-change/test (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/parent-member-change/A.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/parent-member-change/B.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/parent-member-change/C.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/parent-member-change/changes/A.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/parent-member-change/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/parent-member-change/test (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/pkg-self/changes/A1.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/pkg-self/changes/A2.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/pkg-self/changes/B.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/pkg-self/changes/package.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/pkg-self/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/pkg-self/test (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/qualified-access/A.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/qualified-access/B.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/qualified-access/changes/A.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/qualified-access/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/qualified-access/test (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/relative-source-error/changes/absolute.sbt (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/relative-source-error/changes/relative.sbt (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/relative-source-error/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/relative-source-error/src/A.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/relative-source-error/test (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/remove-test-a/changes/1.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/remove-test-a/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/remove-test-a/test (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/remove-test-b/changes/A2.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/remove-test-b/changes/B3.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/remove-test-b/changes/B4.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/remove-test-b/changes/B5.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/remove-test-b/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/remove-test-b/src/main/scala/A.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/remove-test-b/src/main/scala/B.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/remove-test-b/test (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/repeated-parameters/A.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/repeated-parameters/B.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/repeated-parameters/changes/A.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/repeated-parameters/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/repeated-parameters/test (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/replace-test-a/changes/first.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/replace-test-a/changes/second.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/replace-test-a/project/Build.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/replace-test-a/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/replace-test-a/test (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/resident-java/build.sbt (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/resident-java/changes/A1.java (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/resident-java/changes/A2.java (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/resident-java/changes/B0.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/resident-java/changes/B1.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/resident-java/changes/B2.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/resident-java/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/resident-java/test (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/resident-package-object/changes/A.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/resident-package-object/changes/package.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/resident-package-object/changes/package2.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/resident-package-object/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/resident-package-object/test (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/restore-classes/build.sbt (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/restore-classes/changes/A1.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/restore-classes/changes/A2.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/restore-classes/changes/B.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/restore-classes/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/restore-classes/test (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/same-file-used-names/A.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/same-file-used-names/B.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/same-file-used-names/build.sbt (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/same-file-used-names/changes/B.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/same-file-used-names/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/same-file-used-names/test (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/sealed/A.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/sealed/D.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/sealed/changes/A.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/sealed/pending (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/sealed/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/signature-change/B.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/signature-change/changes/A0.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/signature-change/changes/A1.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/signature-change/changes/A2.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/signature-change/changes/A3.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/signature-change/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/signature-change/test (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/specialized/A.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/specialized/B.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/specialized/changes/A.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/specialized/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/specialized/test (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/stability-change/A.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/stability-change/B.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/stability-change/C.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/stability-change/changes/A.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/stability-change/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/stability-change/test (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/synthetic-companion/A.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/synthetic-companion/B.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/synthetic-companion/changes/A2.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/synthetic-companion/dbg.sbt (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/synthetic-companion/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/synthetic-companion/test (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/trait-member-modified/build.sbt (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/trait-member-modified/changes/A1.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/trait-member-modified/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/trait-member-modified/src/main/scala/A.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/trait-member-modified/src/main/scala/B.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/trait-member-modified/test (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/trait-private-object/A.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/trait-private-object/B.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/trait-private-object/changes/A.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/trait-private-object/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/trait-private-object/test (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/trait-private-var/B.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/trait-private-var/changes/A0.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/trait-private-var/changes/A1.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/trait-private-var/changes/A2.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/trait-private-var/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/trait-private-var/test (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/trait-super/A.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/trait-super/B.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/trait-super/Main.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/trait-super/changes/B2.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/trait-super/changes/B3.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/trait-super/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/trait-super/test (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/transitive-a/changes/A2.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/transitive-a/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/transitive-a/src/main/scala/A.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/transitive-a/src/main/scala/B.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/transitive-a/src/main/scala/C.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/transitive-a/test (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/transitive-b/changes/A2.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/transitive-b/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/transitive-b/src/main/scala/A.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/transitive-b/src/main/scala/B.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/transitive-b/src/main/scala/C.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/transitive-b/test (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/transitive-inherit-java/A.java (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/transitive-inherit-java/B.java (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/transitive-inherit-java/C.java (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/transitive-inherit-java/changes/A2.java (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/transitive-inherit-java/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/transitive-inherit-java/test (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/transitive-inherit/A.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/transitive-inherit/B.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/transitive-inherit/C.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/transitive-inherit/changes/A2.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/transitive-inherit/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/transitive-inherit/test (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/transitive-memberRef/build.sbt (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/transitive-memberRef/changes/A1.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/transitive-memberRef/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/transitive-memberRef/src/main/scala/A.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/transitive-memberRef/src/main/scala/B.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/transitive-memberRef/src/main/scala/C.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/transitive-memberRef/src/main/scala/D.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/transitive-memberRef/src/main/scala/X.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/transitive-memberRef/src/main/scala/Y.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/transitive-memberRef/test (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/type-alias/A.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/type-alias/B.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/type-alias/build.sbt (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/type-alias/changes/A.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/type-alias/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/type-alias/test (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/type-parameter/A.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/type-parameter/B.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/type-parameter/C.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/type-parameter/D.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/type-parameter/changes/A.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/type-parameter/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/type-parameter/test (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/typeref-only/A.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/typeref-only/B.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/typeref-only/build.sbt (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/typeref-only/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/typeref-only/test (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/typeref-return/A.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/typeref-return/B.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/typeref-return/changes/A.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/typeref-return/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/typeref-return/test (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/types-in-used-names-a/A.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/types-in-used-names-a/B.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/types-in-used-names-a/C.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/types-in-used-names-a/D.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/types-in-used-names-a/changes/B2.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/types-in-used-names-a/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/types-in-used-names-a/test (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/types-in-used-names-b/A.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/types-in-used-names-b/B.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/types-in-used-names-b/changes/A2.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/types-in-used-names-b/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/types-in-used-names-b/test (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/value-class-underlying/A.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/value-class-underlying/B.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/value-class-underlying/C.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/value-class-underlying/build.sbt (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/value-class-underlying/changes/A2.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/value-class-underlying/test (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/value-class/build.sbt (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/value-class/changes/A0.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/value-class/changes/A1.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/value-class/changes/B0.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/value-class/changes/B1.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/value-class/changes/B2.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/value-class/changes/C0.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/value-class/changes/C1.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/value-class/changes/C2.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/value-class/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/value-class/test (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/var/A.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/var/B.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/var/changes/A.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/var/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/var/test (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/variance/A.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/variance/C.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/variance/changes/A.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/variance/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{bridge => }/src/sbt-test/source-dependencies/variance/test (100%) rename sbt-bridge/{bridge => }/src/test/scala/xsbt/DependencySpecification.scala (100%) rename sbt-bridge/{bridge => }/src/test/scala/xsbt/ExtractAPISpecification.scala (100%) rename sbt-bridge/{bridge => }/src/test/scala/xsbt/ExtractUsedNamesSpecification.scala (100%) rename sbt-bridge/{bridge => }/src/test/scala/xsbt/ScalaCompilerForUnitTesting.scala (100%) rename sbt-bridge/{bridge => }/src/test/scala/xsbti/TestCallback.scala (100%) diff --git a/project/Build.scala b/project/Build.scala index 745c29960f10..b5b1df56a137 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -140,9 +140,9 @@ object DottyBuild extends Build { // necessary evil: dottydoc currently needs to be included in the dotty // project, for sbt integration unmanagedSourceDirectories in Compile := Seq((scalaSource in Compile).value), - unmanagedSourceDirectories in Compile += baseDirectory.value / "doc-tool" / "src", + unmanagedSourceDirectories in Compile += baseDirectory.value / ".." / "doc-tool" / "src", unmanagedSourceDirectories in Test := Seq((scalaSource in Test).value), - unmanagedSourceDirectories in Test += baseDirectory.value / "doc-tool" / "test", + unmanagedSourceDirectories in Test += baseDirectory.value / ".." / "doc-tool" / "test", // set system in/out for repl connectInput in run := true, diff --git a/sbt-bridge/bridge/src/main/scala/xsbt/CompilerClassLoader.scala b/sbt-bridge/src/main/scala/xsbt/CompilerClassLoader.scala similarity index 100% rename from sbt-bridge/bridge/src/main/scala/xsbt/CompilerClassLoader.scala rename to sbt-bridge/src/main/scala/xsbt/CompilerClassLoader.scala diff --git a/sbt-bridge/bridge/src/main/scala/xsbt/CompilerInterface.scala b/sbt-bridge/src/main/scala/xsbt/CompilerInterface.scala similarity index 100% rename from sbt-bridge/bridge/src/main/scala/xsbt/CompilerInterface.scala rename to sbt-bridge/src/main/scala/xsbt/CompilerInterface.scala diff --git a/sbt-bridge/bridge/src/main/scala/xsbt/ConsoleInterface.scala b/sbt-bridge/src/main/scala/xsbt/ConsoleInterface.scala similarity index 100% rename from sbt-bridge/bridge/src/main/scala/xsbt/ConsoleInterface.scala rename to sbt-bridge/src/main/scala/xsbt/ConsoleInterface.scala diff --git a/sbt-bridge/bridge/src/main/scala/xsbt/DelegatingReporter.scala b/sbt-bridge/src/main/scala/xsbt/DelegatingReporter.scala similarity index 100% rename from sbt-bridge/bridge/src/main/scala/xsbt/DelegatingReporter.scala rename to sbt-bridge/src/main/scala/xsbt/DelegatingReporter.scala diff --git a/sbt-bridge/bridge/src/main/scala/xsbt/Log.scala b/sbt-bridge/src/main/scala/xsbt/Log.scala similarity index 100% rename from sbt-bridge/bridge/src/main/scala/xsbt/Log.scala rename to sbt-bridge/src/main/scala/xsbt/Log.scala diff --git a/sbt-bridge/bridge/src/main/scala/xsbt/Message.scala b/sbt-bridge/src/main/scala/xsbt/Message.scala similarity index 100% rename from sbt-bridge/bridge/src/main/scala/xsbt/Message.scala rename to sbt-bridge/src/main/scala/xsbt/Message.scala diff --git a/sbt-bridge/bridge/src/main/scala/xsbt/ScaladocInterface.scala b/sbt-bridge/src/main/scala/xsbt/ScaladocInterface.scala similarity index 100% rename from sbt-bridge/bridge/src/main/scala/xsbt/ScaladocInterface.scala rename to sbt-bridge/src/main/scala/xsbt/ScaladocInterface.scala diff --git a/sbt-bridge/bridge/src/sbt-test/compilerReporter/simple/Source.scala b/sbt-bridge/src/sbt-test/compilerReporter/simple/Source.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/compilerReporter/simple/Source.scala rename to sbt-bridge/src/sbt-test/compilerReporter/simple/Source.scala diff --git a/sbt-bridge/bridge/src/sbt-test/compilerReporter/simple/build.sbt b/sbt-bridge/src/sbt-test/compilerReporter/simple/build.sbt similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/compilerReporter/simple/build.sbt rename to sbt-bridge/src/sbt-test/compilerReporter/simple/build.sbt diff --git a/sbt-bridge/bridge/src/sbt-test/compilerReporter/simple/project/DottyInjectedPlugin.scala b/sbt-bridge/src/sbt-test/compilerReporter/simple/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/compilerReporter/simple/project/DottyInjectedPlugin.scala rename to sbt-bridge/src/sbt-test/compilerReporter/simple/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/bridge/src/sbt-test/compilerReporter/simple/project/Reporter.scala b/sbt-bridge/src/sbt-test/compilerReporter/simple/project/Reporter.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/compilerReporter/simple/project/Reporter.scala rename to sbt-bridge/src/sbt-test/compilerReporter/simple/project/Reporter.scala diff --git a/sbt-bridge/bridge/src/sbt-test/compilerReporter/simple/test b/sbt-bridge/src/sbt-test/compilerReporter/simple/test similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/compilerReporter/simple/test rename to sbt-bridge/src/sbt-test/compilerReporter/simple/test diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/abstract-override/A.scala b/sbt-bridge/src/sbt-test/source-dependencies/abstract-override/A.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/abstract-override/A.scala rename to sbt-bridge/src/sbt-test/source-dependencies/abstract-override/A.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/abstract-override/B.scala b/sbt-bridge/src/sbt-test/source-dependencies/abstract-override/B.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/abstract-override/B.scala rename to sbt-bridge/src/sbt-test/source-dependencies/abstract-override/B.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/abstract-override/C.scala b/sbt-bridge/src/sbt-test/source-dependencies/abstract-override/C.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/abstract-override/C.scala rename to sbt-bridge/src/sbt-test/source-dependencies/abstract-override/C.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/abstract-override/D.scala b/sbt-bridge/src/sbt-test/source-dependencies/abstract-override/D.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/abstract-override/D.scala rename to sbt-bridge/src/sbt-test/source-dependencies/abstract-override/D.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/abstract-override/changes/C2.scala b/sbt-bridge/src/sbt-test/source-dependencies/abstract-override/changes/C2.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/abstract-override/changes/C2.scala rename to sbt-bridge/src/sbt-test/source-dependencies/abstract-override/changes/C2.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/abstract-override/project/DottyInjectedPlugin.scala b/sbt-bridge/src/sbt-test/source-dependencies/abstract-override/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/abstract-override/project/DottyInjectedPlugin.scala rename to sbt-bridge/src/sbt-test/source-dependencies/abstract-override/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/abstract-override/test b/sbt-bridge/src/sbt-test/source-dependencies/abstract-override/test similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/abstract-override/test rename to sbt-bridge/src/sbt-test/source-dependencies/abstract-override/test diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/abstract-type-override/build.sbt b/sbt-bridge/src/sbt-test/source-dependencies/abstract-type-override/build.sbt similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/abstract-type-override/build.sbt rename to sbt-bridge/src/sbt-test/source-dependencies/abstract-type-override/build.sbt diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/abstract-type-override/changes/Bar1.scala b/sbt-bridge/src/sbt-test/source-dependencies/abstract-type-override/changes/Bar1.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/abstract-type-override/changes/Bar1.scala rename to sbt-bridge/src/sbt-test/source-dependencies/abstract-type-override/changes/Bar1.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/abstract-type-override/project/DottyInjectedPlugin.scala b/sbt-bridge/src/sbt-test/source-dependencies/abstract-type-override/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/abstract-type-override/project/DottyInjectedPlugin.scala rename to sbt-bridge/src/sbt-test/source-dependencies/abstract-type-override/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/abstract-type-override/src/main/scala/Bar.scala b/sbt-bridge/src/sbt-test/source-dependencies/abstract-type-override/src/main/scala/Bar.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/abstract-type-override/src/main/scala/Bar.scala rename to sbt-bridge/src/sbt-test/source-dependencies/abstract-type-override/src/main/scala/Bar.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/abstract-type-override/src/main/scala/Foo.scala b/sbt-bridge/src/sbt-test/source-dependencies/abstract-type-override/src/main/scala/Foo.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/abstract-type-override/src/main/scala/Foo.scala rename to sbt-bridge/src/sbt-test/source-dependencies/abstract-type-override/src/main/scala/Foo.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/abstract-type-override/src/main/scala/Impl.scala b/sbt-bridge/src/sbt-test/source-dependencies/abstract-type-override/src/main/scala/Impl.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/abstract-type-override/src/main/scala/Impl.scala rename to sbt-bridge/src/sbt-test/source-dependencies/abstract-type-override/src/main/scala/Impl.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/abstract-type-override/test b/sbt-bridge/src/sbt-test/source-dependencies/abstract-type-override/test similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/abstract-type-override/test rename to sbt-bridge/src/sbt-test/source-dependencies/abstract-type-override/test diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/abstract-type/A.scala b/sbt-bridge/src/sbt-test/source-dependencies/abstract-type/A.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/abstract-type/A.scala rename to sbt-bridge/src/sbt-test/source-dependencies/abstract-type/A.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/abstract-type/B.scala b/sbt-bridge/src/sbt-test/source-dependencies/abstract-type/B.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/abstract-type/B.scala rename to sbt-bridge/src/sbt-test/source-dependencies/abstract-type/B.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/abstract-type/changes/A.scala b/sbt-bridge/src/sbt-test/source-dependencies/abstract-type/changes/A.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/abstract-type/changes/A.scala rename to sbt-bridge/src/sbt-test/source-dependencies/abstract-type/changes/A.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/abstract-type/project/DottyInjectedPlugin.scala b/sbt-bridge/src/sbt-test/source-dependencies/abstract-type/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/abstract-type/project/DottyInjectedPlugin.scala rename to sbt-bridge/src/sbt-test/source-dependencies/abstract-type/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/abstract-type/test b/sbt-bridge/src/sbt-test/source-dependencies/abstract-type/test similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/abstract-type/test rename to sbt-bridge/src/sbt-test/source-dependencies/abstract-type/test diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/added/changes/A1.scala b/sbt-bridge/src/sbt-test/source-dependencies/added/changes/A1.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/added/changes/A1.scala rename to sbt-bridge/src/sbt-test/source-dependencies/added/changes/A1.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/added/changes/A2.scala b/sbt-bridge/src/sbt-test/source-dependencies/added/changes/A2.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/added/changes/A2.scala rename to sbt-bridge/src/sbt-test/source-dependencies/added/changes/A2.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/added/changes/A3.scala b/sbt-bridge/src/sbt-test/source-dependencies/added/changes/A3.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/added/changes/A3.scala rename to sbt-bridge/src/sbt-test/source-dependencies/added/changes/A3.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/added/changes/B1.scala b/sbt-bridge/src/sbt-test/source-dependencies/added/changes/B1.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/added/changes/B1.scala rename to sbt-bridge/src/sbt-test/source-dependencies/added/changes/B1.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/added/changes/B2.scala b/sbt-bridge/src/sbt-test/source-dependencies/added/changes/B2.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/added/changes/B2.scala rename to sbt-bridge/src/sbt-test/source-dependencies/added/changes/B2.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/added/project/DottyInjectedPlugin.scala b/sbt-bridge/src/sbt-test/source-dependencies/added/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/added/project/DottyInjectedPlugin.scala rename to sbt-bridge/src/sbt-test/source-dependencies/added/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/added/test b/sbt-bridge/src/sbt-test/source-dependencies/added/test similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/added/test rename to sbt-bridge/src/sbt-test/source-dependencies/added/test diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/as-seen-from-a/A.scala b/sbt-bridge/src/sbt-test/source-dependencies/as-seen-from-a/A.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/as-seen-from-a/A.scala rename to sbt-bridge/src/sbt-test/source-dependencies/as-seen-from-a/A.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/as-seen-from-a/B.scala b/sbt-bridge/src/sbt-test/source-dependencies/as-seen-from-a/B.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/as-seen-from-a/B.scala rename to sbt-bridge/src/sbt-test/source-dependencies/as-seen-from-a/B.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/as-seen-from-a/C.scala b/sbt-bridge/src/sbt-test/source-dependencies/as-seen-from-a/C.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/as-seen-from-a/C.scala rename to sbt-bridge/src/sbt-test/source-dependencies/as-seen-from-a/C.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/as-seen-from-a/D.scala b/sbt-bridge/src/sbt-test/source-dependencies/as-seen-from-a/D.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/as-seen-from-a/D.scala rename to sbt-bridge/src/sbt-test/source-dependencies/as-seen-from-a/D.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/as-seen-from-a/changes/B2.scala b/sbt-bridge/src/sbt-test/source-dependencies/as-seen-from-a/changes/B2.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/as-seen-from-a/changes/B2.scala rename to sbt-bridge/src/sbt-test/source-dependencies/as-seen-from-a/changes/B2.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/as-seen-from-a/project/DottyInjectedPlugin.scala b/sbt-bridge/src/sbt-test/source-dependencies/as-seen-from-a/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/as-seen-from-a/project/DottyInjectedPlugin.scala rename to sbt-bridge/src/sbt-test/source-dependencies/as-seen-from-a/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/as-seen-from-a/test b/sbt-bridge/src/sbt-test/source-dependencies/as-seen-from-a/test similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/as-seen-from-a/test rename to sbt-bridge/src/sbt-test/source-dependencies/as-seen-from-a/test diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/as-seen-from-b/A.scala b/sbt-bridge/src/sbt-test/source-dependencies/as-seen-from-b/A.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/as-seen-from-b/A.scala rename to sbt-bridge/src/sbt-test/source-dependencies/as-seen-from-b/A.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/as-seen-from-b/B.scala b/sbt-bridge/src/sbt-test/source-dependencies/as-seen-from-b/B.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/as-seen-from-b/B.scala rename to sbt-bridge/src/sbt-test/source-dependencies/as-seen-from-b/B.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/as-seen-from-b/C.scala b/sbt-bridge/src/sbt-test/source-dependencies/as-seen-from-b/C.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/as-seen-from-b/C.scala rename to sbt-bridge/src/sbt-test/source-dependencies/as-seen-from-b/C.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/as-seen-from-b/D.scala b/sbt-bridge/src/sbt-test/source-dependencies/as-seen-from-b/D.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/as-seen-from-b/D.scala rename to sbt-bridge/src/sbt-test/source-dependencies/as-seen-from-b/D.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/as-seen-from-b/changes/B2.scala b/sbt-bridge/src/sbt-test/source-dependencies/as-seen-from-b/changes/B2.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/as-seen-from-b/changes/B2.scala rename to sbt-bridge/src/sbt-test/source-dependencies/as-seen-from-b/changes/B2.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/as-seen-from-b/project/DottyInjectedPlugin.scala b/sbt-bridge/src/sbt-test/source-dependencies/as-seen-from-b/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/as-seen-from-b/project/DottyInjectedPlugin.scala rename to sbt-bridge/src/sbt-test/source-dependencies/as-seen-from-b/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/as-seen-from-b/test b/sbt-bridge/src/sbt-test/source-dependencies/as-seen-from-b/test similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/as-seen-from-b/test rename to sbt-bridge/src/sbt-test/source-dependencies/as-seen-from-b/test diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/backtick-quoted-names/A.scala b/sbt-bridge/src/sbt-test/source-dependencies/backtick-quoted-names/A.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/backtick-quoted-names/A.scala rename to sbt-bridge/src/sbt-test/source-dependencies/backtick-quoted-names/A.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/backtick-quoted-names/B.scala b/sbt-bridge/src/sbt-test/source-dependencies/backtick-quoted-names/B.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/backtick-quoted-names/B.scala rename to sbt-bridge/src/sbt-test/source-dependencies/backtick-quoted-names/B.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/backtick-quoted-names/build.sbt b/sbt-bridge/src/sbt-test/source-dependencies/backtick-quoted-names/build.sbt similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/backtick-quoted-names/build.sbt rename to sbt-bridge/src/sbt-test/source-dependencies/backtick-quoted-names/build.sbt diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/backtick-quoted-names/changes/A.scala b/sbt-bridge/src/sbt-test/source-dependencies/backtick-quoted-names/changes/A.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/backtick-quoted-names/changes/A.scala rename to sbt-bridge/src/sbt-test/source-dependencies/backtick-quoted-names/changes/A.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/backtick-quoted-names/project/DottyInjectedPlugin.scala b/sbt-bridge/src/sbt-test/source-dependencies/backtick-quoted-names/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/backtick-quoted-names/project/DottyInjectedPlugin.scala rename to sbt-bridge/src/sbt-test/source-dependencies/backtick-quoted-names/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/backtick-quoted-names/test b/sbt-bridge/src/sbt-test/source-dependencies/backtick-quoted-names/test similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/backtick-quoted-names/test rename to sbt-bridge/src/sbt-test/source-dependencies/backtick-quoted-names/test diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/binary/changes/Break.scala b/sbt-bridge/src/sbt-test/source-dependencies/binary/changes/Break.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/binary/changes/Break.scala rename to sbt-bridge/src/sbt-test/source-dependencies/binary/changes/Break.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/binary/dep/A.scala b/sbt-bridge/src/sbt-test/source-dependencies/binary/dep/A.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/binary/dep/A.scala rename to sbt-bridge/src/sbt-test/source-dependencies/binary/dep/A.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/binary/project/DottyInjectedPlugin.scala b/sbt-bridge/src/sbt-test/source-dependencies/binary/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/binary/project/DottyInjectedPlugin.scala rename to sbt-bridge/src/sbt-test/source-dependencies/binary/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/binary/project/P.scala b/sbt-bridge/src/sbt-test/source-dependencies/binary/project/P.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/binary/project/P.scala rename to sbt-bridge/src/sbt-test/source-dependencies/binary/project/P.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/binary/test b/sbt-bridge/src/sbt-test/source-dependencies/binary/test similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/binary/test rename to sbt-bridge/src/sbt-test/source-dependencies/binary/test diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/binary/use/B.scala b/sbt-bridge/src/sbt-test/source-dependencies/binary/use/B.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/binary/use/B.scala rename to sbt-bridge/src/sbt-test/source-dependencies/binary/use/B.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/by-name/A.scala b/sbt-bridge/src/sbt-test/source-dependencies/by-name/A.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/by-name/A.scala rename to sbt-bridge/src/sbt-test/source-dependencies/by-name/A.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/by-name/B.scala b/sbt-bridge/src/sbt-test/source-dependencies/by-name/B.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/by-name/B.scala rename to sbt-bridge/src/sbt-test/source-dependencies/by-name/B.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/by-name/changes/A.scala b/sbt-bridge/src/sbt-test/source-dependencies/by-name/changes/A.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/by-name/changes/A.scala rename to sbt-bridge/src/sbt-test/source-dependencies/by-name/changes/A.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/by-name/project/DottyInjectedPlugin.scala b/sbt-bridge/src/sbt-test/source-dependencies/by-name/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/by-name/project/DottyInjectedPlugin.scala rename to sbt-bridge/src/sbt-test/source-dependencies/by-name/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/by-name/test b/sbt-bridge/src/sbt-test/source-dependencies/by-name/test similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/by-name/test rename to sbt-bridge/src/sbt-test/source-dependencies/by-name/test diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/canon/Use.scala b/sbt-bridge/src/sbt-test/source-dependencies/canon/Use.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/canon/Use.scala rename to sbt-bridge/src/sbt-test/source-dependencies/canon/Use.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/canon/actual/A.java b/sbt-bridge/src/sbt-test/source-dependencies/canon/actual/A.java similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/canon/actual/A.java rename to sbt-bridge/src/sbt-test/source-dependencies/canon/actual/A.java diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/canon/actual/a.jar b/sbt-bridge/src/sbt-test/source-dependencies/canon/actual/a.jar similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/canon/actual/a.jar rename to sbt-bridge/src/sbt-test/source-dependencies/canon/actual/a.jar diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/canon/build.sbt b/sbt-bridge/src/sbt-test/source-dependencies/canon/build.sbt similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/canon/build.sbt rename to sbt-bridge/src/sbt-test/source-dependencies/canon/build.sbt diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/canon/lib/a.jar b/sbt-bridge/src/sbt-test/source-dependencies/canon/lib/a.jar similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/canon/lib/a.jar rename to sbt-bridge/src/sbt-test/source-dependencies/canon/lib/a.jar diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/canon/project/DottyInjectedPlugin.scala b/sbt-bridge/src/sbt-test/source-dependencies/canon/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/canon/project/DottyInjectedPlugin.scala rename to sbt-bridge/src/sbt-test/source-dependencies/canon/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/canon/test b/sbt-bridge/src/sbt-test/source-dependencies/canon/test similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/canon/test rename to sbt-bridge/src/sbt-test/source-dependencies/canon/test diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/compactify/build.sbt b/sbt-bridge/src/sbt-test/source-dependencies/compactify/build.sbt similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/compactify/build.sbt rename to sbt-bridge/src/sbt-test/source-dependencies/compactify/build.sbt diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/compactify/project/DottyInjectedPlugin.scala b/sbt-bridge/src/sbt-test/source-dependencies/compactify/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/compactify/project/DottyInjectedPlugin.scala rename to sbt-bridge/src/sbt-test/source-dependencies/compactify/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/compactify/src/main/scala/For.scala b/sbt-bridge/src/sbt-test/source-dependencies/compactify/src/main/scala/For.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/compactify/src/main/scala/For.scala rename to sbt-bridge/src/sbt-test/source-dependencies/compactify/src/main/scala/For.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/compactify/src/main/scala/Nested.scala b/sbt-bridge/src/sbt-test/source-dependencies/compactify/src/main/scala/Nested.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/compactify/src/main/scala/Nested.scala rename to sbt-bridge/src/sbt-test/source-dependencies/compactify/src/main/scala/Nested.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/compactify/test b/sbt-bridge/src/sbt-test/source-dependencies/compactify/test similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/compactify/test rename to sbt-bridge/src/sbt-test/source-dependencies/compactify/test diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/constants/changes/A1.scala b/sbt-bridge/src/sbt-test/source-dependencies/constants/changes/A1.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/constants/changes/A1.scala rename to sbt-bridge/src/sbt-test/source-dependencies/constants/changes/A1.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/constants/changes/A2.scala b/sbt-bridge/src/sbt-test/source-dependencies/constants/changes/A2.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/constants/changes/A2.scala rename to sbt-bridge/src/sbt-test/source-dependencies/constants/changes/A2.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/constants/changes/B.scala b/sbt-bridge/src/sbt-test/source-dependencies/constants/changes/B.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/constants/changes/B.scala rename to sbt-bridge/src/sbt-test/source-dependencies/constants/changes/B.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/constants/project/DottyInjectedPlugin.scala b/sbt-bridge/src/sbt-test/source-dependencies/constants/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/constants/project/DottyInjectedPlugin.scala rename to sbt-bridge/src/sbt-test/source-dependencies/constants/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/constants/test b/sbt-bridge/src/sbt-test/source-dependencies/constants/test similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/constants/test rename to sbt-bridge/src/sbt-test/source-dependencies/constants/test diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/default-params/A.scala b/sbt-bridge/src/sbt-test/source-dependencies/default-params/A.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/default-params/A.scala rename to sbt-bridge/src/sbt-test/source-dependencies/default-params/A.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/default-params/B.scala b/sbt-bridge/src/sbt-test/source-dependencies/default-params/B.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/default-params/B.scala rename to sbt-bridge/src/sbt-test/source-dependencies/default-params/B.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/default-params/changes/A.scala b/sbt-bridge/src/sbt-test/source-dependencies/default-params/changes/A.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/default-params/changes/A.scala rename to sbt-bridge/src/sbt-test/source-dependencies/default-params/changes/A.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/default-params/project/DottyInjectedPlugin.scala b/sbt-bridge/src/sbt-test/source-dependencies/default-params/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/default-params/project/DottyInjectedPlugin.scala rename to sbt-bridge/src/sbt-test/source-dependencies/default-params/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/default-params/test b/sbt-bridge/src/sbt-test/source-dependencies/default-params/test similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/default-params/test rename to sbt-bridge/src/sbt-test/source-dependencies/default-params/test diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/dup-class/changes/A.scala b/sbt-bridge/src/sbt-test/source-dependencies/dup-class/changes/A.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/dup-class/changes/A.scala rename to sbt-bridge/src/sbt-test/source-dependencies/dup-class/changes/A.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/dup-class/changes/A2.scala b/sbt-bridge/src/sbt-test/source-dependencies/dup-class/changes/A2.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/dup-class/changes/A2.scala rename to sbt-bridge/src/sbt-test/source-dependencies/dup-class/changes/A2.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/dup-class/changes/B.scala b/sbt-bridge/src/sbt-test/source-dependencies/dup-class/changes/B.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/dup-class/changes/B.scala rename to sbt-bridge/src/sbt-test/source-dependencies/dup-class/changes/B.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/dup-class/project/DottyInjectedPlugin.scala b/sbt-bridge/src/sbt-test/source-dependencies/dup-class/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/dup-class/project/DottyInjectedPlugin.scala rename to sbt-bridge/src/sbt-test/source-dependencies/dup-class/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/dup-class/test b/sbt-bridge/src/sbt-test/source-dependencies/dup-class/test similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/dup-class/test rename to sbt-bridge/src/sbt-test/source-dependencies/dup-class/test diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/empty-a/changes/A.scala b/sbt-bridge/src/sbt-test/source-dependencies/empty-a/changes/A.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/empty-a/changes/A.scala rename to sbt-bridge/src/sbt-test/source-dependencies/empty-a/changes/A.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/empty-a/changes/A2.scala b/sbt-bridge/src/sbt-test/source-dependencies/empty-a/changes/A2.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/empty-a/changes/A2.scala rename to sbt-bridge/src/sbt-test/source-dependencies/empty-a/changes/A2.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/empty-a/changes/B.scala b/sbt-bridge/src/sbt-test/source-dependencies/empty-a/changes/B.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/empty-a/changes/B.scala rename to sbt-bridge/src/sbt-test/source-dependencies/empty-a/changes/B.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/empty-a/project/DottyInjectedPlugin.scala b/sbt-bridge/src/sbt-test/source-dependencies/empty-a/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/empty-a/project/DottyInjectedPlugin.scala rename to sbt-bridge/src/sbt-test/source-dependencies/empty-a/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/empty-a/test b/sbt-bridge/src/sbt-test/source-dependencies/empty-a/test similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/empty-a/test rename to sbt-bridge/src/sbt-test/source-dependencies/empty-a/test diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/empty-package/changes/Define1.scala b/sbt-bridge/src/sbt-test/source-dependencies/empty-package/changes/Define1.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/empty-package/changes/Define1.scala rename to sbt-bridge/src/sbt-test/source-dependencies/empty-package/changes/Define1.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/empty-package/changes/Define2.scala b/sbt-bridge/src/sbt-test/source-dependencies/empty-package/changes/Define2.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/empty-package/changes/Define2.scala rename to sbt-bridge/src/sbt-test/source-dependencies/empty-package/changes/Define2.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/empty-package/changes/Use.scala b/sbt-bridge/src/sbt-test/source-dependencies/empty-package/changes/Use.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/empty-package/changes/Use.scala rename to sbt-bridge/src/sbt-test/source-dependencies/empty-package/changes/Use.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/empty-package/project/DottyInjectedPlugin.scala b/sbt-bridge/src/sbt-test/source-dependencies/empty-package/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/empty-package/project/DottyInjectedPlugin.scala rename to sbt-bridge/src/sbt-test/source-dependencies/empty-package/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/empty-package/test b/sbt-bridge/src/sbt-test/source-dependencies/empty-package/test similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/empty-package/test rename to sbt-bridge/src/sbt-test/source-dependencies/empty-package/test diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/erasure/A.scala b/sbt-bridge/src/sbt-test/source-dependencies/erasure/A.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/erasure/A.scala rename to sbt-bridge/src/sbt-test/source-dependencies/erasure/A.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/erasure/B.scala b/sbt-bridge/src/sbt-test/source-dependencies/erasure/B.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/erasure/B.scala rename to sbt-bridge/src/sbt-test/source-dependencies/erasure/B.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/erasure/changes/A.scala b/sbt-bridge/src/sbt-test/source-dependencies/erasure/changes/A.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/erasure/changes/A.scala rename to sbt-bridge/src/sbt-test/source-dependencies/erasure/changes/A.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/erasure/project/DottyInjectedPlugin.scala b/sbt-bridge/src/sbt-test/source-dependencies/erasure/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/erasure/project/DottyInjectedPlugin.scala rename to sbt-bridge/src/sbt-test/source-dependencies/erasure/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/erasure/test b/sbt-bridge/src/sbt-test/source-dependencies/erasure/test similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/erasure/test rename to sbt-bridge/src/sbt-test/source-dependencies/erasure/test diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/export-jars/changes/A1.scala b/sbt-bridge/src/sbt-test/source-dependencies/export-jars/changes/A1.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/export-jars/changes/A1.scala rename to sbt-bridge/src/sbt-test/source-dependencies/export-jars/changes/A1.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/export-jars/changes/A2.scala b/sbt-bridge/src/sbt-test/source-dependencies/export-jars/changes/A2.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/export-jars/changes/A2.scala rename to sbt-bridge/src/sbt-test/source-dependencies/export-jars/changes/A2.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/export-jars/changes/A3.scala b/sbt-bridge/src/sbt-test/source-dependencies/export-jars/changes/A3.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/export-jars/changes/A3.scala rename to sbt-bridge/src/sbt-test/source-dependencies/export-jars/changes/A3.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/export-jars/changes/B.scala b/sbt-bridge/src/sbt-test/source-dependencies/export-jars/changes/B.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/export-jars/changes/B.scala rename to sbt-bridge/src/sbt-test/source-dependencies/export-jars/changes/B.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/export-jars/changes/build2.sbt b/sbt-bridge/src/sbt-test/source-dependencies/export-jars/changes/build2.sbt similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/export-jars/changes/build2.sbt rename to sbt-bridge/src/sbt-test/source-dependencies/export-jars/changes/build2.sbt diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/export-jars/project/Build.scala b/sbt-bridge/src/sbt-test/source-dependencies/export-jars/project/Build.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/export-jars/project/Build.scala rename to sbt-bridge/src/sbt-test/source-dependencies/export-jars/project/Build.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/export-jars/project/DottyInjectedPlugin.scala b/sbt-bridge/src/sbt-test/source-dependencies/export-jars/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/export-jars/project/DottyInjectedPlugin.scala rename to sbt-bridge/src/sbt-test/source-dependencies/export-jars/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/export-jars/test b/sbt-bridge/src/sbt-test/source-dependencies/export-jars/test similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/export-jars/test rename to sbt-bridge/src/sbt-test/source-dependencies/export-jars/test diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/ext/A.scala b/sbt-bridge/src/sbt-test/source-dependencies/ext/A.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/ext/A.scala rename to sbt-bridge/src/sbt-test/source-dependencies/ext/A.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/ext/build.sbt b/sbt-bridge/src/sbt-test/source-dependencies/ext/build.sbt similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/ext/build.sbt rename to sbt-bridge/src/sbt-test/source-dependencies/ext/build.sbt diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/ext/project/DottyInjectedPlugin.scala b/sbt-bridge/src/sbt-test/source-dependencies/ext/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/ext/project/DottyInjectedPlugin.scala rename to sbt-bridge/src/sbt-test/source-dependencies/ext/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/ext/test b/sbt-bridge/src/sbt-test/source-dependencies/ext/test similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/ext/test rename to sbt-bridge/src/sbt-test/source-dependencies/ext/test diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/false-error/A.scala b/sbt-bridge/src/sbt-test/source-dependencies/false-error/A.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/false-error/A.scala rename to sbt-bridge/src/sbt-test/source-dependencies/false-error/A.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/false-error/B.scala b/sbt-bridge/src/sbt-test/source-dependencies/false-error/B.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/false-error/B.scala rename to sbt-bridge/src/sbt-test/source-dependencies/false-error/B.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/false-error/changes/A.scala b/sbt-bridge/src/sbt-test/source-dependencies/false-error/changes/A.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/false-error/changes/A.scala rename to sbt-bridge/src/sbt-test/source-dependencies/false-error/changes/A.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/false-error/pending b/sbt-bridge/src/sbt-test/source-dependencies/false-error/pending similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/false-error/pending rename to sbt-bridge/src/sbt-test/source-dependencies/false-error/pending diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/false-error/project/DottyInjectedPlugin.scala b/sbt-bridge/src/sbt-test/source-dependencies/false-error/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/false-error/project/DottyInjectedPlugin.scala rename to sbt-bridge/src/sbt-test/source-dependencies/false-error/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/fbounded-existentials/fbounds.scala b/sbt-bridge/src/sbt-test/source-dependencies/fbounded-existentials/fbounds.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/fbounded-existentials/fbounds.scala rename to sbt-bridge/src/sbt-test/source-dependencies/fbounded-existentials/fbounds.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/fbounded-existentials/project/DottyInjectedPlugin.scala b/sbt-bridge/src/sbt-test/source-dependencies/fbounded-existentials/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/fbounded-existentials/project/DottyInjectedPlugin.scala rename to sbt-bridge/src/sbt-test/source-dependencies/fbounded-existentials/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/fbounded-existentials/test b/sbt-bridge/src/sbt-test/source-dependencies/fbounded-existentials/test similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/fbounded-existentials/test rename to sbt-bridge/src/sbt-test/source-dependencies/fbounded-existentials/test diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/implicit-params/A.scala b/sbt-bridge/src/sbt-test/source-dependencies/implicit-params/A.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/implicit-params/A.scala rename to sbt-bridge/src/sbt-test/source-dependencies/implicit-params/A.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/implicit-params/B.scala b/sbt-bridge/src/sbt-test/source-dependencies/implicit-params/B.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/implicit-params/B.scala rename to sbt-bridge/src/sbt-test/source-dependencies/implicit-params/B.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/implicit-params/changes/A.scala b/sbt-bridge/src/sbt-test/source-dependencies/implicit-params/changes/A.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/implicit-params/changes/A.scala rename to sbt-bridge/src/sbt-test/source-dependencies/implicit-params/changes/A.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/implicit-params/project/DottyInjectedPlugin.scala b/sbt-bridge/src/sbt-test/source-dependencies/implicit-params/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/implicit-params/project/DottyInjectedPlugin.scala rename to sbt-bridge/src/sbt-test/source-dependencies/implicit-params/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/implicit-params/test b/sbt-bridge/src/sbt-test/source-dependencies/implicit-params/test similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/implicit-params/test rename to sbt-bridge/src/sbt-test/source-dependencies/implicit-params/test diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/implicit-search-companion-scope/changes/A1.scala b/sbt-bridge/src/sbt-test/source-dependencies/implicit-search-companion-scope/changes/A1.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/implicit-search-companion-scope/changes/A1.scala rename to sbt-bridge/src/sbt-test/source-dependencies/implicit-search-companion-scope/changes/A1.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/implicit-search-companion-scope/changes/A2.scala b/sbt-bridge/src/sbt-test/source-dependencies/implicit-search-companion-scope/changes/A2.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/implicit-search-companion-scope/changes/A2.scala rename to sbt-bridge/src/sbt-test/source-dependencies/implicit-search-companion-scope/changes/A2.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/implicit-search-companion-scope/changes/B.scala b/sbt-bridge/src/sbt-test/source-dependencies/implicit-search-companion-scope/changes/B.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/implicit-search-companion-scope/changes/B.scala rename to sbt-bridge/src/sbt-test/source-dependencies/implicit-search-companion-scope/changes/B.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/implicit-search-companion-scope/changes/C.scala b/sbt-bridge/src/sbt-test/source-dependencies/implicit-search-companion-scope/changes/C.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/implicit-search-companion-scope/changes/C.scala rename to sbt-bridge/src/sbt-test/source-dependencies/implicit-search-companion-scope/changes/C.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/implicit-search-companion-scope/changes/M.scala b/sbt-bridge/src/sbt-test/source-dependencies/implicit-search-companion-scope/changes/M.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/implicit-search-companion-scope/changes/M.scala rename to sbt-bridge/src/sbt-test/source-dependencies/implicit-search-companion-scope/changes/M.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/implicit-search-companion-scope/project/DottyInjectedPlugin.scala b/sbt-bridge/src/sbt-test/source-dependencies/implicit-search-companion-scope/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/implicit-search-companion-scope/project/DottyInjectedPlugin.scala rename to sbt-bridge/src/sbt-test/source-dependencies/implicit-search-companion-scope/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/implicit-search-companion-scope/test b/sbt-bridge/src/sbt-test/source-dependencies/implicit-search-companion-scope/test similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/implicit-search-companion-scope/test rename to sbt-bridge/src/sbt-test/source-dependencies/implicit-search-companion-scope/test diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/implicit-search/changes/A1.scala b/sbt-bridge/src/sbt-test/source-dependencies/implicit-search/changes/A1.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/implicit-search/changes/A1.scala rename to sbt-bridge/src/sbt-test/source-dependencies/implicit-search/changes/A1.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/implicit-search/changes/A2.scala b/sbt-bridge/src/sbt-test/source-dependencies/implicit-search/changes/A2.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/implicit-search/changes/A2.scala rename to sbt-bridge/src/sbt-test/source-dependencies/implicit-search/changes/A2.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/implicit-search/changes/B.scala b/sbt-bridge/src/sbt-test/source-dependencies/implicit-search/changes/B.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/implicit-search/changes/B.scala rename to sbt-bridge/src/sbt-test/source-dependencies/implicit-search/changes/B.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/implicit-search/changes/C.scala b/sbt-bridge/src/sbt-test/source-dependencies/implicit-search/changes/C.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/implicit-search/changes/C.scala rename to sbt-bridge/src/sbt-test/source-dependencies/implicit-search/changes/C.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/implicit-search/project/DottyInjectedPlugin.scala b/sbt-bridge/src/sbt-test/source-dependencies/implicit-search/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/implicit-search/project/DottyInjectedPlugin.scala rename to sbt-bridge/src/sbt-test/source-dependencies/implicit-search/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/implicit-search/test b/sbt-bridge/src/sbt-test/source-dependencies/implicit-search/test similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/implicit-search/test rename to sbt-bridge/src/sbt-test/source-dependencies/implicit-search/test diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/implicit/A.scala b/sbt-bridge/src/sbt-test/source-dependencies/implicit/A.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/implicit/A.scala rename to sbt-bridge/src/sbt-test/source-dependencies/implicit/A.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/implicit/B.scala b/sbt-bridge/src/sbt-test/source-dependencies/implicit/B.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/implicit/B.scala rename to sbt-bridge/src/sbt-test/source-dependencies/implicit/B.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/implicit/changes/A.scala b/sbt-bridge/src/sbt-test/source-dependencies/implicit/changes/A.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/implicit/changes/A.scala rename to sbt-bridge/src/sbt-test/source-dependencies/implicit/changes/A.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/implicit/project/DottyInjectedPlugin.scala b/sbt-bridge/src/sbt-test/source-dependencies/implicit/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/implicit/project/DottyInjectedPlugin.scala rename to sbt-bridge/src/sbt-test/source-dependencies/implicit/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/implicit/test b/sbt-bridge/src/sbt-test/source-dependencies/implicit/test similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/implicit/test rename to sbt-bridge/src/sbt-test/source-dependencies/implicit/test diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/import-class/A.scala b/sbt-bridge/src/sbt-test/source-dependencies/import-class/A.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/import-class/A.scala rename to sbt-bridge/src/sbt-test/source-dependencies/import-class/A.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/import-class/B.scala b/sbt-bridge/src/sbt-test/source-dependencies/import-class/B.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/import-class/B.scala rename to sbt-bridge/src/sbt-test/source-dependencies/import-class/B.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/import-class/changes/A.scala b/sbt-bridge/src/sbt-test/source-dependencies/import-class/changes/A.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/import-class/changes/A.scala rename to sbt-bridge/src/sbt-test/source-dependencies/import-class/changes/A.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/import-class/project/DottyInjectedPlugin.scala b/sbt-bridge/src/sbt-test/source-dependencies/import-class/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/import-class/project/DottyInjectedPlugin.scala rename to sbt-bridge/src/sbt-test/source-dependencies/import-class/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/import-class/test b/sbt-bridge/src/sbt-test/source-dependencies/import-class/test similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/import-class/test rename to sbt-bridge/src/sbt-test/source-dependencies/import-class/test diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/import-package/A.scala b/sbt-bridge/src/sbt-test/source-dependencies/import-package/A.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/import-package/A.scala rename to sbt-bridge/src/sbt-test/source-dependencies/import-package/A.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/import-package/B.scala b/sbt-bridge/src/sbt-test/source-dependencies/import-package/B.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/import-package/B.scala rename to sbt-bridge/src/sbt-test/source-dependencies/import-package/B.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/import-package/changes/A.scala b/sbt-bridge/src/sbt-test/source-dependencies/import-package/changes/A.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/import-package/changes/A.scala rename to sbt-bridge/src/sbt-test/source-dependencies/import-package/changes/A.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/import-package/pending b/sbt-bridge/src/sbt-test/source-dependencies/import-package/pending similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/import-package/pending rename to sbt-bridge/src/sbt-test/source-dependencies/import-package/pending diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/import-package/project/DottyInjectedPlugin.scala b/sbt-bridge/src/sbt-test/source-dependencies/import-package/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/import-package/project/DottyInjectedPlugin.scala rename to sbt-bridge/src/sbt-test/source-dependencies/import-package/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/inherited-deps-java/A.java b/sbt-bridge/src/sbt-test/source-dependencies/inherited-deps-java/A.java similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/inherited-deps-java/A.java rename to sbt-bridge/src/sbt-test/source-dependencies/inherited-deps-java/A.java diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/inherited-deps-java/B.java b/sbt-bridge/src/sbt-test/source-dependencies/inherited-deps-java/B.java similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/inherited-deps-java/B.java rename to sbt-bridge/src/sbt-test/source-dependencies/inherited-deps-java/B.java diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/inherited-deps-java/C.java b/sbt-bridge/src/sbt-test/source-dependencies/inherited-deps-java/C.java similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/inherited-deps-java/C.java rename to sbt-bridge/src/sbt-test/source-dependencies/inherited-deps-java/C.java diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/inherited-deps-java/D.java b/sbt-bridge/src/sbt-test/source-dependencies/inherited-deps-java/D.java similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/inherited-deps-java/D.java rename to sbt-bridge/src/sbt-test/source-dependencies/inherited-deps-java/D.java diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/inherited-deps-java/E.java b/sbt-bridge/src/sbt-test/source-dependencies/inherited-deps-java/E.java similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/inherited-deps-java/E.java rename to sbt-bridge/src/sbt-test/source-dependencies/inherited-deps-java/E.java diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/inherited-deps-java/F.java b/sbt-bridge/src/sbt-test/source-dependencies/inherited-deps-java/F.java similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/inherited-deps-java/F.java rename to sbt-bridge/src/sbt-test/source-dependencies/inherited-deps-java/F.java diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/inherited-deps-java/G.java b/sbt-bridge/src/sbt-test/source-dependencies/inherited-deps-java/G.java similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/inherited-deps-java/G.java rename to sbt-bridge/src/sbt-test/source-dependencies/inherited-deps-java/G.java diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/inherited-deps-java/J.java b/sbt-bridge/src/sbt-test/source-dependencies/inherited-deps-java/J.java similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/inherited-deps-java/J.java rename to sbt-bridge/src/sbt-test/source-dependencies/inherited-deps-java/J.java diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/inherited-deps-java/build.sbt b/sbt-bridge/src/sbt-test/source-dependencies/inherited-deps-java/build.sbt similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/inherited-deps-java/build.sbt rename to sbt-bridge/src/sbt-test/source-dependencies/inherited-deps-java/build.sbt diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/inherited-deps-java/project/DottyInjectedPlugin.scala b/sbt-bridge/src/sbt-test/source-dependencies/inherited-deps-java/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/inherited-deps-java/project/DottyInjectedPlugin.scala rename to sbt-bridge/src/sbt-test/source-dependencies/inherited-deps-java/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/inherited-deps-java/test b/sbt-bridge/src/sbt-test/source-dependencies/inherited-deps-java/test similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/inherited-deps-java/test rename to sbt-bridge/src/sbt-test/source-dependencies/inherited-deps-java/test diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/inherited_type_params/A.scala b/sbt-bridge/src/sbt-test/source-dependencies/inherited_type_params/A.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/inherited_type_params/A.scala rename to sbt-bridge/src/sbt-test/source-dependencies/inherited_type_params/A.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/inherited_type_params/build.sbt b/sbt-bridge/src/sbt-test/source-dependencies/inherited_type_params/build.sbt similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/inherited_type_params/build.sbt rename to sbt-bridge/src/sbt-test/source-dependencies/inherited_type_params/build.sbt diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/inherited_type_params/project/DottyInjectedPlugin.scala b/sbt-bridge/src/sbt-test/source-dependencies/inherited_type_params/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/inherited_type_params/project/DottyInjectedPlugin.scala rename to sbt-bridge/src/sbt-test/source-dependencies/inherited_type_params/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/inherited_type_params/test b/sbt-bridge/src/sbt-test/source-dependencies/inherited_type_params/test similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/inherited_type_params/test rename to sbt-bridge/src/sbt-test/source-dependencies/inherited_type_params/test diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/inline/A.scala b/sbt-bridge/src/sbt-test/source-dependencies/inline/A.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/inline/A.scala rename to sbt-bridge/src/sbt-test/source-dependencies/inline/A.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/inline/C.scala b/sbt-bridge/src/sbt-test/source-dependencies/inline/C.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/inline/C.scala rename to sbt-bridge/src/sbt-test/source-dependencies/inline/C.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/inline/changes/B1.scala b/sbt-bridge/src/sbt-test/source-dependencies/inline/changes/B1.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/inline/changes/B1.scala rename to sbt-bridge/src/sbt-test/source-dependencies/inline/changes/B1.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/inline/changes/B2.scala b/sbt-bridge/src/sbt-test/source-dependencies/inline/changes/B2.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/inline/changes/B2.scala rename to sbt-bridge/src/sbt-test/source-dependencies/inline/changes/B2.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/inline/changes/B3.scala b/sbt-bridge/src/sbt-test/source-dependencies/inline/changes/B3.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/inline/changes/B3.scala rename to sbt-bridge/src/sbt-test/source-dependencies/inline/changes/B3.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/inline/project/DottyInjectedPlugin.scala b/sbt-bridge/src/sbt-test/source-dependencies/inline/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/inline/project/DottyInjectedPlugin.scala rename to sbt-bridge/src/sbt-test/source-dependencies/inline/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/inline/test b/sbt-bridge/src/sbt-test/source-dependencies/inline/test similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/inline/test rename to sbt-bridge/src/sbt-test/source-dependencies/inline/test diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/intermediate-error/A.scala b/sbt-bridge/src/sbt-test/source-dependencies/intermediate-error/A.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/intermediate-error/A.scala rename to sbt-bridge/src/sbt-test/source-dependencies/intermediate-error/A.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/intermediate-error/B.scala b/sbt-bridge/src/sbt-test/source-dependencies/intermediate-error/B.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/intermediate-error/B.scala rename to sbt-bridge/src/sbt-test/source-dependencies/intermediate-error/B.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/intermediate-error/changes/A2.scala b/sbt-bridge/src/sbt-test/source-dependencies/intermediate-error/changes/A2.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/intermediate-error/changes/A2.scala rename to sbt-bridge/src/sbt-test/source-dependencies/intermediate-error/changes/A2.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/intermediate-error/changes/A3.scala b/sbt-bridge/src/sbt-test/source-dependencies/intermediate-error/changes/A3.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/intermediate-error/changes/A3.scala rename to sbt-bridge/src/sbt-test/source-dependencies/intermediate-error/changes/A3.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/intermediate-error/project/DottyInjectedPlugin.scala b/sbt-bridge/src/sbt-test/source-dependencies/intermediate-error/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/intermediate-error/project/DottyInjectedPlugin.scala rename to sbt-bridge/src/sbt-test/source-dependencies/intermediate-error/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/intermediate-error/test b/sbt-bridge/src/sbt-test/source-dependencies/intermediate-error/test similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/intermediate-error/test rename to sbt-bridge/src/sbt-test/source-dependencies/intermediate-error/test diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/java-analysis-serialization-error/Outer.java b/sbt-bridge/src/sbt-test/source-dependencies/java-analysis-serialization-error/Outer.java similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/java-analysis-serialization-error/Outer.java rename to sbt-bridge/src/sbt-test/source-dependencies/java-analysis-serialization-error/Outer.java diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/java-analysis-serialization-error/build.sbt b/sbt-bridge/src/sbt-test/source-dependencies/java-analysis-serialization-error/build.sbt similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/java-analysis-serialization-error/build.sbt rename to sbt-bridge/src/sbt-test/source-dependencies/java-analysis-serialization-error/build.sbt diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/java-analysis-serialization-error/project/DottyInjectedPlugin.scala b/sbt-bridge/src/sbt-test/source-dependencies/java-analysis-serialization-error/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/java-analysis-serialization-error/project/DottyInjectedPlugin.scala rename to sbt-bridge/src/sbt-test/source-dependencies/java-analysis-serialization-error/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/java-analysis-serialization-error/test b/sbt-bridge/src/sbt-test/source-dependencies/java-analysis-serialization-error/test similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/java-analysis-serialization-error/test rename to sbt-bridge/src/sbt-test/source-dependencies/java-analysis-serialization-error/test diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/java-basic/changes/A.java b/sbt-bridge/src/sbt-test/source-dependencies/java-basic/changes/A.java similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/java-basic/changes/A.java rename to sbt-bridge/src/sbt-test/source-dependencies/java-basic/changes/A.java diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/java-basic/changes/A2.java b/sbt-bridge/src/sbt-test/source-dependencies/java-basic/changes/A2.java similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/java-basic/changes/A2.java rename to sbt-bridge/src/sbt-test/source-dependencies/java-basic/changes/A2.java diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/java-basic/changes/B1.java b/sbt-bridge/src/sbt-test/source-dependencies/java-basic/changes/B1.java similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/java-basic/changes/B1.java rename to sbt-bridge/src/sbt-test/source-dependencies/java-basic/changes/B1.java diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/java-basic/changes/B2.java b/sbt-bridge/src/sbt-test/source-dependencies/java-basic/changes/B2.java similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/java-basic/changes/B2.java rename to sbt-bridge/src/sbt-test/source-dependencies/java-basic/changes/B2.java diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/java-basic/changes/B3.java b/sbt-bridge/src/sbt-test/source-dependencies/java-basic/changes/B3.java similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/java-basic/changes/B3.java rename to sbt-bridge/src/sbt-test/source-dependencies/java-basic/changes/B3.java diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/java-basic/project/DottyInjectedPlugin.scala b/sbt-bridge/src/sbt-test/source-dependencies/java-basic/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/java-basic/project/DottyInjectedPlugin.scala rename to sbt-bridge/src/sbt-test/source-dependencies/java-basic/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/java-basic/test b/sbt-bridge/src/sbt-test/source-dependencies/java-basic/test similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/java-basic/test rename to sbt-bridge/src/sbt-test/source-dependencies/java-basic/test diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/java-generic-workaround/A.java b/sbt-bridge/src/sbt-test/source-dependencies/java-generic-workaround/A.java similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/java-generic-workaround/A.java rename to sbt-bridge/src/sbt-test/source-dependencies/java-generic-workaround/A.java diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/java-generic-workaround/DefaultTreeTableSorter.java b/sbt-bridge/src/sbt-test/source-dependencies/java-generic-workaround/DefaultTreeTableSorter.java similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/java-generic-workaround/DefaultTreeTableSorter.java rename to sbt-bridge/src/sbt-test/source-dependencies/java-generic-workaround/DefaultTreeTableSorter.java diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/java-generic-workaround/TreeColumnModel.java b/sbt-bridge/src/sbt-test/source-dependencies/java-generic-workaround/TreeColumnModel.java similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/java-generic-workaround/TreeColumnModel.java rename to sbt-bridge/src/sbt-test/source-dependencies/java-generic-workaround/TreeColumnModel.java diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/java-generic-workaround/TreeTableSorter.java b/sbt-bridge/src/sbt-test/source-dependencies/java-generic-workaround/TreeTableSorter.java similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/java-generic-workaround/TreeTableSorter.java rename to sbt-bridge/src/sbt-test/source-dependencies/java-generic-workaround/TreeTableSorter.java diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/java-generic-workaround/project/DottyInjectedPlugin.scala b/sbt-bridge/src/sbt-test/source-dependencies/java-generic-workaround/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/java-generic-workaround/project/DottyInjectedPlugin.scala rename to sbt-bridge/src/sbt-test/source-dependencies/java-generic-workaround/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/java-generic-workaround/test b/sbt-bridge/src/sbt-test/source-dependencies/java-generic-workaround/test similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/java-generic-workaround/test rename to sbt-bridge/src/sbt-test/source-dependencies/java-generic-workaround/test diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/java-mixed/JJ.java b/sbt-bridge/src/sbt-test/source-dependencies/java-mixed/JJ.java similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/java-mixed/JJ.java rename to sbt-bridge/src/sbt-test/source-dependencies/java-mixed/JJ.java diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/java-mixed/build.sbt b/sbt-bridge/src/sbt-test/source-dependencies/java-mixed/build.sbt similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/java-mixed/build.sbt rename to sbt-bridge/src/sbt-test/source-dependencies/java-mixed/build.sbt diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/java-mixed/changes/S1.scala b/sbt-bridge/src/sbt-test/source-dependencies/java-mixed/changes/S1.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/java-mixed/changes/S1.scala rename to sbt-bridge/src/sbt-test/source-dependencies/java-mixed/changes/S1.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/java-mixed/changes/S2.scala b/sbt-bridge/src/sbt-test/source-dependencies/java-mixed/changes/S2.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/java-mixed/changes/S2.scala rename to sbt-bridge/src/sbt-test/source-dependencies/java-mixed/changes/S2.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/java-mixed/changes/build.sbt b/sbt-bridge/src/sbt-test/source-dependencies/java-mixed/changes/build.sbt similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/java-mixed/changes/build.sbt rename to sbt-bridge/src/sbt-test/source-dependencies/java-mixed/changes/build.sbt diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/java-mixed/project/DottyInjectedPlugin.scala b/sbt-bridge/src/sbt-test/source-dependencies/java-mixed/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/java-mixed/project/DottyInjectedPlugin.scala rename to sbt-bridge/src/sbt-test/source-dependencies/java-mixed/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/java-mixed/test b/sbt-bridge/src/sbt-test/source-dependencies/java-mixed/test similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/java-mixed/test rename to sbt-bridge/src/sbt-test/source-dependencies/java-mixed/test diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/java-static/changes/J1.java b/sbt-bridge/src/sbt-test/source-dependencies/java-static/changes/J1.java similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/java-static/changes/J1.java rename to sbt-bridge/src/sbt-test/source-dependencies/java-static/changes/J1.java diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/java-static/changes/J2.java b/sbt-bridge/src/sbt-test/source-dependencies/java-static/changes/J2.java similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/java-static/changes/J2.java rename to sbt-bridge/src/sbt-test/source-dependencies/java-static/changes/J2.java diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/java-static/changes/S.scala b/sbt-bridge/src/sbt-test/source-dependencies/java-static/changes/S.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/java-static/changes/S.scala rename to sbt-bridge/src/sbt-test/source-dependencies/java-static/changes/S.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/java-static/project/DottyInjectedPlugin.scala b/sbt-bridge/src/sbt-test/source-dependencies/java-static/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/java-static/project/DottyInjectedPlugin.scala rename to sbt-bridge/src/sbt-test/source-dependencies/java-static/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/java-static/test b/sbt-bridge/src/sbt-test/source-dependencies/java-static/test similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/java-static/test rename to sbt-bridge/src/sbt-test/source-dependencies/java-static/test diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/lazy-val/A.scala b/sbt-bridge/src/sbt-test/source-dependencies/lazy-val/A.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/lazy-val/A.scala rename to sbt-bridge/src/sbt-test/source-dependencies/lazy-val/A.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/lazy-val/B.scala b/sbt-bridge/src/sbt-test/source-dependencies/lazy-val/B.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/lazy-val/B.scala rename to sbt-bridge/src/sbt-test/source-dependencies/lazy-val/B.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/lazy-val/changes/A.scala b/sbt-bridge/src/sbt-test/source-dependencies/lazy-val/changes/A.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/lazy-val/changes/A.scala rename to sbt-bridge/src/sbt-test/source-dependencies/lazy-val/changes/A.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/lazy-val/project/DottyInjectedPlugin.scala b/sbt-bridge/src/sbt-test/source-dependencies/lazy-val/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/lazy-val/project/DottyInjectedPlugin.scala rename to sbt-bridge/src/sbt-test/source-dependencies/lazy-val/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/lazy-val/test b/sbt-bridge/src/sbt-test/source-dependencies/lazy-val/test similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/lazy-val/test rename to sbt-bridge/src/sbt-test/source-dependencies/lazy-val/test diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/less-inter-inv-java/A.java b/sbt-bridge/src/sbt-test/source-dependencies/less-inter-inv-java/A.java similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/less-inter-inv-java/A.java rename to sbt-bridge/src/sbt-test/source-dependencies/less-inter-inv-java/A.java diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/less-inter-inv-java/B.java b/sbt-bridge/src/sbt-test/source-dependencies/less-inter-inv-java/B.java similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/less-inter-inv-java/B.java rename to sbt-bridge/src/sbt-test/source-dependencies/less-inter-inv-java/B.java diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/less-inter-inv-java/C.java b/sbt-bridge/src/sbt-test/source-dependencies/less-inter-inv-java/C.java similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/less-inter-inv-java/C.java rename to sbt-bridge/src/sbt-test/source-dependencies/less-inter-inv-java/C.java diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/less-inter-inv-java/D.java b/sbt-bridge/src/sbt-test/source-dependencies/less-inter-inv-java/D.java similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/less-inter-inv-java/D.java rename to sbt-bridge/src/sbt-test/source-dependencies/less-inter-inv-java/D.java diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/less-inter-inv-java/E.java b/sbt-bridge/src/sbt-test/source-dependencies/less-inter-inv-java/E.java similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/less-inter-inv-java/E.java rename to sbt-bridge/src/sbt-test/source-dependencies/less-inter-inv-java/E.java diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/less-inter-inv-java/build.sbt b/sbt-bridge/src/sbt-test/source-dependencies/less-inter-inv-java/build.sbt similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/less-inter-inv-java/build.sbt rename to sbt-bridge/src/sbt-test/source-dependencies/less-inter-inv-java/build.sbt diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/less-inter-inv-java/changes/A2.java b/sbt-bridge/src/sbt-test/source-dependencies/less-inter-inv-java/changes/A2.java similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/less-inter-inv-java/changes/A2.java rename to sbt-bridge/src/sbt-test/source-dependencies/less-inter-inv-java/changes/A2.java diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/less-inter-inv-java/project/DottyInjectedPlugin.scala b/sbt-bridge/src/sbt-test/source-dependencies/less-inter-inv-java/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/less-inter-inv-java/project/DottyInjectedPlugin.scala rename to sbt-bridge/src/sbt-test/source-dependencies/less-inter-inv-java/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/less-inter-inv-java/test b/sbt-bridge/src/sbt-test/source-dependencies/less-inter-inv-java/test similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/less-inter-inv-java/test rename to sbt-bridge/src/sbt-test/source-dependencies/less-inter-inv-java/test diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/less-inter-inv/A.scala b/sbt-bridge/src/sbt-test/source-dependencies/less-inter-inv/A.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/less-inter-inv/A.scala rename to sbt-bridge/src/sbt-test/source-dependencies/less-inter-inv/A.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/less-inter-inv/B.scala b/sbt-bridge/src/sbt-test/source-dependencies/less-inter-inv/B.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/less-inter-inv/B.scala rename to sbt-bridge/src/sbt-test/source-dependencies/less-inter-inv/B.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/less-inter-inv/C.scala b/sbt-bridge/src/sbt-test/source-dependencies/less-inter-inv/C.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/less-inter-inv/C.scala rename to sbt-bridge/src/sbt-test/source-dependencies/less-inter-inv/C.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/less-inter-inv/D.scala b/sbt-bridge/src/sbt-test/source-dependencies/less-inter-inv/D.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/less-inter-inv/D.scala rename to sbt-bridge/src/sbt-test/source-dependencies/less-inter-inv/D.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/less-inter-inv/E.scala b/sbt-bridge/src/sbt-test/source-dependencies/less-inter-inv/E.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/less-inter-inv/E.scala rename to sbt-bridge/src/sbt-test/source-dependencies/less-inter-inv/E.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/less-inter-inv/build.sbt b/sbt-bridge/src/sbt-test/source-dependencies/less-inter-inv/build.sbt similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/less-inter-inv/build.sbt rename to sbt-bridge/src/sbt-test/source-dependencies/less-inter-inv/build.sbt diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/less-inter-inv/changes/A2.scala b/sbt-bridge/src/sbt-test/source-dependencies/less-inter-inv/changes/A2.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/less-inter-inv/changes/A2.scala rename to sbt-bridge/src/sbt-test/source-dependencies/less-inter-inv/changes/A2.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/less-inter-inv/project/DottyInjectedPlugin.scala b/sbt-bridge/src/sbt-test/source-dependencies/less-inter-inv/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/less-inter-inv/project/DottyInjectedPlugin.scala rename to sbt-bridge/src/sbt-test/source-dependencies/less-inter-inv/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/less-inter-inv/test b/sbt-bridge/src/sbt-test/source-dependencies/less-inter-inv/test similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/less-inter-inv/test rename to sbt-bridge/src/sbt-test/source-dependencies/less-inter-inv/test diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/linearization/A.scala b/sbt-bridge/src/sbt-test/source-dependencies/linearization/A.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/linearization/A.scala rename to sbt-bridge/src/sbt-test/source-dependencies/linearization/A.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/linearization/B.scala b/sbt-bridge/src/sbt-test/source-dependencies/linearization/B.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/linearization/B.scala rename to sbt-bridge/src/sbt-test/source-dependencies/linearization/B.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/linearization/C.scala b/sbt-bridge/src/sbt-test/source-dependencies/linearization/C.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/linearization/C.scala rename to sbt-bridge/src/sbt-test/source-dependencies/linearization/C.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/linearization/D.scala b/sbt-bridge/src/sbt-test/source-dependencies/linearization/D.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/linearization/D.scala rename to sbt-bridge/src/sbt-test/source-dependencies/linearization/D.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/linearization/E.scala b/sbt-bridge/src/sbt-test/source-dependencies/linearization/E.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/linearization/E.scala rename to sbt-bridge/src/sbt-test/source-dependencies/linearization/E.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/linearization/F.scala b/sbt-bridge/src/sbt-test/source-dependencies/linearization/F.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/linearization/F.scala rename to sbt-bridge/src/sbt-test/source-dependencies/linearization/F.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/linearization/changes/D.scala b/sbt-bridge/src/sbt-test/source-dependencies/linearization/changes/D.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/linearization/changes/D.scala rename to sbt-bridge/src/sbt-test/source-dependencies/linearization/changes/D.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/linearization/project/DottyInjectedPlugin.scala b/sbt-bridge/src/sbt-test/source-dependencies/linearization/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/linearization/project/DottyInjectedPlugin.scala rename to sbt-bridge/src/sbt-test/source-dependencies/linearization/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/linearization/test b/sbt-bridge/src/sbt-test/source-dependencies/linearization/test similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/linearization/test rename to sbt-bridge/src/sbt-test/source-dependencies/linearization/test diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/named/A.scala b/sbt-bridge/src/sbt-test/source-dependencies/named/A.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/named/A.scala rename to sbt-bridge/src/sbt-test/source-dependencies/named/A.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/named/B.scala b/sbt-bridge/src/sbt-test/source-dependencies/named/B.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/named/B.scala rename to sbt-bridge/src/sbt-test/source-dependencies/named/B.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/named/changes/A.scala b/sbt-bridge/src/sbt-test/source-dependencies/named/changes/A.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/named/changes/A.scala rename to sbt-bridge/src/sbt-test/source-dependencies/named/changes/A.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/named/project/DottyInjectedPlugin.scala b/sbt-bridge/src/sbt-test/source-dependencies/named/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/named/project/DottyInjectedPlugin.scala rename to sbt-bridge/src/sbt-test/source-dependencies/named/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/named/test b/sbt-bridge/src/sbt-test/source-dependencies/named/test similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/named/test rename to sbt-bridge/src/sbt-test/source-dependencies/named/test diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/nested-case-class/changes/A0.scala b/sbt-bridge/src/sbt-test/source-dependencies/nested-case-class/changes/A0.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/nested-case-class/changes/A0.scala rename to sbt-bridge/src/sbt-test/source-dependencies/nested-case-class/changes/A0.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/nested-case-class/changes/A1.scala b/sbt-bridge/src/sbt-test/source-dependencies/nested-case-class/changes/A1.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/nested-case-class/changes/A1.scala rename to sbt-bridge/src/sbt-test/source-dependencies/nested-case-class/changes/A1.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/nested-case-class/project/DottyInjectedPlugin.scala b/sbt-bridge/src/sbt-test/source-dependencies/nested-case-class/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/nested-case-class/project/DottyInjectedPlugin.scala rename to sbt-bridge/src/sbt-test/source-dependencies/nested-case-class/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/nested-case-class/test b/sbt-bridge/src/sbt-test/source-dependencies/nested-case-class/test similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/nested-case-class/test rename to sbt-bridge/src/sbt-test/source-dependencies/nested-case-class/test diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/new-cyclic/changes/A2.scala b/sbt-bridge/src/sbt-test/source-dependencies/new-cyclic/changes/A2.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/new-cyclic/changes/A2.scala rename to sbt-bridge/src/sbt-test/source-dependencies/new-cyclic/changes/A2.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/new-cyclic/pending b/sbt-bridge/src/sbt-test/source-dependencies/new-cyclic/pending similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/new-cyclic/pending rename to sbt-bridge/src/sbt-test/source-dependencies/new-cyclic/pending diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/new-cyclic/project/DottyInjectedPlugin.scala b/sbt-bridge/src/sbt-test/source-dependencies/new-cyclic/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/new-cyclic/project/DottyInjectedPlugin.scala rename to sbt-bridge/src/sbt-test/source-dependencies/new-cyclic/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/new-cyclic/src/main/scala/A.scala b/sbt-bridge/src/sbt-test/source-dependencies/new-cyclic/src/main/scala/A.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/new-cyclic/src/main/scala/A.scala rename to sbt-bridge/src/sbt-test/source-dependencies/new-cyclic/src/main/scala/A.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/new-cyclic/src/main/scala/B.scala b/sbt-bridge/src/sbt-test/source-dependencies/new-cyclic/src/main/scala/B.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/new-cyclic/src/main/scala/B.scala rename to sbt-bridge/src/sbt-test/source-dependencies/new-cyclic/src/main/scala/B.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/new-pkg-dep/changes/A1.java b/sbt-bridge/src/sbt-test/source-dependencies/new-pkg-dep/changes/A1.java similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/new-pkg-dep/changes/A1.java rename to sbt-bridge/src/sbt-test/source-dependencies/new-pkg-dep/changes/A1.java diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/new-pkg-dep/changes/B0.scala b/sbt-bridge/src/sbt-test/source-dependencies/new-pkg-dep/changes/B0.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/new-pkg-dep/changes/B0.scala rename to sbt-bridge/src/sbt-test/source-dependencies/new-pkg-dep/changes/B0.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/new-pkg-dep/changes/B1.scala b/sbt-bridge/src/sbt-test/source-dependencies/new-pkg-dep/changes/B1.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/new-pkg-dep/changes/B1.scala rename to sbt-bridge/src/sbt-test/source-dependencies/new-pkg-dep/changes/B1.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/new-pkg-dep/project/DottyInjectedPlugin.scala b/sbt-bridge/src/sbt-test/source-dependencies/new-pkg-dep/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/new-pkg-dep/project/DottyInjectedPlugin.scala rename to sbt-bridge/src/sbt-test/source-dependencies/new-pkg-dep/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/new-pkg-dep/test b/sbt-bridge/src/sbt-test/source-dependencies/new-pkg-dep/test similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/new-pkg-dep/test rename to sbt-bridge/src/sbt-test/source-dependencies/new-pkg-dep/test diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/override/A.scala b/sbt-bridge/src/sbt-test/source-dependencies/override/A.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/override/A.scala rename to sbt-bridge/src/sbt-test/source-dependencies/override/A.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/override/B.scala b/sbt-bridge/src/sbt-test/source-dependencies/override/B.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/override/B.scala rename to sbt-bridge/src/sbt-test/source-dependencies/override/B.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/override/C.scala b/sbt-bridge/src/sbt-test/source-dependencies/override/C.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/override/C.scala rename to sbt-bridge/src/sbt-test/source-dependencies/override/C.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/override/D.scala b/sbt-bridge/src/sbt-test/source-dependencies/override/D.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/override/D.scala rename to sbt-bridge/src/sbt-test/source-dependencies/override/D.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/override/changes/B2.scala b/sbt-bridge/src/sbt-test/source-dependencies/override/changes/B2.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/override/changes/B2.scala rename to sbt-bridge/src/sbt-test/source-dependencies/override/changes/B2.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/override/project/DottyInjectedPlugin.scala b/sbt-bridge/src/sbt-test/source-dependencies/override/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/override/project/DottyInjectedPlugin.scala rename to sbt-bridge/src/sbt-test/source-dependencies/override/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/override/test b/sbt-bridge/src/sbt-test/source-dependencies/override/test similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/override/test rename to sbt-bridge/src/sbt-test/source-dependencies/override/test diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/parent-change/W.scala b/sbt-bridge/src/sbt-test/source-dependencies/parent-change/W.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/parent-change/W.scala rename to sbt-bridge/src/sbt-test/source-dependencies/parent-change/W.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/parent-change/Y.scala b/sbt-bridge/src/sbt-test/source-dependencies/parent-change/Y.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/parent-change/Y.scala rename to sbt-bridge/src/sbt-test/source-dependencies/parent-change/Y.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/parent-change/Z.scala b/sbt-bridge/src/sbt-test/source-dependencies/parent-change/Z.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/parent-change/Z.scala rename to sbt-bridge/src/sbt-test/source-dependencies/parent-change/Z.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/parent-change/changes/W.scala b/sbt-bridge/src/sbt-test/source-dependencies/parent-change/changes/W.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/parent-change/changes/W.scala rename to sbt-bridge/src/sbt-test/source-dependencies/parent-change/changes/W.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/parent-change/project/DottyInjectedPlugin.scala b/sbt-bridge/src/sbt-test/source-dependencies/parent-change/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/parent-change/project/DottyInjectedPlugin.scala rename to sbt-bridge/src/sbt-test/source-dependencies/parent-change/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/parent-change/test b/sbt-bridge/src/sbt-test/source-dependencies/parent-change/test similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/parent-change/test rename to sbt-bridge/src/sbt-test/source-dependencies/parent-change/test diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/parent-member-change/A.scala b/sbt-bridge/src/sbt-test/source-dependencies/parent-member-change/A.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/parent-member-change/A.scala rename to sbt-bridge/src/sbt-test/source-dependencies/parent-member-change/A.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/parent-member-change/B.scala b/sbt-bridge/src/sbt-test/source-dependencies/parent-member-change/B.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/parent-member-change/B.scala rename to sbt-bridge/src/sbt-test/source-dependencies/parent-member-change/B.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/parent-member-change/C.scala b/sbt-bridge/src/sbt-test/source-dependencies/parent-member-change/C.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/parent-member-change/C.scala rename to sbt-bridge/src/sbt-test/source-dependencies/parent-member-change/C.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/parent-member-change/changes/A.scala b/sbt-bridge/src/sbt-test/source-dependencies/parent-member-change/changes/A.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/parent-member-change/changes/A.scala rename to sbt-bridge/src/sbt-test/source-dependencies/parent-member-change/changes/A.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/parent-member-change/project/DottyInjectedPlugin.scala b/sbt-bridge/src/sbt-test/source-dependencies/parent-member-change/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/parent-member-change/project/DottyInjectedPlugin.scala rename to sbt-bridge/src/sbt-test/source-dependencies/parent-member-change/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/parent-member-change/test b/sbt-bridge/src/sbt-test/source-dependencies/parent-member-change/test similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/parent-member-change/test rename to sbt-bridge/src/sbt-test/source-dependencies/parent-member-change/test diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/pkg-self/changes/A1.scala b/sbt-bridge/src/sbt-test/source-dependencies/pkg-self/changes/A1.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/pkg-self/changes/A1.scala rename to sbt-bridge/src/sbt-test/source-dependencies/pkg-self/changes/A1.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/pkg-self/changes/A2.scala b/sbt-bridge/src/sbt-test/source-dependencies/pkg-self/changes/A2.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/pkg-self/changes/A2.scala rename to sbt-bridge/src/sbt-test/source-dependencies/pkg-self/changes/A2.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/pkg-self/changes/B.scala b/sbt-bridge/src/sbt-test/source-dependencies/pkg-self/changes/B.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/pkg-self/changes/B.scala rename to sbt-bridge/src/sbt-test/source-dependencies/pkg-self/changes/B.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/pkg-self/changes/package.scala b/sbt-bridge/src/sbt-test/source-dependencies/pkg-self/changes/package.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/pkg-self/changes/package.scala rename to sbt-bridge/src/sbt-test/source-dependencies/pkg-self/changes/package.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/pkg-self/project/DottyInjectedPlugin.scala b/sbt-bridge/src/sbt-test/source-dependencies/pkg-self/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/pkg-self/project/DottyInjectedPlugin.scala rename to sbt-bridge/src/sbt-test/source-dependencies/pkg-self/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/pkg-self/test b/sbt-bridge/src/sbt-test/source-dependencies/pkg-self/test similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/pkg-self/test rename to sbt-bridge/src/sbt-test/source-dependencies/pkg-self/test diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/qualified-access/A.scala b/sbt-bridge/src/sbt-test/source-dependencies/qualified-access/A.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/qualified-access/A.scala rename to sbt-bridge/src/sbt-test/source-dependencies/qualified-access/A.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/qualified-access/B.scala b/sbt-bridge/src/sbt-test/source-dependencies/qualified-access/B.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/qualified-access/B.scala rename to sbt-bridge/src/sbt-test/source-dependencies/qualified-access/B.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/qualified-access/changes/A.scala b/sbt-bridge/src/sbt-test/source-dependencies/qualified-access/changes/A.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/qualified-access/changes/A.scala rename to sbt-bridge/src/sbt-test/source-dependencies/qualified-access/changes/A.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/qualified-access/project/DottyInjectedPlugin.scala b/sbt-bridge/src/sbt-test/source-dependencies/qualified-access/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/qualified-access/project/DottyInjectedPlugin.scala rename to sbt-bridge/src/sbt-test/source-dependencies/qualified-access/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/qualified-access/test b/sbt-bridge/src/sbt-test/source-dependencies/qualified-access/test similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/qualified-access/test rename to sbt-bridge/src/sbt-test/source-dependencies/qualified-access/test diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/relative-source-error/changes/absolute.sbt b/sbt-bridge/src/sbt-test/source-dependencies/relative-source-error/changes/absolute.sbt similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/relative-source-error/changes/absolute.sbt rename to sbt-bridge/src/sbt-test/source-dependencies/relative-source-error/changes/absolute.sbt diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/relative-source-error/changes/relative.sbt b/sbt-bridge/src/sbt-test/source-dependencies/relative-source-error/changes/relative.sbt similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/relative-source-error/changes/relative.sbt rename to sbt-bridge/src/sbt-test/source-dependencies/relative-source-error/changes/relative.sbt diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/relative-source-error/project/DottyInjectedPlugin.scala b/sbt-bridge/src/sbt-test/source-dependencies/relative-source-error/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/relative-source-error/project/DottyInjectedPlugin.scala rename to sbt-bridge/src/sbt-test/source-dependencies/relative-source-error/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/relative-source-error/src/A.scala b/sbt-bridge/src/sbt-test/source-dependencies/relative-source-error/src/A.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/relative-source-error/src/A.scala rename to sbt-bridge/src/sbt-test/source-dependencies/relative-source-error/src/A.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/relative-source-error/test b/sbt-bridge/src/sbt-test/source-dependencies/relative-source-error/test similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/relative-source-error/test rename to sbt-bridge/src/sbt-test/source-dependencies/relative-source-error/test diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/remove-test-a/changes/1.scala b/sbt-bridge/src/sbt-test/source-dependencies/remove-test-a/changes/1.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/remove-test-a/changes/1.scala rename to sbt-bridge/src/sbt-test/source-dependencies/remove-test-a/changes/1.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/remove-test-a/project/DottyInjectedPlugin.scala b/sbt-bridge/src/sbt-test/source-dependencies/remove-test-a/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/remove-test-a/project/DottyInjectedPlugin.scala rename to sbt-bridge/src/sbt-test/source-dependencies/remove-test-a/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/remove-test-a/test b/sbt-bridge/src/sbt-test/source-dependencies/remove-test-a/test similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/remove-test-a/test rename to sbt-bridge/src/sbt-test/source-dependencies/remove-test-a/test diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/remove-test-b/changes/A2.scala b/sbt-bridge/src/sbt-test/source-dependencies/remove-test-b/changes/A2.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/remove-test-b/changes/A2.scala rename to sbt-bridge/src/sbt-test/source-dependencies/remove-test-b/changes/A2.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/remove-test-b/changes/B3.scala b/sbt-bridge/src/sbt-test/source-dependencies/remove-test-b/changes/B3.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/remove-test-b/changes/B3.scala rename to sbt-bridge/src/sbt-test/source-dependencies/remove-test-b/changes/B3.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/remove-test-b/changes/B4.scala b/sbt-bridge/src/sbt-test/source-dependencies/remove-test-b/changes/B4.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/remove-test-b/changes/B4.scala rename to sbt-bridge/src/sbt-test/source-dependencies/remove-test-b/changes/B4.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/remove-test-b/changes/B5.scala b/sbt-bridge/src/sbt-test/source-dependencies/remove-test-b/changes/B5.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/remove-test-b/changes/B5.scala rename to sbt-bridge/src/sbt-test/source-dependencies/remove-test-b/changes/B5.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/remove-test-b/project/DottyInjectedPlugin.scala b/sbt-bridge/src/sbt-test/source-dependencies/remove-test-b/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/remove-test-b/project/DottyInjectedPlugin.scala rename to sbt-bridge/src/sbt-test/source-dependencies/remove-test-b/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/remove-test-b/src/main/scala/A.scala b/sbt-bridge/src/sbt-test/source-dependencies/remove-test-b/src/main/scala/A.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/remove-test-b/src/main/scala/A.scala rename to sbt-bridge/src/sbt-test/source-dependencies/remove-test-b/src/main/scala/A.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/remove-test-b/src/main/scala/B.scala b/sbt-bridge/src/sbt-test/source-dependencies/remove-test-b/src/main/scala/B.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/remove-test-b/src/main/scala/B.scala rename to sbt-bridge/src/sbt-test/source-dependencies/remove-test-b/src/main/scala/B.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/remove-test-b/test b/sbt-bridge/src/sbt-test/source-dependencies/remove-test-b/test similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/remove-test-b/test rename to sbt-bridge/src/sbt-test/source-dependencies/remove-test-b/test diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/repeated-parameters/A.scala b/sbt-bridge/src/sbt-test/source-dependencies/repeated-parameters/A.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/repeated-parameters/A.scala rename to sbt-bridge/src/sbt-test/source-dependencies/repeated-parameters/A.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/repeated-parameters/B.scala b/sbt-bridge/src/sbt-test/source-dependencies/repeated-parameters/B.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/repeated-parameters/B.scala rename to sbt-bridge/src/sbt-test/source-dependencies/repeated-parameters/B.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/repeated-parameters/changes/A.scala b/sbt-bridge/src/sbt-test/source-dependencies/repeated-parameters/changes/A.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/repeated-parameters/changes/A.scala rename to sbt-bridge/src/sbt-test/source-dependencies/repeated-parameters/changes/A.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/repeated-parameters/project/DottyInjectedPlugin.scala b/sbt-bridge/src/sbt-test/source-dependencies/repeated-parameters/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/repeated-parameters/project/DottyInjectedPlugin.scala rename to sbt-bridge/src/sbt-test/source-dependencies/repeated-parameters/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/repeated-parameters/test b/sbt-bridge/src/sbt-test/source-dependencies/repeated-parameters/test similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/repeated-parameters/test rename to sbt-bridge/src/sbt-test/source-dependencies/repeated-parameters/test diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/replace-test-a/changes/first.scala b/sbt-bridge/src/sbt-test/source-dependencies/replace-test-a/changes/first.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/replace-test-a/changes/first.scala rename to sbt-bridge/src/sbt-test/source-dependencies/replace-test-a/changes/first.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/replace-test-a/changes/second.scala b/sbt-bridge/src/sbt-test/source-dependencies/replace-test-a/changes/second.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/replace-test-a/changes/second.scala rename to sbt-bridge/src/sbt-test/source-dependencies/replace-test-a/changes/second.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/replace-test-a/project/Build.scala b/sbt-bridge/src/sbt-test/source-dependencies/replace-test-a/project/Build.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/replace-test-a/project/Build.scala rename to sbt-bridge/src/sbt-test/source-dependencies/replace-test-a/project/Build.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/replace-test-a/project/DottyInjectedPlugin.scala b/sbt-bridge/src/sbt-test/source-dependencies/replace-test-a/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/replace-test-a/project/DottyInjectedPlugin.scala rename to sbt-bridge/src/sbt-test/source-dependencies/replace-test-a/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/replace-test-a/test b/sbt-bridge/src/sbt-test/source-dependencies/replace-test-a/test similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/replace-test-a/test rename to sbt-bridge/src/sbt-test/source-dependencies/replace-test-a/test diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/resident-java/build.sbt b/sbt-bridge/src/sbt-test/source-dependencies/resident-java/build.sbt similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/resident-java/build.sbt rename to sbt-bridge/src/sbt-test/source-dependencies/resident-java/build.sbt diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/resident-java/changes/A1.java b/sbt-bridge/src/sbt-test/source-dependencies/resident-java/changes/A1.java similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/resident-java/changes/A1.java rename to sbt-bridge/src/sbt-test/source-dependencies/resident-java/changes/A1.java diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/resident-java/changes/A2.java b/sbt-bridge/src/sbt-test/source-dependencies/resident-java/changes/A2.java similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/resident-java/changes/A2.java rename to sbt-bridge/src/sbt-test/source-dependencies/resident-java/changes/A2.java diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/resident-java/changes/B0.scala b/sbt-bridge/src/sbt-test/source-dependencies/resident-java/changes/B0.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/resident-java/changes/B0.scala rename to sbt-bridge/src/sbt-test/source-dependencies/resident-java/changes/B0.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/resident-java/changes/B1.scala b/sbt-bridge/src/sbt-test/source-dependencies/resident-java/changes/B1.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/resident-java/changes/B1.scala rename to sbt-bridge/src/sbt-test/source-dependencies/resident-java/changes/B1.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/resident-java/changes/B2.scala b/sbt-bridge/src/sbt-test/source-dependencies/resident-java/changes/B2.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/resident-java/changes/B2.scala rename to sbt-bridge/src/sbt-test/source-dependencies/resident-java/changes/B2.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/resident-java/project/DottyInjectedPlugin.scala b/sbt-bridge/src/sbt-test/source-dependencies/resident-java/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/resident-java/project/DottyInjectedPlugin.scala rename to sbt-bridge/src/sbt-test/source-dependencies/resident-java/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/resident-java/test b/sbt-bridge/src/sbt-test/source-dependencies/resident-java/test similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/resident-java/test rename to sbt-bridge/src/sbt-test/source-dependencies/resident-java/test diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/resident-package-object/changes/A.scala b/sbt-bridge/src/sbt-test/source-dependencies/resident-package-object/changes/A.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/resident-package-object/changes/A.scala rename to sbt-bridge/src/sbt-test/source-dependencies/resident-package-object/changes/A.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/resident-package-object/changes/package.scala b/sbt-bridge/src/sbt-test/source-dependencies/resident-package-object/changes/package.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/resident-package-object/changes/package.scala rename to sbt-bridge/src/sbt-test/source-dependencies/resident-package-object/changes/package.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/resident-package-object/changes/package2.scala b/sbt-bridge/src/sbt-test/source-dependencies/resident-package-object/changes/package2.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/resident-package-object/changes/package2.scala rename to sbt-bridge/src/sbt-test/source-dependencies/resident-package-object/changes/package2.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/resident-package-object/project/DottyInjectedPlugin.scala b/sbt-bridge/src/sbt-test/source-dependencies/resident-package-object/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/resident-package-object/project/DottyInjectedPlugin.scala rename to sbt-bridge/src/sbt-test/source-dependencies/resident-package-object/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/resident-package-object/test b/sbt-bridge/src/sbt-test/source-dependencies/resident-package-object/test similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/resident-package-object/test rename to sbt-bridge/src/sbt-test/source-dependencies/resident-package-object/test diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/restore-classes/build.sbt b/sbt-bridge/src/sbt-test/source-dependencies/restore-classes/build.sbt similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/restore-classes/build.sbt rename to sbt-bridge/src/sbt-test/source-dependencies/restore-classes/build.sbt diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/restore-classes/changes/A1.scala b/sbt-bridge/src/sbt-test/source-dependencies/restore-classes/changes/A1.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/restore-classes/changes/A1.scala rename to sbt-bridge/src/sbt-test/source-dependencies/restore-classes/changes/A1.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/restore-classes/changes/A2.scala b/sbt-bridge/src/sbt-test/source-dependencies/restore-classes/changes/A2.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/restore-classes/changes/A2.scala rename to sbt-bridge/src/sbt-test/source-dependencies/restore-classes/changes/A2.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/restore-classes/changes/B.scala b/sbt-bridge/src/sbt-test/source-dependencies/restore-classes/changes/B.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/restore-classes/changes/B.scala rename to sbt-bridge/src/sbt-test/source-dependencies/restore-classes/changes/B.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/restore-classes/project/DottyInjectedPlugin.scala b/sbt-bridge/src/sbt-test/source-dependencies/restore-classes/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/restore-classes/project/DottyInjectedPlugin.scala rename to sbt-bridge/src/sbt-test/source-dependencies/restore-classes/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/restore-classes/test b/sbt-bridge/src/sbt-test/source-dependencies/restore-classes/test similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/restore-classes/test rename to sbt-bridge/src/sbt-test/source-dependencies/restore-classes/test diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/same-file-used-names/A.scala b/sbt-bridge/src/sbt-test/source-dependencies/same-file-used-names/A.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/same-file-used-names/A.scala rename to sbt-bridge/src/sbt-test/source-dependencies/same-file-used-names/A.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/same-file-used-names/B.scala b/sbt-bridge/src/sbt-test/source-dependencies/same-file-used-names/B.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/same-file-used-names/B.scala rename to sbt-bridge/src/sbt-test/source-dependencies/same-file-used-names/B.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/same-file-used-names/build.sbt b/sbt-bridge/src/sbt-test/source-dependencies/same-file-used-names/build.sbt similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/same-file-used-names/build.sbt rename to sbt-bridge/src/sbt-test/source-dependencies/same-file-used-names/build.sbt diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/same-file-used-names/changes/B.scala b/sbt-bridge/src/sbt-test/source-dependencies/same-file-used-names/changes/B.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/same-file-used-names/changes/B.scala rename to sbt-bridge/src/sbt-test/source-dependencies/same-file-used-names/changes/B.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/same-file-used-names/project/DottyInjectedPlugin.scala b/sbt-bridge/src/sbt-test/source-dependencies/same-file-used-names/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/same-file-used-names/project/DottyInjectedPlugin.scala rename to sbt-bridge/src/sbt-test/source-dependencies/same-file-used-names/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/same-file-used-names/test b/sbt-bridge/src/sbt-test/source-dependencies/same-file-used-names/test similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/same-file-used-names/test rename to sbt-bridge/src/sbt-test/source-dependencies/same-file-used-names/test diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/sealed/A.scala b/sbt-bridge/src/sbt-test/source-dependencies/sealed/A.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/sealed/A.scala rename to sbt-bridge/src/sbt-test/source-dependencies/sealed/A.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/sealed/D.scala b/sbt-bridge/src/sbt-test/source-dependencies/sealed/D.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/sealed/D.scala rename to sbt-bridge/src/sbt-test/source-dependencies/sealed/D.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/sealed/changes/A.scala b/sbt-bridge/src/sbt-test/source-dependencies/sealed/changes/A.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/sealed/changes/A.scala rename to sbt-bridge/src/sbt-test/source-dependencies/sealed/changes/A.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/sealed/pending b/sbt-bridge/src/sbt-test/source-dependencies/sealed/pending similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/sealed/pending rename to sbt-bridge/src/sbt-test/source-dependencies/sealed/pending diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/sealed/project/DottyInjectedPlugin.scala b/sbt-bridge/src/sbt-test/source-dependencies/sealed/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/sealed/project/DottyInjectedPlugin.scala rename to sbt-bridge/src/sbt-test/source-dependencies/sealed/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/signature-change/B.scala b/sbt-bridge/src/sbt-test/source-dependencies/signature-change/B.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/signature-change/B.scala rename to sbt-bridge/src/sbt-test/source-dependencies/signature-change/B.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/signature-change/changes/A0.scala b/sbt-bridge/src/sbt-test/source-dependencies/signature-change/changes/A0.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/signature-change/changes/A0.scala rename to sbt-bridge/src/sbt-test/source-dependencies/signature-change/changes/A0.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/signature-change/changes/A1.scala b/sbt-bridge/src/sbt-test/source-dependencies/signature-change/changes/A1.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/signature-change/changes/A1.scala rename to sbt-bridge/src/sbt-test/source-dependencies/signature-change/changes/A1.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/signature-change/changes/A2.scala b/sbt-bridge/src/sbt-test/source-dependencies/signature-change/changes/A2.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/signature-change/changes/A2.scala rename to sbt-bridge/src/sbt-test/source-dependencies/signature-change/changes/A2.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/signature-change/changes/A3.scala b/sbt-bridge/src/sbt-test/source-dependencies/signature-change/changes/A3.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/signature-change/changes/A3.scala rename to sbt-bridge/src/sbt-test/source-dependencies/signature-change/changes/A3.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/signature-change/project/DottyInjectedPlugin.scala b/sbt-bridge/src/sbt-test/source-dependencies/signature-change/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/signature-change/project/DottyInjectedPlugin.scala rename to sbt-bridge/src/sbt-test/source-dependencies/signature-change/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/signature-change/test b/sbt-bridge/src/sbt-test/source-dependencies/signature-change/test similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/signature-change/test rename to sbt-bridge/src/sbt-test/source-dependencies/signature-change/test diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/specialized/A.scala b/sbt-bridge/src/sbt-test/source-dependencies/specialized/A.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/specialized/A.scala rename to sbt-bridge/src/sbt-test/source-dependencies/specialized/A.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/specialized/B.scala b/sbt-bridge/src/sbt-test/source-dependencies/specialized/B.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/specialized/B.scala rename to sbt-bridge/src/sbt-test/source-dependencies/specialized/B.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/specialized/changes/A.scala b/sbt-bridge/src/sbt-test/source-dependencies/specialized/changes/A.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/specialized/changes/A.scala rename to sbt-bridge/src/sbt-test/source-dependencies/specialized/changes/A.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/specialized/project/DottyInjectedPlugin.scala b/sbt-bridge/src/sbt-test/source-dependencies/specialized/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/specialized/project/DottyInjectedPlugin.scala rename to sbt-bridge/src/sbt-test/source-dependencies/specialized/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/specialized/test b/sbt-bridge/src/sbt-test/source-dependencies/specialized/test similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/specialized/test rename to sbt-bridge/src/sbt-test/source-dependencies/specialized/test diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/stability-change/A.scala b/sbt-bridge/src/sbt-test/source-dependencies/stability-change/A.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/stability-change/A.scala rename to sbt-bridge/src/sbt-test/source-dependencies/stability-change/A.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/stability-change/B.scala b/sbt-bridge/src/sbt-test/source-dependencies/stability-change/B.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/stability-change/B.scala rename to sbt-bridge/src/sbt-test/source-dependencies/stability-change/B.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/stability-change/C.scala b/sbt-bridge/src/sbt-test/source-dependencies/stability-change/C.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/stability-change/C.scala rename to sbt-bridge/src/sbt-test/source-dependencies/stability-change/C.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/stability-change/changes/A.scala b/sbt-bridge/src/sbt-test/source-dependencies/stability-change/changes/A.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/stability-change/changes/A.scala rename to sbt-bridge/src/sbt-test/source-dependencies/stability-change/changes/A.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/stability-change/project/DottyInjectedPlugin.scala b/sbt-bridge/src/sbt-test/source-dependencies/stability-change/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/stability-change/project/DottyInjectedPlugin.scala rename to sbt-bridge/src/sbt-test/source-dependencies/stability-change/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/stability-change/test b/sbt-bridge/src/sbt-test/source-dependencies/stability-change/test similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/stability-change/test rename to sbt-bridge/src/sbt-test/source-dependencies/stability-change/test diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/synthetic-companion/A.scala b/sbt-bridge/src/sbt-test/source-dependencies/synthetic-companion/A.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/synthetic-companion/A.scala rename to sbt-bridge/src/sbt-test/source-dependencies/synthetic-companion/A.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/synthetic-companion/B.scala b/sbt-bridge/src/sbt-test/source-dependencies/synthetic-companion/B.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/synthetic-companion/B.scala rename to sbt-bridge/src/sbt-test/source-dependencies/synthetic-companion/B.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/synthetic-companion/changes/A2.scala b/sbt-bridge/src/sbt-test/source-dependencies/synthetic-companion/changes/A2.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/synthetic-companion/changes/A2.scala rename to sbt-bridge/src/sbt-test/source-dependencies/synthetic-companion/changes/A2.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/synthetic-companion/dbg.sbt b/sbt-bridge/src/sbt-test/source-dependencies/synthetic-companion/dbg.sbt similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/synthetic-companion/dbg.sbt rename to sbt-bridge/src/sbt-test/source-dependencies/synthetic-companion/dbg.sbt diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/synthetic-companion/project/DottyInjectedPlugin.scala b/sbt-bridge/src/sbt-test/source-dependencies/synthetic-companion/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/synthetic-companion/project/DottyInjectedPlugin.scala rename to sbt-bridge/src/sbt-test/source-dependencies/synthetic-companion/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/synthetic-companion/test b/sbt-bridge/src/sbt-test/source-dependencies/synthetic-companion/test similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/synthetic-companion/test rename to sbt-bridge/src/sbt-test/source-dependencies/synthetic-companion/test diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/trait-member-modified/build.sbt b/sbt-bridge/src/sbt-test/source-dependencies/trait-member-modified/build.sbt similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/trait-member-modified/build.sbt rename to sbt-bridge/src/sbt-test/source-dependencies/trait-member-modified/build.sbt diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/trait-member-modified/changes/A1.scala b/sbt-bridge/src/sbt-test/source-dependencies/trait-member-modified/changes/A1.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/trait-member-modified/changes/A1.scala rename to sbt-bridge/src/sbt-test/source-dependencies/trait-member-modified/changes/A1.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/trait-member-modified/project/DottyInjectedPlugin.scala b/sbt-bridge/src/sbt-test/source-dependencies/trait-member-modified/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/trait-member-modified/project/DottyInjectedPlugin.scala rename to sbt-bridge/src/sbt-test/source-dependencies/trait-member-modified/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/trait-member-modified/src/main/scala/A.scala b/sbt-bridge/src/sbt-test/source-dependencies/trait-member-modified/src/main/scala/A.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/trait-member-modified/src/main/scala/A.scala rename to sbt-bridge/src/sbt-test/source-dependencies/trait-member-modified/src/main/scala/A.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/trait-member-modified/src/main/scala/B.scala b/sbt-bridge/src/sbt-test/source-dependencies/trait-member-modified/src/main/scala/B.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/trait-member-modified/src/main/scala/B.scala rename to sbt-bridge/src/sbt-test/source-dependencies/trait-member-modified/src/main/scala/B.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/trait-member-modified/test b/sbt-bridge/src/sbt-test/source-dependencies/trait-member-modified/test similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/trait-member-modified/test rename to sbt-bridge/src/sbt-test/source-dependencies/trait-member-modified/test diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/trait-private-object/A.scala b/sbt-bridge/src/sbt-test/source-dependencies/trait-private-object/A.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/trait-private-object/A.scala rename to sbt-bridge/src/sbt-test/source-dependencies/trait-private-object/A.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/trait-private-object/B.scala b/sbt-bridge/src/sbt-test/source-dependencies/trait-private-object/B.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/trait-private-object/B.scala rename to sbt-bridge/src/sbt-test/source-dependencies/trait-private-object/B.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/trait-private-object/changes/A.scala b/sbt-bridge/src/sbt-test/source-dependencies/trait-private-object/changes/A.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/trait-private-object/changes/A.scala rename to sbt-bridge/src/sbt-test/source-dependencies/trait-private-object/changes/A.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/trait-private-object/project/DottyInjectedPlugin.scala b/sbt-bridge/src/sbt-test/source-dependencies/trait-private-object/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/trait-private-object/project/DottyInjectedPlugin.scala rename to sbt-bridge/src/sbt-test/source-dependencies/trait-private-object/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/trait-private-object/test b/sbt-bridge/src/sbt-test/source-dependencies/trait-private-object/test similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/trait-private-object/test rename to sbt-bridge/src/sbt-test/source-dependencies/trait-private-object/test diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/trait-private-var/B.scala b/sbt-bridge/src/sbt-test/source-dependencies/trait-private-var/B.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/trait-private-var/B.scala rename to sbt-bridge/src/sbt-test/source-dependencies/trait-private-var/B.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/trait-private-var/changes/A0.scala b/sbt-bridge/src/sbt-test/source-dependencies/trait-private-var/changes/A0.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/trait-private-var/changes/A0.scala rename to sbt-bridge/src/sbt-test/source-dependencies/trait-private-var/changes/A0.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/trait-private-var/changes/A1.scala b/sbt-bridge/src/sbt-test/source-dependencies/trait-private-var/changes/A1.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/trait-private-var/changes/A1.scala rename to sbt-bridge/src/sbt-test/source-dependencies/trait-private-var/changes/A1.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/trait-private-var/changes/A2.scala b/sbt-bridge/src/sbt-test/source-dependencies/trait-private-var/changes/A2.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/trait-private-var/changes/A2.scala rename to sbt-bridge/src/sbt-test/source-dependencies/trait-private-var/changes/A2.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/trait-private-var/project/DottyInjectedPlugin.scala b/sbt-bridge/src/sbt-test/source-dependencies/trait-private-var/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/trait-private-var/project/DottyInjectedPlugin.scala rename to sbt-bridge/src/sbt-test/source-dependencies/trait-private-var/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/trait-private-var/test b/sbt-bridge/src/sbt-test/source-dependencies/trait-private-var/test similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/trait-private-var/test rename to sbt-bridge/src/sbt-test/source-dependencies/trait-private-var/test diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/trait-super/A.scala b/sbt-bridge/src/sbt-test/source-dependencies/trait-super/A.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/trait-super/A.scala rename to sbt-bridge/src/sbt-test/source-dependencies/trait-super/A.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/trait-super/B.scala b/sbt-bridge/src/sbt-test/source-dependencies/trait-super/B.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/trait-super/B.scala rename to sbt-bridge/src/sbt-test/source-dependencies/trait-super/B.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/trait-super/Main.scala b/sbt-bridge/src/sbt-test/source-dependencies/trait-super/Main.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/trait-super/Main.scala rename to sbt-bridge/src/sbt-test/source-dependencies/trait-super/Main.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/trait-super/changes/B2.scala b/sbt-bridge/src/sbt-test/source-dependencies/trait-super/changes/B2.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/trait-super/changes/B2.scala rename to sbt-bridge/src/sbt-test/source-dependencies/trait-super/changes/B2.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/trait-super/changes/B3.scala b/sbt-bridge/src/sbt-test/source-dependencies/trait-super/changes/B3.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/trait-super/changes/B3.scala rename to sbt-bridge/src/sbt-test/source-dependencies/trait-super/changes/B3.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/trait-super/project/DottyInjectedPlugin.scala b/sbt-bridge/src/sbt-test/source-dependencies/trait-super/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/trait-super/project/DottyInjectedPlugin.scala rename to sbt-bridge/src/sbt-test/source-dependencies/trait-super/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/trait-super/test b/sbt-bridge/src/sbt-test/source-dependencies/trait-super/test similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/trait-super/test rename to sbt-bridge/src/sbt-test/source-dependencies/trait-super/test diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/transitive-a/changes/A2.scala b/sbt-bridge/src/sbt-test/source-dependencies/transitive-a/changes/A2.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/transitive-a/changes/A2.scala rename to sbt-bridge/src/sbt-test/source-dependencies/transitive-a/changes/A2.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/transitive-a/project/DottyInjectedPlugin.scala b/sbt-bridge/src/sbt-test/source-dependencies/transitive-a/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/transitive-a/project/DottyInjectedPlugin.scala rename to sbt-bridge/src/sbt-test/source-dependencies/transitive-a/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/transitive-a/src/main/scala/A.scala b/sbt-bridge/src/sbt-test/source-dependencies/transitive-a/src/main/scala/A.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/transitive-a/src/main/scala/A.scala rename to sbt-bridge/src/sbt-test/source-dependencies/transitive-a/src/main/scala/A.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/transitive-a/src/main/scala/B.scala b/sbt-bridge/src/sbt-test/source-dependencies/transitive-a/src/main/scala/B.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/transitive-a/src/main/scala/B.scala rename to sbt-bridge/src/sbt-test/source-dependencies/transitive-a/src/main/scala/B.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/transitive-a/src/main/scala/C.scala b/sbt-bridge/src/sbt-test/source-dependencies/transitive-a/src/main/scala/C.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/transitive-a/src/main/scala/C.scala rename to sbt-bridge/src/sbt-test/source-dependencies/transitive-a/src/main/scala/C.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/transitive-a/test b/sbt-bridge/src/sbt-test/source-dependencies/transitive-a/test similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/transitive-a/test rename to sbt-bridge/src/sbt-test/source-dependencies/transitive-a/test diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/transitive-b/changes/A2.scala b/sbt-bridge/src/sbt-test/source-dependencies/transitive-b/changes/A2.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/transitive-b/changes/A2.scala rename to sbt-bridge/src/sbt-test/source-dependencies/transitive-b/changes/A2.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/transitive-b/project/DottyInjectedPlugin.scala b/sbt-bridge/src/sbt-test/source-dependencies/transitive-b/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/transitive-b/project/DottyInjectedPlugin.scala rename to sbt-bridge/src/sbt-test/source-dependencies/transitive-b/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/transitive-b/src/main/scala/A.scala b/sbt-bridge/src/sbt-test/source-dependencies/transitive-b/src/main/scala/A.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/transitive-b/src/main/scala/A.scala rename to sbt-bridge/src/sbt-test/source-dependencies/transitive-b/src/main/scala/A.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/transitive-b/src/main/scala/B.scala b/sbt-bridge/src/sbt-test/source-dependencies/transitive-b/src/main/scala/B.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/transitive-b/src/main/scala/B.scala rename to sbt-bridge/src/sbt-test/source-dependencies/transitive-b/src/main/scala/B.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/transitive-b/src/main/scala/C.scala b/sbt-bridge/src/sbt-test/source-dependencies/transitive-b/src/main/scala/C.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/transitive-b/src/main/scala/C.scala rename to sbt-bridge/src/sbt-test/source-dependencies/transitive-b/src/main/scala/C.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/transitive-b/test b/sbt-bridge/src/sbt-test/source-dependencies/transitive-b/test similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/transitive-b/test rename to sbt-bridge/src/sbt-test/source-dependencies/transitive-b/test diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/transitive-inherit-java/A.java b/sbt-bridge/src/sbt-test/source-dependencies/transitive-inherit-java/A.java similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/transitive-inherit-java/A.java rename to sbt-bridge/src/sbt-test/source-dependencies/transitive-inherit-java/A.java diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/transitive-inherit-java/B.java b/sbt-bridge/src/sbt-test/source-dependencies/transitive-inherit-java/B.java similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/transitive-inherit-java/B.java rename to sbt-bridge/src/sbt-test/source-dependencies/transitive-inherit-java/B.java diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/transitive-inherit-java/C.java b/sbt-bridge/src/sbt-test/source-dependencies/transitive-inherit-java/C.java similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/transitive-inherit-java/C.java rename to sbt-bridge/src/sbt-test/source-dependencies/transitive-inherit-java/C.java diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/transitive-inherit-java/changes/A2.java b/sbt-bridge/src/sbt-test/source-dependencies/transitive-inherit-java/changes/A2.java similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/transitive-inherit-java/changes/A2.java rename to sbt-bridge/src/sbt-test/source-dependencies/transitive-inherit-java/changes/A2.java diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/transitive-inherit-java/project/DottyInjectedPlugin.scala b/sbt-bridge/src/sbt-test/source-dependencies/transitive-inherit-java/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/transitive-inherit-java/project/DottyInjectedPlugin.scala rename to sbt-bridge/src/sbt-test/source-dependencies/transitive-inherit-java/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/transitive-inherit-java/test b/sbt-bridge/src/sbt-test/source-dependencies/transitive-inherit-java/test similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/transitive-inherit-java/test rename to sbt-bridge/src/sbt-test/source-dependencies/transitive-inherit-java/test diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/transitive-inherit/A.scala b/sbt-bridge/src/sbt-test/source-dependencies/transitive-inherit/A.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/transitive-inherit/A.scala rename to sbt-bridge/src/sbt-test/source-dependencies/transitive-inherit/A.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/transitive-inherit/B.scala b/sbt-bridge/src/sbt-test/source-dependencies/transitive-inherit/B.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/transitive-inherit/B.scala rename to sbt-bridge/src/sbt-test/source-dependencies/transitive-inherit/B.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/transitive-inherit/C.scala b/sbt-bridge/src/sbt-test/source-dependencies/transitive-inherit/C.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/transitive-inherit/C.scala rename to sbt-bridge/src/sbt-test/source-dependencies/transitive-inherit/C.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/transitive-inherit/changes/A2.scala b/sbt-bridge/src/sbt-test/source-dependencies/transitive-inherit/changes/A2.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/transitive-inherit/changes/A2.scala rename to sbt-bridge/src/sbt-test/source-dependencies/transitive-inherit/changes/A2.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/transitive-inherit/project/DottyInjectedPlugin.scala b/sbt-bridge/src/sbt-test/source-dependencies/transitive-inherit/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/transitive-inherit/project/DottyInjectedPlugin.scala rename to sbt-bridge/src/sbt-test/source-dependencies/transitive-inherit/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/transitive-inherit/test b/sbt-bridge/src/sbt-test/source-dependencies/transitive-inherit/test similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/transitive-inherit/test rename to sbt-bridge/src/sbt-test/source-dependencies/transitive-inherit/test diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/transitive-memberRef/build.sbt b/sbt-bridge/src/sbt-test/source-dependencies/transitive-memberRef/build.sbt similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/transitive-memberRef/build.sbt rename to sbt-bridge/src/sbt-test/source-dependencies/transitive-memberRef/build.sbt diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/transitive-memberRef/changes/A1.scala b/sbt-bridge/src/sbt-test/source-dependencies/transitive-memberRef/changes/A1.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/transitive-memberRef/changes/A1.scala rename to sbt-bridge/src/sbt-test/source-dependencies/transitive-memberRef/changes/A1.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/transitive-memberRef/project/DottyInjectedPlugin.scala b/sbt-bridge/src/sbt-test/source-dependencies/transitive-memberRef/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/transitive-memberRef/project/DottyInjectedPlugin.scala rename to sbt-bridge/src/sbt-test/source-dependencies/transitive-memberRef/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/transitive-memberRef/src/main/scala/A.scala b/sbt-bridge/src/sbt-test/source-dependencies/transitive-memberRef/src/main/scala/A.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/transitive-memberRef/src/main/scala/A.scala rename to sbt-bridge/src/sbt-test/source-dependencies/transitive-memberRef/src/main/scala/A.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/transitive-memberRef/src/main/scala/B.scala b/sbt-bridge/src/sbt-test/source-dependencies/transitive-memberRef/src/main/scala/B.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/transitive-memberRef/src/main/scala/B.scala rename to sbt-bridge/src/sbt-test/source-dependencies/transitive-memberRef/src/main/scala/B.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/transitive-memberRef/src/main/scala/C.scala b/sbt-bridge/src/sbt-test/source-dependencies/transitive-memberRef/src/main/scala/C.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/transitive-memberRef/src/main/scala/C.scala rename to sbt-bridge/src/sbt-test/source-dependencies/transitive-memberRef/src/main/scala/C.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/transitive-memberRef/src/main/scala/D.scala b/sbt-bridge/src/sbt-test/source-dependencies/transitive-memberRef/src/main/scala/D.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/transitive-memberRef/src/main/scala/D.scala rename to sbt-bridge/src/sbt-test/source-dependencies/transitive-memberRef/src/main/scala/D.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/transitive-memberRef/src/main/scala/X.scala b/sbt-bridge/src/sbt-test/source-dependencies/transitive-memberRef/src/main/scala/X.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/transitive-memberRef/src/main/scala/X.scala rename to sbt-bridge/src/sbt-test/source-dependencies/transitive-memberRef/src/main/scala/X.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/transitive-memberRef/src/main/scala/Y.scala b/sbt-bridge/src/sbt-test/source-dependencies/transitive-memberRef/src/main/scala/Y.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/transitive-memberRef/src/main/scala/Y.scala rename to sbt-bridge/src/sbt-test/source-dependencies/transitive-memberRef/src/main/scala/Y.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/transitive-memberRef/test b/sbt-bridge/src/sbt-test/source-dependencies/transitive-memberRef/test similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/transitive-memberRef/test rename to sbt-bridge/src/sbt-test/source-dependencies/transitive-memberRef/test diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/type-alias/A.scala b/sbt-bridge/src/sbt-test/source-dependencies/type-alias/A.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/type-alias/A.scala rename to sbt-bridge/src/sbt-test/source-dependencies/type-alias/A.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/type-alias/B.scala b/sbt-bridge/src/sbt-test/source-dependencies/type-alias/B.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/type-alias/B.scala rename to sbt-bridge/src/sbt-test/source-dependencies/type-alias/B.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/type-alias/build.sbt b/sbt-bridge/src/sbt-test/source-dependencies/type-alias/build.sbt similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/type-alias/build.sbt rename to sbt-bridge/src/sbt-test/source-dependencies/type-alias/build.sbt diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/type-alias/changes/A.scala b/sbt-bridge/src/sbt-test/source-dependencies/type-alias/changes/A.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/type-alias/changes/A.scala rename to sbt-bridge/src/sbt-test/source-dependencies/type-alias/changes/A.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/type-alias/project/DottyInjectedPlugin.scala b/sbt-bridge/src/sbt-test/source-dependencies/type-alias/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/type-alias/project/DottyInjectedPlugin.scala rename to sbt-bridge/src/sbt-test/source-dependencies/type-alias/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/type-alias/test b/sbt-bridge/src/sbt-test/source-dependencies/type-alias/test similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/type-alias/test rename to sbt-bridge/src/sbt-test/source-dependencies/type-alias/test diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/type-parameter/A.scala b/sbt-bridge/src/sbt-test/source-dependencies/type-parameter/A.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/type-parameter/A.scala rename to sbt-bridge/src/sbt-test/source-dependencies/type-parameter/A.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/type-parameter/B.scala b/sbt-bridge/src/sbt-test/source-dependencies/type-parameter/B.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/type-parameter/B.scala rename to sbt-bridge/src/sbt-test/source-dependencies/type-parameter/B.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/type-parameter/C.scala b/sbt-bridge/src/sbt-test/source-dependencies/type-parameter/C.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/type-parameter/C.scala rename to sbt-bridge/src/sbt-test/source-dependencies/type-parameter/C.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/type-parameter/D.scala b/sbt-bridge/src/sbt-test/source-dependencies/type-parameter/D.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/type-parameter/D.scala rename to sbt-bridge/src/sbt-test/source-dependencies/type-parameter/D.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/type-parameter/changes/A.scala b/sbt-bridge/src/sbt-test/source-dependencies/type-parameter/changes/A.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/type-parameter/changes/A.scala rename to sbt-bridge/src/sbt-test/source-dependencies/type-parameter/changes/A.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/type-parameter/project/DottyInjectedPlugin.scala b/sbt-bridge/src/sbt-test/source-dependencies/type-parameter/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/type-parameter/project/DottyInjectedPlugin.scala rename to sbt-bridge/src/sbt-test/source-dependencies/type-parameter/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/type-parameter/test b/sbt-bridge/src/sbt-test/source-dependencies/type-parameter/test similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/type-parameter/test rename to sbt-bridge/src/sbt-test/source-dependencies/type-parameter/test diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/typeref-only/A.scala b/sbt-bridge/src/sbt-test/source-dependencies/typeref-only/A.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/typeref-only/A.scala rename to sbt-bridge/src/sbt-test/source-dependencies/typeref-only/A.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/typeref-only/B.scala b/sbt-bridge/src/sbt-test/source-dependencies/typeref-only/B.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/typeref-only/B.scala rename to sbt-bridge/src/sbt-test/source-dependencies/typeref-only/B.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/typeref-only/build.sbt b/sbt-bridge/src/sbt-test/source-dependencies/typeref-only/build.sbt similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/typeref-only/build.sbt rename to sbt-bridge/src/sbt-test/source-dependencies/typeref-only/build.sbt diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/typeref-only/project/DottyInjectedPlugin.scala b/sbt-bridge/src/sbt-test/source-dependencies/typeref-only/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/typeref-only/project/DottyInjectedPlugin.scala rename to sbt-bridge/src/sbt-test/source-dependencies/typeref-only/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/typeref-only/test b/sbt-bridge/src/sbt-test/source-dependencies/typeref-only/test similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/typeref-only/test rename to sbt-bridge/src/sbt-test/source-dependencies/typeref-only/test diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/typeref-return/A.scala b/sbt-bridge/src/sbt-test/source-dependencies/typeref-return/A.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/typeref-return/A.scala rename to sbt-bridge/src/sbt-test/source-dependencies/typeref-return/A.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/typeref-return/B.scala b/sbt-bridge/src/sbt-test/source-dependencies/typeref-return/B.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/typeref-return/B.scala rename to sbt-bridge/src/sbt-test/source-dependencies/typeref-return/B.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/typeref-return/changes/A.scala b/sbt-bridge/src/sbt-test/source-dependencies/typeref-return/changes/A.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/typeref-return/changes/A.scala rename to sbt-bridge/src/sbt-test/source-dependencies/typeref-return/changes/A.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/typeref-return/project/DottyInjectedPlugin.scala b/sbt-bridge/src/sbt-test/source-dependencies/typeref-return/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/typeref-return/project/DottyInjectedPlugin.scala rename to sbt-bridge/src/sbt-test/source-dependencies/typeref-return/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/typeref-return/test b/sbt-bridge/src/sbt-test/source-dependencies/typeref-return/test similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/typeref-return/test rename to sbt-bridge/src/sbt-test/source-dependencies/typeref-return/test diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/types-in-used-names-a/A.scala b/sbt-bridge/src/sbt-test/source-dependencies/types-in-used-names-a/A.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/types-in-used-names-a/A.scala rename to sbt-bridge/src/sbt-test/source-dependencies/types-in-used-names-a/A.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/types-in-used-names-a/B.scala b/sbt-bridge/src/sbt-test/source-dependencies/types-in-used-names-a/B.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/types-in-used-names-a/B.scala rename to sbt-bridge/src/sbt-test/source-dependencies/types-in-used-names-a/B.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/types-in-used-names-a/C.scala b/sbt-bridge/src/sbt-test/source-dependencies/types-in-used-names-a/C.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/types-in-used-names-a/C.scala rename to sbt-bridge/src/sbt-test/source-dependencies/types-in-used-names-a/C.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/types-in-used-names-a/D.scala b/sbt-bridge/src/sbt-test/source-dependencies/types-in-used-names-a/D.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/types-in-used-names-a/D.scala rename to sbt-bridge/src/sbt-test/source-dependencies/types-in-used-names-a/D.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/types-in-used-names-a/changes/B2.scala b/sbt-bridge/src/sbt-test/source-dependencies/types-in-used-names-a/changes/B2.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/types-in-used-names-a/changes/B2.scala rename to sbt-bridge/src/sbt-test/source-dependencies/types-in-used-names-a/changes/B2.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/types-in-used-names-a/project/DottyInjectedPlugin.scala b/sbt-bridge/src/sbt-test/source-dependencies/types-in-used-names-a/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/types-in-used-names-a/project/DottyInjectedPlugin.scala rename to sbt-bridge/src/sbt-test/source-dependencies/types-in-used-names-a/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/types-in-used-names-a/test b/sbt-bridge/src/sbt-test/source-dependencies/types-in-used-names-a/test similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/types-in-used-names-a/test rename to sbt-bridge/src/sbt-test/source-dependencies/types-in-used-names-a/test diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/types-in-used-names-b/A.scala b/sbt-bridge/src/sbt-test/source-dependencies/types-in-used-names-b/A.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/types-in-used-names-b/A.scala rename to sbt-bridge/src/sbt-test/source-dependencies/types-in-used-names-b/A.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/types-in-used-names-b/B.scala b/sbt-bridge/src/sbt-test/source-dependencies/types-in-used-names-b/B.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/types-in-used-names-b/B.scala rename to sbt-bridge/src/sbt-test/source-dependencies/types-in-used-names-b/B.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/types-in-used-names-b/changes/A2.scala b/sbt-bridge/src/sbt-test/source-dependencies/types-in-used-names-b/changes/A2.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/types-in-used-names-b/changes/A2.scala rename to sbt-bridge/src/sbt-test/source-dependencies/types-in-used-names-b/changes/A2.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/types-in-used-names-b/project/DottyInjectedPlugin.scala b/sbt-bridge/src/sbt-test/source-dependencies/types-in-used-names-b/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/types-in-used-names-b/project/DottyInjectedPlugin.scala rename to sbt-bridge/src/sbt-test/source-dependencies/types-in-used-names-b/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/types-in-used-names-b/test b/sbt-bridge/src/sbt-test/source-dependencies/types-in-used-names-b/test similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/types-in-used-names-b/test rename to sbt-bridge/src/sbt-test/source-dependencies/types-in-used-names-b/test diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/value-class-underlying/A.scala b/sbt-bridge/src/sbt-test/source-dependencies/value-class-underlying/A.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/value-class-underlying/A.scala rename to sbt-bridge/src/sbt-test/source-dependencies/value-class-underlying/A.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/value-class-underlying/B.scala b/sbt-bridge/src/sbt-test/source-dependencies/value-class-underlying/B.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/value-class-underlying/B.scala rename to sbt-bridge/src/sbt-test/source-dependencies/value-class-underlying/B.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/value-class-underlying/C.scala b/sbt-bridge/src/sbt-test/source-dependencies/value-class-underlying/C.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/value-class-underlying/C.scala rename to sbt-bridge/src/sbt-test/source-dependencies/value-class-underlying/C.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/value-class-underlying/build.sbt b/sbt-bridge/src/sbt-test/source-dependencies/value-class-underlying/build.sbt similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/value-class-underlying/build.sbt rename to sbt-bridge/src/sbt-test/source-dependencies/value-class-underlying/build.sbt diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/value-class-underlying/changes/A2.scala b/sbt-bridge/src/sbt-test/source-dependencies/value-class-underlying/changes/A2.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/value-class-underlying/changes/A2.scala rename to sbt-bridge/src/sbt-test/source-dependencies/value-class-underlying/changes/A2.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/value-class-underlying/test b/sbt-bridge/src/sbt-test/source-dependencies/value-class-underlying/test similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/value-class-underlying/test rename to sbt-bridge/src/sbt-test/source-dependencies/value-class-underlying/test diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/value-class/build.sbt b/sbt-bridge/src/sbt-test/source-dependencies/value-class/build.sbt similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/value-class/build.sbt rename to sbt-bridge/src/sbt-test/source-dependencies/value-class/build.sbt diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/value-class/changes/A0.scala b/sbt-bridge/src/sbt-test/source-dependencies/value-class/changes/A0.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/value-class/changes/A0.scala rename to sbt-bridge/src/sbt-test/source-dependencies/value-class/changes/A0.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/value-class/changes/A1.scala b/sbt-bridge/src/sbt-test/source-dependencies/value-class/changes/A1.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/value-class/changes/A1.scala rename to sbt-bridge/src/sbt-test/source-dependencies/value-class/changes/A1.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/value-class/changes/B0.scala b/sbt-bridge/src/sbt-test/source-dependencies/value-class/changes/B0.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/value-class/changes/B0.scala rename to sbt-bridge/src/sbt-test/source-dependencies/value-class/changes/B0.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/value-class/changes/B1.scala b/sbt-bridge/src/sbt-test/source-dependencies/value-class/changes/B1.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/value-class/changes/B1.scala rename to sbt-bridge/src/sbt-test/source-dependencies/value-class/changes/B1.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/value-class/changes/B2.scala b/sbt-bridge/src/sbt-test/source-dependencies/value-class/changes/B2.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/value-class/changes/B2.scala rename to sbt-bridge/src/sbt-test/source-dependencies/value-class/changes/B2.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/value-class/changes/C0.scala b/sbt-bridge/src/sbt-test/source-dependencies/value-class/changes/C0.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/value-class/changes/C0.scala rename to sbt-bridge/src/sbt-test/source-dependencies/value-class/changes/C0.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/value-class/changes/C1.scala b/sbt-bridge/src/sbt-test/source-dependencies/value-class/changes/C1.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/value-class/changes/C1.scala rename to sbt-bridge/src/sbt-test/source-dependencies/value-class/changes/C1.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/value-class/changes/C2.scala b/sbt-bridge/src/sbt-test/source-dependencies/value-class/changes/C2.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/value-class/changes/C2.scala rename to sbt-bridge/src/sbt-test/source-dependencies/value-class/changes/C2.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/value-class/project/DottyInjectedPlugin.scala b/sbt-bridge/src/sbt-test/source-dependencies/value-class/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/value-class/project/DottyInjectedPlugin.scala rename to sbt-bridge/src/sbt-test/source-dependencies/value-class/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/value-class/test b/sbt-bridge/src/sbt-test/source-dependencies/value-class/test similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/value-class/test rename to sbt-bridge/src/sbt-test/source-dependencies/value-class/test diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/var/A.scala b/sbt-bridge/src/sbt-test/source-dependencies/var/A.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/var/A.scala rename to sbt-bridge/src/sbt-test/source-dependencies/var/A.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/var/B.scala b/sbt-bridge/src/sbt-test/source-dependencies/var/B.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/var/B.scala rename to sbt-bridge/src/sbt-test/source-dependencies/var/B.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/var/changes/A.scala b/sbt-bridge/src/sbt-test/source-dependencies/var/changes/A.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/var/changes/A.scala rename to sbt-bridge/src/sbt-test/source-dependencies/var/changes/A.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/var/project/DottyInjectedPlugin.scala b/sbt-bridge/src/sbt-test/source-dependencies/var/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/var/project/DottyInjectedPlugin.scala rename to sbt-bridge/src/sbt-test/source-dependencies/var/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/var/test b/sbt-bridge/src/sbt-test/source-dependencies/var/test similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/var/test rename to sbt-bridge/src/sbt-test/source-dependencies/var/test diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/variance/A.scala b/sbt-bridge/src/sbt-test/source-dependencies/variance/A.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/variance/A.scala rename to sbt-bridge/src/sbt-test/source-dependencies/variance/A.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/variance/C.scala b/sbt-bridge/src/sbt-test/source-dependencies/variance/C.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/variance/C.scala rename to sbt-bridge/src/sbt-test/source-dependencies/variance/C.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/variance/changes/A.scala b/sbt-bridge/src/sbt-test/source-dependencies/variance/changes/A.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/variance/changes/A.scala rename to sbt-bridge/src/sbt-test/source-dependencies/variance/changes/A.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/variance/project/DottyInjectedPlugin.scala b/sbt-bridge/src/sbt-test/source-dependencies/variance/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/variance/project/DottyInjectedPlugin.scala rename to sbt-bridge/src/sbt-test/source-dependencies/variance/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/variance/test b/sbt-bridge/src/sbt-test/source-dependencies/variance/test similarity index 100% rename from sbt-bridge/bridge/src/sbt-test/source-dependencies/variance/test rename to sbt-bridge/src/sbt-test/source-dependencies/variance/test diff --git a/sbt-bridge/bridge/src/test/scala/xsbt/DependencySpecification.scala b/sbt-bridge/src/test/scala/xsbt/DependencySpecification.scala similarity index 100% rename from sbt-bridge/bridge/src/test/scala/xsbt/DependencySpecification.scala rename to sbt-bridge/src/test/scala/xsbt/DependencySpecification.scala diff --git a/sbt-bridge/bridge/src/test/scala/xsbt/ExtractAPISpecification.scala b/sbt-bridge/src/test/scala/xsbt/ExtractAPISpecification.scala similarity index 100% rename from sbt-bridge/bridge/src/test/scala/xsbt/ExtractAPISpecification.scala rename to sbt-bridge/src/test/scala/xsbt/ExtractAPISpecification.scala diff --git a/sbt-bridge/bridge/src/test/scala/xsbt/ExtractUsedNamesSpecification.scala b/sbt-bridge/src/test/scala/xsbt/ExtractUsedNamesSpecification.scala similarity index 100% rename from sbt-bridge/bridge/src/test/scala/xsbt/ExtractUsedNamesSpecification.scala rename to sbt-bridge/src/test/scala/xsbt/ExtractUsedNamesSpecification.scala diff --git a/sbt-bridge/bridge/src/test/scala/xsbt/ScalaCompilerForUnitTesting.scala b/sbt-bridge/src/test/scala/xsbt/ScalaCompilerForUnitTesting.scala similarity index 100% rename from sbt-bridge/bridge/src/test/scala/xsbt/ScalaCompilerForUnitTesting.scala rename to sbt-bridge/src/test/scala/xsbt/ScalaCompilerForUnitTesting.scala diff --git a/sbt-bridge/bridge/src/test/scala/xsbti/TestCallback.scala b/sbt-bridge/src/test/scala/xsbti/TestCallback.scala similarity index 100% rename from sbt-bridge/bridge/src/test/scala/xsbti/TestCallback.scala rename to sbt-bridge/src/test/scala/xsbti/TestCallback.scala From 574a53f9913ca48c28ea2ea34ab153537ab329de Mon Sep 17 00:00:00 2001 From: Guillaume Martres Date: Mon, 14 Nov 2016 23:05:51 +0100 Subject: [PATCH 32/55] Fix flags for default getters of constructors This manifested itself as a pickling difference in tasty_tools --- compiler/src/dotty/tools/dotc/ast/Desugar.scala | 2 +- compiler/src/dotty/tools/dotc/transform/TreeChecker.scala | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/compiler/src/dotty/tools/dotc/ast/Desugar.scala b/compiler/src/dotty/tools/dotc/ast/Desugar.scala index 366a0e2257af..4b2ff1bc313f 100644 --- a/compiler/src/dotty/tools/dotc/ast/Desugar.scala +++ b/compiler/src/dotty/tools/dotc/ast/Desugar.scala @@ -179,7 +179,7 @@ object desugar { DefDef( name = meth.name.defaultGetterName(n), tparams = meth.tparams.map(tparam => dropContextBound(toDefParam(tparam))), - vparamss = takeUpTo(normalizedVparamss, n), + vparamss = takeUpTo(normalizedVparamss.nestedMap(toDefParam), n), tpt = TypeTree(), rhs = vparam.rhs ).withMods(Modifiers(mods.flags & AccessFlags, mods.privateWithin)) diff --git a/compiler/src/dotty/tools/dotc/transform/TreeChecker.scala b/compiler/src/dotty/tools/dotc/transform/TreeChecker.scala index 4a09d2fef3da..aa4eefe43fac 100644 --- a/compiler/src/dotty/tools/dotc/transform/TreeChecker.scala +++ b/compiler/src/dotty/tools/dotc/transform/TreeChecker.scala @@ -397,6 +397,14 @@ class TreeChecker extends Phase with SymTransformer { withDefinedSyms(ddef.tparams) { withDefinedSymss(ddef.vparamss) { if (!sym.isClassConstructor && !(sym.name eq Names.STATIC_CONSTRUCTOR)) assert(isValidJVMMethodName(sym.name), s"${sym.fullName} name is invalid on jvm") + + ddef.vparamss.foreach(_.foreach { vparam => + assert(vparam.symbol.is(Param), + s"Parameter ${vparam.symbol} of ${sym.fullName} does not have flag `Param` set") + assert(!vparam.symbol.is(AccessFlags), + s"Parameter ${vparam.symbol} of ${sym.fullName} has invalid flag(s): ${vparam.symbol.flags & AccessFlags}") + }) + val tpdTree = super.typedDefDef(ddef, sym) assert(isMethodType(sym.info), i"wrong type, expect a method type for ${sym.fullName}, but found: ${sym.info}") tpdTree From 46f482ebda7aceac2a5f3fb885916a13b95907ca Mon Sep 17 00:00:00 2001 From: Guillaume Martres Date: Mon, 14 Nov 2016 23:11:04 +0100 Subject: [PATCH 33/55] TypedTreeCopier#Select: don't use unstable prefixes This manifested itself as a pickling difference in tasty_tools Note that there are probably more issues in this method, in particular the old type is reused when `qualifier.tpe eq tree.qualifier.tpe` even if the `name` is different. But I'm only trying to get the tests to pass for now. --- compiler/src/dotty/tools/dotc/ast/tpd.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compiler/src/dotty/tools/dotc/ast/tpd.scala b/compiler/src/dotty/tools/dotc/ast/tpd.scala index 44e1cf188704..cd6b3fcf212f 100644 --- a/compiler/src/dotty/tools/dotc/ast/tpd.scala +++ b/compiler/src/dotty/tools/dotc/ast/tpd.scala @@ -464,7 +464,7 @@ object tpd extends Trees.Instance[Type] with TypedTreeInfo { case tree: Select if qualifier.tpe eq tree.qualifier.tpe => tree1.withTypeUnchecked(tree.tpe) case _ => tree.tpe match { - case tpe: NamedType => tree1.withType(tpe.derivedSelect(qualifier.tpe)) + case tpe: NamedType => tree1.withType(tpe.derivedSelect(qualifier.tpe.widenIfUnstable)) case _ => tree1.withTypeUnchecked(tree.tpe) } } From a7d25b9eb8f4d6eca84bdeb32227e427a9de5072 Mon Sep 17 00:00:00 2001 From: Guillaume Martres Date: Mon, 14 Nov 2016 23:32:35 +0100 Subject: [PATCH 34/55] -Ytest-pickler: homogenize template body output order --- .../tools/dotc/printing/RefinedPrinter.scala | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/compiler/src/dotty/tools/dotc/printing/RefinedPrinter.scala b/compiler/src/dotty/tools/dotc/printing/RefinedPrinter.scala index 29e1d4869757..00627fc286b7 100644 --- a/compiler/src/dotty/tools/dotc/printing/RefinedPrinter.scala +++ b/compiler/src/dotty/tools/dotc/printing/RefinedPrinter.scala @@ -288,7 +288,20 @@ class RefinedPrinter(_ctx: Context) extends PlainPrinter(_ctx) { val selfName = if (self.name == nme.WILDCARD) "this" else self.name.toString (selfName ~ optText(self.tpt)(": " ~ _) ~ " =>").close } provided !self.isEmpty - val bodyText = "{" ~~ selfText ~~ toTextGlobal(primaryConstrs ::: impl.body, "\n") ~ "}" + + val body = if (ctx.settings.YtestPickler.value) { + // Pickling/unpickling reorders the body members, so we need to homogenize + val (params, rest) = impl.body partition { + case stat: TypeDef => stat.symbol.is(Param) + case stat: ValOrDefDef => + stat.symbol.is(ParamAccessor) && !stat.symbol.isSetter + case _ => false + } + params ::: rest + } else impl.body + + val bodyText = "{" ~~ selfText ~~ toTextGlobal(primaryConstrs ::: body, "\n") ~ "}" + prefix ~ (" extends" provided !ofNew) ~~ parentsText ~~ bodyText } From 717264b8940a337b123ee42e09c9b02a2a5c3b11 Mon Sep 17 00:00:00 2001 From: Guillaume Martres Date: Mon, 14 Nov 2016 23:44:56 +0100 Subject: [PATCH 35/55] -Ytest-pickler: avoid forcing anything when there's a difference This might cause a stale symbol exception and make it harder to find the source of the problem. --- compiler/src/dotty/tools/dotc/transform/Pickler.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compiler/src/dotty/tools/dotc/transform/Pickler.scala b/compiler/src/dotty/tools/dotc/transform/Pickler.scala index 61c3ca5de5a9..bf37067b1c2e 100644 --- a/compiler/src/dotty/tools/dotc/transform/Pickler.scala +++ b/compiler/src/dotty/tools/dotc/transform/Pickler.scala @@ -101,7 +101,7 @@ class Pickler extends Phase { if (previous != unpickled) { output("before-pickling.txt", previous) output("after-pickling.txt", unpickled) - ctx.error(i"""pickling difference for ${cls.fullName} in ${cls.sourceFile}, for details: + ctx.error(s"""pickling difference for ${cls} in ${cls.sourceFile}, for details: | | diff before-pickling.txt after-pickling.txt""") } From 49f2ffd37ab79d4d3b2214534b03dc05eb641da3 Mon Sep 17 00:00:00 2001 From: Guillaume Martres Date: Mon, 14 Nov 2016 23:48:21 +0100 Subject: [PATCH 36/55] TreeUnpickler: Add missing case for ENUMconst --- compiler/src/dotty/tools/dotc/core/tasty/TreeUnpickler.scala | 2 ++ 1 file changed, 2 insertions(+) diff --git a/compiler/src/dotty/tools/dotc/core/tasty/TreeUnpickler.scala b/compiler/src/dotty/tools/dotc/core/tasty/TreeUnpickler.scala index eba9ab5331d6..79408ddde216 100644 --- a/compiler/src/dotty/tools/dotc/core/tasty/TreeUnpickler.scala +++ b/compiler/src/dotty/tools/dotc/core/tasty/TreeUnpickler.scala @@ -347,6 +347,8 @@ class TreeUnpickler(reader: TastyReader, tastyName: TastyName.Table, posUnpickle ConstantType(Constant(null)) case CLASSconst => ConstantType(Constant(readType())) + case ENUMconst => + ConstantType(Constant(readTermRef().termSymbol)) case BYNAMEtype => ExprType(readType()) } From 19c4c24f884b8e7245ffdd26fbb573761703496a Mon Sep 17 00:00:00 2001 From: Guillaume Martres Date: Wed, 16 Nov 2016 17:38:56 +0100 Subject: [PATCH 37/55] bin/common: jar is dotty-compiler, not dotty --- bin/common | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/common b/bin/common index 21c957f7a441..3b7f226cb468 100755 --- a/bin/common +++ b/bin/common @@ -132,7 +132,7 @@ function check_jar { } check_jar "dotty-interfaces" $INTERFACES_JAR "interfaces/src" 'INTERFACES_JAR=$(build_jar dotty-interfaces/package interfaces/target)' -check_jar "dotty" $MAIN_JAR "compiler/src" 'MAIN_JAR=$(build_jar dotty-compiler/package compiler/target/scala-$SCALA_BINARY_VERSION)' +check_jar "dotty-compiler" $MAIN_JAR "compiler/src" 'MAIN_JAR=$(build_jar dotty-compiler/package compiler/target/scala-$SCALA_BINARY_VERSION)' check_jar "dotty-library" $DOTTY_LIB_JAR "library/src" 'DOTTY_LIB_JAR=$(build_jar dotty-library/package library/target/scala-$SCALA_BINARY_VERSION)' check_jar "dotty-tests" $TEST_JAR "compiler/test" 'TEST_JAR=$(build_jar dotty-compiler/test:package compiler/target/scala-$SCALA_BINARY_VERSION /dotty.*-tests\.jar/p)' From ce23380cbcec633cba63f19bc8f02c1d2b8048bb Mon Sep 17 00:00:00 2001 From: Guillaume Martres Date: Wed, 16 Nov 2016 21:57:19 +0100 Subject: [PATCH 38/55] checkNoPrivateLeaks: handle references to companion members Previously Outer2#Inner#foo failed to compile with: ``` non-private method foo refers to private value x in its type signature ``` This should compile because the boundary of `foo` is `class Outer2` and the boundary of `x` is `object Outer2`. This commit fixes this by also considering the linked boundary in `checkNoPrivateLeaks`. --- .../src/dotty/tools/dotc/typer/Checking.scala | 18 ++++++++++++++++-- tests/neg/leaks.scala | 7 +++++++ tests/pos/leaks.scala | 17 +++++++++++++++++ 3 files changed, 40 insertions(+), 2 deletions(-) create mode 100644 tests/neg/leaks.scala create mode 100644 tests/pos/leaks.scala diff --git a/compiler/src/dotty/tools/dotc/typer/Checking.scala b/compiler/src/dotty/tools/dotc/typer/Checking.scala index dbfc89f6cc4a..c363ee81ef89 100644 --- a/compiler/src/dotty/tools/dotc/typer/Checking.scala +++ b/compiler/src/dotty/tools/dotc/typer/Checking.scala @@ -353,17 +353,31 @@ object Checking { class NotPrivate extends TypeMap { type Errors = List[(String, Position)] var errors: Errors = Nil + def accessBoundary(sym: Symbol): Symbol = if (sym.is(Private)) sym.owner else if (sym.privateWithin.exists) sym.privateWithin else if (sym.is(Package)) sym else accessBoundary(sym.owner) + + val symBoundary = accessBoundary(sym) + + /** Is `other` leaked outside its access boundary ? + * @pre The signature of `sym` refers to `other` + */ + def isLeaked(other: Symbol) = + other.is(Private) && { + val otherBoundary = other.owner + val otherLinkedBoundary = otherBoundary.linkedClass + !(symBoundary.isContainedIn(otherBoundary) || + otherLinkedBoundary.exists && symBoundary.isContainedIn(otherLinkedBoundary)) + } + def apply(tp: Type): Type = tp match { case tp: NamedType => val prevErrors = errors var tp1 = - if (tp.symbol.is(Private) && - !accessBoundary(sym).isContainedIn(tp.symbol.owner)) { + if (isLeaked(tp.symbol)) { errors = (em"non-private $sym refers to private ${tp.symbol}\n in its type signature ${sym.info}", sym.pos) :: errors tp diff --git a/tests/neg/leaks.scala b/tests/neg/leaks.scala new file mode 100644 index 000000000000..bb81d8cd28c6 --- /dev/null +++ b/tests/neg/leaks.scala @@ -0,0 +1,7 @@ +class Outer { + private val x: Int = 1 + + class Inner { + def foo: x.type = x // error: non-private method foo refers to private value x in its type signature + } +} diff --git a/tests/pos/leaks.scala b/tests/pos/leaks.scala new file mode 100644 index 000000000000..dbb47d75a722 --- /dev/null +++ b/tests/pos/leaks.scala @@ -0,0 +1,17 @@ +class Outer1 { + private val x: Int = 1 + + private class Inner { + def foo: x.type = x // OK + } +} + +object Outer2 { + private val x: Int = 1 +} + +class Outer2 { + private class Inner { + def foo: Outer2.x.type = Outer2.x // OK + } +} From d3a4916b4f04e89a6fd850206f92bbffa8cce14e Mon Sep 17 00:00:00 2001 From: Guillaume Martres Date: Wed, 16 Nov 2016 22:34:39 +0100 Subject: [PATCH 39/55] checkNoPrivateLeaks: handle defs in local classes The access boundary of a def in a local class is the owner of that class, previously it was set to the access boundary of the owner of the class instead. --- compiler/src/dotty/tools/dotc/typer/Checking.scala | 2 +- tests/neg/leaks.scala | 9 +++++++++ tests/pos/leaks.scala | 10 ++++++++++ 3 files changed, 20 insertions(+), 1 deletion(-) diff --git a/compiler/src/dotty/tools/dotc/typer/Checking.scala b/compiler/src/dotty/tools/dotc/typer/Checking.scala index c363ee81ef89..0c5a8e5dbcdf 100644 --- a/compiler/src/dotty/tools/dotc/typer/Checking.scala +++ b/compiler/src/dotty/tools/dotc/typer/Checking.scala @@ -355,7 +355,7 @@ object Checking { var errors: Errors = Nil def accessBoundary(sym: Symbol): Symbol = - if (sym.is(Private)) sym.owner + if (sym.is(Private) || !sym.owner.isClass) sym.owner else if (sym.privateWithin.exists) sym.privateWithin else if (sym.is(Package)) sym else accessBoundary(sym.owner) diff --git a/tests/neg/leaks.scala b/tests/neg/leaks.scala index bb81d8cd28c6..0431c18ce750 100644 --- a/tests/neg/leaks.scala +++ b/tests/neg/leaks.scala @@ -5,3 +5,12 @@ class Outer { def foo: x.type = x // error: non-private method foo refers to private value x in its type signature } } + +class Outer3Neg { + def meth: Unit = { + class Inner { + private val x: Int = 1 + def foo: x.type = x // error + } + } +} diff --git a/tests/pos/leaks.scala b/tests/pos/leaks.scala index dbb47d75a722..3fe029c75865 100644 --- a/tests/pos/leaks.scala +++ b/tests/pos/leaks.scala @@ -15,3 +15,13 @@ class Outer2 { def foo: Outer2.x.type = Outer2.x // OK } } + +class Outer3 { + private val x: Int = 1 + + def meth: Unit = { + class Inner { + def foo: x.type = x // OK + } + } +} From 1dee5b6341a7986c298f1251257f629bd4340067 Mon Sep 17 00:00:00 2001 From: Guillaume Martres Date: Fri, 18 Nov 2016 00:17:49 +0100 Subject: [PATCH 40/55] checkNoPrivateLeaks is now also done in TreeUnpickler This could be abstracted better but we'll end up replacing checkNoPrivateLeaks soon anyway due to https://github.com/lampepfl/dotty/issues/1723 --- .../src/dotty/tools/dotc/core/tasty/TreeUnpickler.scala | 7 +++++++ compiler/src/dotty/tools/dotc/transform/PostTyper.scala | 1 + tests/pickling/private-leak.scala | 9 +++++++++ 3 files changed, 17 insertions(+) create mode 100644 tests/pickling/private-leak.scala diff --git a/compiler/src/dotty/tools/dotc/core/tasty/TreeUnpickler.scala b/compiler/src/dotty/tools/dotc/core/tasty/TreeUnpickler.scala index 79408ddde216..1d23a902a942 100644 --- a/compiler/src/dotty/tools/dotc/core/tasty/TreeUnpickler.scala +++ b/compiler/src/dotty/tools/dotc/core/tasty/TreeUnpickler.scala @@ -14,6 +14,7 @@ import scala.annotation.{tailrec, switch} import scala.collection.mutable.ListBuffer import scala.collection.{ mutable, immutable } import config.Printers.pickling +import typer.Checking /** Unpickler for typed trees * @param reader the reader from which to unpickle @@ -732,6 +733,12 @@ class TreeUnpickler(reader: TastyReader, tastyName: TastyName.Table, posUnpickle // no longer necessary. goto(end) setPos(start, tree) + + // This is also done in PostTyper but needs to be redone here + if (!sym.is(SyntheticOrPrivate) && sym.owner.isClass) { + sym.info = Checking.checkNoPrivateLeaks(sym, tree.pos) + } + tree } private def readTemplate(implicit ctx: Context): Template = { diff --git a/compiler/src/dotty/tools/dotc/transform/PostTyper.scala b/compiler/src/dotty/tools/dotc/transform/PostTyper.scala index 1ed47d92e349..e7c0df1b9d24 100644 --- a/compiler/src/dotty/tools/dotc/transform/PostTyper.scala +++ b/compiler/src/dotty/tools/dotc/transform/PostTyper.scala @@ -107,6 +107,7 @@ class PostTyper extends MacroTransform with IdentityDenotTransformer { thisTran private def transformMemberDef(tree: MemberDef)(implicit ctx: Context): Unit = { val sym = tree.symbol sym.transformAnnotations(transformAnnot) + // Has to be redone in TreeUnpickler if (!sym.is(SyntheticOrPrivate) && sym.owner.isClass) { val info1 = Checking.checkNoPrivateLeaks(sym, tree.pos) if (info1 ne sym.info) diff --git a/tests/pickling/private-leak.scala b/tests/pickling/private-leak.scala new file mode 100644 index 000000000000..3fc32b51962f --- /dev/null +++ b/tests/pickling/private-leak.scala @@ -0,0 +1,9 @@ +package private_leak + +class Test { + private type Foo = Int + + val x: Foo = 1 + + x // unpickled with type Foo +} From 830d4699e4ad8d866fa0c109697f0eebd99b3ecd Mon Sep 17 00:00:00 2001 From: Guillaume Martres Date: Fri, 18 Nov 2016 00:28:56 +0100 Subject: [PATCH 41/55] Workaround last issue with -Ytest-pickler We run checkNoPrivateLeaks in the unpickler since last commit and this is causing an issue related to privacy leaks. Give up and workaround it since we're going to redesign how we handle privacy leaks because of https://github.com/lampepfl/dotty/issues/1723 anyway. --- compiler/src/dotty/tools/dotc/core/Symbols.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compiler/src/dotty/tools/dotc/core/Symbols.scala b/compiler/src/dotty/tools/dotc/core/Symbols.scala index b5bd196d234d..c0427e320010 100644 --- a/compiler/src/dotty/tools/dotc/core/Symbols.scala +++ b/compiler/src/dotty/tools/dotc/core/Symbols.scala @@ -574,7 +574,7 @@ object Symbols { /** Copy a symbol, overriding selective fields */ def copy( owner: Symbol = sym.owner, - name: N = sym.name, + name: N = (sym.name: N), // Dotty deviation: type ascription to avoid leaking private sym (only happens in unpickling), won't be needed once #1723 is fixed flags: FlagSet = sym.flags, info: Type = sym.info, privateWithin: Symbol = sym.privateWithin, From 3693211aafb3253c0f4608c84c285f5572d5ad6a Mon Sep 17 00:00:00 2001 From: Guillaume Martres Date: Mon, 14 Nov 2016 23:50:57 +0100 Subject: [PATCH 42/55] Do not force symbols of annotations when unpickling This lead to stale symbol errors in `tasty_tools` because the symbol forcing was bringing forward symbols from the previous run before the corresponding symbols for the current run were created. We fix this by adding Annotations#deferredSymAndTree which behaves similarly to Annotations#deferred but take a by-name symbol. We also remove TreeUnpickler#LazyAnnotationReader which was apparently never used. --- .../dotty/tools/dotc/core/Annotations.scala | 20 +++++++++++++++---- .../tools/dotc/core/tasty/TreeUnpickler.scala | 10 ++-------- 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/compiler/src/dotty/tools/dotc/core/Annotations.scala b/compiler/src/dotty/tools/dotc/core/Annotations.scala index 0e8e5a1f0dab..985b1ea3d638 100644 --- a/compiler/src/dotty/tools/dotc/core/Annotations.scala +++ b/compiler/src/dotty/tools/dotc/core/Annotations.scala @@ -34,14 +34,15 @@ object Annotations { def tree(implicit ctx: Context): Tree = t } - abstract case class LazyAnnotation(sym: Symbol) extends Annotation { + abstract class LazyAnnotation extends Annotation { + override def symbol(implicit ctx: Context): Symbol + def complete(implicit ctx: Context): Tree + private var myTree: Tree = null def tree(implicit ctx: Context) = { if (myTree == null) myTree = complete(ctx) myTree } - def complete(implicit ctx: Context): Tree - override def symbol(implicit ctx: Context): Symbol = sym } /** An annotation indicating the body of a right-hand side, @@ -108,8 +109,19 @@ object Annotations { apply(resolveConstructor(atp, args)) } + /** Create an annotation where the tree is computed lazily. */ def deferred(sym: Symbol, treeFn: Context => Tree)(implicit ctx: Context): Annotation = - new LazyAnnotation(sym) { + new LazyAnnotation { + override def symbol(implicit ctx: Context): Symbol = sym + def complete(implicit ctx: Context) = treeFn(ctx) + } + + /** Create an annotation where the symbol and the tree are computed lazily. */ + def deferredSymAndTree(sym: => Symbol, treeFn: Context => Tree)(implicit ctx: Context): Annotation = + new LazyAnnotation { + lazy val symf = sym + + override def symbol(implicit ctx: Context): Symbol = symf def complete(implicit ctx: Context) = treeFn(ctx) } diff --git a/compiler/src/dotty/tools/dotc/core/tasty/TreeUnpickler.scala b/compiler/src/dotty/tools/dotc/core/tasty/TreeUnpickler.scala index 1d23a902a942..6fcc2fcaa142 100644 --- a/compiler/src/dotty/tools/dotc/core/tasty/TreeUnpickler.scala +++ b/compiler/src/dotty/tools/dotc/core/tasty/TreeUnpickler.scala @@ -552,9 +552,9 @@ class TreeUnpickler(reader: TastyReader, tastyName: TastyName.Table, posUnpickle case ANNOTATION => readByte() val end = readEnd() - val sym = readType().typeSymbol + val tp = readType() val lazyAnnotTree = readLater(end, rdr => ctx => rdr.readTerm()(ctx)) - annots += Annotation.deferred(sym, _ => lazyAnnotTree.complete) + annots += Annotation.deferredSymAndTree(tp.typeSymbol, _ => lazyAnnotTree.complete) case _ => assert(false, s"illegal modifier tag at $currentAddr") } @@ -1103,12 +1103,6 @@ class TreeUnpickler(reader: TastyReader, tastyName: TastyName.Table, posUnpickle } } - class LazyAnnotationReader(sym: Symbol, reader: TreeReader) extends LazyAnnotation(sym) { - def complete(implicit ctx: Context) = { - reader.readTerm()(ctx.withPhaseNoLater(ctx.picklerPhase)) - } - } - /** A lazy datastructure that records how definitions are nested in TASTY data. * The structure is lazy because it needs to be computed only for forward references * to symbols that happen before the referenced symbol is created (see `symbolAt`). From 2d6a290d93e9a4e58cda443b93cd126ebee43be8 Mon Sep 17 00:00:00 2001 From: Guillaume Martres Date: Thu, 13 Oct 2016 17:58:59 +0200 Subject: [PATCH 43/55] ExtractDependencies: correctly record inheritance on type alias This fix the test "Extracted source dependencies from public members" which previously failed with: Set('G, 'E) is not equal to Set('B, 'E) (DependencySpecification.scala:34) `H` extends `G.T[Int]` which is an alias of `B`, so the `topLevelInheritanceDepndencies` of `H` should contain `B`, this was not the case before because we didn't dealias before looking for the top-level class of the dependency, so we ended up with `G`, the top-level class in which the alias `T` is contained. --- compiler/src/dotty/tools/dotc/sbt/ExtractDependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compiler/src/dotty/tools/dotc/sbt/ExtractDependencies.scala b/compiler/src/dotty/tools/dotc/sbt/ExtractDependencies.scala index 229e35360401..fefa63f6fdc4 100644 --- a/compiler/src/dotty/tools/dotc/sbt/ExtractDependencies.scala +++ b/compiler/src/dotty/tools/dotc/sbt/ExtractDependencies.scala @@ -200,7 +200,7 @@ private class ExtractDependenciesCollector(implicit val ctx: Context) extends tp addDependency(ref.symbol) usedTypeTraverser.traverse(ref.tpe) case t @ Template(_, parents, _, _) => - t.parents.foreach(p => addInheritanceDependency(p.tpe.typeSymbol)) + t.parents.foreach(p => addInheritanceDependency(p.tpe.classSymbol)) case _ => } traverseChildren(tree) From e5b64f1e4444f9a37851a11314a7025d413aed43 Mon Sep 17 00:00:00 2001 From: Guillaume Martres Date: Fri, 18 Nov 2016 01:56:10 +0100 Subject: [PATCH 44/55] Move PatmatExhaustivityTest.scala in its proper place --- .../test/dotty/tools/dotc}/transform/PatmatExhaustivityTest.scala | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename {test/test => compiler/test/dotty/tools/dotc}/transform/PatmatExhaustivityTest.scala (100%) diff --git a/test/test/transform/PatmatExhaustivityTest.scala b/compiler/test/dotty/tools/dotc/transform/PatmatExhaustivityTest.scala similarity index 100% rename from test/test/transform/PatmatExhaustivityTest.scala rename to compiler/test/dotty/tools/dotc/transform/PatmatExhaustivityTest.scala From 1806e28cc9b82823b534abcbcf5bb36cd74732a8 Mon Sep 17 00:00:00 2001 From: Guillaume Martres Date: Fri, 18 Nov 2016 02:05:32 +0100 Subject: [PATCH 45/55] Fix remaining tests with incorrect paths following move --- .../test/dotc/scala-collections.whitelist | 500 +++++++++--------- compiler/test/dotc/tests.scala | 1 - doc-tool/test/BaseTest.scala | 2 +- doc-tool/test/UsecaseTest.scala | 4 +- 4 files changed, 253 insertions(+), 254 deletions(-) diff --git a/compiler/test/dotc/scala-collections.whitelist b/compiler/test/dotc/scala-collections.whitelist index 29db48cf2c31..bb62b260a4c5 100644 --- a/compiler/test/dotc/scala-collections.whitelist +++ b/compiler/test/dotc/scala-collections.whitelist @@ -1,282 +1,282 @@ -./scala-scala/src/library/scala/runtime/RichBoolean.scala -./scala-scala/src/library/scala/runtime/RichByte.scala -./scala-scala/src/library/scala/runtime/RichChar.scala -./scala-scala/src/library/scala/runtime/RichDouble.scala -./scala-scala/src/library/scala/runtime/RichException.scala -./scala-scala/src/library/scala/runtime/RichFloat.scala -./scala-scala/src/library/scala/runtime/RichInt.scala -./scala-scala/src/library/scala/runtime/RichLong.scala -./scala-scala/src/library/scala/runtime/RichShort.scala -./scala-scala/src/library/scala/Array.scala -./scala-scala/src/library/scala/NotImplementedError.scala -./scala-scala/src/library/scala/AnyValCompanion.scala +../scala-scala/src/library/scala/runtime/RichBoolean.scala +../scala-scala/src/library/scala/runtime/RichByte.scala +../scala-scala/src/library/scala/runtime/RichChar.scala +../scala-scala/src/library/scala/runtime/RichDouble.scala +../scala-scala/src/library/scala/runtime/RichException.scala +../scala-scala/src/library/scala/runtime/RichFloat.scala +../scala-scala/src/library/scala/runtime/RichInt.scala +../scala-scala/src/library/scala/runtime/RichLong.scala +../scala-scala/src/library/scala/runtime/RichShort.scala +../scala-scala/src/library/scala/Array.scala +../scala-scala/src/library/scala/NotImplementedError.scala +../scala-scala/src/library/scala/AnyValCompanion.scala # AnyVal is a synthesized class in Dotty, cannot be compiled from source. -#./scala-scala/src/library/scala/AnyVal.scala +#../scala-scala/src/library/scala/AnyVal.scala -./scala-scala/src/library/scala/Boolean.scala -./scala-scala/src/library/scala/Byte.scala -./scala-scala/src/library/scala/Char.scala -./scala-scala/src/library/scala/Double.scala -./scala-scala/src/library/scala/Float.scala -./scala-scala/src/library/scala/Int.scala -./scala-scala/src/library/scala/Long.scala -./scala-scala/src/library/scala/Short.scala -./scala-scala/src/library/scala/Unit.scala -./scala-scala/src/library/scala/Cloneable.scala -./scala-scala/src/library/scala/DelayedInit.scala -./scala-scala/src/library/scala/Dynamic.scala -./scala-scala/src/library/scala/Equals.scala -./scala-scala/src/library/scala/Immutable.scala -./scala-scala/src/library/scala/MatchError.scala -./scala-scala/src/library/scala/Mutable.scala -./scala-scala/src/library/scala/NotNull.scala -./scala-scala/src/library/scala/Option.scala -./scala-scala/src/library/scala/PartialFunction.scala -./scala-scala/src/library/scala/Predef.scala -./scala-scala/src/library/scala/Product.scala -./scala-scala/src/library/scala/Product1.scala -./scala-scala/src/library/scala/Product10.scala -./scala-scala/src/library/scala/Product11.scala -./scala-scala/src/library/scala/Product12.scala -./scala-scala/src/library/scala/Product13.scala -./scala-scala/src/library/scala/Product14.scala -./scala-scala/src/library/scala/Product15.scala -./scala-scala/src/library/scala/Product16.scala -./scala-scala/src/library/scala/Product17.scala -./scala-scala/src/library/scala/Product18.scala -./scala-scala/src/library/scala/Product19.scala -./scala-scala/src/library/scala/Product2.scala -./scala-scala/src/library/scala/Product20.scala -./scala-scala/src/library/scala/Product21.scala -./scala-scala/src/library/scala/Product22.scala -./scala-scala/src/library/scala/Product3.scala -./scala-scala/src/library/scala/Product4.scala -./scala-scala/src/library/scala/Product5.scala -./scala-scala/src/library/scala/Product6.scala -./scala-scala/src/library/scala/Product7.scala -./scala-scala/src/library/scala/Product8.scala -./scala-scala/src/library/scala/Product9.scala -./scala-scala/src/library/scala/Proxy.scala -./scala-scala/src/library/scala/SerialVersionUID.scala -./scala-scala/src/library/scala/Serializable.scala -./scala-scala/src/library/scala/Specializable.scala -./scala-scala/src/library/scala/Symbol.scala -./scala-scala/src/library/scala/UninitializedError.scala -./scala-scala/src/library/scala/UninitializedFieldError.scala -./scala-scala/src/library/scala/collection/IndexedSeqOptimized.scala -./scala-scala/src/library/scala/collection/IterableLike.scala -./scala-scala/src/library/scala/collection/Iterator.scala -./scala-scala/src/library/scala/collection/LinearSeqOptimized.scala -./scala-scala/src/library/scala/collection/TraversableOnce.scala -./scala-scala/src/library/scala/collection/generic/Growable.scala -./scala-scala/src/library/scala/collection/generic/TraversableForwarder.scala -./scala-scala/src/library/scala/collection/immutable/BitSet.scala -./scala-scala/src/library/scala/collection/immutable/DefaultMap.scala -./scala-scala/src/library/scala/collection/immutable/IndexedSeq.scala -./scala-scala/src/library/scala/collection/immutable/Iterable.scala -./scala-scala/src/library/scala/collection/immutable/LinearSeq.scala -./scala-scala/src/library/scala/collection/immutable/List.scala -./scala-scala/src/library/scala/collection/immutable/MapProxy.scala -./scala-scala/src/library/scala/collection/immutable/PagedSeq.scala -./scala-scala/src/library/scala/collection/immutable/Queue.scala -./scala-scala/src/library/scala/collection/immutable/Seq.scala -./scala-scala/src/library/scala/collection/mutable/IndexedSeq.scala -./scala-scala/src/library/scala/collection/mutable/ListBuffer.scala -./scala-scala/src/library/scala/collection/mutable/BufferLike.scala +../scala-scala/src/library/scala/Boolean.scala +../scala-scala/src/library/scala/Byte.scala +../scala-scala/src/library/scala/Char.scala +../scala-scala/src/library/scala/Double.scala +../scala-scala/src/library/scala/Float.scala +../scala-scala/src/library/scala/Int.scala +../scala-scala/src/library/scala/Long.scala +../scala-scala/src/library/scala/Short.scala +../scala-scala/src/library/scala/Unit.scala +../scala-scala/src/library/scala/Cloneable.scala +../scala-scala/src/library/scala/DelayedInit.scala +../scala-scala/src/library/scala/Dynamic.scala +../scala-scala/src/library/scala/Equals.scala +../scala-scala/src/library/scala/Immutable.scala +../scala-scala/src/library/scala/MatchError.scala +../scala-scala/src/library/scala/Mutable.scala +../scala-scala/src/library/scala/NotNull.scala +../scala-scala/src/library/scala/Option.scala +../scala-scala/src/library/scala/PartialFunction.scala +../scala-scala/src/library/scala/Predef.scala +../scala-scala/src/library/scala/Product.scala +../scala-scala/src/library/scala/Product1.scala +../scala-scala/src/library/scala/Product10.scala +../scala-scala/src/library/scala/Product11.scala +../scala-scala/src/library/scala/Product12.scala +../scala-scala/src/library/scala/Product13.scala +../scala-scala/src/library/scala/Product14.scala +../scala-scala/src/library/scala/Product15.scala +../scala-scala/src/library/scala/Product16.scala +../scala-scala/src/library/scala/Product17.scala +../scala-scala/src/library/scala/Product18.scala +../scala-scala/src/library/scala/Product19.scala +../scala-scala/src/library/scala/Product2.scala +../scala-scala/src/library/scala/Product20.scala +../scala-scala/src/library/scala/Product21.scala +../scala-scala/src/library/scala/Product22.scala +../scala-scala/src/library/scala/Product3.scala +../scala-scala/src/library/scala/Product4.scala +../scala-scala/src/library/scala/Product5.scala +../scala-scala/src/library/scala/Product6.scala +../scala-scala/src/library/scala/Product7.scala +../scala-scala/src/library/scala/Product8.scala +../scala-scala/src/library/scala/Product9.scala +../scala-scala/src/library/scala/Proxy.scala +../scala-scala/src/library/scala/SerialVersionUID.scala +../scala-scala/src/library/scala/Serializable.scala +../scala-scala/src/library/scala/Specializable.scala +../scala-scala/src/library/scala/Symbol.scala +../scala-scala/src/library/scala/UninitializedError.scala +../scala-scala/src/library/scala/UninitializedFieldError.scala +../scala-scala/src/library/scala/collection/IndexedSeqOptimized.scala +../scala-scala/src/library/scala/collection/IterableLike.scala +../scala-scala/src/library/scala/collection/Iterator.scala +../scala-scala/src/library/scala/collection/LinearSeqOptimized.scala +../scala-scala/src/library/scala/collection/TraversableOnce.scala +../scala-scala/src/library/scala/collection/generic/Growable.scala +../scala-scala/src/library/scala/collection/generic/TraversableForwarder.scala +../scala-scala/src/library/scala/collection/immutable/BitSet.scala +../scala-scala/src/library/scala/collection/immutable/DefaultMap.scala +../scala-scala/src/library/scala/collection/immutable/IndexedSeq.scala +../scala-scala/src/library/scala/collection/immutable/Iterable.scala +../scala-scala/src/library/scala/collection/immutable/LinearSeq.scala +../scala-scala/src/library/scala/collection/immutable/List.scala +../scala-scala/src/library/scala/collection/immutable/MapProxy.scala +../scala-scala/src/library/scala/collection/immutable/PagedSeq.scala +../scala-scala/src/library/scala/collection/immutable/Queue.scala +../scala-scala/src/library/scala/collection/immutable/Seq.scala +../scala-scala/src/library/scala/collection/mutable/IndexedSeq.scala +../scala-scala/src/library/scala/collection/mutable/ListBuffer.scala +../scala-scala/src/library/scala/collection/mutable/BufferLike.scala -./scala-scala/src/library/scala/collection/mutable/ArrayBuilder.scala +../scala-scala/src/library/scala/collection/mutable/ArrayBuilder.scala -./scala-scala/src/library/scala/collection/immutable/Stack.scala -./scala-scala/src/library/scala/collection/immutable/StringLike.scala -./scala-scala/src/library/scala/collection/immutable/StringOps.scala -./scala-scala/src/library/scala/collection/immutable/Traversable.scala -./scala-scala/src/library/scala/collection/immutable/Vector.scala -./scala-scala/src/library/scala/collection/immutable/WrappedString.scala -./scala-scala/src/library/scala/collection/mutable/Builder.scala -./scala-scala/src/library/scala/collection/mutable/GrowingBuilder.scala -./scala-scala/src/library/scala/collection/mutable/WrappedArray.scala -./scala-scala/src/library/scala/collection/mutable/WrappedArrayBuilder.scala -./scala-scala/src/library/scala/deprecated.scala -./scala-scala/src/library/scala/deprecatedInheritance.scala -./scala-scala/src/library/scala/deprecatedName.scala -./scala-scala/src/library/scala/deprecatedOverriding.scala -./scala-scala/src/library/scala/inline.scala -./scala-scala/src/library/scala/language.scala -./scala-scala/src/library/scala/languageFeature.scala -./scala-scala/src/library/scala/math/Equiv.scala -./scala-scala/src/library/scala/math/Fractional.scala -./scala-scala/src/library/scala/math/Integral.scala -./scala-scala/src/library/scala/math/Numeric.scala -./scala-scala/src/library/scala/math/Ordered.scala -./scala-scala/src/library/scala/math/Ordering.scala -./scala-scala/src/library/scala/math/PartialOrdering.scala -./scala-scala/src/library/scala/math/ScalaNumericConversions.scala -./scala-scala/src/library/scala/math/package.scala -./scala-scala/src/library/scala/native.scala -./scala-scala/src/library/scala/noinline.scala -./scala-scala/src/library/scala/package.scala -./scala-scala/src/library/scala/remote.scala -./scala-scala/src/library/scala/specialized.scala -./scala-scala/src/library/scala/throws.scala -./scala-scala/src/library/scala/transient.scala -./scala-scala/src/library/scala/unchecked.scala -./scala-scala/src/library/scala/volatile.scala -./scala-scala/src/library/scala/collection/BitSet.scala -./scala-scala/src/library/scala/collection/BitSetLike.scala -./scala-scala/src/library/scala/collection/BufferedIterator.scala -./scala-scala/src/library/scala/collection/CustomParallelizable.scala -./scala-scala/src/library/scala/collection/DefaultMap.scala -./scala-scala/src/library/scala/collection/GenIterable.scala -./scala-scala/src/library/scala/collection/GenIterableLike.scala -./scala-scala/src/library/scala/collection/GenMap.scala -./scala-scala/src/library/scala/collection/GenMapLike.scala -./scala-scala/src/library/scala/collection/GenSeq.scala -./scala-scala/src/library/scala/collection/GenSeqLike.scala -./scala-scala/src/library/scala/collection/GenSet.scala -./scala-scala/src/library/scala/collection/GenSetLike.scala -./scala-scala/src/library/scala/collection/GenTraversable.scala -./scala-scala/src/library/scala/collection/GenTraversableLike.scala +../scala-scala/src/library/scala/collection/immutable/Stack.scala +../scala-scala/src/library/scala/collection/immutable/StringLike.scala +../scala-scala/src/library/scala/collection/immutable/StringOps.scala +../scala-scala/src/library/scala/collection/immutable/Traversable.scala +../scala-scala/src/library/scala/collection/immutable/Vector.scala +../scala-scala/src/library/scala/collection/immutable/WrappedString.scala +../scala-scala/src/library/scala/collection/mutable/Builder.scala +../scala-scala/src/library/scala/collection/mutable/GrowingBuilder.scala +../scala-scala/src/library/scala/collection/mutable/WrappedArray.scala +../scala-scala/src/library/scala/collection/mutable/WrappedArrayBuilder.scala +../scala-scala/src/library/scala/deprecated.scala +../scala-scala/src/library/scala/deprecatedInheritance.scala +../scala-scala/src/library/scala/deprecatedName.scala +../scala-scala/src/library/scala/deprecatedOverriding.scala +../scala-scala/src/library/scala/inline.scala +../scala-scala/src/library/scala/language.scala +../scala-scala/src/library/scala/languageFeature.scala +../scala-scala/src/library/scala/math/Equiv.scala +../scala-scala/src/library/scala/math/Fractional.scala +../scala-scala/src/library/scala/math/Integral.scala +../scala-scala/src/library/scala/math/Numeric.scala +../scala-scala/src/library/scala/math/Ordered.scala +../scala-scala/src/library/scala/math/Ordering.scala +../scala-scala/src/library/scala/math/PartialOrdering.scala +../scala-scala/src/library/scala/math/ScalaNumericConversions.scala +../scala-scala/src/library/scala/math/package.scala +../scala-scala/src/library/scala/native.scala +../scala-scala/src/library/scala/noinline.scala +../scala-scala/src/library/scala/package.scala +../scala-scala/src/library/scala/remote.scala +../scala-scala/src/library/scala/specialized.scala +../scala-scala/src/library/scala/throws.scala +../scala-scala/src/library/scala/transient.scala +../scala-scala/src/library/scala/unchecked.scala +../scala-scala/src/library/scala/volatile.scala +../scala-scala/src/library/scala/collection/BitSet.scala +../scala-scala/src/library/scala/collection/BitSetLike.scala +../scala-scala/src/library/scala/collection/BufferedIterator.scala +../scala-scala/src/library/scala/collection/CustomParallelizable.scala +../scala-scala/src/library/scala/collection/DefaultMap.scala +../scala-scala/src/library/scala/collection/GenIterable.scala +../scala-scala/src/library/scala/collection/GenIterableLike.scala +../scala-scala/src/library/scala/collection/GenMap.scala +../scala-scala/src/library/scala/collection/GenMapLike.scala +../scala-scala/src/library/scala/collection/GenSeq.scala +../scala-scala/src/library/scala/collection/GenSeqLike.scala +../scala-scala/src/library/scala/collection/GenSet.scala +../scala-scala/src/library/scala/collection/GenSetLike.scala +../scala-scala/src/library/scala/collection/GenTraversable.scala +../scala-scala/src/library/scala/collection/GenTraversableLike.scala -./scala-scala/src/library/scala/collection/GenTraversableOnce.scala -./scala-scala/src/library/scala/collection/IndexedSeq.scala -./scala-scala/src/library/scala/collection/IndexedSeqLike.scala -./scala-scala/src/library/scala/collection/Iterable.scala -./scala-scala/src/library/scala/collection/IterableProxy.scala -./scala-scala/src/library/scala/collection/IterableProxyLike.scala -./scala-scala/src/library/scala/collection/JavaConversions.scala -./scala-scala/src/library/scala/collection/JavaConverters.scala -./scala-scala/src/library/scala/collection/LinearSeq.scala -./scala-scala/src/library/scala/collection/LinearSeqLike.scala -./scala-scala/src/library/scala/collection/Map.scala -./scala-scala/src/library/scala/collection/MapLike.scala -./scala-scala/src/library/scala/collection/MapProxy.scala -./scala-scala/src/library/scala/collection/MapProxyLike.scala -./scala-scala/src/library/scala/collection/Parallel.scala -./scala-scala/src/library/scala/collection/Parallelizable.scala -./scala-scala/src/library/scala/collection/Searching.scala -./scala-scala/src/library/scala/collection/Seq.scala -./scala-scala/src/library/scala/collection/SeqExtractors.scala -./scala-scala/src/library/scala/collection/SeqLike.scala -./scala-scala/src/library/scala/collection/SeqProxy.scala -./scala-scala/src/library/scala/collection/SeqProxyLike.scala -./scala-scala/src/library/scala/collection/Set.scala -./scala-scala/src/library/scala/collection/SetLike.scala -./scala-scala/src/library/scala/collection/SetProxy.scala -./scala-scala/src/library/scala/collection/SetProxyLike.scala -./scala-scala/src/library/scala/collection/SortedMap.scala -./scala-scala/src/library/scala/collection/SortedMapLike.scala -./scala-scala/src/library/scala/collection/SortedSet.scala -./scala-scala/src/library/scala/collection/SortedSetLike.scala -./scala-scala/src/library/scala/collection/Traversable.scala -./scala-scala/src/library/scala/collection/TraversableLike.scala +../scala-scala/src/library/scala/collection/GenTraversableOnce.scala +../scala-scala/src/library/scala/collection/IndexedSeq.scala +../scala-scala/src/library/scala/collection/IndexedSeqLike.scala +../scala-scala/src/library/scala/collection/Iterable.scala +../scala-scala/src/library/scala/collection/IterableProxy.scala +../scala-scala/src/library/scala/collection/IterableProxyLike.scala +../scala-scala/src/library/scala/collection/JavaConversions.scala +../scala-scala/src/library/scala/collection/JavaConverters.scala +../scala-scala/src/library/scala/collection/LinearSeq.scala +../scala-scala/src/library/scala/collection/LinearSeqLike.scala +../scala-scala/src/library/scala/collection/Map.scala +../scala-scala/src/library/scala/collection/MapLike.scala +../scala-scala/src/library/scala/collection/MapProxy.scala +../scala-scala/src/library/scala/collection/MapProxyLike.scala +../scala-scala/src/library/scala/collection/Parallel.scala +../scala-scala/src/library/scala/collection/Parallelizable.scala +../scala-scala/src/library/scala/collection/Searching.scala +../scala-scala/src/library/scala/collection/Seq.scala +../scala-scala/src/library/scala/collection/SeqExtractors.scala +../scala-scala/src/library/scala/collection/SeqLike.scala +../scala-scala/src/library/scala/collection/SeqProxy.scala +../scala-scala/src/library/scala/collection/SeqProxyLike.scala +../scala-scala/src/library/scala/collection/Set.scala +../scala-scala/src/library/scala/collection/SetLike.scala +../scala-scala/src/library/scala/collection/SetProxy.scala +../scala-scala/src/library/scala/collection/SetProxyLike.scala +../scala-scala/src/library/scala/collection/SortedMap.scala +../scala-scala/src/library/scala/collection/SortedMapLike.scala +../scala-scala/src/library/scala/collection/SortedSet.scala +../scala-scala/src/library/scala/collection/SortedSetLike.scala +../scala-scala/src/library/scala/collection/Traversable.scala +../scala-scala/src/library/scala/collection/TraversableLike.scala -./scala-scala/src/library/scala/collection/TraversableProxy.scala -./scala-scala/src/library/scala/collection/TraversableProxyLike.scala -./scala-scala/src/library/scala/collection/package.scala +../scala-scala/src/library/scala/collection/TraversableProxy.scala +../scala-scala/src/library/scala/collection/TraversableProxyLike.scala +../scala-scala/src/library/scala/collection/package.scala -./scala-scala/src/library/scala/collection/IterableView.scala -./scala-scala/src/library/scala/collection/SeqView.scala -./scala-scala/src/library/scala/collection/TraversableView.scala +../scala-scala/src/library/scala/collection/IterableView.scala +../scala-scala/src/library/scala/collection/SeqView.scala +../scala-scala/src/library/scala/collection/TraversableView.scala ## those classes use early initialisers. -./scala-scala/src/library/scala/collection/TraversableViewLike.scala -./scala-scala/src/library/scala/collection/IterableViewLike.scala -./scala-scala/src/library/scala/collection/SeqViewLike.scala -./scala-scala/src/library/scala/collection/mutable/IndexedSeqView.scala -./scala-scala/src/library/scala/collection/immutable/StreamViewLike.scala -./scala-scala/src/library/scala/collection/immutable/TrieIterator.scala +../scala-scala/src/library/scala/collection/TraversableViewLike.scala +../scala-scala/src/library/scala/collection/IterableViewLike.scala +../scala-scala/src/library/scala/collection/SeqViewLike.scala +../scala-scala/src/library/scala/collection/mutable/IndexedSeqView.scala +../scala-scala/src/library/scala/collection/immutable/StreamViewLike.scala +../scala-scala/src/library/scala/collection/immutable/TrieIterator.scala -./scala-scala/src/library/scala/collection/immutable/HashMap.scala -./scala-scala/src/library/scala/collection/immutable/HashSet.scala +../scala-scala/src/library/scala/collection/immutable/HashMap.scala +../scala-scala/src/library/scala/collection/immutable/HashSet.scala -./scala-scala/src/library/scala/collection/immutable/IntMap.scala -./scala-scala/src/library/scala/collection/immutable/ListMap.scala -./scala-scala/src/library/scala/collection/immutable/ListSet.scala -./scala-scala/src/library/scala/collection/immutable/LongMap.scala +../scala-scala/src/library/scala/collection/immutable/IntMap.scala +../scala-scala/src/library/scala/collection/immutable/ListMap.scala +../scala-scala/src/library/scala/collection/immutable/ListSet.scala +../scala-scala/src/library/scala/collection/immutable/LongMap.scala -./scala-scala/src/library/scala/collection/immutable/Map.scala -./scala-scala/src/library/scala/collection/immutable/MapLike.scala -./scala-scala/src/library/scala/collection/immutable/NumericRange.scala -./scala-scala/src/library/scala/collection/immutable/Range.scala -./scala-scala/src/library/scala/collection/immutable/RedBlackTree.scala +../scala-scala/src/library/scala/collection/immutable/Map.scala +../scala-scala/src/library/scala/collection/immutable/MapLike.scala +../scala-scala/src/library/scala/collection/immutable/NumericRange.scala +../scala-scala/src/library/scala/collection/immutable/Range.scala +../scala-scala/src/library/scala/collection/immutable/RedBlackTree.scala # had a variance error, now fixed. -./scala-scala/src/library/scala/collection/immutable/Set.scala +../scala-scala/src/library/scala/collection/immutable/Set.scala -./scala-scala/src/library/scala/collection/immutable/SetProxy.scala +../scala-scala/src/library/scala/collection/immutable/SetProxy.scala # https://github.com/lampepfl/dotty/issues/942 -./scala-scala/src/library/scala/collection/immutable/SortedMap.scala -./scala-scala/src/library/scala/collection/immutable/SortedSet.scala +../scala-scala/src/library/scala/collection/immutable/SortedMap.scala +../scala-scala/src/library/scala/collection/immutable/SortedSet.scala # https://github.com/lampepfl/dotty/issues/941 -./scala-scala/src/library/scala/collection/immutable/Stream.scala -./scala-scala/src/library/scala/collection/immutable/StreamView.scala +../scala-scala/src/library/scala/collection/immutable/Stream.scala +../scala-scala/src/library/scala/collection/immutable/StreamView.scala -./scala-scala/src/library/scala/collection/immutable/TreeMap.scala -./scala-scala/src/library/scala/collection/immutable/TreeSet.scala -./scala-scala/src/library/scala/collection/generic/BitOperations.scala -./scala-scala/src/library/scala/collection/generic/BitSetFactory.scala -./scala-scala/src/library/scala/collection/generic/CanBuildFrom.scala -./scala-scala/src/library/scala/collection/generic/CanCombineFrom.scala -./scala-scala/src/library/scala/collection/generic/ClassTagTraversableFactory.scala -./scala-scala/src/library/scala/collection/generic/Clearable.scala -./scala-scala/src/library/scala/collection/generic/FilterMonadic.scala -./scala-scala/src/library/scala/collection/generic/GenMapFactory.scala -./scala-scala/src/library/scala/collection/generic/GenSeqFactory.scala -./scala-scala/src/library/scala/collection/generic/GenSetFactory.scala -./scala-scala/src/library/scala/collection/generic/GenTraversableFactory.scala -./scala-scala/src/library/scala/collection/generic/GenericClassTagCompanion.scala -./scala-scala/src/library/scala/collection/generic/GenericClassTagTraversableTemplate.scala -./scala-scala/src/library/scala/collection/generic/GenericCompanion.scala -./scala-scala/src/library/scala/collection/generic/GenericOrderedCompanion.scala -./scala-scala/src/library/scala/collection/generic/GenericOrderedTraversableTemplate.scala -./scala-scala/src/library/scala/collection/generic/GenericParCompanion.scala -./scala-scala/src/library/scala/collection/generic/GenericParTemplate.scala -./scala-scala/src/library/scala/collection/generic/GenericSeqCompanion.scala -./scala-scala/src/library/scala/collection/generic/GenericSetTemplate.scala +../scala-scala/src/library/scala/collection/immutable/TreeMap.scala +../scala-scala/src/library/scala/collection/immutable/TreeSet.scala +../scala-scala/src/library/scala/collection/generic/BitOperations.scala +../scala-scala/src/library/scala/collection/generic/BitSetFactory.scala +../scala-scala/src/library/scala/collection/generic/CanBuildFrom.scala +../scala-scala/src/library/scala/collection/generic/CanCombineFrom.scala +../scala-scala/src/library/scala/collection/generic/ClassTagTraversableFactory.scala +../scala-scala/src/library/scala/collection/generic/Clearable.scala +../scala-scala/src/library/scala/collection/generic/FilterMonadic.scala +../scala-scala/src/library/scala/collection/generic/GenMapFactory.scala +../scala-scala/src/library/scala/collection/generic/GenSeqFactory.scala +../scala-scala/src/library/scala/collection/generic/GenSetFactory.scala +../scala-scala/src/library/scala/collection/generic/GenTraversableFactory.scala +../scala-scala/src/library/scala/collection/generic/GenericClassTagCompanion.scala +../scala-scala/src/library/scala/collection/generic/GenericClassTagTraversableTemplate.scala +../scala-scala/src/library/scala/collection/generic/GenericCompanion.scala +../scala-scala/src/library/scala/collection/generic/GenericOrderedCompanion.scala +../scala-scala/src/library/scala/collection/generic/GenericOrderedTraversableTemplate.scala +../scala-scala/src/library/scala/collection/generic/GenericParCompanion.scala +../scala-scala/src/library/scala/collection/generic/GenericParTemplate.scala +../scala-scala/src/library/scala/collection/generic/GenericSeqCompanion.scala +../scala-scala/src/library/scala/collection/generic/GenericSetTemplate.scala -./scala-scala/src/library/scala/collection/generic/GenericTraversableTemplate.scala +../scala-scala/src/library/scala/collection/generic/GenericTraversableTemplate.scala -./scala-scala/src/library/scala/collection/generic/HasNewBuilder.scala -./scala-scala/src/library/scala/collection/generic/HasNewCombiner.scala +../scala-scala/src/library/scala/collection/generic/HasNewBuilder.scala +../scala-scala/src/library/scala/collection/generic/HasNewCombiner.scala -./scala-scala/src/library/scala/collection/generic/ImmutableMapFactory.scala -./scala-scala/src/library/scala/collection/generic/ImmutableSetFactory.scala +../scala-scala/src/library/scala/collection/generic/ImmutableMapFactory.scala +../scala-scala/src/library/scala/collection/generic/ImmutableSetFactory.scala -./scala-scala/src/library/scala/collection/generic/ImmutableSortedMapFactory.scala -./scala-scala/src/library/scala/collection/generic/ImmutableSortedSetFactory.scala -./scala-scala/src/library/scala/collection/generic/IndexedSeqFactory.scala -./scala-scala/src/library/scala/collection/generic/IsSeqLike.scala -./scala-scala/src/library/scala/collection/generic/IsTraversableLike.scala -./scala-scala/src/library/scala/collection/generic/IsTraversableOnce.scala -./scala-scala/src/library/scala/collection/generic/IterableForwarder.scala +../scala-scala/src/library/scala/collection/generic/ImmutableSortedMapFactory.scala +../scala-scala/src/library/scala/collection/generic/ImmutableSortedSetFactory.scala +../scala-scala/src/library/scala/collection/generic/IndexedSeqFactory.scala +../scala-scala/src/library/scala/collection/generic/IsSeqLike.scala +../scala-scala/src/library/scala/collection/generic/IsTraversableLike.scala +../scala-scala/src/library/scala/collection/generic/IsTraversableOnce.scala +../scala-scala/src/library/scala/collection/generic/IterableForwarder.scala -./scala-scala/src/library/scala/collection/generic/MapFactory.scala -./scala-scala/src/library/scala/collection/generic/MutableMapFactory.scala -./scala-scala/src/library/scala/collection/generic/MutableSetFactory.scala -./scala-scala/src/library/scala/collection/generic/ParMapFactory.scala -./scala-scala/src/library/scala/collection/generic/SeqFactory.scala -./scala-scala/src/library/scala/collection/generic/SortedMapFactory.scala -./scala-scala/src/library/scala/collection/generic/SortedSetFactory.scala -./scala-scala/src/library/scala/collection/generic/SetFactory.scala -./scala-scala/src/library/scala/collection/generic/ParFactory.scala +../scala-scala/src/library/scala/collection/generic/MapFactory.scala +../scala-scala/src/library/scala/collection/generic/MutableMapFactory.scala +../scala-scala/src/library/scala/collection/generic/MutableSetFactory.scala +../scala-scala/src/library/scala/collection/generic/ParMapFactory.scala +../scala-scala/src/library/scala/collection/generic/SeqFactory.scala +../scala-scala/src/library/scala/collection/generic/SortedMapFactory.scala +../scala-scala/src/library/scala/collection/generic/SortedSetFactory.scala +../scala-scala/src/library/scala/collection/generic/SetFactory.scala +../scala-scala/src/library/scala/collection/generic/ParFactory.scala # https://github.com/lampepfl/dotty/issues/974 -> @smarter -./scala-scala/src/library/scala/collection/generic/MutableSortedSetFactory.scala +../scala-scala/src/library/scala/collection/generic/MutableSortedSetFactory.scala # cyclic reference, maybe related to #974 -> @smarter -#./scala-scala/src/library/scala/collection/generic/ParSetFactory.scala +#../scala-scala/src/library/scala/collection/generic/ParSetFactory.scala -./scala-scala/src/library/scala/collection/generic/OrderedTraversableFactory.scala -./scala-scala/src/library/scala/collection/generic/SeqForwarder.scala -./scala-scala/src/library/scala/collection/generic/Shrinkable.scala -./scala-scala/src/library/scala/collection/generic/Signalling.scala -./scala-scala/src/library/scala/collection/generic/Sizing.scala -./scala-scala/src/library/scala/collection/generic/SliceInterval.scala -./scala-scala/src/library/scala/collection/generic/Sorted.scala -./scala-scala/src/library/scala/collection/generic/Subtractable.scala -./scala-scala/src/library/scala/collection/generic/TraversableFactory.scala -./scala-scala/src/library/scala/collection/generic/package.scala +../scala-scala/src/library/scala/collection/generic/OrderedTraversableFactory.scala +../scala-scala/src/library/scala/collection/generic/SeqForwarder.scala +../scala-scala/src/library/scala/collection/generic/Shrinkable.scala +../scala-scala/src/library/scala/collection/generic/Signalling.scala +../scala-scala/src/library/scala/collection/generic/Sizing.scala +../scala-scala/src/library/scala/collection/generic/SliceInterval.scala +../scala-scala/src/library/scala/collection/generic/Sorted.scala +../scala-scala/src/library/scala/collection/generic/Subtractable.scala +../scala-scala/src/library/scala/collection/generic/TraversableFactory.scala +../scala-scala/src/library/scala/collection/generic/package.scala diff --git a/compiler/test/dotc/tests.scala b/compiler/test/dotc/tests.scala index bb3b1e5e006a..a3946947cd00 100644 --- a/compiler/test/dotc/tests.scala +++ b/compiler/test/dotc/tests.scala @@ -190,7 +190,6 @@ class tests extends CompilerTest { .filter(!_.startsWith("#")) // allow comment lines prefixed by # .map(_.takeWhile(_ != '#').trim) // allow comments in the end of line .filter(_.nonEmpty) - .map("." + _) // files are contained one dir up .toList @Test def compileStdLib = compileList("compileStdLib", stdlibFiles, "-migration" :: "-Yno-inline" :: scala2mode) diff --git a/doc-tool/test/BaseTest.scala b/doc-tool/test/BaseTest.scala index e439c6eca02f..7f3d62277869 100644 --- a/doc-tool/test/BaseTest.scala +++ b/doc-tool/test/BaseTest.scala @@ -23,7 +23,7 @@ trait DottyTest { ctx.setProperty(ContextDoc, new ContextDottydoc) ctx.setSetting( ctx.settings.classpath, - "./library/target/scala-2.11/dotty-library_2.11-0.1-SNAPSHOT.jar" + "../library/target/scala-2.11/dotty-library_2.11-0.1-SNAPSHOT.jar" ) base.initialize()(ctx) ctx diff --git a/doc-tool/test/UsecaseTest.scala b/doc-tool/test/UsecaseTest.scala index b5d47e4b6ce8..113d54aad15f 100644 --- a/doc-tool/test/UsecaseTest.scala +++ b/doc-tool/test/UsecaseTest.scala @@ -223,12 +223,12 @@ class UsecaseTest extends DottyTest { } @Test def checkIterator = - checkFiles("./scala-scala/src/library/scala/collection/Iterator.scala" :: Nil) { _ => + checkFiles("../scala-scala/src/library/scala/collection/Iterator.scala" :: Nil) { _ => // success if typer throws no errors! :) } @Test def checkIterableLike = - checkFiles("./scala-scala/src/library/scala/collection/IterableLike.scala" :: Nil) { _ => + checkFiles("../scala-scala/src/library/scala/collection/IterableLike.scala" :: Nil) { _ => // success if typer throws no errors! :) } } From 07923f1c6269ffc459f101dd1ac06cfaefd5c86c Mon Sep 17 00:00:00 2001 From: Guillaume Martres Date: Sat, 19 Nov 2016 22:27:56 +0100 Subject: [PATCH 46/55] Run some tests sequentially to avoid exhausting available memory Some tests are run with "-Ytest-pickler" which uses a huge amount of memory. By running these tests one by one when no other test is running, we avoid running out of memory. --- .../test/dotty/partest/DPConsoleRunner.scala | 39 +++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/compiler/test/dotty/partest/DPConsoleRunner.scala b/compiler/test/dotty/partest/DPConsoleRunner.scala index 310cba44d0d1..06a36f661c3a 100644 --- a/compiler/test/dotty/partest/DPConsoleRunner.scala +++ b/compiler/test/dotty/partest/DPConsoleRunner.scala @@ -88,6 +88,45 @@ extends SuiteRunner(testSourcePath, fileManager, updateCheck, failed, javaCmdPat """.stripMargin } + /** Tests which are compiled with one or more of the flags in this list will be run + * one by one, without any other test running at the same time. + * This is necessary because some test flags require a lot of memory when running + * the compiler and may exhaust the available memory when run in parallel with other tests. + */ + def sequentialFlags = List("-Ytest-pickler") + + override def runTestsForFiles(kindFiles: Array[File], kind: String): Array[TestState] = { + val (sequentialTests, parallelTests) = + kindFiles partition { kindFile => + val flags = kindFile.changeExtension("flags").fileContents + sequentialFlags.exists(seqFlag => flags.contains(seqFlag)) + } + + val seqResults = + if (!sequentialTests.isEmpty) { + val savedThreads = sys.props("partest.threads") + sys.props("partest.threads") = "1" + + NestUI.echo(s"## we will run ${sequentialTests.length} tests sequentially") + val res = super.runTestsForFiles(sequentialTests, kind) + + if (savedThreads != null) + sys.props("partest.threads") = savedThreads + else + sys.props.remove("partest.threads") + + res + } else Array[TestState]() + + val parResults = + if (!parallelTests.isEmpty) { + NestUI.echo(s"## we will run ${parallelTests.length} tests in parallel using ${PartestDefaults.numThreads} threads") + super.runTestsForFiles(parallelTests, kind) + } else Array[TestState]() + + seqResults ++ parResults + } + // override for DPTestRunner and redirecting compilation output to test.clog override def runTest(testFile: File): TestState = { val runner = new DPTestRunner(testFile, this) From 90d7f97a836ef57f51d274dbc0f0c66657a913ae Mon Sep 17 00:00:00 2001 From: Guillaume Martres Date: Sat, 19 Nov 2016 23:31:45 +0100 Subject: [PATCH 47/55] Replace dotc task by run, make dotc an alias of run --- project/Build.scala | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/project/Build.scala b/project/Build.scala index b5b1df56a137..0461b5886f3e 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -90,6 +90,7 @@ object DottyBuild extends Build { addCommandAlias("dotr", "dotty-compiler/dotr") ++ addCommandAlias("dotc", "dotty-compiler/dotc") ++ addCommandAlias("repl", "dotty-compiler/repl") ++ + addCommandAlias("run", "dotty-compiler/run") ++ addCommandAlias("packageAll", "dotty-compiler/packageAll") ++ addCommandAlias( "partest", @@ -218,7 +219,7 @@ object DottyBuild extends Build { s"""$java -classpath .:$dottyLib:$scalaLib ${args.mkString(" ")}""" ! } }, - dotc := Def.inputTaskDyn { + run := Def.inputTaskDyn { val dottyLib = packageAll.value("dotty-library") val args: Seq[String] = spaceDelimited("").parsed @@ -231,6 +232,7 @@ object DottyBuild extends Build { s" dotty.tools.dotc.Main " + fullArgs.mkString(" ") ) }.evaluated, + dotc := run.evaluated, // enable verbose exception messages for JUnit testOptions in Test += Tests.Argument( From da1bfe392c638fc03181e0d6b51eb41dbdcce548 Mon Sep 17 00:00:00 2001 From: Guillaume Martres Date: Sat, 19 Nov 2016 23:33:56 +0100 Subject: [PATCH 48/55] Remove unnecessary aliases These commands already work without defining aliases --- project/Build.scala | 4 ---- 1 file changed, 4 deletions(-) diff --git a/project/Build.scala b/project/Build.scala index 0461b5886f3e..d0281cd12d06 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -87,11 +87,7 @@ object DottyBuild extends Build { dependsOn(`dotty-compiler`). dependsOn(`dotty-library`). settings( - addCommandAlias("dotr", "dotty-compiler/dotr") ++ - addCommandAlias("dotc", "dotty-compiler/dotc") ++ - addCommandAlias("repl", "dotty-compiler/repl") ++ addCommandAlias("run", "dotty-compiler/run") ++ - addCommandAlias("packageAll", "dotty-compiler/packageAll") ++ addCommandAlias( "partest", ";packageAll" + From c3eb841ce8ae349d9820dbf6c18884955e74254e Mon Sep 17 00:00:00 2001 From: Guillaume Martres Date: Sun, 20 Nov 2016 00:02:50 +0100 Subject: [PATCH 49/55] Make every project use the new directory structure --- bench/{src/test/scala => test}/Benchmarks.scala | 0 .../tools/dotc/interfaces/AbstractFile.java | 0 .../tools/dotc/interfaces/CompilerCallback.java | 0 .../dotty/tools/dotc/interfaces/Diagnostic.java | 0 .../tools/dotc/interfaces/ReporterResult.java | 0 .../tools/dotc/interfaces/SimpleReporter.java | 0 .../dotty/tools/dotc/interfaces/SourceFile.java | 0 .../tools/dotc/interfaces/SourcePosition.java | 0 project/Build.scala | 16 +++++++++++----- .../scalajs/src/{main/scala => }/hello.scala | 0 .../compilerReporter/simple/Source.scala | 0 .../sbt-test/compilerReporter/simple/build.sbt | 0 .../simple/project/DottyInjectedPlugin.scala | 0 .../simple/project/Reporter.scala | 0 .../sbt-test/compilerReporter/simple/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 | 0 .../source-dependencies/abstract-override/test | 0 .../abstract-type-override/build.sbt | 0 .../abstract-type-override/changes/Bar1.scala | 0 .../project/DottyInjectedPlugin.scala | 0 .../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 | 0 .../source-dependencies/abstract-type/test | 0 .../source-dependencies/added/changes/A1.scala | 0 .../source-dependencies/added/changes/A2.scala | 0 .../source-dependencies/added/changes/A3.scala | 0 .../source-dependencies/added/changes/B1.scala | 0 .../source-dependencies/added/changes/B2.scala | 0 .../added/project/DottyInjectedPlugin.scala | 0 .../sbt-test/source-dependencies/added/test | 0 .../source-dependencies/as-seen-from-a/A.scala | 0 .../source-dependencies/as-seen-from-a/B.scala | 0 .../source-dependencies/as-seen-from-a/C.scala | 0 .../source-dependencies/as-seen-from-a/D.scala | 0 .../as-seen-from-a/changes/B2.scala | 0 .../project/DottyInjectedPlugin.scala | 0 .../source-dependencies/as-seen-from-a/test | 0 .../source-dependencies/as-seen-from-b/A.scala | 0 .../source-dependencies/as-seen-from-b/B.scala | 0 .../source-dependencies/as-seen-from-b/C.scala | 0 .../source-dependencies/as-seen-from-b/D.scala | 0 .../as-seen-from-b/changes/B2.scala | 0 .../project/DottyInjectedPlugin.scala | 0 .../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 | 0 .../backtick-quoted-names/test | 0 .../binary/changes/Break.scala | 0 .../source-dependencies/binary/dep/A.scala | 0 .../binary/project/DottyInjectedPlugin.scala | 0 .../source-dependencies/binary/project/P.scala | 0 .../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 .../source-dependencies/by-name/changes/A.scala | 0 .../by-name/project/DottyInjectedPlugin.scala | 0 .../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 | 0 .../sbt-test/source-dependencies/canon/test | 0 .../source-dependencies/compactify/build.sbt | 0 .../project/DottyInjectedPlugin.scala | 0 .../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 .../constants/project/DottyInjectedPlugin.scala | 0 .../sbt-test/source-dependencies/constants/test | 0 .../source-dependencies/default-params/A.scala | 0 .../source-dependencies/default-params/B.scala | 0 .../default-params/changes/A.scala | 0 .../project/DottyInjectedPlugin.scala | 0 .../source-dependencies/default-params/test | 0 .../dup-class/changes/A.scala | 0 .../dup-class/changes/A2.scala | 0 .../dup-class/changes/B.scala | 0 .../dup-class/project/DottyInjectedPlugin.scala | 0 .../sbt-test/source-dependencies/dup-class/test | 0 .../source-dependencies/empty-a/changes/A.scala | 0 .../empty-a/changes/A2.scala | 0 .../source-dependencies/empty-a/changes/B.scala | 0 .../empty-a/project/DottyInjectedPlugin.scala | 0 .../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 | 0 .../source-dependencies/empty-package/test | 0 .../source-dependencies/erasure/A.scala | 0 .../source-dependencies/erasure/B.scala | 0 .../source-dependencies/erasure/changes/A.scala | 0 .../erasure/project/DottyInjectedPlugin.scala | 0 .../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 | 0 .../source-dependencies/export-jars/test | 0 .../sbt-test/source-dependencies/ext/A.scala | 0 .../sbt-test/source-dependencies/ext/build.sbt | 0 .../ext/project/DottyInjectedPlugin.scala | 0 .../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 | 0 .../fbounded-existentials/fbounds.scala | 0 .../project/DottyInjectedPlugin.scala | 0 .../fbounded-existentials/test | 0 .../source-dependencies/implicit-params/A.scala | 0 .../source-dependencies/implicit-params/B.scala | 0 .../implicit-params/changes/A.scala | 0 .../project/DottyInjectedPlugin.scala | 0 .../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 | 0 .../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 | 0 .../source-dependencies/implicit-search/test | 0 .../source-dependencies/implicit/A.scala | 0 .../source-dependencies/implicit/B.scala | 0 .../implicit/changes/A.scala | 0 .../implicit/project/DottyInjectedPlugin.scala | 0 .../sbt-test/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 | 0 .../source-dependencies/import-class/test | 0 .../source-dependencies/import-package/A.scala | 0 .../source-dependencies/import-package/B.scala | 0 .../import-package/changes/A.scala | 0 .../source-dependencies/import-package/pending | 0 .../project/DottyInjectedPlugin.scala | 0 .../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 | 0 .../inherited-deps-java/test | 0 .../inherited_type_params/A.scala | 0 .../inherited_type_params/build.sbt | 0 .../project/DottyInjectedPlugin.scala | 0 .../inherited_type_params/test | 0 .../sbt-test/source-dependencies/inline/A.scala | 0 .../sbt-test/source-dependencies/inline/C.scala | 0 .../source-dependencies/inline/changes/B1.scala | 0 .../source-dependencies/inline/changes/B2.scala | 0 .../source-dependencies/inline/changes/B3.scala | 0 .../inline/project/DottyInjectedPlugin.scala | 0 .../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 | 0 .../source-dependencies/intermediate-error/test | 0 .../Outer.java | 0 .../java-analysis-serialization-error/build.sbt | 0 .../project/DottyInjectedPlugin.scala | 0 .../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 | 0 .../source-dependencies/java-basic/test | 0 .../java-generic-workaround/A.java | 0 .../DefaultTreeTableSorter.java | 0 .../TreeColumnModel.java | 0 .../TreeTableSorter.java | 0 .../project/DottyInjectedPlugin.scala | 0 .../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 | 0 .../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 | 0 .../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 .../lazy-val/project/DottyInjectedPlugin.scala | 0 .../sbt-test/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 | 0 .../less-inter-inv-java/test | 0 .../source-dependencies/less-inter-inv/A.scala | 0 .../source-dependencies/less-inter-inv/B.scala | 0 .../source-dependencies/less-inter-inv/C.scala | 0 .../source-dependencies/less-inter-inv/D.scala | 0 .../source-dependencies/less-inter-inv/E.scala | 0 .../less-inter-inv/build.sbt | 0 .../less-inter-inv/changes/A2.scala | 0 .../project/DottyInjectedPlugin.scala | 0 .../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 | 0 .../source-dependencies/linearization/test | 0 .../sbt-test/source-dependencies/named/A.scala | 0 .../sbt-test/source-dependencies/named/B.scala | 0 .../source-dependencies/named/changes/A.scala | 0 .../named/project/DottyInjectedPlugin.scala | 0 .../sbt-test/source-dependencies/named/test | 0 .../nested-case-class/changes/A0.scala | 0 .../nested-case-class/changes/A1.scala | 0 .../project/DottyInjectedPlugin.scala | 0 .../source-dependencies/nested-case-class/test | 0 .../new-cyclic/changes/A2.scala | 0 .../source-dependencies/new-cyclic/pending | 0 .../project/DottyInjectedPlugin.scala | 0 .../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 | 0 .../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 .../override/project/DottyInjectedPlugin.scala | 0 .../sbt-test/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 | 0 .../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 | 0 .../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 .../pkg-self/project/DottyInjectedPlugin.scala | 0 .../sbt-test/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 | 0 .../source-dependencies/qualified-access/test | 0 .../relative-source-error/changes/absolute.sbt | 0 .../relative-source-error/changes/relative.sbt | 0 .../project/DottyInjectedPlugin.scala | 0 .../relative-source-error/src/A.scala | 0 .../relative-source-error/test | 0 .../remove-test-a/changes/1.scala | 0 .../project/DottyInjectedPlugin.scala | 0 .../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 | 0 .../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 | 0 .../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 | 0 .../source-dependencies/replace-test-a/test | 0 .../source-dependencies/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 | 0 .../source-dependencies/resident-java/test | 0 .../resident-package-object/changes/A.scala | 0 .../changes/package.scala | 0 .../changes/package2.scala | 0 .../project/DottyInjectedPlugin.scala | 0 .../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 | 0 .../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 | 0 .../same-file-used-names/test | 0 .../sbt-test/source-dependencies/sealed/A.scala | 0 .../sbt-test/source-dependencies/sealed/D.scala | 0 .../source-dependencies/sealed/changes/A.scala | 0 .../sbt-test/source-dependencies/sealed/pending | 0 .../sealed/project/DottyInjectedPlugin.scala | 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 | 0 .../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 | 0 .../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 | 0 .../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 | 0 .../synthetic-companion/test | 0 .../trait-member-modified/build.sbt | 0 .../trait-member-modified/changes/A1.scala | 0 .../project/DottyInjectedPlugin.scala | 0 .../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 | 0 .../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 | 0 .../source-dependencies/trait-private-var/test | 0 .../source-dependencies/trait-super/A.scala | 0 .../source-dependencies/trait-super/B.scala | 0 .../source-dependencies/trait-super/Main.scala | 0 .../trait-super/changes/B2.scala | 0 .../trait-super/changes/B3.scala | 0 .../project/DottyInjectedPlugin.scala | 0 .../source-dependencies/trait-super/test | 0 .../transitive-a/changes/A2.scala | 0 .../project/DottyInjectedPlugin.scala | 0 .../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 | 0 .../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 | 0 .../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 | 0 .../source-dependencies/transitive-inherit/test | 0 .../transitive-memberRef/build.sbt | 0 .../transitive-memberRef/changes/A1.scala | 0 .../project/DottyInjectedPlugin.scala | 0 .../transitive-memberRef/src/main/scala/A.scala | 0 .../transitive-memberRef/src/main/scala/B.scala | 0 .../transitive-memberRef/src/main/scala/C.scala | 0 .../transitive-memberRef/src/main/scala/D.scala | 0 .../transitive-memberRef/src/main/scala/X.scala | 0 .../transitive-memberRef/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 | 0 .../source-dependencies/type-alias/test | 0 .../source-dependencies/type-parameter/A.scala | 0 .../source-dependencies/type-parameter/B.scala | 0 .../source-dependencies/type-parameter/C.scala | 0 .../source-dependencies/type-parameter/D.scala | 0 .../type-parameter/changes/A.scala | 0 .../project/DottyInjectedPlugin.scala | 0 .../source-dependencies/type-parameter/test | 0 .../source-dependencies/typeref-only/A.scala | 0 .../source-dependencies/typeref-only/B.scala | 0 .../source-dependencies/typeref-only/build.sbt | 0 .../project/DottyInjectedPlugin.scala | 0 .../source-dependencies/typeref-only/test | 0 .../source-dependencies/typeref-return/A.scala | 0 .../source-dependencies/typeref-return/B.scala | 0 .../typeref-return/changes/A.scala | 0 .../project/DottyInjectedPlugin.scala | 0 .../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 | 0 .../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 | 0 .../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 | 0 .../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 | 0 .../sbt-test/source-dependencies/var/test | 0 .../source-dependencies/variance/A.scala | 0 .../source-dependencies/variance/C.scala | 0 .../variance/changes/A.scala | 0 .../variance/project/DottyInjectedPlugin.scala | 0 .../sbt-test/source-dependencies/variance/test | 0 .../scala => }/xsbt/CompilerClassLoader.scala | 0 .../scala => }/xsbt/CompilerInterface.scala | 0 .../scala => }/xsbt/ConsoleInterface.scala | 0 .../scala => }/xsbt/DelegatingReporter.scala | 0 sbt-bridge/src/{main/scala => }/xsbt/Log.scala | 0 .../src/{main/scala => }/xsbt/Message.scala | 0 .../scala => }/xsbt/ScaladocInterface.scala | 0 .../xsbt/DependencySpecification.scala | 0 .../xsbt/ExtractAPISpecification.scala | 0 .../xsbt/ExtractUsedNamesSpecification.scala | 0 .../xsbt/ScalaCompilerForUnitTesting.scala | 0 .../scala => test}/xsbti/TestCallback.scala | 0 517 files changed, 11 insertions(+), 5 deletions(-) rename bench/{src/test/scala => test}/Benchmarks.scala (100%) rename interfaces/src/{main/java => }/dotty/tools/dotc/interfaces/AbstractFile.java (100%) rename interfaces/src/{main/java => }/dotty/tools/dotc/interfaces/CompilerCallback.java (100%) rename interfaces/src/{main/java => }/dotty/tools/dotc/interfaces/Diagnostic.java (100%) rename interfaces/src/{main/java => }/dotty/tools/dotc/interfaces/ReporterResult.java (100%) rename interfaces/src/{main/java => }/dotty/tools/dotc/interfaces/SimpleReporter.java (100%) rename interfaces/src/{main/java => }/dotty/tools/dotc/interfaces/SourceFile.java (100%) rename interfaces/src/{main/java => }/dotty/tools/dotc/interfaces/SourcePosition.java (100%) rename sandbox/scalajs/src/{main/scala => }/hello.scala (100%) rename sbt-bridge/{src => }/sbt-test/compilerReporter/simple/Source.scala (100%) rename sbt-bridge/{src => }/sbt-test/compilerReporter/simple/build.sbt (100%) rename sbt-bridge/{src => }/sbt-test/compilerReporter/simple/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{src => }/sbt-test/compilerReporter/simple/project/Reporter.scala (100%) rename sbt-bridge/{src => }/sbt-test/compilerReporter/simple/test (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/abstract-override/A.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/abstract-override/B.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/abstract-override/C.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/abstract-override/D.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/abstract-override/changes/C2.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/abstract-override/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/abstract-override/test (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/abstract-type-override/build.sbt (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/abstract-type-override/changes/Bar1.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/abstract-type-override/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/abstract-type-override/src/main/scala/Bar.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/abstract-type-override/src/main/scala/Foo.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/abstract-type-override/src/main/scala/Impl.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/abstract-type-override/test (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/abstract-type/A.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/abstract-type/B.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/abstract-type/changes/A.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/abstract-type/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/abstract-type/test (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/added/changes/A1.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/added/changes/A2.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/added/changes/A3.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/added/changes/B1.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/added/changes/B2.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/added/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/added/test (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/as-seen-from-a/A.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/as-seen-from-a/B.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/as-seen-from-a/C.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/as-seen-from-a/D.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/as-seen-from-a/changes/B2.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/as-seen-from-a/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/as-seen-from-a/test (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/as-seen-from-b/A.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/as-seen-from-b/B.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/as-seen-from-b/C.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/as-seen-from-b/D.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/as-seen-from-b/changes/B2.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/as-seen-from-b/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/as-seen-from-b/test (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/backtick-quoted-names/A.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/backtick-quoted-names/B.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/backtick-quoted-names/build.sbt (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/backtick-quoted-names/changes/A.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/backtick-quoted-names/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/backtick-quoted-names/test (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/binary/changes/Break.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/binary/dep/A.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/binary/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/binary/project/P.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/binary/test (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/binary/use/B.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/by-name/A.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/by-name/B.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/by-name/changes/A.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/by-name/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/by-name/test (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/canon/Use.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/canon/actual/A.java (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/canon/actual/a.jar (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/canon/build.sbt (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/canon/lib/a.jar (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/canon/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/canon/test (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/compactify/build.sbt (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/compactify/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/compactify/src/main/scala/For.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/compactify/src/main/scala/Nested.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/compactify/test (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/constants/changes/A1.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/constants/changes/A2.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/constants/changes/B.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/constants/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/constants/test (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/default-params/A.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/default-params/B.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/default-params/changes/A.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/default-params/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/default-params/test (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/dup-class/changes/A.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/dup-class/changes/A2.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/dup-class/changes/B.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/dup-class/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/dup-class/test (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/empty-a/changes/A.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/empty-a/changes/A2.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/empty-a/changes/B.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/empty-a/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/empty-a/test (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/empty-package/changes/Define1.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/empty-package/changes/Define2.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/empty-package/changes/Use.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/empty-package/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/empty-package/test (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/erasure/A.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/erasure/B.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/erasure/changes/A.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/erasure/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/erasure/test (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/export-jars/changes/A1.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/export-jars/changes/A2.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/export-jars/changes/A3.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/export-jars/changes/B.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/export-jars/changes/build2.sbt (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/export-jars/project/Build.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/export-jars/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/export-jars/test (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/ext/A.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/ext/build.sbt (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/ext/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/ext/test (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/false-error/A.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/false-error/B.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/false-error/changes/A.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/false-error/pending (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/false-error/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/fbounded-existentials/fbounds.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/fbounded-existentials/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/fbounded-existentials/test (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/implicit-params/A.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/implicit-params/B.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/implicit-params/changes/A.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/implicit-params/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/implicit-params/test (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/implicit-search-companion-scope/changes/A1.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/implicit-search-companion-scope/changes/A2.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/implicit-search-companion-scope/changes/B.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/implicit-search-companion-scope/changes/C.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/implicit-search-companion-scope/changes/M.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/implicit-search-companion-scope/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/implicit-search-companion-scope/test (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/implicit-search/changes/A1.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/implicit-search/changes/A2.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/implicit-search/changes/B.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/implicit-search/changes/C.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/implicit-search/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/implicit-search/test (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/implicit/A.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/implicit/B.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/implicit/changes/A.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/implicit/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/implicit/test (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/import-class/A.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/import-class/B.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/import-class/changes/A.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/import-class/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/import-class/test (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/import-package/A.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/import-package/B.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/import-package/changes/A.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/import-package/pending (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/import-package/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/inherited-deps-java/A.java (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/inherited-deps-java/B.java (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/inherited-deps-java/C.java (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/inherited-deps-java/D.java (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/inherited-deps-java/E.java (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/inherited-deps-java/F.java (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/inherited-deps-java/G.java (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/inherited-deps-java/J.java (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/inherited-deps-java/build.sbt (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/inherited-deps-java/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/inherited-deps-java/test (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/inherited_type_params/A.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/inherited_type_params/build.sbt (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/inherited_type_params/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/inherited_type_params/test (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/inline/A.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/inline/C.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/inline/changes/B1.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/inline/changes/B2.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/inline/changes/B3.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/inline/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/inline/test (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/intermediate-error/A.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/intermediate-error/B.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/intermediate-error/changes/A2.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/intermediate-error/changes/A3.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/intermediate-error/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/intermediate-error/test (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/java-analysis-serialization-error/Outer.java (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/java-analysis-serialization-error/build.sbt (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/java-analysis-serialization-error/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/java-analysis-serialization-error/test (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/java-basic/changes/A.java (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/java-basic/changes/A2.java (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/java-basic/changes/B1.java (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/java-basic/changes/B2.java (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/java-basic/changes/B3.java (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/java-basic/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/java-basic/test (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/java-generic-workaround/A.java (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/java-generic-workaround/DefaultTreeTableSorter.java (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/java-generic-workaround/TreeColumnModel.java (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/java-generic-workaround/TreeTableSorter.java (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/java-generic-workaround/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/java-generic-workaround/test (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/java-mixed/JJ.java (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/java-mixed/build.sbt (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/java-mixed/changes/S1.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/java-mixed/changes/S2.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/java-mixed/changes/build.sbt (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/java-mixed/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/java-mixed/test (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/java-static/changes/J1.java (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/java-static/changes/J2.java (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/java-static/changes/S.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/java-static/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/java-static/test (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/lazy-val/A.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/lazy-val/B.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/lazy-val/changes/A.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/lazy-val/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/lazy-val/test (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/less-inter-inv-java/A.java (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/less-inter-inv-java/B.java (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/less-inter-inv-java/C.java (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/less-inter-inv-java/D.java (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/less-inter-inv-java/E.java (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/less-inter-inv-java/build.sbt (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/less-inter-inv-java/changes/A2.java (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/less-inter-inv-java/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/less-inter-inv-java/test (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/less-inter-inv/A.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/less-inter-inv/B.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/less-inter-inv/C.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/less-inter-inv/D.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/less-inter-inv/E.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/less-inter-inv/build.sbt (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/less-inter-inv/changes/A2.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/less-inter-inv/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/less-inter-inv/test (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/linearization/A.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/linearization/B.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/linearization/C.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/linearization/D.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/linearization/E.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/linearization/F.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/linearization/changes/D.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/linearization/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/linearization/test (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/named/A.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/named/B.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/named/changes/A.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/named/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/named/test (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/nested-case-class/changes/A0.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/nested-case-class/changes/A1.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/nested-case-class/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/nested-case-class/test (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/new-cyclic/changes/A2.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/new-cyclic/pending (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/new-cyclic/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/new-cyclic/src/main/scala/A.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/new-cyclic/src/main/scala/B.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/new-pkg-dep/changes/A1.java (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/new-pkg-dep/changes/B0.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/new-pkg-dep/changes/B1.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/new-pkg-dep/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/new-pkg-dep/test (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/override/A.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/override/B.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/override/C.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/override/D.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/override/changes/B2.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/override/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/override/test (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/parent-change/W.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/parent-change/Y.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/parent-change/Z.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/parent-change/changes/W.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/parent-change/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/parent-change/test (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/parent-member-change/A.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/parent-member-change/B.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/parent-member-change/C.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/parent-member-change/changes/A.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/parent-member-change/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/parent-member-change/test (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/pkg-self/changes/A1.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/pkg-self/changes/A2.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/pkg-self/changes/B.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/pkg-self/changes/package.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/pkg-self/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/pkg-self/test (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/qualified-access/A.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/qualified-access/B.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/qualified-access/changes/A.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/qualified-access/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/qualified-access/test (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/relative-source-error/changes/absolute.sbt (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/relative-source-error/changes/relative.sbt (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/relative-source-error/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/relative-source-error/src/A.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/relative-source-error/test (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/remove-test-a/changes/1.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/remove-test-a/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/remove-test-a/test (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/remove-test-b/changes/A2.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/remove-test-b/changes/B3.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/remove-test-b/changes/B4.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/remove-test-b/changes/B5.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/remove-test-b/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/remove-test-b/src/main/scala/A.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/remove-test-b/src/main/scala/B.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/remove-test-b/test (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/repeated-parameters/A.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/repeated-parameters/B.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/repeated-parameters/changes/A.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/repeated-parameters/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/repeated-parameters/test (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/replace-test-a/changes/first.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/replace-test-a/changes/second.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/replace-test-a/project/Build.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/replace-test-a/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/replace-test-a/test (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/resident-java/build.sbt (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/resident-java/changes/A1.java (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/resident-java/changes/A2.java (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/resident-java/changes/B0.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/resident-java/changes/B1.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/resident-java/changes/B2.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/resident-java/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/resident-java/test (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/resident-package-object/changes/A.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/resident-package-object/changes/package.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/resident-package-object/changes/package2.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/resident-package-object/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/resident-package-object/test (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/restore-classes/build.sbt (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/restore-classes/changes/A1.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/restore-classes/changes/A2.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/restore-classes/changes/B.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/restore-classes/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/restore-classes/test (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/same-file-used-names/A.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/same-file-used-names/B.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/same-file-used-names/build.sbt (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/same-file-used-names/changes/B.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/same-file-used-names/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/same-file-used-names/test (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/sealed/A.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/sealed/D.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/sealed/changes/A.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/sealed/pending (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/sealed/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/signature-change/B.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/signature-change/changes/A0.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/signature-change/changes/A1.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/signature-change/changes/A2.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/signature-change/changes/A3.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/signature-change/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/signature-change/test (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/specialized/A.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/specialized/B.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/specialized/changes/A.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/specialized/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/specialized/test (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/stability-change/A.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/stability-change/B.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/stability-change/C.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/stability-change/changes/A.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/stability-change/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/stability-change/test (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/synthetic-companion/A.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/synthetic-companion/B.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/synthetic-companion/changes/A2.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/synthetic-companion/dbg.sbt (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/synthetic-companion/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/synthetic-companion/test (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/trait-member-modified/build.sbt (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/trait-member-modified/changes/A1.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/trait-member-modified/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/trait-member-modified/src/main/scala/A.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/trait-member-modified/src/main/scala/B.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/trait-member-modified/test (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/trait-private-object/A.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/trait-private-object/B.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/trait-private-object/changes/A.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/trait-private-object/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/trait-private-object/test (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/trait-private-var/B.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/trait-private-var/changes/A0.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/trait-private-var/changes/A1.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/trait-private-var/changes/A2.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/trait-private-var/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/trait-private-var/test (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/trait-super/A.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/trait-super/B.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/trait-super/Main.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/trait-super/changes/B2.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/trait-super/changes/B3.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/trait-super/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/trait-super/test (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/transitive-a/changes/A2.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/transitive-a/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/transitive-a/src/main/scala/A.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/transitive-a/src/main/scala/B.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/transitive-a/src/main/scala/C.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/transitive-a/test (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/transitive-b/changes/A2.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/transitive-b/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/transitive-b/src/main/scala/A.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/transitive-b/src/main/scala/B.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/transitive-b/src/main/scala/C.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/transitive-b/test (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/transitive-inherit-java/A.java (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/transitive-inherit-java/B.java (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/transitive-inherit-java/C.java (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/transitive-inherit-java/changes/A2.java (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/transitive-inherit-java/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/transitive-inherit-java/test (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/transitive-inherit/A.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/transitive-inherit/B.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/transitive-inherit/C.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/transitive-inherit/changes/A2.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/transitive-inherit/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/transitive-inherit/test (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/transitive-memberRef/build.sbt (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/transitive-memberRef/changes/A1.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/transitive-memberRef/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/transitive-memberRef/src/main/scala/A.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/transitive-memberRef/src/main/scala/B.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/transitive-memberRef/src/main/scala/C.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/transitive-memberRef/src/main/scala/D.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/transitive-memberRef/src/main/scala/X.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/transitive-memberRef/src/main/scala/Y.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/transitive-memberRef/test (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/type-alias/A.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/type-alias/B.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/type-alias/build.sbt (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/type-alias/changes/A.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/type-alias/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/type-alias/test (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/type-parameter/A.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/type-parameter/B.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/type-parameter/C.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/type-parameter/D.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/type-parameter/changes/A.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/type-parameter/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/type-parameter/test (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/typeref-only/A.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/typeref-only/B.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/typeref-only/build.sbt (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/typeref-only/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/typeref-only/test (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/typeref-return/A.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/typeref-return/B.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/typeref-return/changes/A.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/typeref-return/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/typeref-return/test (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/types-in-used-names-a/A.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/types-in-used-names-a/B.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/types-in-used-names-a/C.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/types-in-used-names-a/D.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/types-in-used-names-a/changes/B2.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/types-in-used-names-a/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/types-in-used-names-a/test (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/types-in-used-names-b/A.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/types-in-used-names-b/B.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/types-in-used-names-b/changes/A2.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/types-in-used-names-b/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/types-in-used-names-b/test (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/value-class-underlying/A.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/value-class-underlying/B.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/value-class-underlying/C.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/value-class-underlying/build.sbt (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/value-class-underlying/changes/A2.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/value-class-underlying/test (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/value-class/build.sbt (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/value-class/changes/A0.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/value-class/changes/A1.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/value-class/changes/B0.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/value-class/changes/B1.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/value-class/changes/B2.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/value-class/changes/C0.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/value-class/changes/C1.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/value-class/changes/C2.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/value-class/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/value-class/test (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/var/A.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/var/B.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/var/changes/A.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/var/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/var/test (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/variance/A.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/variance/C.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/variance/changes/A.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/variance/project/DottyInjectedPlugin.scala (100%) rename sbt-bridge/{src => }/sbt-test/source-dependencies/variance/test (100%) rename sbt-bridge/src/{main/scala => }/xsbt/CompilerClassLoader.scala (100%) rename sbt-bridge/src/{main/scala => }/xsbt/CompilerInterface.scala (100%) rename sbt-bridge/src/{main/scala => }/xsbt/ConsoleInterface.scala (100%) rename sbt-bridge/src/{main/scala => }/xsbt/DelegatingReporter.scala (100%) rename sbt-bridge/src/{main/scala => }/xsbt/Log.scala (100%) rename sbt-bridge/src/{main/scala => }/xsbt/Message.scala (100%) rename sbt-bridge/src/{main/scala => }/xsbt/ScaladocInterface.scala (100%) rename sbt-bridge/{src/test/scala => test}/xsbt/DependencySpecification.scala (100%) rename sbt-bridge/{src/test/scala => test}/xsbt/ExtractAPISpecification.scala (100%) rename sbt-bridge/{src/test/scala => test}/xsbt/ExtractUsedNamesSpecification.scala (100%) rename sbt-bridge/{src/test/scala => test}/xsbt/ScalaCompilerForUnitTesting.scala (100%) rename sbt-bridge/{src/test/scala => test}/xsbti/TestCallback.scala (100%) diff --git a/bench/src/test/scala/Benchmarks.scala b/bench/test/Benchmarks.scala similarity index 100% rename from bench/src/test/scala/Benchmarks.scala rename to bench/test/Benchmarks.scala diff --git a/interfaces/src/main/java/dotty/tools/dotc/interfaces/AbstractFile.java b/interfaces/src/dotty/tools/dotc/interfaces/AbstractFile.java similarity index 100% rename from interfaces/src/main/java/dotty/tools/dotc/interfaces/AbstractFile.java rename to interfaces/src/dotty/tools/dotc/interfaces/AbstractFile.java diff --git a/interfaces/src/main/java/dotty/tools/dotc/interfaces/CompilerCallback.java b/interfaces/src/dotty/tools/dotc/interfaces/CompilerCallback.java similarity index 100% rename from interfaces/src/main/java/dotty/tools/dotc/interfaces/CompilerCallback.java rename to interfaces/src/dotty/tools/dotc/interfaces/CompilerCallback.java diff --git a/interfaces/src/main/java/dotty/tools/dotc/interfaces/Diagnostic.java b/interfaces/src/dotty/tools/dotc/interfaces/Diagnostic.java similarity index 100% rename from interfaces/src/main/java/dotty/tools/dotc/interfaces/Diagnostic.java rename to interfaces/src/dotty/tools/dotc/interfaces/Diagnostic.java diff --git a/interfaces/src/main/java/dotty/tools/dotc/interfaces/ReporterResult.java b/interfaces/src/dotty/tools/dotc/interfaces/ReporterResult.java similarity index 100% rename from interfaces/src/main/java/dotty/tools/dotc/interfaces/ReporterResult.java rename to interfaces/src/dotty/tools/dotc/interfaces/ReporterResult.java diff --git a/interfaces/src/main/java/dotty/tools/dotc/interfaces/SimpleReporter.java b/interfaces/src/dotty/tools/dotc/interfaces/SimpleReporter.java similarity index 100% rename from interfaces/src/main/java/dotty/tools/dotc/interfaces/SimpleReporter.java rename to interfaces/src/dotty/tools/dotc/interfaces/SimpleReporter.java diff --git a/interfaces/src/main/java/dotty/tools/dotc/interfaces/SourceFile.java b/interfaces/src/dotty/tools/dotc/interfaces/SourceFile.java similarity index 100% rename from interfaces/src/main/java/dotty/tools/dotc/interfaces/SourceFile.java rename to interfaces/src/dotty/tools/dotc/interfaces/SourceFile.java diff --git a/interfaces/src/main/java/dotty/tools/dotc/interfaces/SourcePosition.java b/interfaces/src/dotty/tools/dotc/interfaces/SourcePosition.java similarity index 100% rename from interfaces/src/main/java/dotty/tools/dotc/interfaces/SourcePosition.java rename to interfaces/src/dotty/tools/dotc/interfaces/SourcePosition.java diff --git a/project/Build.scala b/project/Build.scala index d0281cd12d06..c46455bf8ad8 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -69,13 +69,14 @@ object DottyBuild extends Build { // set sources to src/, tests to test/ and resources to resources/ lazy val sourceStructure = Seq( - scalaSource in Compile := baseDirectory.value / "src", - scalaSource in Test := baseDirectory.value / "test", - javaSource in Compile := baseDirectory.value / "src", - javaSource in Test := baseDirectory.value / "test", - resourceDirectory in Compile := baseDirectory.value / "resources" + scalaSource in Compile := baseDirectory.value / "src", + scalaSource in Test := baseDirectory.value / "test", + javaSource in Compile := baseDirectory.value / "src", + javaSource in Test := baseDirectory.value / "test", + resourceDirectory in Compile := baseDirectory.value / "resources" ) + /** Projects -------------------------------------------------------------- */ // The root project: // - aggregates other projects so that "compile", "test", etc are run on all projects at once. @@ -117,6 +118,7 @@ object DottyBuild extends Build { lazy val `dotty-interfaces` = project.in(file("interfaces")). + settings(sourceStructure). settings( // Do not append Scala versions to the generated artifacts crossPaths := false, @@ -364,6 +366,7 @@ object DottyBuild extends Build { lazy val `dotty-sbt-bridge` = project.in(file("sbt-bridge")). dependsOn(`dotty-compiler`). + settings(sourceStructure). settings( overrideScalaVersionSetting, @@ -409,6 +412,7 @@ object DottyBuild extends Build { ). settings(ScriptedPlugin.scriptedSettings: _*). settings( + ScriptedPlugin.sbtTestDirectory := baseDirectory.value / "sbt-test", ScriptedPlugin.scriptedLaunchOpts := Seq("-Xmx1024m"), ScriptedPlugin.scriptedBufferLog := false // TODO: Use this instead of manually copying DottyInjectedPlugin.scala @@ -450,6 +454,7 @@ object DottyInjectedPlugin extends AutoPlugin { */ lazy val sjsSandbox = project.in(file("sandbox/scalajs")). enablePlugins(ScalaJSPlugin). + settings(sourceStructure). settings( overrideScalaVersionSetting, @@ -484,6 +489,7 @@ object DottyInjectedPlugin extends AutoPlugin { lazy val `dotty-bench` = project.in(file("bench")). dependsOn(`dotty-compiler` % "compile->test"). + settings(sourceStructure). settings( overrideScalaVersionSetting, diff --git a/sandbox/scalajs/src/main/scala/hello.scala b/sandbox/scalajs/src/hello.scala similarity index 100% rename from sandbox/scalajs/src/main/scala/hello.scala rename to sandbox/scalajs/src/hello.scala diff --git a/sbt-bridge/src/sbt-test/compilerReporter/simple/Source.scala b/sbt-bridge/sbt-test/compilerReporter/simple/Source.scala similarity index 100% rename from sbt-bridge/src/sbt-test/compilerReporter/simple/Source.scala rename to sbt-bridge/sbt-test/compilerReporter/simple/Source.scala diff --git a/sbt-bridge/src/sbt-test/compilerReporter/simple/build.sbt b/sbt-bridge/sbt-test/compilerReporter/simple/build.sbt similarity index 100% rename from sbt-bridge/src/sbt-test/compilerReporter/simple/build.sbt rename to sbt-bridge/sbt-test/compilerReporter/simple/build.sbt diff --git a/sbt-bridge/src/sbt-test/compilerReporter/simple/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/compilerReporter/simple/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/src/sbt-test/compilerReporter/simple/project/DottyInjectedPlugin.scala rename to sbt-bridge/sbt-test/compilerReporter/simple/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/src/sbt-test/compilerReporter/simple/project/Reporter.scala b/sbt-bridge/sbt-test/compilerReporter/simple/project/Reporter.scala similarity index 100% rename from sbt-bridge/src/sbt-test/compilerReporter/simple/project/Reporter.scala rename to sbt-bridge/sbt-test/compilerReporter/simple/project/Reporter.scala diff --git a/sbt-bridge/src/sbt-test/compilerReporter/simple/test b/sbt-bridge/sbt-test/compilerReporter/simple/test similarity index 100% rename from sbt-bridge/src/sbt-test/compilerReporter/simple/test rename to sbt-bridge/sbt-test/compilerReporter/simple/test diff --git a/sbt-bridge/src/sbt-test/source-dependencies/abstract-override/A.scala b/sbt-bridge/sbt-test/source-dependencies/abstract-override/A.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/abstract-override/A.scala rename to sbt-bridge/sbt-test/source-dependencies/abstract-override/A.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/abstract-override/B.scala b/sbt-bridge/sbt-test/source-dependencies/abstract-override/B.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/abstract-override/B.scala rename to sbt-bridge/sbt-test/source-dependencies/abstract-override/B.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/abstract-override/C.scala b/sbt-bridge/sbt-test/source-dependencies/abstract-override/C.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/abstract-override/C.scala rename to sbt-bridge/sbt-test/source-dependencies/abstract-override/C.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/abstract-override/D.scala b/sbt-bridge/sbt-test/source-dependencies/abstract-override/D.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/abstract-override/D.scala rename to sbt-bridge/sbt-test/source-dependencies/abstract-override/D.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/abstract-override/changes/C2.scala b/sbt-bridge/sbt-test/source-dependencies/abstract-override/changes/C2.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/abstract-override/changes/C2.scala rename to sbt-bridge/sbt-test/source-dependencies/abstract-override/changes/C2.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/abstract-override/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/abstract-override/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/abstract-override/project/DottyInjectedPlugin.scala rename to sbt-bridge/sbt-test/source-dependencies/abstract-override/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/abstract-override/test b/sbt-bridge/sbt-test/source-dependencies/abstract-override/test similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/abstract-override/test rename to sbt-bridge/sbt-test/source-dependencies/abstract-override/test diff --git a/sbt-bridge/src/sbt-test/source-dependencies/abstract-type-override/build.sbt b/sbt-bridge/sbt-test/source-dependencies/abstract-type-override/build.sbt similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/abstract-type-override/build.sbt rename to sbt-bridge/sbt-test/source-dependencies/abstract-type-override/build.sbt diff --git a/sbt-bridge/src/sbt-test/source-dependencies/abstract-type-override/changes/Bar1.scala b/sbt-bridge/sbt-test/source-dependencies/abstract-type-override/changes/Bar1.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/abstract-type-override/changes/Bar1.scala rename to sbt-bridge/sbt-test/source-dependencies/abstract-type-override/changes/Bar1.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/abstract-type-override/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/abstract-type-override/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/abstract-type-override/project/DottyInjectedPlugin.scala rename to sbt-bridge/sbt-test/source-dependencies/abstract-type-override/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/abstract-type-override/src/main/scala/Bar.scala b/sbt-bridge/sbt-test/source-dependencies/abstract-type-override/src/main/scala/Bar.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/abstract-type-override/src/main/scala/Bar.scala rename to sbt-bridge/sbt-test/source-dependencies/abstract-type-override/src/main/scala/Bar.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/abstract-type-override/src/main/scala/Foo.scala b/sbt-bridge/sbt-test/source-dependencies/abstract-type-override/src/main/scala/Foo.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/abstract-type-override/src/main/scala/Foo.scala rename to sbt-bridge/sbt-test/source-dependencies/abstract-type-override/src/main/scala/Foo.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/abstract-type-override/src/main/scala/Impl.scala b/sbt-bridge/sbt-test/source-dependencies/abstract-type-override/src/main/scala/Impl.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/abstract-type-override/src/main/scala/Impl.scala rename to sbt-bridge/sbt-test/source-dependencies/abstract-type-override/src/main/scala/Impl.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/abstract-type-override/test b/sbt-bridge/sbt-test/source-dependencies/abstract-type-override/test similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/abstract-type-override/test rename to sbt-bridge/sbt-test/source-dependencies/abstract-type-override/test diff --git a/sbt-bridge/src/sbt-test/source-dependencies/abstract-type/A.scala b/sbt-bridge/sbt-test/source-dependencies/abstract-type/A.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/abstract-type/A.scala rename to sbt-bridge/sbt-test/source-dependencies/abstract-type/A.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/abstract-type/B.scala b/sbt-bridge/sbt-test/source-dependencies/abstract-type/B.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/abstract-type/B.scala rename to sbt-bridge/sbt-test/source-dependencies/abstract-type/B.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/abstract-type/changes/A.scala b/sbt-bridge/sbt-test/source-dependencies/abstract-type/changes/A.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/abstract-type/changes/A.scala rename to sbt-bridge/sbt-test/source-dependencies/abstract-type/changes/A.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/abstract-type/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/abstract-type/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/abstract-type/project/DottyInjectedPlugin.scala rename to sbt-bridge/sbt-test/source-dependencies/abstract-type/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/abstract-type/test b/sbt-bridge/sbt-test/source-dependencies/abstract-type/test similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/abstract-type/test rename to sbt-bridge/sbt-test/source-dependencies/abstract-type/test diff --git a/sbt-bridge/src/sbt-test/source-dependencies/added/changes/A1.scala b/sbt-bridge/sbt-test/source-dependencies/added/changes/A1.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/added/changes/A1.scala rename to sbt-bridge/sbt-test/source-dependencies/added/changes/A1.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/added/changes/A2.scala b/sbt-bridge/sbt-test/source-dependencies/added/changes/A2.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/added/changes/A2.scala rename to sbt-bridge/sbt-test/source-dependencies/added/changes/A2.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/added/changes/A3.scala b/sbt-bridge/sbt-test/source-dependencies/added/changes/A3.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/added/changes/A3.scala rename to sbt-bridge/sbt-test/source-dependencies/added/changes/A3.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/added/changes/B1.scala b/sbt-bridge/sbt-test/source-dependencies/added/changes/B1.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/added/changes/B1.scala rename to sbt-bridge/sbt-test/source-dependencies/added/changes/B1.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/added/changes/B2.scala b/sbt-bridge/sbt-test/source-dependencies/added/changes/B2.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/added/changes/B2.scala rename to sbt-bridge/sbt-test/source-dependencies/added/changes/B2.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/added/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/added/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/added/project/DottyInjectedPlugin.scala rename to sbt-bridge/sbt-test/source-dependencies/added/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/added/test b/sbt-bridge/sbt-test/source-dependencies/added/test similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/added/test rename to sbt-bridge/sbt-test/source-dependencies/added/test diff --git a/sbt-bridge/src/sbt-test/source-dependencies/as-seen-from-a/A.scala b/sbt-bridge/sbt-test/source-dependencies/as-seen-from-a/A.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/as-seen-from-a/A.scala rename to sbt-bridge/sbt-test/source-dependencies/as-seen-from-a/A.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/as-seen-from-a/B.scala b/sbt-bridge/sbt-test/source-dependencies/as-seen-from-a/B.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/as-seen-from-a/B.scala rename to sbt-bridge/sbt-test/source-dependencies/as-seen-from-a/B.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/as-seen-from-a/C.scala b/sbt-bridge/sbt-test/source-dependencies/as-seen-from-a/C.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/as-seen-from-a/C.scala rename to sbt-bridge/sbt-test/source-dependencies/as-seen-from-a/C.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/as-seen-from-a/D.scala b/sbt-bridge/sbt-test/source-dependencies/as-seen-from-a/D.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/as-seen-from-a/D.scala rename to sbt-bridge/sbt-test/source-dependencies/as-seen-from-a/D.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/as-seen-from-a/changes/B2.scala b/sbt-bridge/sbt-test/source-dependencies/as-seen-from-a/changes/B2.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/as-seen-from-a/changes/B2.scala rename to sbt-bridge/sbt-test/source-dependencies/as-seen-from-a/changes/B2.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/as-seen-from-a/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/as-seen-from-a/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/as-seen-from-a/project/DottyInjectedPlugin.scala rename to sbt-bridge/sbt-test/source-dependencies/as-seen-from-a/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/as-seen-from-a/test b/sbt-bridge/sbt-test/source-dependencies/as-seen-from-a/test similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/as-seen-from-a/test rename to sbt-bridge/sbt-test/source-dependencies/as-seen-from-a/test diff --git a/sbt-bridge/src/sbt-test/source-dependencies/as-seen-from-b/A.scala b/sbt-bridge/sbt-test/source-dependencies/as-seen-from-b/A.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/as-seen-from-b/A.scala rename to sbt-bridge/sbt-test/source-dependencies/as-seen-from-b/A.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/as-seen-from-b/B.scala b/sbt-bridge/sbt-test/source-dependencies/as-seen-from-b/B.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/as-seen-from-b/B.scala rename to sbt-bridge/sbt-test/source-dependencies/as-seen-from-b/B.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/as-seen-from-b/C.scala b/sbt-bridge/sbt-test/source-dependencies/as-seen-from-b/C.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/as-seen-from-b/C.scala rename to sbt-bridge/sbt-test/source-dependencies/as-seen-from-b/C.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/as-seen-from-b/D.scala b/sbt-bridge/sbt-test/source-dependencies/as-seen-from-b/D.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/as-seen-from-b/D.scala rename to sbt-bridge/sbt-test/source-dependencies/as-seen-from-b/D.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/as-seen-from-b/changes/B2.scala b/sbt-bridge/sbt-test/source-dependencies/as-seen-from-b/changes/B2.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/as-seen-from-b/changes/B2.scala rename to sbt-bridge/sbt-test/source-dependencies/as-seen-from-b/changes/B2.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/as-seen-from-b/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/as-seen-from-b/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/as-seen-from-b/project/DottyInjectedPlugin.scala rename to sbt-bridge/sbt-test/source-dependencies/as-seen-from-b/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/as-seen-from-b/test b/sbt-bridge/sbt-test/source-dependencies/as-seen-from-b/test similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/as-seen-from-b/test rename to sbt-bridge/sbt-test/source-dependencies/as-seen-from-b/test diff --git a/sbt-bridge/src/sbt-test/source-dependencies/backtick-quoted-names/A.scala b/sbt-bridge/sbt-test/source-dependencies/backtick-quoted-names/A.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/backtick-quoted-names/A.scala rename to sbt-bridge/sbt-test/source-dependencies/backtick-quoted-names/A.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/backtick-quoted-names/B.scala b/sbt-bridge/sbt-test/source-dependencies/backtick-quoted-names/B.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/backtick-quoted-names/B.scala rename to sbt-bridge/sbt-test/source-dependencies/backtick-quoted-names/B.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/backtick-quoted-names/build.sbt b/sbt-bridge/sbt-test/source-dependencies/backtick-quoted-names/build.sbt similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/backtick-quoted-names/build.sbt rename to sbt-bridge/sbt-test/source-dependencies/backtick-quoted-names/build.sbt diff --git a/sbt-bridge/src/sbt-test/source-dependencies/backtick-quoted-names/changes/A.scala b/sbt-bridge/sbt-test/source-dependencies/backtick-quoted-names/changes/A.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/backtick-quoted-names/changes/A.scala rename to sbt-bridge/sbt-test/source-dependencies/backtick-quoted-names/changes/A.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/backtick-quoted-names/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/backtick-quoted-names/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/backtick-quoted-names/project/DottyInjectedPlugin.scala rename to sbt-bridge/sbt-test/source-dependencies/backtick-quoted-names/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/backtick-quoted-names/test b/sbt-bridge/sbt-test/source-dependencies/backtick-quoted-names/test similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/backtick-quoted-names/test rename to sbt-bridge/sbt-test/source-dependencies/backtick-quoted-names/test diff --git a/sbt-bridge/src/sbt-test/source-dependencies/binary/changes/Break.scala b/sbt-bridge/sbt-test/source-dependencies/binary/changes/Break.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/binary/changes/Break.scala rename to sbt-bridge/sbt-test/source-dependencies/binary/changes/Break.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/binary/dep/A.scala b/sbt-bridge/sbt-test/source-dependencies/binary/dep/A.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/binary/dep/A.scala rename to sbt-bridge/sbt-test/source-dependencies/binary/dep/A.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/binary/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/binary/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/binary/project/DottyInjectedPlugin.scala rename to sbt-bridge/sbt-test/source-dependencies/binary/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/binary/project/P.scala b/sbt-bridge/sbt-test/source-dependencies/binary/project/P.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/binary/project/P.scala rename to sbt-bridge/sbt-test/source-dependencies/binary/project/P.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/binary/test b/sbt-bridge/sbt-test/source-dependencies/binary/test similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/binary/test rename to sbt-bridge/sbt-test/source-dependencies/binary/test diff --git a/sbt-bridge/src/sbt-test/source-dependencies/binary/use/B.scala b/sbt-bridge/sbt-test/source-dependencies/binary/use/B.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/binary/use/B.scala rename to sbt-bridge/sbt-test/source-dependencies/binary/use/B.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/by-name/A.scala b/sbt-bridge/sbt-test/source-dependencies/by-name/A.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/by-name/A.scala rename to sbt-bridge/sbt-test/source-dependencies/by-name/A.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/by-name/B.scala b/sbt-bridge/sbt-test/source-dependencies/by-name/B.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/by-name/B.scala rename to sbt-bridge/sbt-test/source-dependencies/by-name/B.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/by-name/changes/A.scala b/sbt-bridge/sbt-test/source-dependencies/by-name/changes/A.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/by-name/changes/A.scala rename to sbt-bridge/sbt-test/source-dependencies/by-name/changes/A.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/by-name/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/by-name/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/by-name/project/DottyInjectedPlugin.scala rename to sbt-bridge/sbt-test/source-dependencies/by-name/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/by-name/test b/sbt-bridge/sbt-test/source-dependencies/by-name/test similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/by-name/test rename to sbt-bridge/sbt-test/source-dependencies/by-name/test diff --git a/sbt-bridge/src/sbt-test/source-dependencies/canon/Use.scala b/sbt-bridge/sbt-test/source-dependencies/canon/Use.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/canon/Use.scala rename to sbt-bridge/sbt-test/source-dependencies/canon/Use.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/canon/actual/A.java b/sbt-bridge/sbt-test/source-dependencies/canon/actual/A.java similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/canon/actual/A.java rename to sbt-bridge/sbt-test/source-dependencies/canon/actual/A.java diff --git a/sbt-bridge/src/sbt-test/source-dependencies/canon/actual/a.jar b/sbt-bridge/sbt-test/source-dependencies/canon/actual/a.jar similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/canon/actual/a.jar rename to sbt-bridge/sbt-test/source-dependencies/canon/actual/a.jar diff --git a/sbt-bridge/src/sbt-test/source-dependencies/canon/build.sbt b/sbt-bridge/sbt-test/source-dependencies/canon/build.sbt similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/canon/build.sbt rename to sbt-bridge/sbt-test/source-dependencies/canon/build.sbt diff --git a/sbt-bridge/src/sbt-test/source-dependencies/canon/lib/a.jar b/sbt-bridge/sbt-test/source-dependencies/canon/lib/a.jar similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/canon/lib/a.jar rename to sbt-bridge/sbt-test/source-dependencies/canon/lib/a.jar diff --git a/sbt-bridge/src/sbt-test/source-dependencies/canon/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/canon/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/canon/project/DottyInjectedPlugin.scala rename to sbt-bridge/sbt-test/source-dependencies/canon/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/canon/test b/sbt-bridge/sbt-test/source-dependencies/canon/test similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/canon/test rename to sbt-bridge/sbt-test/source-dependencies/canon/test diff --git a/sbt-bridge/src/sbt-test/source-dependencies/compactify/build.sbt b/sbt-bridge/sbt-test/source-dependencies/compactify/build.sbt similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/compactify/build.sbt rename to sbt-bridge/sbt-test/source-dependencies/compactify/build.sbt diff --git a/sbt-bridge/src/sbt-test/source-dependencies/compactify/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/compactify/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/compactify/project/DottyInjectedPlugin.scala rename to sbt-bridge/sbt-test/source-dependencies/compactify/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/compactify/src/main/scala/For.scala b/sbt-bridge/sbt-test/source-dependencies/compactify/src/main/scala/For.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/compactify/src/main/scala/For.scala rename to sbt-bridge/sbt-test/source-dependencies/compactify/src/main/scala/For.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/compactify/src/main/scala/Nested.scala b/sbt-bridge/sbt-test/source-dependencies/compactify/src/main/scala/Nested.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/compactify/src/main/scala/Nested.scala rename to sbt-bridge/sbt-test/source-dependencies/compactify/src/main/scala/Nested.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/compactify/test b/sbt-bridge/sbt-test/source-dependencies/compactify/test similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/compactify/test rename to sbt-bridge/sbt-test/source-dependencies/compactify/test diff --git a/sbt-bridge/src/sbt-test/source-dependencies/constants/changes/A1.scala b/sbt-bridge/sbt-test/source-dependencies/constants/changes/A1.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/constants/changes/A1.scala rename to sbt-bridge/sbt-test/source-dependencies/constants/changes/A1.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/constants/changes/A2.scala b/sbt-bridge/sbt-test/source-dependencies/constants/changes/A2.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/constants/changes/A2.scala rename to sbt-bridge/sbt-test/source-dependencies/constants/changes/A2.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/constants/changes/B.scala b/sbt-bridge/sbt-test/source-dependencies/constants/changes/B.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/constants/changes/B.scala rename to sbt-bridge/sbt-test/source-dependencies/constants/changes/B.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/constants/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/constants/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/constants/project/DottyInjectedPlugin.scala rename to sbt-bridge/sbt-test/source-dependencies/constants/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/constants/test b/sbt-bridge/sbt-test/source-dependencies/constants/test similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/constants/test rename to sbt-bridge/sbt-test/source-dependencies/constants/test diff --git a/sbt-bridge/src/sbt-test/source-dependencies/default-params/A.scala b/sbt-bridge/sbt-test/source-dependencies/default-params/A.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/default-params/A.scala rename to sbt-bridge/sbt-test/source-dependencies/default-params/A.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/default-params/B.scala b/sbt-bridge/sbt-test/source-dependencies/default-params/B.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/default-params/B.scala rename to sbt-bridge/sbt-test/source-dependencies/default-params/B.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/default-params/changes/A.scala b/sbt-bridge/sbt-test/source-dependencies/default-params/changes/A.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/default-params/changes/A.scala rename to sbt-bridge/sbt-test/source-dependencies/default-params/changes/A.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/default-params/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/default-params/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/default-params/project/DottyInjectedPlugin.scala rename to sbt-bridge/sbt-test/source-dependencies/default-params/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/default-params/test b/sbt-bridge/sbt-test/source-dependencies/default-params/test similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/default-params/test rename to sbt-bridge/sbt-test/source-dependencies/default-params/test diff --git a/sbt-bridge/src/sbt-test/source-dependencies/dup-class/changes/A.scala b/sbt-bridge/sbt-test/source-dependencies/dup-class/changes/A.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/dup-class/changes/A.scala rename to sbt-bridge/sbt-test/source-dependencies/dup-class/changes/A.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/dup-class/changes/A2.scala b/sbt-bridge/sbt-test/source-dependencies/dup-class/changes/A2.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/dup-class/changes/A2.scala rename to sbt-bridge/sbt-test/source-dependencies/dup-class/changes/A2.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/dup-class/changes/B.scala b/sbt-bridge/sbt-test/source-dependencies/dup-class/changes/B.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/dup-class/changes/B.scala rename to sbt-bridge/sbt-test/source-dependencies/dup-class/changes/B.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/dup-class/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/dup-class/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/dup-class/project/DottyInjectedPlugin.scala rename to sbt-bridge/sbt-test/source-dependencies/dup-class/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/dup-class/test b/sbt-bridge/sbt-test/source-dependencies/dup-class/test similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/dup-class/test rename to sbt-bridge/sbt-test/source-dependencies/dup-class/test diff --git a/sbt-bridge/src/sbt-test/source-dependencies/empty-a/changes/A.scala b/sbt-bridge/sbt-test/source-dependencies/empty-a/changes/A.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/empty-a/changes/A.scala rename to sbt-bridge/sbt-test/source-dependencies/empty-a/changes/A.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/empty-a/changes/A2.scala b/sbt-bridge/sbt-test/source-dependencies/empty-a/changes/A2.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/empty-a/changes/A2.scala rename to sbt-bridge/sbt-test/source-dependencies/empty-a/changes/A2.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/empty-a/changes/B.scala b/sbt-bridge/sbt-test/source-dependencies/empty-a/changes/B.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/empty-a/changes/B.scala rename to sbt-bridge/sbt-test/source-dependencies/empty-a/changes/B.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/empty-a/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/empty-a/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/empty-a/project/DottyInjectedPlugin.scala rename to sbt-bridge/sbt-test/source-dependencies/empty-a/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/empty-a/test b/sbt-bridge/sbt-test/source-dependencies/empty-a/test similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/empty-a/test rename to sbt-bridge/sbt-test/source-dependencies/empty-a/test diff --git a/sbt-bridge/src/sbt-test/source-dependencies/empty-package/changes/Define1.scala b/sbt-bridge/sbt-test/source-dependencies/empty-package/changes/Define1.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/empty-package/changes/Define1.scala rename to sbt-bridge/sbt-test/source-dependencies/empty-package/changes/Define1.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/empty-package/changes/Define2.scala b/sbt-bridge/sbt-test/source-dependencies/empty-package/changes/Define2.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/empty-package/changes/Define2.scala rename to sbt-bridge/sbt-test/source-dependencies/empty-package/changes/Define2.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/empty-package/changes/Use.scala b/sbt-bridge/sbt-test/source-dependencies/empty-package/changes/Use.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/empty-package/changes/Use.scala rename to sbt-bridge/sbt-test/source-dependencies/empty-package/changes/Use.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/empty-package/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/empty-package/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/empty-package/project/DottyInjectedPlugin.scala rename to sbt-bridge/sbt-test/source-dependencies/empty-package/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/empty-package/test b/sbt-bridge/sbt-test/source-dependencies/empty-package/test similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/empty-package/test rename to sbt-bridge/sbt-test/source-dependencies/empty-package/test diff --git a/sbt-bridge/src/sbt-test/source-dependencies/erasure/A.scala b/sbt-bridge/sbt-test/source-dependencies/erasure/A.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/erasure/A.scala rename to sbt-bridge/sbt-test/source-dependencies/erasure/A.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/erasure/B.scala b/sbt-bridge/sbt-test/source-dependencies/erasure/B.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/erasure/B.scala rename to sbt-bridge/sbt-test/source-dependencies/erasure/B.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/erasure/changes/A.scala b/sbt-bridge/sbt-test/source-dependencies/erasure/changes/A.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/erasure/changes/A.scala rename to sbt-bridge/sbt-test/source-dependencies/erasure/changes/A.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/erasure/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/erasure/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/erasure/project/DottyInjectedPlugin.scala rename to sbt-bridge/sbt-test/source-dependencies/erasure/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/erasure/test b/sbt-bridge/sbt-test/source-dependencies/erasure/test similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/erasure/test rename to sbt-bridge/sbt-test/source-dependencies/erasure/test diff --git a/sbt-bridge/src/sbt-test/source-dependencies/export-jars/changes/A1.scala b/sbt-bridge/sbt-test/source-dependencies/export-jars/changes/A1.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/export-jars/changes/A1.scala rename to sbt-bridge/sbt-test/source-dependencies/export-jars/changes/A1.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/export-jars/changes/A2.scala b/sbt-bridge/sbt-test/source-dependencies/export-jars/changes/A2.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/export-jars/changes/A2.scala rename to sbt-bridge/sbt-test/source-dependencies/export-jars/changes/A2.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/export-jars/changes/A3.scala b/sbt-bridge/sbt-test/source-dependencies/export-jars/changes/A3.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/export-jars/changes/A3.scala rename to sbt-bridge/sbt-test/source-dependencies/export-jars/changes/A3.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/export-jars/changes/B.scala b/sbt-bridge/sbt-test/source-dependencies/export-jars/changes/B.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/export-jars/changes/B.scala rename to sbt-bridge/sbt-test/source-dependencies/export-jars/changes/B.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/export-jars/changes/build2.sbt b/sbt-bridge/sbt-test/source-dependencies/export-jars/changes/build2.sbt similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/export-jars/changes/build2.sbt rename to sbt-bridge/sbt-test/source-dependencies/export-jars/changes/build2.sbt diff --git a/sbt-bridge/src/sbt-test/source-dependencies/export-jars/project/Build.scala b/sbt-bridge/sbt-test/source-dependencies/export-jars/project/Build.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/export-jars/project/Build.scala rename to sbt-bridge/sbt-test/source-dependencies/export-jars/project/Build.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/export-jars/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/export-jars/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/export-jars/project/DottyInjectedPlugin.scala rename to sbt-bridge/sbt-test/source-dependencies/export-jars/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/export-jars/test b/sbt-bridge/sbt-test/source-dependencies/export-jars/test similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/export-jars/test rename to sbt-bridge/sbt-test/source-dependencies/export-jars/test diff --git a/sbt-bridge/src/sbt-test/source-dependencies/ext/A.scala b/sbt-bridge/sbt-test/source-dependencies/ext/A.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/ext/A.scala rename to sbt-bridge/sbt-test/source-dependencies/ext/A.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/ext/build.sbt b/sbt-bridge/sbt-test/source-dependencies/ext/build.sbt similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/ext/build.sbt rename to sbt-bridge/sbt-test/source-dependencies/ext/build.sbt diff --git a/sbt-bridge/src/sbt-test/source-dependencies/ext/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/ext/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/ext/project/DottyInjectedPlugin.scala rename to sbt-bridge/sbt-test/source-dependencies/ext/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/ext/test b/sbt-bridge/sbt-test/source-dependencies/ext/test similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/ext/test rename to sbt-bridge/sbt-test/source-dependencies/ext/test diff --git a/sbt-bridge/src/sbt-test/source-dependencies/false-error/A.scala b/sbt-bridge/sbt-test/source-dependencies/false-error/A.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/false-error/A.scala rename to sbt-bridge/sbt-test/source-dependencies/false-error/A.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/false-error/B.scala b/sbt-bridge/sbt-test/source-dependencies/false-error/B.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/false-error/B.scala rename to sbt-bridge/sbt-test/source-dependencies/false-error/B.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/false-error/changes/A.scala b/sbt-bridge/sbt-test/source-dependencies/false-error/changes/A.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/false-error/changes/A.scala rename to sbt-bridge/sbt-test/source-dependencies/false-error/changes/A.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/false-error/pending b/sbt-bridge/sbt-test/source-dependencies/false-error/pending similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/false-error/pending rename to sbt-bridge/sbt-test/source-dependencies/false-error/pending diff --git a/sbt-bridge/src/sbt-test/source-dependencies/false-error/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/false-error/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/false-error/project/DottyInjectedPlugin.scala rename to sbt-bridge/sbt-test/source-dependencies/false-error/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/fbounded-existentials/fbounds.scala b/sbt-bridge/sbt-test/source-dependencies/fbounded-existentials/fbounds.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/fbounded-existentials/fbounds.scala rename to sbt-bridge/sbt-test/source-dependencies/fbounded-existentials/fbounds.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/fbounded-existentials/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/fbounded-existentials/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/fbounded-existentials/project/DottyInjectedPlugin.scala rename to sbt-bridge/sbt-test/source-dependencies/fbounded-existentials/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/fbounded-existentials/test b/sbt-bridge/sbt-test/source-dependencies/fbounded-existentials/test similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/fbounded-existentials/test rename to sbt-bridge/sbt-test/source-dependencies/fbounded-existentials/test diff --git a/sbt-bridge/src/sbt-test/source-dependencies/implicit-params/A.scala b/sbt-bridge/sbt-test/source-dependencies/implicit-params/A.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/implicit-params/A.scala rename to sbt-bridge/sbt-test/source-dependencies/implicit-params/A.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/implicit-params/B.scala b/sbt-bridge/sbt-test/source-dependencies/implicit-params/B.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/implicit-params/B.scala rename to sbt-bridge/sbt-test/source-dependencies/implicit-params/B.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/implicit-params/changes/A.scala b/sbt-bridge/sbt-test/source-dependencies/implicit-params/changes/A.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/implicit-params/changes/A.scala rename to sbt-bridge/sbt-test/source-dependencies/implicit-params/changes/A.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/implicit-params/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/implicit-params/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/implicit-params/project/DottyInjectedPlugin.scala rename to sbt-bridge/sbt-test/source-dependencies/implicit-params/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/implicit-params/test b/sbt-bridge/sbt-test/source-dependencies/implicit-params/test similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/implicit-params/test rename to sbt-bridge/sbt-test/source-dependencies/implicit-params/test diff --git a/sbt-bridge/src/sbt-test/source-dependencies/implicit-search-companion-scope/changes/A1.scala b/sbt-bridge/sbt-test/source-dependencies/implicit-search-companion-scope/changes/A1.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/implicit-search-companion-scope/changes/A1.scala rename to sbt-bridge/sbt-test/source-dependencies/implicit-search-companion-scope/changes/A1.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/implicit-search-companion-scope/changes/A2.scala b/sbt-bridge/sbt-test/source-dependencies/implicit-search-companion-scope/changes/A2.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/implicit-search-companion-scope/changes/A2.scala rename to sbt-bridge/sbt-test/source-dependencies/implicit-search-companion-scope/changes/A2.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/implicit-search-companion-scope/changes/B.scala b/sbt-bridge/sbt-test/source-dependencies/implicit-search-companion-scope/changes/B.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/implicit-search-companion-scope/changes/B.scala rename to sbt-bridge/sbt-test/source-dependencies/implicit-search-companion-scope/changes/B.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/implicit-search-companion-scope/changes/C.scala b/sbt-bridge/sbt-test/source-dependencies/implicit-search-companion-scope/changes/C.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/implicit-search-companion-scope/changes/C.scala rename to sbt-bridge/sbt-test/source-dependencies/implicit-search-companion-scope/changes/C.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/implicit-search-companion-scope/changes/M.scala b/sbt-bridge/sbt-test/source-dependencies/implicit-search-companion-scope/changes/M.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/implicit-search-companion-scope/changes/M.scala rename to sbt-bridge/sbt-test/source-dependencies/implicit-search-companion-scope/changes/M.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/implicit-search-companion-scope/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/implicit-search-companion-scope/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/implicit-search-companion-scope/project/DottyInjectedPlugin.scala rename to sbt-bridge/sbt-test/source-dependencies/implicit-search-companion-scope/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/implicit-search-companion-scope/test b/sbt-bridge/sbt-test/source-dependencies/implicit-search-companion-scope/test similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/implicit-search-companion-scope/test rename to sbt-bridge/sbt-test/source-dependencies/implicit-search-companion-scope/test diff --git a/sbt-bridge/src/sbt-test/source-dependencies/implicit-search/changes/A1.scala b/sbt-bridge/sbt-test/source-dependencies/implicit-search/changes/A1.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/implicit-search/changes/A1.scala rename to sbt-bridge/sbt-test/source-dependencies/implicit-search/changes/A1.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/implicit-search/changes/A2.scala b/sbt-bridge/sbt-test/source-dependencies/implicit-search/changes/A2.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/implicit-search/changes/A2.scala rename to sbt-bridge/sbt-test/source-dependencies/implicit-search/changes/A2.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/implicit-search/changes/B.scala b/sbt-bridge/sbt-test/source-dependencies/implicit-search/changes/B.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/implicit-search/changes/B.scala rename to sbt-bridge/sbt-test/source-dependencies/implicit-search/changes/B.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/implicit-search/changes/C.scala b/sbt-bridge/sbt-test/source-dependencies/implicit-search/changes/C.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/implicit-search/changes/C.scala rename to sbt-bridge/sbt-test/source-dependencies/implicit-search/changes/C.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/implicit-search/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/implicit-search/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/implicit-search/project/DottyInjectedPlugin.scala rename to sbt-bridge/sbt-test/source-dependencies/implicit-search/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/implicit-search/test b/sbt-bridge/sbt-test/source-dependencies/implicit-search/test similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/implicit-search/test rename to sbt-bridge/sbt-test/source-dependencies/implicit-search/test diff --git a/sbt-bridge/src/sbt-test/source-dependencies/implicit/A.scala b/sbt-bridge/sbt-test/source-dependencies/implicit/A.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/implicit/A.scala rename to sbt-bridge/sbt-test/source-dependencies/implicit/A.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/implicit/B.scala b/sbt-bridge/sbt-test/source-dependencies/implicit/B.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/implicit/B.scala rename to sbt-bridge/sbt-test/source-dependencies/implicit/B.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/implicit/changes/A.scala b/sbt-bridge/sbt-test/source-dependencies/implicit/changes/A.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/implicit/changes/A.scala rename to sbt-bridge/sbt-test/source-dependencies/implicit/changes/A.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/implicit/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/implicit/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/implicit/project/DottyInjectedPlugin.scala rename to sbt-bridge/sbt-test/source-dependencies/implicit/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/implicit/test b/sbt-bridge/sbt-test/source-dependencies/implicit/test similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/implicit/test rename to sbt-bridge/sbt-test/source-dependencies/implicit/test diff --git a/sbt-bridge/src/sbt-test/source-dependencies/import-class/A.scala b/sbt-bridge/sbt-test/source-dependencies/import-class/A.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/import-class/A.scala rename to sbt-bridge/sbt-test/source-dependencies/import-class/A.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/import-class/B.scala b/sbt-bridge/sbt-test/source-dependencies/import-class/B.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/import-class/B.scala rename to sbt-bridge/sbt-test/source-dependencies/import-class/B.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/import-class/changes/A.scala b/sbt-bridge/sbt-test/source-dependencies/import-class/changes/A.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/import-class/changes/A.scala rename to sbt-bridge/sbt-test/source-dependencies/import-class/changes/A.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/import-class/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/import-class/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/import-class/project/DottyInjectedPlugin.scala rename to sbt-bridge/sbt-test/source-dependencies/import-class/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/import-class/test b/sbt-bridge/sbt-test/source-dependencies/import-class/test similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/import-class/test rename to sbt-bridge/sbt-test/source-dependencies/import-class/test diff --git a/sbt-bridge/src/sbt-test/source-dependencies/import-package/A.scala b/sbt-bridge/sbt-test/source-dependencies/import-package/A.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/import-package/A.scala rename to sbt-bridge/sbt-test/source-dependencies/import-package/A.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/import-package/B.scala b/sbt-bridge/sbt-test/source-dependencies/import-package/B.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/import-package/B.scala rename to sbt-bridge/sbt-test/source-dependencies/import-package/B.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/import-package/changes/A.scala b/sbt-bridge/sbt-test/source-dependencies/import-package/changes/A.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/import-package/changes/A.scala rename to sbt-bridge/sbt-test/source-dependencies/import-package/changes/A.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/import-package/pending b/sbt-bridge/sbt-test/source-dependencies/import-package/pending similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/import-package/pending rename to sbt-bridge/sbt-test/source-dependencies/import-package/pending diff --git a/sbt-bridge/src/sbt-test/source-dependencies/import-package/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/import-package/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/import-package/project/DottyInjectedPlugin.scala rename to sbt-bridge/sbt-test/source-dependencies/import-package/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/inherited-deps-java/A.java b/sbt-bridge/sbt-test/source-dependencies/inherited-deps-java/A.java similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/inherited-deps-java/A.java rename to sbt-bridge/sbt-test/source-dependencies/inherited-deps-java/A.java diff --git a/sbt-bridge/src/sbt-test/source-dependencies/inherited-deps-java/B.java b/sbt-bridge/sbt-test/source-dependencies/inherited-deps-java/B.java similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/inherited-deps-java/B.java rename to sbt-bridge/sbt-test/source-dependencies/inherited-deps-java/B.java diff --git a/sbt-bridge/src/sbt-test/source-dependencies/inherited-deps-java/C.java b/sbt-bridge/sbt-test/source-dependencies/inherited-deps-java/C.java similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/inherited-deps-java/C.java rename to sbt-bridge/sbt-test/source-dependencies/inherited-deps-java/C.java diff --git a/sbt-bridge/src/sbt-test/source-dependencies/inherited-deps-java/D.java b/sbt-bridge/sbt-test/source-dependencies/inherited-deps-java/D.java similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/inherited-deps-java/D.java rename to sbt-bridge/sbt-test/source-dependencies/inherited-deps-java/D.java diff --git a/sbt-bridge/src/sbt-test/source-dependencies/inherited-deps-java/E.java b/sbt-bridge/sbt-test/source-dependencies/inherited-deps-java/E.java similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/inherited-deps-java/E.java rename to sbt-bridge/sbt-test/source-dependencies/inherited-deps-java/E.java diff --git a/sbt-bridge/src/sbt-test/source-dependencies/inherited-deps-java/F.java b/sbt-bridge/sbt-test/source-dependencies/inherited-deps-java/F.java similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/inherited-deps-java/F.java rename to sbt-bridge/sbt-test/source-dependencies/inherited-deps-java/F.java diff --git a/sbt-bridge/src/sbt-test/source-dependencies/inherited-deps-java/G.java b/sbt-bridge/sbt-test/source-dependencies/inherited-deps-java/G.java similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/inherited-deps-java/G.java rename to sbt-bridge/sbt-test/source-dependencies/inherited-deps-java/G.java diff --git a/sbt-bridge/src/sbt-test/source-dependencies/inherited-deps-java/J.java b/sbt-bridge/sbt-test/source-dependencies/inherited-deps-java/J.java similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/inherited-deps-java/J.java rename to sbt-bridge/sbt-test/source-dependencies/inherited-deps-java/J.java diff --git a/sbt-bridge/src/sbt-test/source-dependencies/inherited-deps-java/build.sbt b/sbt-bridge/sbt-test/source-dependencies/inherited-deps-java/build.sbt similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/inherited-deps-java/build.sbt rename to sbt-bridge/sbt-test/source-dependencies/inherited-deps-java/build.sbt diff --git a/sbt-bridge/src/sbt-test/source-dependencies/inherited-deps-java/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/inherited-deps-java/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/inherited-deps-java/project/DottyInjectedPlugin.scala rename to sbt-bridge/sbt-test/source-dependencies/inherited-deps-java/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/inherited-deps-java/test b/sbt-bridge/sbt-test/source-dependencies/inherited-deps-java/test similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/inherited-deps-java/test rename to sbt-bridge/sbt-test/source-dependencies/inherited-deps-java/test diff --git a/sbt-bridge/src/sbt-test/source-dependencies/inherited_type_params/A.scala b/sbt-bridge/sbt-test/source-dependencies/inherited_type_params/A.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/inherited_type_params/A.scala rename to sbt-bridge/sbt-test/source-dependencies/inherited_type_params/A.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/inherited_type_params/build.sbt b/sbt-bridge/sbt-test/source-dependencies/inherited_type_params/build.sbt similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/inherited_type_params/build.sbt rename to sbt-bridge/sbt-test/source-dependencies/inherited_type_params/build.sbt diff --git a/sbt-bridge/src/sbt-test/source-dependencies/inherited_type_params/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/inherited_type_params/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/inherited_type_params/project/DottyInjectedPlugin.scala rename to sbt-bridge/sbt-test/source-dependencies/inherited_type_params/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/inherited_type_params/test b/sbt-bridge/sbt-test/source-dependencies/inherited_type_params/test similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/inherited_type_params/test rename to sbt-bridge/sbt-test/source-dependencies/inherited_type_params/test diff --git a/sbt-bridge/src/sbt-test/source-dependencies/inline/A.scala b/sbt-bridge/sbt-test/source-dependencies/inline/A.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/inline/A.scala rename to sbt-bridge/sbt-test/source-dependencies/inline/A.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/inline/C.scala b/sbt-bridge/sbt-test/source-dependencies/inline/C.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/inline/C.scala rename to sbt-bridge/sbt-test/source-dependencies/inline/C.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/inline/changes/B1.scala b/sbt-bridge/sbt-test/source-dependencies/inline/changes/B1.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/inline/changes/B1.scala rename to sbt-bridge/sbt-test/source-dependencies/inline/changes/B1.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/inline/changes/B2.scala b/sbt-bridge/sbt-test/source-dependencies/inline/changes/B2.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/inline/changes/B2.scala rename to sbt-bridge/sbt-test/source-dependencies/inline/changes/B2.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/inline/changes/B3.scala b/sbt-bridge/sbt-test/source-dependencies/inline/changes/B3.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/inline/changes/B3.scala rename to sbt-bridge/sbt-test/source-dependencies/inline/changes/B3.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/inline/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/inline/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/inline/project/DottyInjectedPlugin.scala rename to sbt-bridge/sbt-test/source-dependencies/inline/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/inline/test b/sbt-bridge/sbt-test/source-dependencies/inline/test similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/inline/test rename to sbt-bridge/sbt-test/source-dependencies/inline/test diff --git a/sbt-bridge/src/sbt-test/source-dependencies/intermediate-error/A.scala b/sbt-bridge/sbt-test/source-dependencies/intermediate-error/A.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/intermediate-error/A.scala rename to sbt-bridge/sbt-test/source-dependencies/intermediate-error/A.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/intermediate-error/B.scala b/sbt-bridge/sbt-test/source-dependencies/intermediate-error/B.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/intermediate-error/B.scala rename to sbt-bridge/sbt-test/source-dependencies/intermediate-error/B.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/intermediate-error/changes/A2.scala b/sbt-bridge/sbt-test/source-dependencies/intermediate-error/changes/A2.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/intermediate-error/changes/A2.scala rename to sbt-bridge/sbt-test/source-dependencies/intermediate-error/changes/A2.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/intermediate-error/changes/A3.scala b/sbt-bridge/sbt-test/source-dependencies/intermediate-error/changes/A3.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/intermediate-error/changes/A3.scala rename to sbt-bridge/sbt-test/source-dependencies/intermediate-error/changes/A3.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/intermediate-error/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/intermediate-error/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/intermediate-error/project/DottyInjectedPlugin.scala rename to sbt-bridge/sbt-test/source-dependencies/intermediate-error/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/intermediate-error/test b/sbt-bridge/sbt-test/source-dependencies/intermediate-error/test similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/intermediate-error/test rename to sbt-bridge/sbt-test/source-dependencies/intermediate-error/test diff --git a/sbt-bridge/src/sbt-test/source-dependencies/java-analysis-serialization-error/Outer.java b/sbt-bridge/sbt-test/source-dependencies/java-analysis-serialization-error/Outer.java similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/java-analysis-serialization-error/Outer.java rename to sbt-bridge/sbt-test/source-dependencies/java-analysis-serialization-error/Outer.java diff --git a/sbt-bridge/src/sbt-test/source-dependencies/java-analysis-serialization-error/build.sbt b/sbt-bridge/sbt-test/source-dependencies/java-analysis-serialization-error/build.sbt similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/java-analysis-serialization-error/build.sbt rename to sbt-bridge/sbt-test/source-dependencies/java-analysis-serialization-error/build.sbt diff --git a/sbt-bridge/src/sbt-test/source-dependencies/java-analysis-serialization-error/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/java-analysis-serialization-error/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/java-analysis-serialization-error/project/DottyInjectedPlugin.scala rename to sbt-bridge/sbt-test/source-dependencies/java-analysis-serialization-error/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/java-analysis-serialization-error/test b/sbt-bridge/sbt-test/source-dependencies/java-analysis-serialization-error/test similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/java-analysis-serialization-error/test rename to sbt-bridge/sbt-test/source-dependencies/java-analysis-serialization-error/test diff --git a/sbt-bridge/src/sbt-test/source-dependencies/java-basic/changes/A.java b/sbt-bridge/sbt-test/source-dependencies/java-basic/changes/A.java similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/java-basic/changes/A.java rename to sbt-bridge/sbt-test/source-dependencies/java-basic/changes/A.java diff --git a/sbt-bridge/src/sbt-test/source-dependencies/java-basic/changes/A2.java b/sbt-bridge/sbt-test/source-dependencies/java-basic/changes/A2.java similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/java-basic/changes/A2.java rename to sbt-bridge/sbt-test/source-dependencies/java-basic/changes/A2.java diff --git a/sbt-bridge/src/sbt-test/source-dependencies/java-basic/changes/B1.java b/sbt-bridge/sbt-test/source-dependencies/java-basic/changes/B1.java similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/java-basic/changes/B1.java rename to sbt-bridge/sbt-test/source-dependencies/java-basic/changes/B1.java diff --git a/sbt-bridge/src/sbt-test/source-dependencies/java-basic/changes/B2.java b/sbt-bridge/sbt-test/source-dependencies/java-basic/changes/B2.java similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/java-basic/changes/B2.java rename to sbt-bridge/sbt-test/source-dependencies/java-basic/changes/B2.java diff --git a/sbt-bridge/src/sbt-test/source-dependencies/java-basic/changes/B3.java b/sbt-bridge/sbt-test/source-dependencies/java-basic/changes/B3.java similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/java-basic/changes/B3.java rename to sbt-bridge/sbt-test/source-dependencies/java-basic/changes/B3.java diff --git a/sbt-bridge/src/sbt-test/source-dependencies/java-basic/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/java-basic/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/java-basic/project/DottyInjectedPlugin.scala rename to sbt-bridge/sbt-test/source-dependencies/java-basic/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/java-basic/test b/sbt-bridge/sbt-test/source-dependencies/java-basic/test similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/java-basic/test rename to sbt-bridge/sbt-test/source-dependencies/java-basic/test diff --git a/sbt-bridge/src/sbt-test/source-dependencies/java-generic-workaround/A.java b/sbt-bridge/sbt-test/source-dependencies/java-generic-workaround/A.java similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/java-generic-workaround/A.java rename to sbt-bridge/sbt-test/source-dependencies/java-generic-workaround/A.java diff --git a/sbt-bridge/src/sbt-test/source-dependencies/java-generic-workaround/DefaultTreeTableSorter.java b/sbt-bridge/sbt-test/source-dependencies/java-generic-workaround/DefaultTreeTableSorter.java similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/java-generic-workaround/DefaultTreeTableSorter.java rename to sbt-bridge/sbt-test/source-dependencies/java-generic-workaround/DefaultTreeTableSorter.java diff --git a/sbt-bridge/src/sbt-test/source-dependencies/java-generic-workaround/TreeColumnModel.java b/sbt-bridge/sbt-test/source-dependencies/java-generic-workaround/TreeColumnModel.java similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/java-generic-workaround/TreeColumnModel.java rename to sbt-bridge/sbt-test/source-dependencies/java-generic-workaround/TreeColumnModel.java diff --git a/sbt-bridge/src/sbt-test/source-dependencies/java-generic-workaround/TreeTableSorter.java b/sbt-bridge/sbt-test/source-dependencies/java-generic-workaround/TreeTableSorter.java similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/java-generic-workaround/TreeTableSorter.java rename to sbt-bridge/sbt-test/source-dependencies/java-generic-workaround/TreeTableSorter.java diff --git a/sbt-bridge/src/sbt-test/source-dependencies/java-generic-workaround/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/java-generic-workaround/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/java-generic-workaround/project/DottyInjectedPlugin.scala rename to sbt-bridge/sbt-test/source-dependencies/java-generic-workaround/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/java-generic-workaround/test b/sbt-bridge/sbt-test/source-dependencies/java-generic-workaround/test similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/java-generic-workaround/test rename to sbt-bridge/sbt-test/source-dependencies/java-generic-workaround/test diff --git a/sbt-bridge/src/sbt-test/source-dependencies/java-mixed/JJ.java b/sbt-bridge/sbt-test/source-dependencies/java-mixed/JJ.java similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/java-mixed/JJ.java rename to sbt-bridge/sbt-test/source-dependencies/java-mixed/JJ.java diff --git a/sbt-bridge/src/sbt-test/source-dependencies/java-mixed/build.sbt b/sbt-bridge/sbt-test/source-dependencies/java-mixed/build.sbt similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/java-mixed/build.sbt rename to sbt-bridge/sbt-test/source-dependencies/java-mixed/build.sbt diff --git a/sbt-bridge/src/sbt-test/source-dependencies/java-mixed/changes/S1.scala b/sbt-bridge/sbt-test/source-dependencies/java-mixed/changes/S1.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/java-mixed/changes/S1.scala rename to sbt-bridge/sbt-test/source-dependencies/java-mixed/changes/S1.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/java-mixed/changes/S2.scala b/sbt-bridge/sbt-test/source-dependencies/java-mixed/changes/S2.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/java-mixed/changes/S2.scala rename to sbt-bridge/sbt-test/source-dependencies/java-mixed/changes/S2.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/java-mixed/changes/build.sbt b/sbt-bridge/sbt-test/source-dependencies/java-mixed/changes/build.sbt similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/java-mixed/changes/build.sbt rename to sbt-bridge/sbt-test/source-dependencies/java-mixed/changes/build.sbt diff --git a/sbt-bridge/src/sbt-test/source-dependencies/java-mixed/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/java-mixed/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/java-mixed/project/DottyInjectedPlugin.scala rename to sbt-bridge/sbt-test/source-dependencies/java-mixed/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/java-mixed/test b/sbt-bridge/sbt-test/source-dependencies/java-mixed/test similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/java-mixed/test rename to sbt-bridge/sbt-test/source-dependencies/java-mixed/test diff --git a/sbt-bridge/src/sbt-test/source-dependencies/java-static/changes/J1.java b/sbt-bridge/sbt-test/source-dependencies/java-static/changes/J1.java similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/java-static/changes/J1.java rename to sbt-bridge/sbt-test/source-dependencies/java-static/changes/J1.java diff --git a/sbt-bridge/src/sbt-test/source-dependencies/java-static/changes/J2.java b/sbt-bridge/sbt-test/source-dependencies/java-static/changes/J2.java similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/java-static/changes/J2.java rename to sbt-bridge/sbt-test/source-dependencies/java-static/changes/J2.java diff --git a/sbt-bridge/src/sbt-test/source-dependencies/java-static/changes/S.scala b/sbt-bridge/sbt-test/source-dependencies/java-static/changes/S.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/java-static/changes/S.scala rename to sbt-bridge/sbt-test/source-dependencies/java-static/changes/S.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/java-static/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/java-static/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/java-static/project/DottyInjectedPlugin.scala rename to sbt-bridge/sbt-test/source-dependencies/java-static/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/java-static/test b/sbt-bridge/sbt-test/source-dependencies/java-static/test similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/java-static/test rename to sbt-bridge/sbt-test/source-dependencies/java-static/test diff --git a/sbt-bridge/src/sbt-test/source-dependencies/lazy-val/A.scala b/sbt-bridge/sbt-test/source-dependencies/lazy-val/A.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/lazy-val/A.scala rename to sbt-bridge/sbt-test/source-dependencies/lazy-val/A.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/lazy-val/B.scala b/sbt-bridge/sbt-test/source-dependencies/lazy-val/B.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/lazy-val/B.scala rename to sbt-bridge/sbt-test/source-dependencies/lazy-val/B.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/lazy-val/changes/A.scala b/sbt-bridge/sbt-test/source-dependencies/lazy-val/changes/A.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/lazy-val/changes/A.scala rename to sbt-bridge/sbt-test/source-dependencies/lazy-val/changes/A.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/lazy-val/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/lazy-val/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/lazy-val/project/DottyInjectedPlugin.scala rename to sbt-bridge/sbt-test/source-dependencies/lazy-val/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/lazy-val/test b/sbt-bridge/sbt-test/source-dependencies/lazy-val/test similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/lazy-val/test rename to sbt-bridge/sbt-test/source-dependencies/lazy-val/test diff --git a/sbt-bridge/src/sbt-test/source-dependencies/less-inter-inv-java/A.java b/sbt-bridge/sbt-test/source-dependencies/less-inter-inv-java/A.java similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/less-inter-inv-java/A.java rename to sbt-bridge/sbt-test/source-dependencies/less-inter-inv-java/A.java diff --git a/sbt-bridge/src/sbt-test/source-dependencies/less-inter-inv-java/B.java b/sbt-bridge/sbt-test/source-dependencies/less-inter-inv-java/B.java similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/less-inter-inv-java/B.java rename to sbt-bridge/sbt-test/source-dependencies/less-inter-inv-java/B.java diff --git a/sbt-bridge/src/sbt-test/source-dependencies/less-inter-inv-java/C.java b/sbt-bridge/sbt-test/source-dependencies/less-inter-inv-java/C.java similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/less-inter-inv-java/C.java rename to sbt-bridge/sbt-test/source-dependencies/less-inter-inv-java/C.java diff --git a/sbt-bridge/src/sbt-test/source-dependencies/less-inter-inv-java/D.java b/sbt-bridge/sbt-test/source-dependencies/less-inter-inv-java/D.java similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/less-inter-inv-java/D.java rename to sbt-bridge/sbt-test/source-dependencies/less-inter-inv-java/D.java diff --git a/sbt-bridge/src/sbt-test/source-dependencies/less-inter-inv-java/E.java b/sbt-bridge/sbt-test/source-dependencies/less-inter-inv-java/E.java similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/less-inter-inv-java/E.java rename to sbt-bridge/sbt-test/source-dependencies/less-inter-inv-java/E.java diff --git a/sbt-bridge/src/sbt-test/source-dependencies/less-inter-inv-java/build.sbt b/sbt-bridge/sbt-test/source-dependencies/less-inter-inv-java/build.sbt similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/less-inter-inv-java/build.sbt rename to sbt-bridge/sbt-test/source-dependencies/less-inter-inv-java/build.sbt diff --git a/sbt-bridge/src/sbt-test/source-dependencies/less-inter-inv-java/changes/A2.java b/sbt-bridge/sbt-test/source-dependencies/less-inter-inv-java/changes/A2.java similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/less-inter-inv-java/changes/A2.java rename to sbt-bridge/sbt-test/source-dependencies/less-inter-inv-java/changes/A2.java diff --git a/sbt-bridge/src/sbt-test/source-dependencies/less-inter-inv-java/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/less-inter-inv-java/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/less-inter-inv-java/project/DottyInjectedPlugin.scala rename to sbt-bridge/sbt-test/source-dependencies/less-inter-inv-java/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/less-inter-inv-java/test b/sbt-bridge/sbt-test/source-dependencies/less-inter-inv-java/test similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/less-inter-inv-java/test rename to sbt-bridge/sbt-test/source-dependencies/less-inter-inv-java/test diff --git a/sbt-bridge/src/sbt-test/source-dependencies/less-inter-inv/A.scala b/sbt-bridge/sbt-test/source-dependencies/less-inter-inv/A.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/less-inter-inv/A.scala rename to sbt-bridge/sbt-test/source-dependencies/less-inter-inv/A.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/less-inter-inv/B.scala b/sbt-bridge/sbt-test/source-dependencies/less-inter-inv/B.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/less-inter-inv/B.scala rename to sbt-bridge/sbt-test/source-dependencies/less-inter-inv/B.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/less-inter-inv/C.scala b/sbt-bridge/sbt-test/source-dependencies/less-inter-inv/C.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/less-inter-inv/C.scala rename to sbt-bridge/sbt-test/source-dependencies/less-inter-inv/C.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/less-inter-inv/D.scala b/sbt-bridge/sbt-test/source-dependencies/less-inter-inv/D.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/less-inter-inv/D.scala rename to sbt-bridge/sbt-test/source-dependencies/less-inter-inv/D.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/less-inter-inv/E.scala b/sbt-bridge/sbt-test/source-dependencies/less-inter-inv/E.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/less-inter-inv/E.scala rename to sbt-bridge/sbt-test/source-dependencies/less-inter-inv/E.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/less-inter-inv/build.sbt b/sbt-bridge/sbt-test/source-dependencies/less-inter-inv/build.sbt similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/less-inter-inv/build.sbt rename to sbt-bridge/sbt-test/source-dependencies/less-inter-inv/build.sbt diff --git a/sbt-bridge/src/sbt-test/source-dependencies/less-inter-inv/changes/A2.scala b/sbt-bridge/sbt-test/source-dependencies/less-inter-inv/changes/A2.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/less-inter-inv/changes/A2.scala rename to sbt-bridge/sbt-test/source-dependencies/less-inter-inv/changes/A2.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/less-inter-inv/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/less-inter-inv/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/less-inter-inv/project/DottyInjectedPlugin.scala rename to sbt-bridge/sbt-test/source-dependencies/less-inter-inv/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/less-inter-inv/test b/sbt-bridge/sbt-test/source-dependencies/less-inter-inv/test similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/less-inter-inv/test rename to sbt-bridge/sbt-test/source-dependencies/less-inter-inv/test diff --git a/sbt-bridge/src/sbt-test/source-dependencies/linearization/A.scala b/sbt-bridge/sbt-test/source-dependencies/linearization/A.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/linearization/A.scala rename to sbt-bridge/sbt-test/source-dependencies/linearization/A.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/linearization/B.scala b/sbt-bridge/sbt-test/source-dependencies/linearization/B.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/linearization/B.scala rename to sbt-bridge/sbt-test/source-dependencies/linearization/B.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/linearization/C.scala b/sbt-bridge/sbt-test/source-dependencies/linearization/C.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/linearization/C.scala rename to sbt-bridge/sbt-test/source-dependencies/linearization/C.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/linearization/D.scala b/sbt-bridge/sbt-test/source-dependencies/linearization/D.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/linearization/D.scala rename to sbt-bridge/sbt-test/source-dependencies/linearization/D.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/linearization/E.scala b/sbt-bridge/sbt-test/source-dependencies/linearization/E.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/linearization/E.scala rename to sbt-bridge/sbt-test/source-dependencies/linearization/E.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/linearization/F.scala b/sbt-bridge/sbt-test/source-dependencies/linearization/F.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/linearization/F.scala rename to sbt-bridge/sbt-test/source-dependencies/linearization/F.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/linearization/changes/D.scala b/sbt-bridge/sbt-test/source-dependencies/linearization/changes/D.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/linearization/changes/D.scala rename to sbt-bridge/sbt-test/source-dependencies/linearization/changes/D.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/linearization/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/linearization/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/linearization/project/DottyInjectedPlugin.scala rename to sbt-bridge/sbt-test/source-dependencies/linearization/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/linearization/test b/sbt-bridge/sbt-test/source-dependencies/linearization/test similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/linearization/test rename to sbt-bridge/sbt-test/source-dependencies/linearization/test diff --git a/sbt-bridge/src/sbt-test/source-dependencies/named/A.scala b/sbt-bridge/sbt-test/source-dependencies/named/A.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/named/A.scala rename to sbt-bridge/sbt-test/source-dependencies/named/A.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/named/B.scala b/sbt-bridge/sbt-test/source-dependencies/named/B.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/named/B.scala rename to sbt-bridge/sbt-test/source-dependencies/named/B.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/named/changes/A.scala b/sbt-bridge/sbt-test/source-dependencies/named/changes/A.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/named/changes/A.scala rename to sbt-bridge/sbt-test/source-dependencies/named/changes/A.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/named/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/named/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/named/project/DottyInjectedPlugin.scala rename to sbt-bridge/sbt-test/source-dependencies/named/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/named/test b/sbt-bridge/sbt-test/source-dependencies/named/test similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/named/test rename to sbt-bridge/sbt-test/source-dependencies/named/test diff --git a/sbt-bridge/src/sbt-test/source-dependencies/nested-case-class/changes/A0.scala b/sbt-bridge/sbt-test/source-dependencies/nested-case-class/changes/A0.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/nested-case-class/changes/A0.scala rename to sbt-bridge/sbt-test/source-dependencies/nested-case-class/changes/A0.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/nested-case-class/changes/A1.scala b/sbt-bridge/sbt-test/source-dependencies/nested-case-class/changes/A1.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/nested-case-class/changes/A1.scala rename to sbt-bridge/sbt-test/source-dependencies/nested-case-class/changes/A1.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/nested-case-class/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/nested-case-class/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/nested-case-class/project/DottyInjectedPlugin.scala rename to sbt-bridge/sbt-test/source-dependencies/nested-case-class/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/nested-case-class/test b/sbt-bridge/sbt-test/source-dependencies/nested-case-class/test similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/nested-case-class/test rename to sbt-bridge/sbt-test/source-dependencies/nested-case-class/test diff --git a/sbt-bridge/src/sbt-test/source-dependencies/new-cyclic/changes/A2.scala b/sbt-bridge/sbt-test/source-dependencies/new-cyclic/changes/A2.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/new-cyclic/changes/A2.scala rename to sbt-bridge/sbt-test/source-dependencies/new-cyclic/changes/A2.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/new-cyclic/pending b/sbt-bridge/sbt-test/source-dependencies/new-cyclic/pending similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/new-cyclic/pending rename to sbt-bridge/sbt-test/source-dependencies/new-cyclic/pending diff --git a/sbt-bridge/src/sbt-test/source-dependencies/new-cyclic/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/new-cyclic/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/new-cyclic/project/DottyInjectedPlugin.scala rename to sbt-bridge/sbt-test/source-dependencies/new-cyclic/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/new-cyclic/src/main/scala/A.scala b/sbt-bridge/sbt-test/source-dependencies/new-cyclic/src/main/scala/A.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/new-cyclic/src/main/scala/A.scala rename to sbt-bridge/sbt-test/source-dependencies/new-cyclic/src/main/scala/A.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/new-cyclic/src/main/scala/B.scala b/sbt-bridge/sbt-test/source-dependencies/new-cyclic/src/main/scala/B.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/new-cyclic/src/main/scala/B.scala rename to sbt-bridge/sbt-test/source-dependencies/new-cyclic/src/main/scala/B.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/new-pkg-dep/changes/A1.java b/sbt-bridge/sbt-test/source-dependencies/new-pkg-dep/changes/A1.java similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/new-pkg-dep/changes/A1.java rename to sbt-bridge/sbt-test/source-dependencies/new-pkg-dep/changes/A1.java diff --git a/sbt-bridge/src/sbt-test/source-dependencies/new-pkg-dep/changes/B0.scala b/sbt-bridge/sbt-test/source-dependencies/new-pkg-dep/changes/B0.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/new-pkg-dep/changes/B0.scala rename to sbt-bridge/sbt-test/source-dependencies/new-pkg-dep/changes/B0.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/new-pkg-dep/changes/B1.scala b/sbt-bridge/sbt-test/source-dependencies/new-pkg-dep/changes/B1.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/new-pkg-dep/changes/B1.scala rename to sbt-bridge/sbt-test/source-dependencies/new-pkg-dep/changes/B1.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/new-pkg-dep/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/new-pkg-dep/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/new-pkg-dep/project/DottyInjectedPlugin.scala rename to sbt-bridge/sbt-test/source-dependencies/new-pkg-dep/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/new-pkg-dep/test b/sbt-bridge/sbt-test/source-dependencies/new-pkg-dep/test similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/new-pkg-dep/test rename to sbt-bridge/sbt-test/source-dependencies/new-pkg-dep/test diff --git a/sbt-bridge/src/sbt-test/source-dependencies/override/A.scala b/sbt-bridge/sbt-test/source-dependencies/override/A.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/override/A.scala rename to sbt-bridge/sbt-test/source-dependencies/override/A.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/override/B.scala b/sbt-bridge/sbt-test/source-dependencies/override/B.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/override/B.scala rename to sbt-bridge/sbt-test/source-dependencies/override/B.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/override/C.scala b/sbt-bridge/sbt-test/source-dependencies/override/C.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/override/C.scala rename to sbt-bridge/sbt-test/source-dependencies/override/C.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/override/D.scala b/sbt-bridge/sbt-test/source-dependencies/override/D.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/override/D.scala rename to sbt-bridge/sbt-test/source-dependencies/override/D.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/override/changes/B2.scala b/sbt-bridge/sbt-test/source-dependencies/override/changes/B2.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/override/changes/B2.scala rename to sbt-bridge/sbt-test/source-dependencies/override/changes/B2.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/override/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/override/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/override/project/DottyInjectedPlugin.scala rename to sbt-bridge/sbt-test/source-dependencies/override/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/override/test b/sbt-bridge/sbt-test/source-dependencies/override/test similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/override/test rename to sbt-bridge/sbt-test/source-dependencies/override/test diff --git a/sbt-bridge/src/sbt-test/source-dependencies/parent-change/W.scala b/sbt-bridge/sbt-test/source-dependencies/parent-change/W.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/parent-change/W.scala rename to sbt-bridge/sbt-test/source-dependencies/parent-change/W.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/parent-change/Y.scala b/sbt-bridge/sbt-test/source-dependencies/parent-change/Y.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/parent-change/Y.scala rename to sbt-bridge/sbt-test/source-dependencies/parent-change/Y.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/parent-change/Z.scala b/sbt-bridge/sbt-test/source-dependencies/parent-change/Z.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/parent-change/Z.scala rename to sbt-bridge/sbt-test/source-dependencies/parent-change/Z.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/parent-change/changes/W.scala b/sbt-bridge/sbt-test/source-dependencies/parent-change/changes/W.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/parent-change/changes/W.scala rename to sbt-bridge/sbt-test/source-dependencies/parent-change/changes/W.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/parent-change/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/parent-change/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/parent-change/project/DottyInjectedPlugin.scala rename to sbt-bridge/sbt-test/source-dependencies/parent-change/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/parent-change/test b/sbt-bridge/sbt-test/source-dependencies/parent-change/test similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/parent-change/test rename to sbt-bridge/sbt-test/source-dependencies/parent-change/test diff --git a/sbt-bridge/src/sbt-test/source-dependencies/parent-member-change/A.scala b/sbt-bridge/sbt-test/source-dependencies/parent-member-change/A.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/parent-member-change/A.scala rename to sbt-bridge/sbt-test/source-dependencies/parent-member-change/A.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/parent-member-change/B.scala b/sbt-bridge/sbt-test/source-dependencies/parent-member-change/B.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/parent-member-change/B.scala rename to sbt-bridge/sbt-test/source-dependencies/parent-member-change/B.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/parent-member-change/C.scala b/sbt-bridge/sbt-test/source-dependencies/parent-member-change/C.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/parent-member-change/C.scala rename to sbt-bridge/sbt-test/source-dependencies/parent-member-change/C.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/parent-member-change/changes/A.scala b/sbt-bridge/sbt-test/source-dependencies/parent-member-change/changes/A.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/parent-member-change/changes/A.scala rename to sbt-bridge/sbt-test/source-dependencies/parent-member-change/changes/A.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/parent-member-change/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/parent-member-change/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/parent-member-change/project/DottyInjectedPlugin.scala rename to sbt-bridge/sbt-test/source-dependencies/parent-member-change/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/parent-member-change/test b/sbt-bridge/sbt-test/source-dependencies/parent-member-change/test similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/parent-member-change/test rename to sbt-bridge/sbt-test/source-dependencies/parent-member-change/test diff --git a/sbt-bridge/src/sbt-test/source-dependencies/pkg-self/changes/A1.scala b/sbt-bridge/sbt-test/source-dependencies/pkg-self/changes/A1.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/pkg-self/changes/A1.scala rename to sbt-bridge/sbt-test/source-dependencies/pkg-self/changes/A1.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/pkg-self/changes/A2.scala b/sbt-bridge/sbt-test/source-dependencies/pkg-self/changes/A2.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/pkg-self/changes/A2.scala rename to sbt-bridge/sbt-test/source-dependencies/pkg-self/changes/A2.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/pkg-self/changes/B.scala b/sbt-bridge/sbt-test/source-dependencies/pkg-self/changes/B.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/pkg-self/changes/B.scala rename to sbt-bridge/sbt-test/source-dependencies/pkg-self/changes/B.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/pkg-self/changes/package.scala b/sbt-bridge/sbt-test/source-dependencies/pkg-self/changes/package.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/pkg-self/changes/package.scala rename to sbt-bridge/sbt-test/source-dependencies/pkg-self/changes/package.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/pkg-self/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/pkg-self/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/pkg-self/project/DottyInjectedPlugin.scala rename to sbt-bridge/sbt-test/source-dependencies/pkg-self/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/pkg-self/test b/sbt-bridge/sbt-test/source-dependencies/pkg-self/test similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/pkg-self/test rename to sbt-bridge/sbt-test/source-dependencies/pkg-self/test diff --git a/sbt-bridge/src/sbt-test/source-dependencies/qualified-access/A.scala b/sbt-bridge/sbt-test/source-dependencies/qualified-access/A.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/qualified-access/A.scala rename to sbt-bridge/sbt-test/source-dependencies/qualified-access/A.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/qualified-access/B.scala b/sbt-bridge/sbt-test/source-dependencies/qualified-access/B.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/qualified-access/B.scala rename to sbt-bridge/sbt-test/source-dependencies/qualified-access/B.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/qualified-access/changes/A.scala b/sbt-bridge/sbt-test/source-dependencies/qualified-access/changes/A.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/qualified-access/changes/A.scala rename to sbt-bridge/sbt-test/source-dependencies/qualified-access/changes/A.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/qualified-access/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/qualified-access/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/qualified-access/project/DottyInjectedPlugin.scala rename to sbt-bridge/sbt-test/source-dependencies/qualified-access/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/qualified-access/test b/sbt-bridge/sbt-test/source-dependencies/qualified-access/test similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/qualified-access/test rename to sbt-bridge/sbt-test/source-dependencies/qualified-access/test diff --git a/sbt-bridge/src/sbt-test/source-dependencies/relative-source-error/changes/absolute.sbt b/sbt-bridge/sbt-test/source-dependencies/relative-source-error/changes/absolute.sbt similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/relative-source-error/changes/absolute.sbt rename to sbt-bridge/sbt-test/source-dependencies/relative-source-error/changes/absolute.sbt diff --git a/sbt-bridge/src/sbt-test/source-dependencies/relative-source-error/changes/relative.sbt b/sbt-bridge/sbt-test/source-dependencies/relative-source-error/changes/relative.sbt similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/relative-source-error/changes/relative.sbt rename to sbt-bridge/sbt-test/source-dependencies/relative-source-error/changes/relative.sbt diff --git a/sbt-bridge/src/sbt-test/source-dependencies/relative-source-error/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/relative-source-error/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/relative-source-error/project/DottyInjectedPlugin.scala rename to sbt-bridge/sbt-test/source-dependencies/relative-source-error/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/relative-source-error/src/A.scala b/sbt-bridge/sbt-test/source-dependencies/relative-source-error/src/A.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/relative-source-error/src/A.scala rename to sbt-bridge/sbt-test/source-dependencies/relative-source-error/src/A.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/relative-source-error/test b/sbt-bridge/sbt-test/source-dependencies/relative-source-error/test similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/relative-source-error/test rename to sbt-bridge/sbt-test/source-dependencies/relative-source-error/test diff --git a/sbt-bridge/src/sbt-test/source-dependencies/remove-test-a/changes/1.scala b/sbt-bridge/sbt-test/source-dependencies/remove-test-a/changes/1.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/remove-test-a/changes/1.scala rename to sbt-bridge/sbt-test/source-dependencies/remove-test-a/changes/1.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/remove-test-a/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/remove-test-a/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/remove-test-a/project/DottyInjectedPlugin.scala rename to sbt-bridge/sbt-test/source-dependencies/remove-test-a/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/remove-test-a/test b/sbt-bridge/sbt-test/source-dependencies/remove-test-a/test similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/remove-test-a/test rename to sbt-bridge/sbt-test/source-dependencies/remove-test-a/test diff --git a/sbt-bridge/src/sbt-test/source-dependencies/remove-test-b/changes/A2.scala b/sbt-bridge/sbt-test/source-dependencies/remove-test-b/changes/A2.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/remove-test-b/changes/A2.scala rename to sbt-bridge/sbt-test/source-dependencies/remove-test-b/changes/A2.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/remove-test-b/changes/B3.scala b/sbt-bridge/sbt-test/source-dependencies/remove-test-b/changes/B3.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/remove-test-b/changes/B3.scala rename to sbt-bridge/sbt-test/source-dependencies/remove-test-b/changes/B3.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/remove-test-b/changes/B4.scala b/sbt-bridge/sbt-test/source-dependencies/remove-test-b/changes/B4.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/remove-test-b/changes/B4.scala rename to sbt-bridge/sbt-test/source-dependencies/remove-test-b/changes/B4.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/remove-test-b/changes/B5.scala b/sbt-bridge/sbt-test/source-dependencies/remove-test-b/changes/B5.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/remove-test-b/changes/B5.scala rename to sbt-bridge/sbt-test/source-dependencies/remove-test-b/changes/B5.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/remove-test-b/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/remove-test-b/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/remove-test-b/project/DottyInjectedPlugin.scala rename to sbt-bridge/sbt-test/source-dependencies/remove-test-b/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/remove-test-b/src/main/scala/A.scala b/sbt-bridge/sbt-test/source-dependencies/remove-test-b/src/main/scala/A.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/remove-test-b/src/main/scala/A.scala rename to sbt-bridge/sbt-test/source-dependencies/remove-test-b/src/main/scala/A.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/remove-test-b/src/main/scala/B.scala b/sbt-bridge/sbt-test/source-dependencies/remove-test-b/src/main/scala/B.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/remove-test-b/src/main/scala/B.scala rename to sbt-bridge/sbt-test/source-dependencies/remove-test-b/src/main/scala/B.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/remove-test-b/test b/sbt-bridge/sbt-test/source-dependencies/remove-test-b/test similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/remove-test-b/test rename to sbt-bridge/sbt-test/source-dependencies/remove-test-b/test diff --git a/sbt-bridge/src/sbt-test/source-dependencies/repeated-parameters/A.scala b/sbt-bridge/sbt-test/source-dependencies/repeated-parameters/A.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/repeated-parameters/A.scala rename to sbt-bridge/sbt-test/source-dependencies/repeated-parameters/A.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/repeated-parameters/B.scala b/sbt-bridge/sbt-test/source-dependencies/repeated-parameters/B.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/repeated-parameters/B.scala rename to sbt-bridge/sbt-test/source-dependencies/repeated-parameters/B.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/repeated-parameters/changes/A.scala b/sbt-bridge/sbt-test/source-dependencies/repeated-parameters/changes/A.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/repeated-parameters/changes/A.scala rename to sbt-bridge/sbt-test/source-dependencies/repeated-parameters/changes/A.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/repeated-parameters/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/repeated-parameters/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/repeated-parameters/project/DottyInjectedPlugin.scala rename to sbt-bridge/sbt-test/source-dependencies/repeated-parameters/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/repeated-parameters/test b/sbt-bridge/sbt-test/source-dependencies/repeated-parameters/test similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/repeated-parameters/test rename to sbt-bridge/sbt-test/source-dependencies/repeated-parameters/test diff --git a/sbt-bridge/src/sbt-test/source-dependencies/replace-test-a/changes/first.scala b/sbt-bridge/sbt-test/source-dependencies/replace-test-a/changes/first.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/replace-test-a/changes/first.scala rename to sbt-bridge/sbt-test/source-dependencies/replace-test-a/changes/first.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/replace-test-a/changes/second.scala b/sbt-bridge/sbt-test/source-dependencies/replace-test-a/changes/second.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/replace-test-a/changes/second.scala rename to sbt-bridge/sbt-test/source-dependencies/replace-test-a/changes/second.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/replace-test-a/project/Build.scala b/sbt-bridge/sbt-test/source-dependencies/replace-test-a/project/Build.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/replace-test-a/project/Build.scala rename to sbt-bridge/sbt-test/source-dependencies/replace-test-a/project/Build.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/replace-test-a/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/replace-test-a/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/replace-test-a/project/DottyInjectedPlugin.scala rename to sbt-bridge/sbt-test/source-dependencies/replace-test-a/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/replace-test-a/test b/sbt-bridge/sbt-test/source-dependencies/replace-test-a/test similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/replace-test-a/test rename to sbt-bridge/sbt-test/source-dependencies/replace-test-a/test diff --git a/sbt-bridge/src/sbt-test/source-dependencies/resident-java/build.sbt b/sbt-bridge/sbt-test/source-dependencies/resident-java/build.sbt similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/resident-java/build.sbt rename to sbt-bridge/sbt-test/source-dependencies/resident-java/build.sbt diff --git a/sbt-bridge/src/sbt-test/source-dependencies/resident-java/changes/A1.java b/sbt-bridge/sbt-test/source-dependencies/resident-java/changes/A1.java similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/resident-java/changes/A1.java rename to sbt-bridge/sbt-test/source-dependencies/resident-java/changes/A1.java diff --git a/sbt-bridge/src/sbt-test/source-dependencies/resident-java/changes/A2.java b/sbt-bridge/sbt-test/source-dependencies/resident-java/changes/A2.java similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/resident-java/changes/A2.java rename to sbt-bridge/sbt-test/source-dependencies/resident-java/changes/A2.java diff --git a/sbt-bridge/src/sbt-test/source-dependencies/resident-java/changes/B0.scala b/sbt-bridge/sbt-test/source-dependencies/resident-java/changes/B0.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/resident-java/changes/B0.scala rename to sbt-bridge/sbt-test/source-dependencies/resident-java/changes/B0.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/resident-java/changes/B1.scala b/sbt-bridge/sbt-test/source-dependencies/resident-java/changes/B1.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/resident-java/changes/B1.scala rename to sbt-bridge/sbt-test/source-dependencies/resident-java/changes/B1.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/resident-java/changes/B2.scala b/sbt-bridge/sbt-test/source-dependencies/resident-java/changes/B2.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/resident-java/changes/B2.scala rename to sbt-bridge/sbt-test/source-dependencies/resident-java/changes/B2.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/resident-java/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/resident-java/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/resident-java/project/DottyInjectedPlugin.scala rename to sbt-bridge/sbt-test/source-dependencies/resident-java/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/resident-java/test b/sbt-bridge/sbt-test/source-dependencies/resident-java/test similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/resident-java/test rename to sbt-bridge/sbt-test/source-dependencies/resident-java/test diff --git a/sbt-bridge/src/sbt-test/source-dependencies/resident-package-object/changes/A.scala b/sbt-bridge/sbt-test/source-dependencies/resident-package-object/changes/A.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/resident-package-object/changes/A.scala rename to sbt-bridge/sbt-test/source-dependencies/resident-package-object/changes/A.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/resident-package-object/changes/package.scala b/sbt-bridge/sbt-test/source-dependencies/resident-package-object/changes/package.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/resident-package-object/changes/package.scala rename to sbt-bridge/sbt-test/source-dependencies/resident-package-object/changes/package.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/resident-package-object/changes/package2.scala b/sbt-bridge/sbt-test/source-dependencies/resident-package-object/changes/package2.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/resident-package-object/changes/package2.scala rename to sbt-bridge/sbt-test/source-dependencies/resident-package-object/changes/package2.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/resident-package-object/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/resident-package-object/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/resident-package-object/project/DottyInjectedPlugin.scala rename to sbt-bridge/sbt-test/source-dependencies/resident-package-object/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/resident-package-object/test b/sbt-bridge/sbt-test/source-dependencies/resident-package-object/test similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/resident-package-object/test rename to sbt-bridge/sbt-test/source-dependencies/resident-package-object/test diff --git a/sbt-bridge/src/sbt-test/source-dependencies/restore-classes/build.sbt b/sbt-bridge/sbt-test/source-dependencies/restore-classes/build.sbt similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/restore-classes/build.sbt rename to sbt-bridge/sbt-test/source-dependencies/restore-classes/build.sbt diff --git a/sbt-bridge/src/sbt-test/source-dependencies/restore-classes/changes/A1.scala b/sbt-bridge/sbt-test/source-dependencies/restore-classes/changes/A1.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/restore-classes/changes/A1.scala rename to sbt-bridge/sbt-test/source-dependencies/restore-classes/changes/A1.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/restore-classes/changes/A2.scala b/sbt-bridge/sbt-test/source-dependencies/restore-classes/changes/A2.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/restore-classes/changes/A2.scala rename to sbt-bridge/sbt-test/source-dependencies/restore-classes/changes/A2.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/restore-classes/changes/B.scala b/sbt-bridge/sbt-test/source-dependencies/restore-classes/changes/B.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/restore-classes/changes/B.scala rename to sbt-bridge/sbt-test/source-dependencies/restore-classes/changes/B.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/restore-classes/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/restore-classes/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/restore-classes/project/DottyInjectedPlugin.scala rename to sbt-bridge/sbt-test/source-dependencies/restore-classes/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/restore-classes/test b/sbt-bridge/sbt-test/source-dependencies/restore-classes/test similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/restore-classes/test rename to sbt-bridge/sbt-test/source-dependencies/restore-classes/test diff --git a/sbt-bridge/src/sbt-test/source-dependencies/same-file-used-names/A.scala b/sbt-bridge/sbt-test/source-dependencies/same-file-used-names/A.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/same-file-used-names/A.scala rename to sbt-bridge/sbt-test/source-dependencies/same-file-used-names/A.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/same-file-used-names/B.scala b/sbt-bridge/sbt-test/source-dependencies/same-file-used-names/B.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/same-file-used-names/B.scala rename to sbt-bridge/sbt-test/source-dependencies/same-file-used-names/B.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/same-file-used-names/build.sbt b/sbt-bridge/sbt-test/source-dependencies/same-file-used-names/build.sbt similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/same-file-used-names/build.sbt rename to sbt-bridge/sbt-test/source-dependencies/same-file-used-names/build.sbt diff --git a/sbt-bridge/src/sbt-test/source-dependencies/same-file-used-names/changes/B.scala b/sbt-bridge/sbt-test/source-dependencies/same-file-used-names/changes/B.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/same-file-used-names/changes/B.scala rename to sbt-bridge/sbt-test/source-dependencies/same-file-used-names/changes/B.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/same-file-used-names/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/same-file-used-names/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/same-file-used-names/project/DottyInjectedPlugin.scala rename to sbt-bridge/sbt-test/source-dependencies/same-file-used-names/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/same-file-used-names/test b/sbt-bridge/sbt-test/source-dependencies/same-file-used-names/test similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/same-file-used-names/test rename to sbt-bridge/sbt-test/source-dependencies/same-file-used-names/test diff --git a/sbt-bridge/src/sbt-test/source-dependencies/sealed/A.scala b/sbt-bridge/sbt-test/source-dependencies/sealed/A.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/sealed/A.scala rename to sbt-bridge/sbt-test/source-dependencies/sealed/A.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/sealed/D.scala b/sbt-bridge/sbt-test/source-dependencies/sealed/D.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/sealed/D.scala rename to sbt-bridge/sbt-test/source-dependencies/sealed/D.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/sealed/changes/A.scala b/sbt-bridge/sbt-test/source-dependencies/sealed/changes/A.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/sealed/changes/A.scala rename to sbt-bridge/sbt-test/source-dependencies/sealed/changes/A.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/sealed/pending b/sbt-bridge/sbt-test/source-dependencies/sealed/pending similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/sealed/pending rename to sbt-bridge/sbt-test/source-dependencies/sealed/pending diff --git a/sbt-bridge/src/sbt-test/source-dependencies/sealed/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/sealed/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/sealed/project/DottyInjectedPlugin.scala rename to sbt-bridge/sbt-test/source-dependencies/sealed/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/signature-change/B.scala b/sbt-bridge/sbt-test/source-dependencies/signature-change/B.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/signature-change/B.scala rename to sbt-bridge/sbt-test/source-dependencies/signature-change/B.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/signature-change/changes/A0.scala b/sbt-bridge/sbt-test/source-dependencies/signature-change/changes/A0.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/signature-change/changes/A0.scala rename to sbt-bridge/sbt-test/source-dependencies/signature-change/changes/A0.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/signature-change/changes/A1.scala b/sbt-bridge/sbt-test/source-dependencies/signature-change/changes/A1.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/signature-change/changes/A1.scala rename to sbt-bridge/sbt-test/source-dependencies/signature-change/changes/A1.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/signature-change/changes/A2.scala b/sbt-bridge/sbt-test/source-dependencies/signature-change/changes/A2.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/signature-change/changes/A2.scala rename to sbt-bridge/sbt-test/source-dependencies/signature-change/changes/A2.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/signature-change/changes/A3.scala b/sbt-bridge/sbt-test/source-dependencies/signature-change/changes/A3.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/signature-change/changes/A3.scala rename to sbt-bridge/sbt-test/source-dependencies/signature-change/changes/A3.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/signature-change/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/signature-change/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/signature-change/project/DottyInjectedPlugin.scala rename to sbt-bridge/sbt-test/source-dependencies/signature-change/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/signature-change/test b/sbt-bridge/sbt-test/source-dependencies/signature-change/test similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/signature-change/test rename to sbt-bridge/sbt-test/source-dependencies/signature-change/test diff --git a/sbt-bridge/src/sbt-test/source-dependencies/specialized/A.scala b/sbt-bridge/sbt-test/source-dependencies/specialized/A.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/specialized/A.scala rename to sbt-bridge/sbt-test/source-dependencies/specialized/A.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/specialized/B.scala b/sbt-bridge/sbt-test/source-dependencies/specialized/B.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/specialized/B.scala rename to sbt-bridge/sbt-test/source-dependencies/specialized/B.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/specialized/changes/A.scala b/sbt-bridge/sbt-test/source-dependencies/specialized/changes/A.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/specialized/changes/A.scala rename to sbt-bridge/sbt-test/source-dependencies/specialized/changes/A.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/specialized/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/specialized/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/specialized/project/DottyInjectedPlugin.scala rename to sbt-bridge/sbt-test/source-dependencies/specialized/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/specialized/test b/sbt-bridge/sbt-test/source-dependencies/specialized/test similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/specialized/test rename to sbt-bridge/sbt-test/source-dependencies/specialized/test diff --git a/sbt-bridge/src/sbt-test/source-dependencies/stability-change/A.scala b/sbt-bridge/sbt-test/source-dependencies/stability-change/A.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/stability-change/A.scala rename to sbt-bridge/sbt-test/source-dependencies/stability-change/A.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/stability-change/B.scala b/sbt-bridge/sbt-test/source-dependencies/stability-change/B.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/stability-change/B.scala rename to sbt-bridge/sbt-test/source-dependencies/stability-change/B.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/stability-change/C.scala b/sbt-bridge/sbt-test/source-dependencies/stability-change/C.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/stability-change/C.scala rename to sbt-bridge/sbt-test/source-dependencies/stability-change/C.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/stability-change/changes/A.scala b/sbt-bridge/sbt-test/source-dependencies/stability-change/changes/A.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/stability-change/changes/A.scala rename to sbt-bridge/sbt-test/source-dependencies/stability-change/changes/A.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/stability-change/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/stability-change/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/stability-change/project/DottyInjectedPlugin.scala rename to sbt-bridge/sbt-test/source-dependencies/stability-change/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/stability-change/test b/sbt-bridge/sbt-test/source-dependencies/stability-change/test similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/stability-change/test rename to sbt-bridge/sbt-test/source-dependencies/stability-change/test diff --git a/sbt-bridge/src/sbt-test/source-dependencies/synthetic-companion/A.scala b/sbt-bridge/sbt-test/source-dependencies/synthetic-companion/A.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/synthetic-companion/A.scala rename to sbt-bridge/sbt-test/source-dependencies/synthetic-companion/A.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/synthetic-companion/B.scala b/sbt-bridge/sbt-test/source-dependencies/synthetic-companion/B.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/synthetic-companion/B.scala rename to sbt-bridge/sbt-test/source-dependencies/synthetic-companion/B.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/synthetic-companion/changes/A2.scala b/sbt-bridge/sbt-test/source-dependencies/synthetic-companion/changes/A2.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/synthetic-companion/changes/A2.scala rename to sbt-bridge/sbt-test/source-dependencies/synthetic-companion/changes/A2.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/synthetic-companion/dbg.sbt b/sbt-bridge/sbt-test/source-dependencies/synthetic-companion/dbg.sbt similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/synthetic-companion/dbg.sbt rename to sbt-bridge/sbt-test/source-dependencies/synthetic-companion/dbg.sbt diff --git a/sbt-bridge/src/sbt-test/source-dependencies/synthetic-companion/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/synthetic-companion/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/synthetic-companion/project/DottyInjectedPlugin.scala rename to sbt-bridge/sbt-test/source-dependencies/synthetic-companion/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/synthetic-companion/test b/sbt-bridge/sbt-test/source-dependencies/synthetic-companion/test similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/synthetic-companion/test rename to sbt-bridge/sbt-test/source-dependencies/synthetic-companion/test diff --git a/sbt-bridge/src/sbt-test/source-dependencies/trait-member-modified/build.sbt b/sbt-bridge/sbt-test/source-dependencies/trait-member-modified/build.sbt similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/trait-member-modified/build.sbt rename to sbt-bridge/sbt-test/source-dependencies/trait-member-modified/build.sbt diff --git a/sbt-bridge/src/sbt-test/source-dependencies/trait-member-modified/changes/A1.scala b/sbt-bridge/sbt-test/source-dependencies/trait-member-modified/changes/A1.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/trait-member-modified/changes/A1.scala rename to sbt-bridge/sbt-test/source-dependencies/trait-member-modified/changes/A1.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/trait-member-modified/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/trait-member-modified/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/trait-member-modified/project/DottyInjectedPlugin.scala rename to sbt-bridge/sbt-test/source-dependencies/trait-member-modified/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/trait-member-modified/src/main/scala/A.scala b/sbt-bridge/sbt-test/source-dependencies/trait-member-modified/src/main/scala/A.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/trait-member-modified/src/main/scala/A.scala rename to sbt-bridge/sbt-test/source-dependencies/trait-member-modified/src/main/scala/A.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/trait-member-modified/src/main/scala/B.scala b/sbt-bridge/sbt-test/source-dependencies/trait-member-modified/src/main/scala/B.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/trait-member-modified/src/main/scala/B.scala rename to sbt-bridge/sbt-test/source-dependencies/trait-member-modified/src/main/scala/B.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/trait-member-modified/test b/sbt-bridge/sbt-test/source-dependencies/trait-member-modified/test similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/trait-member-modified/test rename to sbt-bridge/sbt-test/source-dependencies/trait-member-modified/test diff --git a/sbt-bridge/src/sbt-test/source-dependencies/trait-private-object/A.scala b/sbt-bridge/sbt-test/source-dependencies/trait-private-object/A.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/trait-private-object/A.scala rename to sbt-bridge/sbt-test/source-dependencies/trait-private-object/A.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/trait-private-object/B.scala b/sbt-bridge/sbt-test/source-dependencies/trait-private-object/B.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/trait-private-object/B.scala rename to sbt-bridge/sbt-test/source-dependencies/trait-private-object/B.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/trait-private-object/changes/A.scala b/sbt-bridge/sbt-test/source-dependencies/trait-private-object/changes/A.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/trait-private-object/changes/A.scala rename to sbt-bridge/sbt-test/source-dependencies/trait-private-object/changes/A.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/trait-private-object/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/trait-private-object/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/trait-private-object/project/DottyInjectedPlugin.scala rename to sbt-bridge/sbt-test/source-dependencies/trait-private-object/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/trait-private-object/test b/sbt-bridge/sbt-test/source-dependencies/trait-private-object/test similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/trait-private-object/test rename to sbt-bridge/sbt-test/source-dependencies/trait-private-object/test diff --git a/sbt-bridge/src/sbt-test/source-dependencies/trait-private-var/B.scala b/sbt-bridge/sbt-test/source-dependencies/trait-private-var/B.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/trait-private-var/B.scala rename to sbt-bridge/sbt-test/source-dependencies/trait-private-var/B.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/trait-private-var/changes/A0.scala b/sbt-bridge/sbt-test/source-dependencies/trait-private-var/changes/A0.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/trait-private-var/changes/A0.scala rename to sbt-bridge/sbt-test/source-dependencies/trait-private-var/changes/A0.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/trait-private-var/changes/A1.scala b/sbt-bridge/sbt-test/source-dependencies/trait-private-var/changes/A1.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/trait-private-var/changes/A1.scala rename to sbt-bridge/sbt-test/source-dependencies/trait-private-var/changes/A1.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/trait-private-var/changes/A2.scala b/sbt-bridge/sbt-test/source-dependencies/trait-private-var/changes/A2.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/trait-private-var/changes/A2.scala rename to sbt-bridge/sbt-test/source-dependencies/trait-private-var/changes/A2.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/trait-private-var/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/trait-private-var/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/trait-private-var/project/DottyInjectedPlugin.scala rename to sbt-bridge/sbt-test/source-dependencies/trait-private-var/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/trait-private-var/test b/sbt-bridge/sbt-test/source-dependencies/trait-private-var/test similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/trait-private-var/test rename to sbt-bridge/sbt-test/source-dependencies/trait-private-var/test diff --git a/sbt-bridge/src/sbt-test/source-dependencies/trait-super/A.scala b/sbt-bridge/sbt-test/source-dependencies/trait-super/A.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/trait-super/A.scala rename to sbt-bridge/sbt-test/source-dependencies/trait-super/A.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/trait-super/B.scala b/sbt-bridge/sbt-test/source-dependencies/trait-super/B.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/trait-super/B.scala rename to sbt-bridge/sbt-test/source-dependencies/trait-super/B.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/trait-super/Main.scala b/sbt-bridge/sbt-test/source-dependencies/trait-super/Main.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/trait-super/Main.scala rename to sbt-bridge/sbt-test/source-dependencies/trait-super/Main.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/trait-super/changes/B2.scala b/sbt-bridge/sbt-test/source-dependencies/trait-super/changes/B2.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/trait-super/changes/B2.scala rename to sbt-bridge/sbt-test/source-dependencies/trait-super/changes/B2.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/trait-super/changes/B3.scala b/sbt-bridge/sbt-test/source-dependencies/trait-super/changes/B3.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/trait-super/changes/B3.scala rename to sbt-bridge/sbt-test/source-dependencies/trait-super/changes/B3.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/trait-super/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/trait-super/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/trait-super/project/DottyInjectedPlugin.scala rename to sbt-bridge/sbt-test/source-dependencies/trait-super/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/trait-super/test b/sbt-bridge/sbt-test/source-dependencies/trait-super/test similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/trait-super/test rename to sbt-bridge/sbt-test/source-dependencies/trait-super/test diff --git a/sbt-bridge/src/sbt-test/source-dependencies/transitive-a/changes/A2.scala b/sbt-bridge/sbt-test/source-dependencies/transitive-a/changes/A2.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/transitive-a/changes/A2.scala rename to sbt-bridge/sbt-test/source-dependencies/transitive-a/changes/A2.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/transitive-a/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/transitive-a/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/transitive-a/project/DottyInjectedPlugin.scala rename to sbt-bridge/sbt-test/source-dependencies/transitive-a/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/transitive-a/src/main/scala/A.scala b/sbt-bridge/sbt-test/source-dependencies/transitive-a/src/main/scala/A.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/transitive-a/src/main/scala/A.scala rename to sbt-bridge/sbt-test/source-dependencies/transitive-a/src/main/scala/A.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/transitive-a/src/main/scala/B.scala b/sbt-bridge/sbt-test/source-dependencies/transitive-a/src/main/scala/B.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/transitive-a/src/main/scala/B.scala rename to sbt-bridge/sbt-test/source-dependencies/transitive-a/src/main/scala/B.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/transitive-a/src/main/scala/C.scala b/sbt-bridge/sbt-test/source-dependencies/transitive-a/src/main/scala/C.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/transitive-a/src/main/scala/C.scala rename to sbt-bridge/sbt-test/source-dependencies/transitive-a/src/main/scala/C.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/transitive-a/test b/sbt-bridge/sbt-test/source-dependencies/transitive-a/test similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/transitive-a/test rename to sbt-bridge/sbt-test/source-dependencies/transitive-a/test diff --git a/sbt-bridge/src/sbt-test/source-dependencies/transitive-b/changes/A2.scala b/sbt-bridge/sbt-test/source-dependencies/transitive-b/changes/A2.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/transitive-b/changes/A2.scala rename to sbt-bridge/sbt-test/source-dependencies/transitive-b/changes/A2.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/transitive-b/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/transitive-b/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/transitive-b/project/DottyInjectedPlugin.scala rename to sbt-bridge/sbt-test/source-dependencies/transitive-b/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/transitive-b/src/main/scala/A.scala b/sbt-bridge/sbt-test/source-dependencies/transitive-b/src/main/scala/A.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/transitive-b/src/main/scala/A.scala rename to sbt-bridge/sbt-test/source-dependencies/transitive-b/src/main/scala/A.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/transitive-b/src/main/scala/B.scala b/sbt-bridge/sbt-test/source-dependencies/transitive-b/src/main/scala/B.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/transitive-b/src/main/scala/B.scala rename to sbt-bridge/sbt-test/source-dependencies/transitive-b/src/main/scala/B.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/transitive-b/src/main/scala/C.scala b/sbt-bridge/sbt-test/source-dependencies/transitive-b/src/main/scala/C.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/transitive-b/src/main/scala/C.scala rename to sbt-bridge/sbt-test/source-dependencies/transitive-b/src/main/scala/C.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/transitive-b/test b/sbt-bridge/sbt-test/source-dependencies/transitive-b/test similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/transitive-b/test rename to sbt-bridge/sbt-test/source-dependencies/transitive-b/test diff --git a/sbt-bridge/src/sbt-test/source-dependencies/transitive-inherit-java/A.java b/sbt-bridge/sbt-test/source-dependencies/transitive-inherit-java/A.java similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/transitive-inherit-java/A.java rename to sbt-bridge/sbt-test/source-dependencies/transitive-inherit-java/A.java diff --git a/sbt-bridge/src/sbt-test/source-dependencies/transitive-inherit-java/B.java b/sbt-bridge/sbt-test/source-dependencies/transitive-inherit-java/B.java similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/transitive-inherit-java/B.java rename to sbt-bridge/sbt-test/source-dependencies/transitive-inherit-java/B.java diff --git a/sbt-bridge/src/sbt-test/source-dependencies/transitive-inherit-java/C.java b/sbt-bridge/sbt-test/source-dependencies/transitive-inherit-java/C.java similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/transitive-inherit-java/C.java rename to sbt-bridge/sbt-test/source-dependencies/transitive-inherit-java/C.java diff --git a/sbt-bridge/src/sbt-test/source-dependencies/transitive-inherit-java/changes/A2.java b/sbt-bridge/sbt-test/source-dependencies/transitive-inherit-java/changes/A2.java similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/transitive-inherit-java/changes/A2.java rename to sbt-bridge/sbt-test/source-dependencies/transitive-inherit-java/changes/A2.java diff --git a/sbt-bridge/src/sbt-test/source-dependencies/transitive-inherit-java/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/transitive-inherit-java/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/transitive-inherit-java/project/DottyInjectedPlugin.scala rename to sbt-bridge/sbt-test/source-dependencies/transitive-inherit-java/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/transitive-inherit-java/test b/sbt-bridge/sbt-test/source-dependencies/transitive-inherit-java/test similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/transitive-inherit-java/test rename to sbt-bridge/sbt-test/source-dependencies/transitive-inherit-java/test diff --git a/sbt-bridge/src/sbt-test/source-dependencies/transitive-inherit/A.scala b/sbt-bridge/sbt-test/source-dependencies/transitive-inherit/A.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/transitive-inherit/A.scala rename to sbt-bridge/sbt-test/source-dependencies/transitive-inherit/A.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/transitive-inherit/B.scala b/sbt-bridge/sbt-test/source-dependencies/transitive-inherit/B.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/transitive-inherit/B.scala rename to sbt-bridge/sbt-test/source-dependencies/transitive-inherit/B.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/transitive-inherit/C.scala b/sbt-bridge/sbt-test/source-dependencies/transitive-inherit/C.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/transitive-inherit/C.scala rename to sbt-bridge/sbt-test/source-dependencies/transitive-inherit/C.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/transitive-inherit/changes/A2.scala b/sbt-bridge/sbt-test/source-dependencies/transitive-inherit/changes/A2.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/transitive-inherit/changes/A2.scala rename to sbt-bridge/sbt-test/source-dependencies/transitive-inherit/changes/A2.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/transitive-inherit/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/transitive-inherit/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/transitive-inherit/project/DottyInjectedPlugin.scala rename to sbt-bridge/sbt-test/source-dependencies/transitive-inherit/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/transitive-inherit/test b/sbt-bridge/sbt-test/source-dependencies/transitive-inherit/test similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/transitive-inherit/test rename to sbt-bridge/sbt-test/source-dependencies/transitive-inherit/test diff --git a/sbt-bridge/src/sbt-test/source-dependencies/transitive-memberRef/build.sbt b/sbt-bridge/sbt-test/source-dependencies/transitive-memberRef/build.sbt similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/transitive-memberRef/build.sbt rename to sbt-bridge/sbt-test/source-dependencies/transitive-memberRef/build.sbt diff --git a/sbt-bridge/src/sbt-test/source-dependencies/transitive-memberRef/changes/A1.scala b/sbt-bridge/sbt-test/source-dependencies/transitive-memberRef/changes/A1.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/transitive-memberRef/changes/A1.scala rename to sbt-bridge/sbt-test/source-dependencies/transitive-memberRef/changes/A1.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/transitive-memberRef/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/transitive-memberRef/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/transitive-memberRef/project/DottyInjectedPlugin.scala rename to sbt-bridge/sbt-test/source-dependencies/transitive-memberRef/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/transitive-memberRef/src/main/scala/A.scala b/sbt-bridge/sbt-test/source-dependencies/transitive-memberRef/src/main/scala/A.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/transitive-memberRef/src/main/scala/A.scala rename to sbt-bridge/sbt-test/source-dependencies/transitive-memberRef/src/main/scala/A.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/transitive-memberRef/src/main/scala/B.scala b/sbt-bridge/sbt-test/source-dependencies/transitive-memberRef/src/main/scala/B.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/transitive-memberRef/src/main/scala/B.scala rename to sbt-bridge/sbt-test/source-dependencies/transitive-memberRef/src/main/scala/B.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/transitive-memberRef/src/main/scala/C.scala b/sbt-bridge/sbt-test/source-dependencies/transitive-memberRef/src/main/scala/C.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/transitive-memberRef/src/main/scala/C.scala rename to sbt-bridge/sbt-test/source-dependencies/transitive-memberRef/src/main/scala/C.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/transitive-memberRef/src/main/scala/D.scala b/sbt-bridge/sbt-test/source-dependencies/transitive-memberRef/src/main/scala/D.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/transitive-memberRef/src/main/scala/D.scala rename to sbt-bridge/sbt-test/source-dependencies/transitive-memberRef/src/main/scala/D.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/transitive-memberRef/src/main/scala/X.scala b/sbt-bridge/sbt-test/source-dependencies/transitive-memberRef/src/main/scala/X.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/transitive-memberRef/src/main/scala/X.scala rename to sbt-bridge/sbt-test/source-dependencies/transitive-memberRef/src/main/scala/X.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/transitive-memberRef/src/main/scala/Y.scala b/sbt-bridge/sbt-test/source-dependencies/transitive-memberRef/src/main/scala/Y.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/transitive-memberRef/src/main/scala/Y.scala rename to sbt-bridge/sbt-test/source-dependencies/transitive-memberRef/src/main/scala/Y.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/transitive-memberRef/test b/sbt-bridge/sbt-test/source-dependencies/transitive-memberRef/test similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/transitive-memberRef/test rename to sbt-bridge/sbt-test/source-dependencies/transitive-memberRef/test diff --git a/sbt-bridge/src/sbt-test/source-dependencies/type-alias/A.scala b/sbt-bridge/sbt-test/source-dependencies/type-alias/A.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/type-alias/A.scala rename to sbt-bridge/sbt-test/source-dependencies/type-alias/A.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/type-alias/B.scala b/sbt-bridge/sbt-test/source-dependencies/type-alias/B.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/type-alias/B.scala rename to sbt-bridge/sbt-test/source-dependencies/type-alias/B.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/type-alias/build.sbt b/sbt-bridge/sbt-test/source-dependencies/type-alias/build.sbt similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/type-alias/build.sbt rename to sbt-bridge/sbt-test/source-dependencies/type-alias/build.sbt diff --git a/sbt-bridge/src/sbt-test/source-dependencies/type-alias/changes/A.scala b/sbt-bridge/sbt-test/source-dependencies/type-alias/changes/A.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/type-alias/changes/A.scala rename to sbt-bridge/sbt-test/source-dependencies/type-alias/changes/A.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/type-alias/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/type-alias/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/type-alias/project/DottyInjectedPlugin.scala rename to sbt-bridge/sbt-test/source-dependencies/type-alias/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/type-alias/test b/sbt-bridge/sbt-test/source-dependencies/type-alias/test similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/type-alias/test rename to sbt-bridge/sbt-test/source-dependencies/type-alias/test diff --git a/sbt-bridge/src/sbt-test/source-dependencies/type-parameter/A.scala b/sbt-bridge/sbt-test/source-dependencies/type-parameter/A.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/type-parameter/A.scala rename to sbt-bridge/sbt-test/source-dependencies/type-parameter/A.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/type-parameter/B.scala b/sbt-bridge/sbt-test/source-dependencies/type-parameter/B.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/type-parameter/B.scala rename to sbt-bridge/sbt-test/source-dependencies/type-parameter/B.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/type-parameter/C.scala b/sbt-bridge/sbt-test/source-dependencies/type-parameter/C.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/type-parameter/C.scala rename to sbt-bridge/sbt-test/source-dependencies/type-parameter/C.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/type-parameter/D.scala b/sbt-bridge/sbt-test/source-dependencies/type-parameter/D.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/type-parameter/D.scala rename to sbt-bridge/sbt-test/source-dependencies/type-parameter/D.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/type-parameter/changes/A.scala b/sbt-bridge/sbt-test/source-dependencies/type-parameter/changes/A.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/type-parameter/changes/A.scala rename to sbt-bridge/sbt-test/source-dependencies/type-parameter/changes/A.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/type-parameter/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/type-parameter/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/type-parameter/project/DottyInjectedPlugin.scala rename to sbt-bridge/sbt-test/source-dependencies/type-parameter/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/type-parameter/test b/sbt-bridge/sbt-test/source-dependencies/type-parameter/test similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/type-parameter/test rename to sbt-bridge/sbt-test/source-dependencies/type-parameter/test diff --git a/sbt-bridge/src/sbt-test/source-dependencies/typeref-only/A.scala b/sbt-bridge/sbt-test/source-dependencies/typeref-only/A.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/typeref-only/A.scala rename to sbt-bridge/sbt-test/source-dependencies/typeref-only/A.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/typeref-only/B.scala b/sbt-bridge/sbt-test/source-dependencies/typeref-only/B.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/typeref-only/B.scala rename to sbt-bridge/sbt-test/source-dependencies/typeref-only/B.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/typeref-only/build.sbt b/sbt-bridge/sbt-test/source-dependencies/typeref-only/build.sbt similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/typeref-only/build.sbt rename to sbt-bridge/sbt-test/source-dependencies/typeref-only/build.sbt diff --git a/sbt-bridge/src/sbt-test/source-dependencies/typeref-only/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/typeref-only/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/typeref-only/project/DottyInjectedPlugin.scala rename to sbt-bridge/sbt-test/source-dependencies/typeref-only/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/typeref-only/test b/sbt-bridge/sbt-test/source-dependencies/typeref-only/test similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/typeref-only/test rename to sbt-bridge/sbt-test/source-dependencies/typeref-only/test diff --git a/sbt-bridge/src/sbt-test/source-dependencies/typeref-return/A.scala b/sbt-bridge/sbt-test/source-dependencies/typeref-return/A.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/typeref-return/A.scala rename to sbt-bridge/sbt-test/source-dependencies/typeref-return/A.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/typeref-return/B.scala b/sbt-bridge/sbt-test/source-dependencies/typeref-return/B.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/typeref-return/B.scala rename to sbt-bridge/sbt-test/source-dependencies/typeref-return/B.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/typeref-return/changes/A.scala b/sbt-bridge/sbt-test/source-dependencies/typeref-return/changes/A.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/typeref-return/changes/A.scala rename to sbt-bridge/sbt-test/source-dependencies/typeref-return/changes/A.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/typeref-return/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/typeref-return/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/typeref-return/project/DottyInjectedPlugin.scala rename to sbt-bridge/sbt-test/source-dependencies/typeref-return/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/typeref-return/test b/sbt-bridge/sbt-test/source-dependencies/typeref-return/test similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/typeref-return/test rename to sbt-bridge/sbt-test/source-dependencies/typeref-return/test diff --git a/sbt-bridge/src/sbt-test/source-dependencies/types-in-used-names-a/A.scala b/sbt-bridge/sbt-test/source-dependencies/types-in-used-names-a/A.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/types-in-used-names-a/A.scala rename to sbt-bridge/sbt-test/source-dependencies/types-in-used-names-a/A.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/types-in-used-names-a/B.scala b/sbt-bridge/sbt-test/source-dependencies/types-in-used-names-a/B.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/types-in-used-names-a/B.scala rename to sbt-bridge/sbt-test/source-dependencies/types-in-used-names-a/B.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/types-in-used-names-a/C.scala b/sbt-bridge/sbt-test/source-dependencies/types-in-used-names-a/C.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/types-in-used-names-a/C.scala rename to sbt-bridge/sbt-test/source-dependencies/types-in-used-names-a/C.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/types-in-used-names-a/D.scala b/sbt-bridge/sbt-test/source-dependencies/types-in-used-names-a/D.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/types-in-used-names-a/D.scala rename to sbt-bridge/sbt-test/source-dependencies/types-in-used-names-a/D.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/types-in-used-names-a/changes/B2.scala b/sbt-bridge/sbt-test/source-dependencies/types-in-used-names-a/changes/B2.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/types-in-used-names-a/changes/B2.scala rename to sbt-bridge/sbt-test/source-dependencies/types-in-used-names-a/changes/B2.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/types-in-used-names-a/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/types-in-used-names-a/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/types-in-used-names-a/project/DottyInjectedPlugin.scala rename to sbt-bridge/sbt-test/source-dependencies/types-in-used-names-a/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/types-in-used-names-a/test b/sbt-bridge/sbt-test/source-dependencies/types-in-used-names-a/test similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/types-in-used-names-a/test rename to sbt-bridge/sbt-test/source-dependencies/types-in-used-names-a/test diff --git a/sbt-bridge/src/sbt-test/source-dependencies/types-in-used-names-b/A.scala b/sbt-bridge/sbt-test/source-dependencies/types-in-used-names-b/A.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/types-in-used-names-b/A.scala rename to sbt-bridge/sbt-test/source-dependencies/types-in-used-names-b/A.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/types-in-used-names-b/B.scala b/sbt-bridge/sbt-test/source-dependencies/types-in-used-names-b/B.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/types-in-used-names-b/B.scala rename to sbt-bridge/sbt-test/source-dependencies/types-in-used-names-b/B.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/types-in-used-names-b/changes/A2.scala b/sbt-bridge/sbt-test/source-dependencies/types-in-used-names-b/changes/A2.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/types-in-used-names-b/changes/A2.scala rename to sbt-bridge/sbt-test/source-dependencies/types-in-used-names-b/changes/A2.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/types-in-used-names-b/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/types-in-used-names-b/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/types-in-used-names-b/project/DottyInjectedPlugin.scala rename to sbt-bridge/sbt-test/source-dependencies/types-in-used-names-b/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/types-in-used-names-b/test b/sbt-bridge/sbt-test/source-dependencies/types-in-used-names-b/test similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/types-in-used-names-b/test rename to sbt-bridge/sbt-test/source-dependencies/types-in-used-names-b/test diff --git a/sbt-bridge/src/sbt-test/source-dependencies/value-class-underlying/A.scala b/sbt-bridge/sbt-test/source-dependencies/value-class-underlying/A.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/value-class-underlying/A.scala rename to sbt-bridge/sbt-test/source-dependencies/value-class-underlying/A.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/value-class-underlying/B.scala b/sbt-bridge/sbt-test/source-dependencies/value-class-underlying/B.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/value-class-underlying/B.scala rename to sbt-bridge/sbt-test/source-dependencies/value-class-underlying/B.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/value-class-underlying/C.scala b/sbt-bridge/sbt-test/source-dependencies/value-class-underlying/C.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/value-class-underlying/C.scala rename to sbt-bridge/sbt-test/source-dependencies/value-class-underlying/C.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/value-class-underlying/build.sbt b/sbt-bridge/sbt-test/source-dependencies/value-class-underlying/build.sbt similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/value-class-underlying/build.sbt rename to sbt-bridge/sbt-test/source-dependencies/value-class-underlying/build.sbt diff --git a/sbt-bridge/src/sbt-test/source-dependencies/value-class-underlying/changes/A2.scala b/sbt-bridge/sbt-test/source-dependencies/value-class-underlying/changes/A2.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/value-class-underlying/changes/A2.scala rename to sbt-bridge/sbt-test/source-dependencies/value-class-underlying/changes/A2.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/value-class-underlying/test b/sbt-bridge/sbt-test/source-dependencies/value-class-underlying/test similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/value-class-underlying/test rename to sbt-bridge/sbt-test/source-dependencies/value-class-underlying/test diff --git a/sbt-bridge/src/sbt-test/source-dependencies/value-class/build.sbt b/sbt-bridge/sbt-test/source-dependencies/value-class/build.sbt similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/value-class/build.sbt rename to sbt-bridge/sbt-test/source-dependencies/value-class/build.sbt diff --git a/sbt-bridge/src/sbt-test/source-dependencies/value-class/changes/A0.scala b/sbt-bridge/sbt-test/source-dependencies/value-class/changes/A0.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/value-class/changes/A0.scala rename to sbt-bridge/sbt-test/source-dependencies/value-class/changes/A0.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/value-class/changes/A1.scala b/sbt-bridge/sbt-test/source-dependencies/value-class/changes/A1.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/value-class/changes/A1.scala rename to sbt-bridge/sbt-test/source-dependencies/value-class/changes/A1.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/value-class/changes/B0.scala b/sbt-bridge/sbt-test/source-dependencies/value-class/changes/B0.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/value-class/changes/B0.scala rename to sbt-bridge/sbt-test/source-dependencies/value-class/changes/B0.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/value-class/changes/B1.scala b/sbt-bridge/sbt-test/source-dependencies/value-class/changes/B1.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/value-class/changes/B1.scala rename to sbt-bridge/sbt-test/source-dependencies/value-class/changes/B1.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/value-class/changes/B2.scala b/sbt-bridge/sbt-test/source-dependencies/value-class/changes/B2.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/value-class/changes/B2.scala rename to sbt-bridge/sbt-test/source-dependencies/value-class/changes/B2.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/value-class/changes/C0.scala b/sbt-bridge/sbt-test/source-dependencies/value-class/changes/C0.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/value-class/changes/C0.scala rename to sbt-bridge/sbt-test/source-dependencies/value-class/changes/C0.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/value-class/changes/C1.scala b/sbt-bridge/sbt-test/source-dependencies/value-class/changes/C1.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/value-class/changes/C1.scala rename to sbt-bridge/sbt-test/source-dependencies/value-class/changes/C1.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/value-class/changes/C2.scala b/sbt-bridge/sbt-test/source-dependencies/value-class/changes/C2.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/value-class/changes/C2.scala rename to sbt-bridge/sbt-test/source-dependencies/value-class/changes/C2.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/value-class/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/value-class/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/value-class/project/DottyInjectedPlugin.scala rename to sbt-bridge/sbt-test/source-dependencies/value-class/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/value-class/test b/sbt-bridge/sbt-test/source-dependencies/value-class/test similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/value-class/test rename to sbt-bridge/sbt-test/source-dependencies/value-class/test diff --git a/sbt-bridge/src/sbt-test/source-dependencies/var/A.scala b/sbt-bridge/sbt-test/source-dependencies/var/A.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/var/A.scala rename to sbt-bridge/sbt-test/source-dependencies/var/A.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/var/B.scala b/sbt-bridge/sbt-test/source-dependencies/var/B.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/var/B.scala rename to sbt-bridge/sbt-test/source-dependencies/var/B.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/var/changes/A.scala b/sbt-bridge/sbt-test/source-dependencies/var/changes/A.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/var/changes/A.scala rename to sbt-bridge/sbt-test/source-dependencies/var/changes/A.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/var/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/var/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/var/project/DottyInjectedPlugin.scala rename to sbt-bridge/sbt-test/source-dependencies/var/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/var/test b/sbt-bridge/sbt-test/source-dependencies/var/test similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/var/test rename to sbt-bridge/sbt-test/source-dependencies/var/test diff --git a/sbt-bridge/src/sbt-test/source-dependencies/variance/A.scala b/sbt-bridge/sbt-test/source-dependencies/variance/A.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/variance/A.scala rename to sbt-bridge/sbt-test/source-dependencies/variance/A.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/variance/C.scala b/sbt-bridge/sbt-test/source-dependencies/variance/C.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/variance/C.scala rename to sbt-bridge/sbt-test/source-dependencies/variance/C.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/variance/changes/A.scala b/sbt-bridge/sbt-test/source-dependencies/variance/changes/A.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/variance/changes/A.scala rename to sbt-bridge/sbt-test/source-dependencies/variance/changes/A.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/variance/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/variance/project/DottyInjectedPlugin.scala similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/variance/project/DottyInjectedPlugin.scala rename to sbt-bridge/sbt-test/source-dependencies/variance/project/DottyInjectedPlugin.scala diff --git a/sbt-bridge/src/sbt-test/source-dependencies/variance/test b/sbt-bridge/sbt-test/source-dependencies/variance/test similarity index 100% rename from sbt-bridge/src/sbt-test/source-dependencies/variance/test rename to sbt-bridge/sbt-test/source-dependencies/variance/test diff --git a/sbt-bridge/src/main/scala/xsbt/CompilerClassLoader.scala b/sbt-bridge/src/xsbt/CompilerClassLoader.scala similarity index 100% rename from sbt-bridge/src/main/scala/xsbt/CompilerClassLoader.scala rename to sbt-bridge/src/xsbt/CompilerClassLoader.scala diff --git a/sbt-bridge/src/main/scala/xsbt/CompilerInterface.scala b/sbt-bridge/src/xsbt/CompilerInterface.scala similarity index 100% rename from sbt-bridge/src/main/scala/xsbt/CompilerInterface.scala rename to sbt-bridge/src/xsbt/CompilerInterface.scala diff --git a/sbt-bridge/src/main/scala/xsbt/ConsoleInterface.scala b/sbt-bridge/src/xsbt/ConsoleInterface.scala similarity index 100% rename from sbt-bridge/src/main/scala/xsbt/ConsoleInterface.scala rename to sbt-bridge/src/xsbt/ConsoleInterface.scala diff --git a/sbt-bridge/src/main/scala/xsbt/DelegatingReporter.scala b/sbt-bridge/src/xsbt/DelegatingReporter.scala similarity index 100% rename from sbt-bridge/src/main/scala/xsbt/DelegatingReporter.scala rename to sbt-bridge/src/xsbt/DelegatingReporter.scala diff --git a/sbt-bridge/src/main/scala/xsbt/Log.scala b/sbt-bridge/src/xsbt/Log.scala similarity index 100% rename from sbt-bridge/src/main/scala/xsbt/Log.scala rename to sbt-bridge/src/xsbt/Log.scala diff --git a/sbt-bridge/src/main/scala/xsbt/Message.scala b/sbt-bridge/src/xsbt/Message.scala similarity index 100% rename from sbt-bridge/src/main/scala/xsbt/Message.scala rename to sbt-bridge/src/xsbt/Message.scala diff --git a/sbt-bridge/src/main/scala/xsbt/ScaladocInterface.scala b/sbt-bridge/src/xsbt/ScaladocInterface.scala similarity index 100% rename from sbt-bridge/src/main/scala/xsbt/ScaladocInterface.scala rename to sbt-bridge/src/xsbt/ScaladocInterface.scala diff --git a/sbt-bridge/src/test/scala/xsbt/DependencySpecification.scala b/sbt-bridge/test/xsbt/DependencySpecification.scala similarity index 100% rename from sbt-bridge/src/test/scala/xsbt/DependencySpecification.scala rename to sbt-bridge/test/xsbt/DependencySpecification.scala diff --git a/sbt-bridge/src/test/scala/xsbt/ExtractAPISpecification.scala b/sbt-bridge/test/xsbt/ExtractAPISpecification.scala similarity index 100% rename from sbt-bridge/src/test/scala/xsbt/ExtractAPISpecification.scala rename to sbt-bridge/test/xsbt/ExtractAPISpecification.scala diff --git a/sbt-bridge/src/test/scala/xsbt/ExtractUsedNamesSpecification.scala b/sbt-bridge/test/xsbt/ExtractUsedNamesSpecification.scala similarity index 100% rename from sbt-bridge/src/test/scala/xsbt/ExtractUsedNamesSpecification.scala rename to sbt-bridge/test/xsbt/ExtractUsedNamesSpecification.scala diff --git a/sbt-bridge/src/test/scala/xsbt/ScalaCompilerForUnitTesting.scala b/sbt-bridge/test/xsbt/ScalaCompilerForUnitTesting.scala similarity index 100% rename from sbt-bridge/src/test/scala/xsbt/ScalaCompilerForUnitTesting.scala rename to sbt-bridge/test/xsbt/ScalaCompilerForUnitTesting.scala diff --git a/sbt-bridge/src/test/scala/xsbti/TestCallback.scala b/sbt-bridge/test/xsbti/TestCallback.scala similarity index 100% rename from sbt-bridge/src/test/scala/xsbti/TestCallback.scala rename to sbt-bridge/test/xsbti/TestCallback.scala From 9a0c1f75a732d4fb3e419bd8c78bdcac09facd0e Mon Sep 17 00:00:00 2001 From: Felix Mulder Date: Mon, 21 Nov 2016 14:48:07 +0100 Subject: [PATCH 50/55] Move benchmarks test to right location --- bench/test/{ => dotty/tools/benchmarks}/Benchmarks.scala | 1 - 1 file changed, 1 deletion(-) rename bench/test/{ => dotty/tools/benchmarks}/Benchmarks.scala (99%) diff --git a/bench/test/Benchmarks.scala b/bench/test/dotty/tools/benchmarks/Benchmarks.scala similarity index 99% rename from bench/test/Benchmarks.scala rename to bench/test/dotty/tools/benchmarks/Benchmarks.scala index 8c1b18e661df..fe5517ad9ddd 100644 --- a/bench/test/Benchmarks.scala +++ b/bench/test/dotty/tools/benchmarks/Benchmarks.scala @@ -1,6 +1,5 @@ package dotty.tools.benchmarks - import org.scalameter.Key.reports._ import org.scalameter.PerformanceTest.OnlineRegressionReport import org.scalameter.api._ From f582ee010a933af991182a32d514bf92e255a07b Mon Sep 17 00:00:00 2001 From: Felix Mulder Date: Mon, 21 Nov 2016 14:54:17 +0100 Subject: [PATCH 51/55] Rename sbt bin project to `dotty-bin-tests` Otherwise this would get picked up by eclipse plugin as a project named `bin` --- project/Build.scala | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/project/Build.scala b/project/Build.scala index c46455bf8ad8..d9fd9013ed66 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -57,7 +57,12 @@ object DottyBuild extends Build { homepage in Global := Some(url("https://github.com/lampepfl/dotty")), // scalac options - scalacOptions in Global ++= Seq("-feature", "-deprecation", "-encoding", "UTF8", "-language:existentials,higherKinds,implicitConversions"), + scalacOptions in Global ++= Seq( + "-feature", + "-deprecation", + "-encoding", "UTF8", + "-language:existentials,higherKinds,implicitConversions" + ), javacOptions in Global ++= Seq("-Xlint:unchecked", "-Xlint:deprecation") ) @@ -96,7 +101,7 @@ object DottyBuild extends Build { ";dotty-compiler/lockPartestFile" + ";dotty-compiler/test:test" + ";dotty-compiler/runPartestRunner" + - ";bin/test" // script tests need to run after the unit tests + ";dotty-bin-tests/test" // script tests need to run after the unit tests ) ++ addCommandAlias( "partest-only", @@ -343,7 +348,7 @@ object DottyBuild extends Build { settings(publishing) /* Contains unit tests for the scripts */ - lazy val bin = project.in(file("bin")). + lazy val `dotty-bin-tests` = project.in(file("bin")). settings(sourceStructure). settings( publishArtifact := false, From 799bd1a5039ee6250bdc48c7ff85797d699307ad Mon Sep 17 00:00:00 2001 From: Felix Mulder Date: Mon, 21 Nov 2016 17:38:07 +0100 Subject: [PATCH 52/55] Fix script choosing wrong artefact Depending on order, scripts might choose the wrong jar (i.e. test instead of non test). This commit addresses that by sedding away results which have `javadoc` or `tests` in the jar name --- bin/common | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/common b/bin/common index 3b7f226cb468..1cb79fc1407e 100755 --- a/bin/common +++ b/bin/common @@ -58,7 +58,7 @@ function build_jar { local sedjar="$3" if [ "$sedjar" == "" ]; then - sedjar="/.*\.jar/p" + sedjar="/tests/d; /javadoc/d; /.*\.jar/p" fi if [ "$jar" == "" ]; then From fee0b0e77d98191a26b01489bb9446e659569d1b Mon Sep 17 00:00:00 2001 From: Felix Mulder Date: Mon, 21 Nov 2016 17:39:04 +0100 Subject: [PATCH 53/55] Disable script tests, should be done by nightly --- project/Build.scala | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/project/Build.scala b/project/Build.scala index d9fd9013ed66..699c7ea8ac31 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -100,8 +100,7 @@ object DottyBuild extends Build { ";dotty-compiler/test:runMain dotc.build" + ";dotty-compiler/lockPartestFile" + ";dotty-compiler/test:test" + - ";dotty-compiler/runPartestRunner" + - ";dotty-bin-tests/test" // script tests need to run after the unit tests + ";dotty-compiler/runPartestRunner" ) ++ addCommandAlias( "partest-only", From e50afe94eec1824fb4e9dd9ddbbbfbc53c8d72eb Mon Sep 17 00:00:00 2001 From: Guillaume Martres Date: Mon, 21 Nov 2016 19:59:17 +0100 Subject: [PATCH 54/55] Properly unpickle This trees without qualifier Otherwise, they may end up with a qualifier, this manifested itself as a pickling difference in `tasty_tools`. --- compiler/src/dotty/tools/dotc/core/tasty/TreeUnpickler.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compiler/src/dotty/tools/dotc/core/tasty/TreeUnpickler.scala b/compiler/src/dotty/tools/dotc/core/tasty/TreeUnpickler.scala index 6fcc2fcaa142..925e39ce990c 100644 --- a/compiler/src/dotty/tools/dotc/core/tasty/TreeUnpickler.scala +++ b/compiler/src/dotty/tools/dotc/core/tasty/TreeUnpickler.scala @@ -881,7 +881,7 @@ class TreeUnpickler(reader: TastyReader, tastyName: TastyName.Table, posUnpickle readType() match { case path: TypeRef => TypeTree(path) case path: TermRef => ref(path) - case path: ThisType => This(path.cls) + case path: ThisType => untpd.This(untpd.EmptyTypeIdent).withType(path) case path: ConstantType => Literal(path.value) } } From 9222af0bb61921f20417112c9d4a4ccce5b0d01a Mon Sep 17 00:00:00 2001 From: Guillaume Martres Date: Mon, 21 Nov 2016 20:00:24 +0100 Subject: [PATCH 55/55] TreeUnpickler: Workaround cyclic reference involving self-type Special-casing like this is ugly, we should decide whether we want to avoid simplifications on all TypTrees and whether we want to do this just in unpickler or always. But I want to merge this PR first. --- .../src/dotty/tools/dotc/core/tasty/TreeUnpickler.scala | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/compiler/src/dotty/tools/dotc/core/tasty/TreeUnpickler.scala b/compiler/src/dotty/tools/dotc/core/tasty/TreeUnpickler.scala index 925e39ce990c..66cfcf453b61 100644 --- a/compiler/src/dotty/tools/dotc/core/tasty/TreeUnpickler.scala +++ b/compiler/src/dotty/tools/dotc/core/tasty/TreeUnpickler.scala @@ -1026,7 +1026,10 @@ class TreeUnpickler(reader: TastyReader, tastyName: TastyName.Table, posUnpickle case APPLIEDtpt => AppliedTypeTree(readTpt(), until(end)(readTpt())) case ANDtpt => - AndTypeTree(readTpt(), readTpt()) + val tpt1 = readTpt() + val tpt2 = readTpt() + // FIXME: We need to do this instead of "AndType(tpt1, tpt2)" to avoid self-type cyclic reference in tasty_tools + untpd.AndTypeTree(tpt1, tpt2).withType(AndType(tpt1.tpe, tpt2.tpe)) case ORtpt => OrTypeTree(readTpt(), readTpt()) case ANNOTATEDtpt => @@ -1046,7 +1049,8 @@ class TreeUnpickler(reader: TastyReader, tastyName: TastyName.Table, posUnpickle } val tree = if (tag < firstLengthTreeTag) readSimpleTerm() else readLengthTerm() - tree.overwriteType(tree.tpe.simplified) + if (!tree.isInstanceOf[TypTree]) // FIXME: Necessary to avoid self-type cyclic reference in tasty_tools + tree.overwriteType(tree.tpe.simplified) setPos(start, tree) }