diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 401de0eb51aa..176e65eaad42 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -348,12 +348,9 @@ jobs: - name: Add SBT proxy repositories run: cp -vf .github/workflows/repositories /root/.sbt/ ; true - - name: Test sbt 1.4.x + - name: Test sbt run: ./project/scripts/sbt "sbt-dotty/scripted; sbt-community-build/scripted" - - name: Test sbt 1.5.x - run: ./project/scripts/sbt "set \`sbt-dotty\`/scriptedSbt := \"1.5.0-RC1\"; sbt-dotty/scripted sbt-dotty/*" - test_java8: runs-on: [self-hosted, Linux] container: diff --git a/community-build/community-projects/AsyncFile b/community-build/community-projects/AsyncFile index 831f1db78cbd..015856b5e3e6 160000 --- a/community-build/community-projects/AsyncFile +++ b/community-build/community-projects/AsyncFile @@ -1 +1 @@ -Subproject commit 831f1db78cbda7b060a7dfe0426d0b59709fd728 +Subproject commit 015856b5e3e648b4198a2708c8df986fa79ae862 diff --git a/community-build/community-projects/Equal b/community-build/community-projects/Equal index 43e829e01959..ac9adcc11894 160000 --- a/community-build/community-projects/Equal +++ b/community-build/community-projects/Equal @@ -1 +1 @@ -Subproject commit 43e829e0195961500824388a6552a66ec13521cd +Subproject commit ac9adcc118947e017335a25fe111b6d84342f2e3 diff --git a/community-build/community-projects/FingerTree b/community-build/community-projects/FingerTree index b5c89dff9efa..efd604882dca 160000 --- a/community-build/community-projects/FingerTree +++ b/community-build/community-projects/FingerTree @@ -1 +1 @@ -Subproject commit b5c89dff9efaab861b605199ac3d0ccfbb3f80d4 +Subproject commit efd604882dca6617da51a815a3172b8d43905f03 diff --git a/community-build/community-projects/Log b/community-build/community-projects/Log index bef85c8a61d8..e974ad4b92e0 160000 --- a/community-build/community-projects/Log +++ b/community-build/community-projects/Log @@ -1 +1 @@ -Subproject commit bef85c8a61d8f08be65a2de1822cb60485296d32 +Subproject commit e974ad4b92e0bfe61be744258cb641f554512c27 diff --git a/community-build/community-projects/Lucre b/community-build/community-projects/Lucre index 87d680baaa23..115abaceacce 160000 --- a/community-build/community-projects/Lucre +++ b/community-build/community-projects/Lucre @@ -1 +1 @@ -Subproject commit 87d680baaa2355de5b062adcbdfc5005e787521b +Subproject commit 115abaceacce5f4d7085851ee56a2ed41143b6bc diff --git a/community-build/community-projects/Model b/community-build/community-projects/Model index d4fa3fdc4049..e7ece6c38644 160000 --- a/community-build/community-projects/Model +++ b/community-build/community-projects/Model @@ -1 +1 @@ -Subproject commit d4fa3fdc4049020e2cddd694d0e44f79b2bc0cfe +Subproject commit e7ece6c386448bead5e383ccee82f8b4c6d79601 diff --git a/community-build/community-projects/Numbers b/community-build/community-projects/Numbers index 3d9a4a028e61..041194001f56 160000 --- a/community-build/community-projects/Numbers +++ b/community-build/community-projects/Numbers @@ -1 +1 @@ -Subproject commit 3d9a4a028e610ee28499284ed30a53789270c56e +Subproject commit 041194001f5678877c6f647a7a4dea2fe369028d diff --git a/community-build/community-projects/ScalaPB b/community-build/community-projects/ScalaPB index 95515e8d052a..c1fa23f2f3b2 160000 --- a/community-build/community-projects/ScalaPB +++ b/community-build/community-projects/ScalaPB @@ -1 +1 @@ -Subproject commit 95515e8d052a3b36f6fad168838e874420360de4 +Subproject commit c1fa23f2f3b265d0926cb6ef2c9748d090e83fb9 diff --git a/community-build/community-projects/Serial b/community-build/community-projects/Serial index b4c3724b7fac..027d83320748 160000 --- a/community-build/community-projects/Serial +++ b/community-build/community-projects/Serial @@ -1 +1 @@ -Subproject commit b4c3724b7fac8b4d7fbae730118c5075c6f4392d +Subproject commit 027d83320748bcd8f0924ff19b954f586875a032 diff --git a/community-build/community-projects/Span b/community-build/community-projects/Span index 467882fc0320..252ab6c81920 160000 --- a/community-build/community-projects/Span +++ b/community-build/community-projects/Span @@ -1 +1 @@ -Subproject commit 467882fc032081db5fe840db94251c9cc89cb30a +Subproject commit 252ab6c8192054888c3358d070b54fd7ad52e75a diff --git a/community-build/community-projects/akka b/community-build/community-projects/akka index 5b9496313ca7..054db58ace6d 160000 --- a/community-build/community-projects/akka +++ b/community-build/community-projects/akka @@ -1 +1 @@ -Subproject commit 5b9496313ca7be34e2a8149d38f8b1ce7c6f6b01 +Subproject commit 054db58ace6deca7431714da062f02280d1f5c1b diff --git a/community-build/community-projects/algebra b/community-build/community-projects/algebra index a010f13d7c4f..2d0d5c3b10fb 160000 --- a/community-build/community-projects/algebra +++ b/community-build/community-projects/algebra @@ -1 +1 @@ -Subproject commit a010f13d7c4f5029ed0f6ce088f6e55a0c87ef3e +Subproject commit 2d0d5c3b10fb7b34569ac309236a1ee6f560f888 diff --git a/community-build/community-projects/betterfiles b/community-build/community-projects/betterfiles index e138a70e4922..bcfe54fba386 160000 --- a/community-build/community-projects/betterfiles +++ b/community-build/community-projects/betterfiles @@ -1 +1 @@ -Subproject commit e138a70e49225584171e5e879181796fe5594292 +Subproject commit bcfe54fba386b7dcf918a682ba878e5cce1cc9e7 diff --git a/community-build/community-projects/cats b/community-build/community-projects/cats index 2c27eb8b6fe5..e8480b48e8bf 160000 --- a/community-build/community-projects/cats +++ b/community-build/community-projects/cats @@ -1 +1 @@ -Subproject commit 2c27eb8b6fe567d5a7adcb8433646d6f718d3e94 +Subproject commit e8480b48e8bfafa0aa0897b772002111e885f30d diff --git a/community-build/community-projects/cats-effect-2 b/community-build/community-projects/cats-effect-2 index f3d3bb3428fa..93b8b8cf9805 160000 --- a/community-build/community-projects/cats-effect-2 +++ b/community-build/community-projects/cats-effect-2 @@ -1 +1 @@ -Subproject commit f3d3bb3428faa9b2495310dfd520844c37018042 +Subproject commit 93b8b8cf9805b6467335ddf67929a4d70178caf2 diff --git a/community-build/community-projects/cats-effect-3 b/community-build/community-projects/cats-effect-3 index 04155e429e23..7efd1cd703ce 160000 --- a/community-build/community-projects/cats-effect-3 +++ b/community-build/community-projects/cats-effect-3 @@ -1 +1 @@ -Subproject commit 04155e429e230224e61235c4e4dd125419f82f7a +Subproject commit 7efd1cd703ce0a614bad288421c7325a7fc2f869 diff --git a/community-build/community-projects/cats-mtl b/community-build/community-projects/cats-mtl index 1b0d1404f0eb..8539ee3ae125 160000 --- a/community-build/community-projects/cats-mtl +++ b/community-build/community-projects/cats-mtl @@ -1 +1 @@ -Subproject commit 1b0d1404f0eb104e72d4fd80c4ba285c9390fbc0 +Subproject commit 8539ee3ae1256f7087091575d07d1d1c57d607c7 diff --git a/community-build/community-projects/coop b/community-build/community-projects/coop index d3bcd3622dc3..36c229a042ef 160000 --- a/community-build/community-projects/coop +++ b/community-build/community-projects/coop @@ -1 +1 @@ -Subproject commit d3bcd3622dc3a1f3257e2d861d724c04ab634b81 +Subproject commit 36c229a042ef92944b596c5a722d74c96ce376d8 diff --git a/community-build/community-projects/discipline b/community-build/community-projects/discipline index 4e3f9678c847..b1f3a155cce6 160000 --- a/community-build/community-projects/discipline +++ b/community-build/community-projects/discipline @@ -1 +1 @@ -Subproject commit 4e3f9678c84702b079209ae9928d9b6c884a7514 +Subproject commit b1f3a155cce62a497e03cbfb15ea1aa459e70077 diff --git a/community-build/community-projects/discipline-munit b/community-build/community-projects/discipline-munit index e0a3aee65b85..170eb28bb9b0 160000 --- a/community-build/community-projects/discipline-munit +++ b/community-build/community-projects/discipline-munit @@ -1 +1 @@ -Subproject commit e0a3aee65b85bf8d6bb53037e4bc33ebfdeaedff +Subproject commit 170eb28bb9b021d97920e4398470bdaccd5134b1 diff --git a/community-build/community-projects/discipline-specs2 b/community-build/community-projects/discipline-specs2 index b2fa931a44ee..1dbb402762ee 160000 --- a/community-build/community-projects/discipline-specs2 +++ b/community-build/community-projects/discipline-specs2 @@ -1 +1 @@ -Subproject commit b2fa931a44eeb6a6afa1343e57f963e73aafff59 +Subproject commit 1dbb402762ee398b791864cf61d5cca008cc5eb4 diff --git a/community-build/community-projects/dotty-cps-async b/community-build/community-projects/dotty-cps-async index 614dc4a30557..4854d63e580d 160000 --- a/community-build/community-projects/dotty-cps-async +++ b/community-build/community-projects/dotty-cps-async @@ -1 +1 @@ -Subproject commit 614dc4a30557bf7d282387d0c7efcdb59d97d76b +Subproject commit 4854d63e580da198c31da0e217b8ccf6446271fc diff --git a/community-build/community-projects/effpi b/community-build/community-projects/effpi index 52702912ce92..9ac66c1a0b67 160000 --- a/community-build/community-projects/effpi +++ b/community-build/community-projects/effpi @@ -1 +1 @@ -Subproject commit 52702912ce92b801ab9fb033d30970cdf45b6961 +Subproject commit 9ac66c1a0b67e8ce28ea4f0e88350ef60be80762 diff --git a/community-build/community-projects/endpoints4s b/community-build/community-projects/endpoints4s index 9433bf818e4a..c5b6c4cb40fa 160000 --- a/community-build/community-projects/endpoints4s +++ b/community-build/community-projects/endpoints4s @@ -1 +1 @@ -Subproject commit 9433bf818e4ac06815017ec9344ce648bd52d82a +Subproject commit c5b6c4cb40fae0fdf09d848898b6099fb27ae178 diff --git a/community-build/community-projects/fastparse b/community-build/community-projects/fastparse index 9b02d7050013..ad0f4e51bad2 160000 --- a/community-build/community-projects/fastparse +++ b/community-build/community-projects/fastparse @@ -1 +1 @@ -Subproject commit 9b02d7050013fd7158f37f60116f3907d4a578e2 +Subproject commit ad0f4e51bad2d74a6e7e12f3b7287707567aa48a diff --git a/community-build/community-projects/intent b/community-build/community-projects/intent index b1a62511741d..7b6e80c28dd3 160000 --- a/community-build/community-projects/intent +++ b/community-build/community-projects/intent @@ -1 +1 @@ -Subproject commit b1a62511741d84cc84fdf14c051804fe81629cdb +Subproject commit 7b6e80c28dd3fd2a85987e6ad89cfd60c7f575f6 diff --git a/community-build/community-projects/izumi-reflect b/community-build/community-projects/izumi-reflect index 54051d0bca92..cfbdd503200e 160000 --- a/community-build/community-projects/izumi-reflect +++ b/community-build/community-projects/izumi-reflect @@ -1 +1 @@ -Subproject commit 54051d0bca921706ef0a3f9f63264f6f57d50ef0 +Subproject commit cfbdd503200e9f1780b05a748ea17341ea583bef diff --git a/community-build/community-projects/minitest b/community-build/community-projects/minitest index 746b6aa16432..b2ce216784d8 160000 --- a/community-build/community-projects/minitest +++ b/community-build/community-projects/minitest @@ -1 +1 @@ -Subproject commit 746b6aa1643254786549ebe2785c80693359acd1 +Subproject commit b2ce216784d8cf2b59a557e0d4a8a30faa2d6b0b diff --git a/community-build/community-projects/munit b/community-build/community-projects/munit index 7006d9d3963c..cd3dfe89af6f 160000 --- a/community-build/community-projects/munit +++ b/community-build/community-projects/munit @@ -1 +1 @@ -Subproject commit 7006d9d3963c0f1db5594e4a054a3531ee781c9a +Subproject commit cd3dfe89af6f438df2348296c908f4f951de9f5e diff --git a/community-build/community-projects/perspective b/community-build/community-projects/perspective index f0525cdc94a5..5cb36066d782 160000 --- a/community-build/community-projects/perspective +++ b/community-build/community-projects/perspective @@ -1 +1 @@ -Subproject commit f0525cdc94a52e92587a464761741369f3351345 +Subproject commit 5cb36066d782d97bb96ec9d6603ce0a682178ba1 diff --git a/community-build/community-projects/scala-collection-compat b/community-build/community-projects/scala-collection-compat index 57669d80c4fd..57fce0270089 160000 --- a/community-build/community-projects/scala-collection-compat +++ b/community-build/community-projects/scala-collection-compat @@ -1 +1 @@ -Subproject commit 57669d80c4fdd09bbe633356ffa44b833b3850aa +Subproject commit 57fce0270089fec80c48677b777d6288231adda9 diff --git a/community-build/community-projects/scala-parallel-collections b/community-build/community-projects/scala-parallel-collections index 152db284cc56..eed20544862b 160000 --- a/community-build/community-projects/scala-parallel-collections +++ b/community-build/community-projects/scala-parallel-collections @@ -1 +1 @@ -Subproject commit 152db284cc56c59c8fa9f74454e03d04c4355b60 +Subproject commit eed20544862b87a6ce61f93c9fa7d72394187f37 diff --git a/community-build/community-projects/scala-parser-combinators b/community-build/community-projects/scala-parser-combinators index da176a05c462..96bac506e419 160000 --- a/community-build/community-projects/scala-parser-combinators +++ b/community-build/community-projects/scala-parser-combinators @@ -1 +1 @@ -Subproject commit da176a05c4623c4edb81b1274034ad1e85835dc4 +Subproject commit 96bac506e419ff3c5daf01e88bb6adddbb74e5e1 diff --git a/community-build/community-projects/scala-stm b/community-build/community-projects/scala-stm index 96ef6e56af08..c0aa2e2a563f 160000 --- a/community-build/community-projects/scala-stm +++ b/community-build/community-projects/scala-stm @@ -1 +1 @@ -Subproject commit 96ef6e56af08d0ec600ec80ebec68d227a8c048c +Subproject commit c0aa2e2a563f8e7ff54719099ef9f3c36077e5c7 diff --git a/community-build/community-projects/scala-xml b/community-build/community-projects/scala-xml index d809e1d855d7..499ff2a40fcc 160000 --- a/community-build/community-projects/scala-xml +++ b/community-build/community-projects/scala-xml @@ -1 +1 @@ -Subproject commit d809e1d855d75352365ae4f218049a9910de7265 +Subproject commit 499ff2a40fccf1c275881397f5431754d1c70392 diff --git a/community-build/community-projects/scalacheck b/community-build/community-projects/scalacheck index ad6b6f997a91..46c4102034cd 160000 --- a/community-build/community-projects/scalacheck +++ b/community-build/community-projects/scalacheck @@ -1 +1 @@ -Subproject commit ad6b6f997a9189dc9abdb187440cad4de5c33720 +Subproject commit 46c4102034cde41be10c2acb1e2eb6debd728842 diff --git a/community-build/community-projects/scalap b/community-build/community-projects/scalap index 6dc9e16358a0..4710b010a1d6 160000 --- a/community-build/community-projects/scalap +++ b/community-build/community-projects/scalap @@ -1 +1 @@ -Subproject commit 6dc9e16358a07150ca0e89df6ed38e79854a411c +Subproject commit 4710b010a1d60792f1005a7452e11b45221c077e diff --git a/community-build/community-projects/scalatest b/community-build/community-projects/scalatest index d3b7db9af036..3bc7d4cfdf38 160000 --- a/community-build/community-projects/scalatest +++ b/community-build/community-projects/scalatest @@ -1 +1 @@ -Subproject commit d3b7db9af036829e417e6a08940d9e4e406cfbf2 +Subproject commit 3bc7d4cfdf385da16381990a4abb9602e2e6563b diff --git a/community-build/community-projects/scalatestplus-junit b/community-build/community-projects/scalatestplus-junit index 3857010185d9..05b7415a2879 160000 --- a/community-build/community-projects/scalatestplus-junit +++ b/community-build/community-projects/scalatestplus-junit @@ -1 +1 @@ -Subproject commit 3857010185d95c3b5fece4800759436ceebdc0e7 +Subproject commit 05b7415a287919e72266bacd80fee4cb75f2698c diff --git a/community-build/community-projects/scalatestplus-scalacheck b/community-build/community-projects/scalatestplus-scalacheck index 010387f5854e..de494e2c21a9 160000 --- a/community-build/community-projects/scalatestplus-scalacheck +++ b/community-build/community-projects/scalatestplus-scalacheck @@ -1 +1 @@ -Subproject commit 010387f5854eb473ddc71ecd2d6a0183dfebfbcb +Subproject commit de494e2c21a9ed50137a744c70f03e2f55b9d9fa diff --git a/community-build/community-projects/scalaz b/community-build/community-projects/scalaz index 7d9d32a66127..55bb2eb4f655 160000 --- a/community-build/community-projects/scalaz +++ b/community-build/community-projects/scalaz @@ -1 +1 @@ -Subproject commit 7d9d32a6612784713c09e9cde8507d34ed9d8f25 +Subproject commit 55bb2eb4f65509a79be153ce11250e8fb6cc93eb diff --git a/community-build/community-projects/scodec b/community-build/community-projects/scodec index 84db5f776573..b52fb279d661 160000 --- a/community-build/community-projects/scodec +++ b/community-build/community-projects/scodec @@ -1 +1 @@ -Subproject commit 84db5f7765738024aebd8df2bf53151cc6d4d793 +Subproject commit b52fb279d661236cceffd3237fa82ed7b2ff15e1 diff --git a/community-build/community-projects/scodec-bits b/community-build/community-projects/scodec-bits index 85de35c014b9..07bac492e44f 160000 --- a/community-build/community-projects/scodec-bits +++ b/community-build/community-projects/scodec-bits @@ -1 +1 @@ -Subproject commit 85de35c014b948f0dd3f94e975c42d17deab4055 +Subproject commit 07bac492e44f9baf88890701bd1c71d6134d5cb3 diff --git a/community-build/community-projects/sconfig b/community-build/community-projects/sconfig index 43f7b12dce6e..a92553d91932 160000 --- a/community-build/community-projects/sconfig +++ b/community-build/community-projects/sconfig @@ -1 +1 @@ -Subproject commit 43f7b12dce6ec53bc7fafee8a35141944f31763e +Subproject commit a92553d91932735147cbac471f566cdb8559050a diff --git a/community-build/community-projects/shapeless b/community-build/community-projects/shapeless index 94c1d4413373..e2ae0a65b6d8 160000 --- a/community-build/community-projects/shapeless +++ b/community-build/community-projects/shapeless @@ -1 +1 @@ -Subproject commit 94c1d44133739c7c57b64228caccc4fc938c2862 +Subproject commit e2ae0a65b6d8945863c52bcb40397b7e564de715 diff --git a/community-build/community-projects/simulacrum-scalafix b/community-build/community-projects/simulacrum-scalafix index 75f7e10d30fb..05b5519944c8 160000 --- a/community-build/community-projects/simulacrum-scalafix +++ b/community-build/community-projects/simulacrum-scalafix @@ -1 +1 @@ -Subproject commit 75f7e10d30fb1b848b7adaf2a026320ee548b56a +Subproject commit 05b5519944c8c7b71bd3ada74738a4047c45a801 diff --git a/community-build/community-projects/stdLib213 b/community-build/community-projects/stdLib213 index d39b0169e2e1..2e0aac97c6b8 160000 --- a/community-build/community-projects/stdLib213 +++ b/community-build/community-projects/stdLib213 @@ -1 +1 @@ -Subproject commit d39b0169e2e1fa434d05669fe4abc720ac879e6e +Subproject commit 2e0aac97c6b8f1eca5b9015701c1731ef337b692 diff --git a/community-build/community-projects/verify b/community-build/community-projects/verify index 3af47d0e9297..77ae388a3ee2 160000 --- a/community-build/community-projects/verify +++ b/community-build/community-projects/verify @@ -1 +1 @@ -Subproject commit 3af47d0e929786436cc26bee576870a330f0d0cb +Subproject commit 77ae388a3ee2b086218572e76a46d114d88af8cd diff --git a/community-build/community-projects/xml-interpolator b/community-build/community-projects/xml-interpolator index 0e032658e3d9..6ad49782c40d 160000 --- a/community-build/community-projects/xml-interpolator +++ b/community-build/community-projects/xml-interpolator @@ -1 +1 @@ -Subproject commit 0e032658e3d915bac4a22360bcdeb880bd81a03d +Subproject commit 6ad49782c40de4c2817eefb32f5f6770c50fd09a diff --git a/community-build/community-projects/zio b/community-build/community-projects/zio index c08d2b0bd87d..ad38a2682ac2 160000 --- a/community-build/community-projects/zio +++ b/community-build/community-projects/zio @@ -1 +1 @@ -Subproject commit c08d2b0bd87de82617ae71fc3922292bc8f7b194 +Subproject commit ad38a2682ac25143328c944ddbc40f25c96551f6 diff --git a/community-build/src/scala/dotty/communitybuild/projects.scala b/community-build/src/scala/dotty/communitybuild/projects.scala index a44b44d6085f..38a98c2c9bf6 100644 --- a/community-build/src/scala/dotty/communitybuild/projects.scala +++ b/community-build/src/scala/dotty/communitybuild/projects.scala @@ -116,7 +116,7 @@ final case class SbtCommunityProject( override val docCommand = if sbtDocCommand eq null then null else val cmd = if sbtDocCommand.startsWith(";") then sbtDocCommand else s";$sbtDocCommand" - s"$baseCommand set every useScaladoc := true; set every doc/logLevel := Level.Warn $cmd " + s"$baseCommand set every doc/logLevel := Level.Warn $cmd " override val runCommandsArgs: List[String] = // Run the sbt command with the compiler version and sbt plugin set in the build @@ -124,7 +124,7 @@ final case class SbtCommunityProject( case Some(ivyHome) => List(s"-Dsbt.ivy.home=$ivyHome") case _ => Nil extraSbtArgs ++ sbtProps ++ List( - "-sbt-version", "1.4.9", + "-sbt-version", "1.5.0-RC2", "-Dsbt.supershell=false", s"-Ddotty.communitybuild.dir=$communitybuildDir", s"--addPluginSbtFile=$sbtPluginFilePath" @@ -140,7 +140,7 @@ object projects: private def forceDoc(projects: String*) = projects.map(project => - s""";set $project/Compile/doc/sources ++= ($project/Compile/doc/tastyFiles).value ;$project/doc""" + s""";set $project/Compile/doc/sources := ($project/Compile/sources).value ;$project/doc""" ).mkString(" ") private def aggregateDoc(in: String)(projects: String*) = @@ -397,7 +397,7 @@ object projects: project = "scodec-bits", sbtTestCommand = "coreJVM/test;coreJS/test", sbtPublishCommand = "coreJVM/publishLocal;coreJS/publishLocal", - sbtDocCommand = "coreJVM/doc", + // sbtDocCommand = "coreJVM/doc", dependencies = List(munit) ) @@ -405,7 +405,7 @@ object projects: project = "scodec", sbtTestCommand = "unitTests/test", // Adds package - sbtDocCommand = "coreJVM/doc", + // sbtDocCommand = "coreJVM/doc", dependencies = List(munit, scodecBits) ) @@ -451,14 +451,14 @@ object projects: lazy val catsEffect2 = SbtCommunityProject( project = "cats-effect-2", sbtTestCommand = "test", - sbtDocCommand = ";coreJVM/doc ;lawsJVM/doc", + // sbtDocCommand = ";coreJVM/doc ;lawsJVM/doc", dependencies = List(cats, disciplineMunit) ) lazy val catsEffect3 = SbtCommunityProject( project = "cats-effect-3", sbtTestCommand = "test", - sbtDocCommand = ";coreJVM/doc ;lawsJVM/doc ;kernelJVM/doc", + // sbtDocCommand = ";coreJVM/doc ;lawsJVM/doc ;kernelJVM/doc", dependencies = List(cats, coop, disciplineSpecs2, scalacheck) ) diff --git a/project/Bootstrap.scala b/project/Bootstrap.scala new file mode 100644 index 000000000000..2472162558b7 --- /dev/null +++ b/project/Bootstrap.scala @@ -0,0 +1,39 @@ +package sbt + +import sbt.internal.classpath.ClassLoaderCache +import sbt.internal.inc.ScalaInstance + +object Bootstrap { + // copied from https://github.com/sbt/sbt/blob/33e2bfe2810246c8e4e1b37ec110d15e588a4fce/main/src/main/scala/sbt/Defaults.scala#L1120-L1165 + def makeScalaInstance( + version: String, + libraryJars: Array[File], + allCompilerJars: Seq[File], + allDocJars: Seq[File], + state: State, + topLoader: ClassLoader + ): ScalaInstance = { + val classLoaderCache = state.extendedClassLoaderCache + val compilerJars = allCompilerJars.filterNot(libraryJars.contains).distinct.toArray + val docJars = allDocJars + .filterNot(jar => libraryJars.contains(jar) || compilerJars.contains(jar)) + .distinct.toArray + val allJars = libraryJars ++ compilerJars ++ docJars + + val libraryLoader = classLoaderCache(libraryJars.toList, topLoader) + val compilerLoader = classLoaderCache(compilerJars.toList, libraryLoader) + val fullLoader = + if (docJars.isEmpty) compilerLoader + else classLoaderCache(docJars.distinct.toList, compilerLoader) + new ScalaInstance( + version = version, + loader = fullLoader, + loaderCompilerOnly = compilerLoader, + loaderLibraryOnly = libraryLoader, + libraryJars = libraryJars, + compilerJars = compilerJars, + allJars = allJars, + explicitActual = Some(version) + ) + } +} \ No newline at end of file diff --git a/project/Build.scala b/project/Build.scala index 02474e8a648b..fba4a3c14ecb 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -15,8 +15,6 @@ import xerial.sbt.pack.PackPlugin import xerial.sbt.pack.PackPlugin.autoImport._ import xerial.sbt.Sonatype.autoImport._ -import dotty.tools.sbtplugin.DottyPlugin.autoImport._ -import dotty.tools.sbtplugin.DottyPlugin.makeScalaInstance import dotty.tools.sbtplugin.DottyIDEPlugin.{ installCodeExtension, prepareCommand, runProcess } import dotty.tools.sbtplugin.DottyIDEPlugin.autoImport._ @@ -51,7 +49,7 @@ abstract class DottyJSPlugin(settings: Seq[Setting[_]]) extends AutoPlugin { _.filter(!_.name.startsWith("junit-interface")) }, libraryDependencies += - ("org.scala-js" %% "scalajs-junit-test-runtime" % scalaJSVersion % "test").withDottyCompat(scalaVersion.value), + ("org.scala-js" %% "scalajs-junit-test-runtime" % scalaJSVersion % "test").cross(CrossVersion.for3Use2_13), // Typecheck the Scala.js IR found on the classpath scalaJSLinkerConfig ~= (_.withCheckIR(true)), @@ -268,7 +266,8 @@ object Build { // Settings used when compiling dotty (both non-bootstrapped and bootstrapped) lazy val commonDottySettings = commonSettings ++ Seq( // Manually set the standard library to use - autoScalaLibrary := false + autoScalaLibrary := false, + classpathOptions ~= (_.withAutoBoot(false).withFilterLibrary(false)) ) lazy val commonScala2Settings = commonSettings ++ Seq( @@ -288,7 +287,7 @@ object Build { scalaVersion := referenceVersion, excludeFromIDE := true, - disableDocSetting + disableDocSetting, ) lazy val scalacOptionsDocSettings = Seq( @@ -358,16 +357,17 @@ object Build { val dottyCompiler = (`scala3-compiler` / Compile / packageBin).value val scaladoc = (`scaladoc-nonBootstrapped` / Compile / packageBin).value + val allCompilerJars = Seq(tastyCore, dottyLibrary, dottyInterfaces, dottyCompiler) ++ externalNonBootstrappedDeps.map(_.data) + val allDocJars = Seq(scaladoc) val allJars = Seq(tastyCore, dottyLibrary, dottyInterfaces, dottyCompiler, scaladoc) ++ externalNonBootstrappedDeps.map(_.data) - makeScalaInstance( - state.value, + sbt.Bootstrap.makeScalaInstance( scalaVersion.value, - scalaLibrary, - dottyLibrary, - dottyCompiler, - allJars, - appConfiguration.value + Array(scalaLibrary, dottyLibrary), + allCompilerJars, + Seq(scaladoc), + state.value, + scalaInstanceTopLoader.value ) }, Compile / doc / scalacOptions ++= scalacOptionsDocSettings, @@ -605,8 +605,8 @@ object Build { ivyConfigurations += SourceDeps.hide, transitiveClassifiers := Seq("sources"), libraryDependencies += - ("org.scala-js" %% "scalajs-ir" % scalaJSVersion % "sourcedeps").withDottyCompat(scalaVersion.value), - (Compile / sourceGenerators) += Def.task { + ("org.scala-js" %% "scalajs-ir" % scalaJSVersion % "sourcedeps").cross(CrossVersion.for3Use2_13), + Compile / sourceGenerators += Def.task { val s = streams.value val cacheDir = s.cacheDirectory val trgDir = (Compile / sourceManaged).value / "scalajs-ir-src" @@ -715,7 +715,7 @@ object Build { enablePlugins(NonBootstrappedDottyJSPlugin). settings( libraryDependencies += - ("org.scala-js" %% "scalajs-library" % scalaJSVersion).withDottyCompat(scalaVersion.value), + ("org.scala-js" %% "scalajs-library" % scalaJSVersion).cross(CrossVersion.for3Use2_13), unmanagedSourceDirectories in Compile := (unmanagedSourceDirectories in (`scala3-library`, Compile)).value ) @@ -734,7 +734,7 @@ object Build { enablePlugins(BootstrappedDottyJSPlugin). settings( libraryDependencies += - ("org.scala-js" %% "scalajs-library" % scalaJSVersion).withDottyCompat(scalaVersion.value), + ("org.scala-js" %% "scalajs-library" % scalaJSVersion).cross(CrossVersion.for3Use2_13), Compile / unmanagedSourceDirectories ++= (`scala3-library-bootstrapped` / Compile / unmanagedSourceDirectories).value, @@ -1066,7 +1066,7 @@ object Build { // We need JUnit in the Compile configuration libraryDependencies += - ("org.scala-js" %% "scalajs-junit-test-runtime" % scalaJSVersion).withDottyCompat(scalaVersion.value), + ("org.scala-js" %% "scalajs-junit-test-runtime" % scalaJSVersion).cross(CrossVersion.for3Use2_13), (Compile / sourceGenerators) += Def.task { import org.scalajs.linker.interface.CheckedBehavior @@ -1243,6 +1243,10 @@ object Build { baseDirectory.value / "../language-server/src/dotty/tools/languageserver/config", sbtTestDirectory := baseDirectory.value / "sbt-test", + // ensure that sbt-dotty is built on sbt 1.4 and scripted are run on sbt 1.5 + pluginCrossBuild / sbtVersion := "1.4.9", + scriptedSbt := "1.5.0-RC2", + // The batch mode accidentally became the default with no way to disable // it in sbt 1.4 (https://github.com/sbt/sbt/issues/5913#issuecomment-716003195). // We enable it explicitly here to make it clear that we're using it. @@ -1337,6 +1341,12 @@ object Build { version := sbtCommunityBuildVersion, organization := "ch.epfl.lamp", sbtTestDirectory := baseDirectory.value / "sbt-test", + + // hack to run the scripted tests on a nightly version of sbt + // see https://github.com/sbt/sbt/issues/6347 + scriptedSbt := "1.4.7", + scriptedLaunchOpts ++= Seq("-Dsbt.version=1.5.0-RC2"), + scriptedLaunchOpts ++= Seq( "-Dplugin.version=" + version.value, "-Dplugin.scalaVersion=" + dottyVersion, @@ -1389,7 +1399,6 @@ object Build { // (publishLocal in `scala3-staging`).value val pluginText = s"""updateOptions in Global ~= (_.withLatestSnapshots(false)) - |addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % "$sbtDottyVersion") |addSbtPlugin("ch.epfl.lamp" % "sbt-community-build" % "$sbtCommunityBuildVersion") |addSbtPlugin("org.scala-js" % "sbt-scalajs" % "$scalaJSVersion")""".stripMargin IO.write(baseDirectory.value / "sbt-dotty-sbt", pluginText) @@ -1729,7 +1738,7 @@ object Build { pr.settings( Test / fork := false, scalaJSUseMainModuleInitializer := true, - libraryDependencies += ("org.scala-js" %%% "scalajs-dom" % "1.1.0").withDottyCompat(scalaVersion.value) + libraryDependencies += ("org.scala-js" %%% "scalajs-dom" % "1.1.0").cross(CrossVersion.for3Use2_13) ) } diff --git a/project/build.properties b/project/build.properties index dbae93bcfd51..af4ff6f29be9 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.4.9 +sbt.version=1.5.0-RC2 diff --git a/project/build.sbt b/project/build.sbt index fe0b179ee6f5..db5c30c5ea14 100644 --- a/project/build.sbt +++ b/project/build.sbt @@ -1,16 +1,17 @@ // Used by VersionUtil to get gitHash and commitDate libraryDependencies += "org.eclipse.jgit" % "org.eclipse.jgit" % "4.11.0.201803080745-r" -// Include the sources of the sbt-dotty plugin in the project build, +// Include the source of DottyIDEPlugin in the project build, // so that we can use the current in-development version of the plugin // in our build instead of a released version. +// We do not add SbtDottyPlugin to show that it is not usefull anymore +// However, adding one source but not the others is very fragile -Compile / unmanagedSourceDirectories += baseDirectory.value / "../sbt-dotty/src" +Compile / unmanagedSources += baseDirectory.value / "../sbt-dotty/src/dotty/tools/sbtplugin/DottyIDEPlugin.scala" // Keep in sync with `sbt-dotty` config in Build.scala libraryDependencies ++= Seq( - Dependencies.`jackson-databind`, - Dependencies.newCompilerInterface + Dependencies.`jackson-databind` ) Compile / unmanagedSourceDirectories += baseDirectory.value / "../language-server/src/dotty/tools/languageserver/config" diff --git a/sbt-community-build/sbt-test/sbt-community-build/inter-project-transitive-dep/build.sbt b/sbt-community-build/sbt-test/sbt-community-build/inter-project-transitive-dep/build.sbt index 5d8eb6a0ad82..ecc49539d4ec 100644 --- a/sbt-community-build/sbt-test/sbt-community-build/inter-project-transitive-dep/build.sbt +++ b/sbt-community-build/sbt-test/sbt-community-build/inter-project-transitive-dep/build.sbt @@ -9,14 +9,12 @@ lazy val a = project ) lazy val b = project - .settings(onlyThisTestResolverSettings) .settings( name := "b", libraryDependencies := Seq(organization.value %% "a" % "0.4.0-SNAPSHOT"), ) lazy val c = project - .settings(onlyThisTestResolverSettings) .settings( name := "c", libraryDependencies := Seq(), // don't depend on scala-library diff --git a/sbt-community-build/sbt-test/sbt-community-build/inter-project-transitive-dep/project/ThisTestPlugin.scala b/sbt-community-build/sbt-test/sbt-community-build/inter-project-transitive-dep/project/ThisTestPlugin.scala index 38065b524de4..6c78756beabd 100644 --- a/sbt-community-build/sbt-test/sbt-community-build/inter-project-transitive-dep/project/ThisTestPlugin.scala +++ b/sbt-community-build/sbt-test/sbt-community-build/inter-project-transitive-dep/project/ThisTestPlugin.scala @@ -24,10 +24,4 @@ object ThisTestPlugin extends AutoPlugin { deleteDepsFile := IO.delete(file(sys.props("dotty.communitybuild.dir")) / "dotty-community-build-deps"), ) } - - object autoImport { - def onlyThisTestResolverSettings: Seq[Setting[_]] = Seq( - externalResolvers := thisTestResolver.value :: Nil - ) - } } diff --git a/sbt-community-build/sbt-test/sbt-community-build/inter-project-transitive-dep/project/plugins.sbt b/sbt-community-build/sbt-test/sbt-community-build/inter-project-transitive-dep/project/plugins.sbt index c9ff25c194ee..b90dfe2ab4fd 100644 --- a/sbt-community-build/sbt-test/sbt-community-build/inter-project-transitive-dep/project/plugins.sbt +++ b/sbt-community-build/sbt-test/sbt-community-build/inter-project-transitive-dep/project/plugins.sbt @@ -1,2 +1 @@ addSbtPlugin("ch.epfl.lamp" % "sbt-community-build" % sys.props("plugin.version")) -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.sbtDottyVersion")) diff --git a/sbt-community-build/sbt-test/sbt-community-build/multiple-deps/build.sbt b/sbt-community-build/sbt-test/sbt-community-build/multiple-deps/build.sbt index 43f4c872c11b..184d2a536ca5 100644 --- a/sbt-community-build/sbt-test/sbt-community-build/multiple-deps/build.sbt +++ b/sbt-community-build/sbt-test/sbt-community-build/multiple-deps/build.sbt @@ -16,7 +16,6 @@ lazy val b = project ) lazy val c = project - .settings(onlyThisTestResolverSettings) .settings( name := "c", libraryDependencies := Seq( diff --git a/sbt-community-build/sbt-test/sbt-community-build/multiple-deps/project/ThisTestPlugin.scala b/sbt-community-build/sbt-test/sbt-community-build/multiple-deps/project/ThisTestPlugin.scala index 38065b524de4..6c78756beabd 100644 --- a/sbt-community-build/sbt-test/sbt-community-build/multiple-deps/project/ThisTestPlugin.scala +++ b/sbt-community-build/sbt-test/sbt-community-build/multiple-deps/project/ThisTestPlugin.scala @@ -24,10 +24,4 @@ object ThisTestPlugin extends AutoPlugin { deleteDepsFile := IO.delete(file(sys.props("dotty.communitybuild.dir")) / "dotty-community-build-deps"), ) } - - object autoImport { - def onlyThisTestResolverSettings: Seq[Setting[_]] = Seq( - externalResolvers := thisTestResolver.value :: Nil - ) - } } diff --git a/sbt-community-build/sbt-test/sbt-community-build/multiple-deps/project/plugins.sbt b/sbt-community-build/sbt-test/sbt-community-build/multiple-deps/project/plugins.sbt index c9ff25c194ee..b90dfe2ab4fd 100644 --- a/sbt-community-build/sbt-test/sbt-community-build/multiple-deps/project/plugins.sbt +++ b/sbt-community-build/sbt-test/sbt-community-build/multiple-deps/project/plugins.sbt @@ -1,2 +1 @@ addSbtPlugin("ch.epfl.lamp" % "sbt-community-build" % sys.props("plugin.version")) -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.sbtDottyVersion")) diff --git a/sbt-community-build/sbt-test/sbt-community-build/scalajs/build.sbt b/sbt-community-build/sbt-test/sbt-community-build/scalajs/build.sbt index 15a3b1316968..73a87c760c36 100644 --- a/sbt-community-build/sbt-test/sbt-community-build/scalajs/build.sbt +++ b/sbt-community-build/sbt-test/sbt-community-build/scalajs/build.sbt @@ -17,7 +17,6 @@ lazy val aJS = project ) lazy val bJVM = project - .settings(onlyThisTestResolverSettings) .settings( name := "b", libraryDependencies := Seq(organization.value %%% "a" % "0.5.0-SNAPSHOT"), @@ -25,7 +24,6 @@ lazy val bJVM = project lazy val bJS = project .enablePlugins(ScalaJSPlugin) - .settings(onlyThisTestResolverSettings) .settings( name := "b", libraryDependencies := Seq(organization.value %%% "a" % "0.5.0-SNAPSHOT"), diff --git a/sbt-community-build/sbt-test/sbt-community-build/scalajs/project/ThisTestPlugin.scala b/sbt-community-build/sbt-test/sbt-community-build/scalajs/project/ThisTestPlugin.scala index 38065b524de4..6c78756beabd 100644 --- a/sbt-community-build/sbt-test/sbt-community-build/scalajs/project/ThisTestPlugin.scala +++ b/sbt-community-build/sbt-test/sbt-community-build/scalajs/project/ThisTestPlugin.scala @@ -24,10 +24,4 @@ object ThisTestPlugin extends AutoPlugin { deleteDepsFile := IO.delete(file(sys.props("dotty.communitybuild.dir")) / "dotty-community-build-deps"), ) } - - object autoImport { - def onlyThisTestResolverSettings: Seq[Setting[_]] = Seq( - externalResolvers := thisTestResolver.value :: Nil - ) - } } diff --git a/sbt-community-build/sbt-test/sbt-community-build/scalajs/project/plugins.sbt b/sbt-community-build/sbt-test/sbt-community-build/scalajs/project/plugins.sbt index 85bf601273c1..4754c84edc43 100644 --- a/sbt-community-build/sbt-test/sbt-community-build/scalajs/project/plugins.sbt +++ b/sbt-community-build/sbt-test/sbt-community-build/scalajs/project/plugins.sbt @@ -1,3 +1,2 @@ addSbtPlugin("ch.epfl.lamp" % "sbt-community-build" % sys.props("plugin.version")) -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.sbtDottyVersion")) addSbtPlugin("org.scala-js" % "sbt-scalajs" % sys.props("plugin.scalaJSVersion")) diff --git a/sbt-community-build/sbt-test/sbt-community-build/single-dep/build.sbt b/sbt-community-build/sbt-test/sbt-community-build/single-dep/build.sbt index 945900611587..2c1304a5daeb 100644 --- a/sbt-community-build/sbt-test/sbt-community-build/single-dep/build.sbt +++ b/sbt-community-build/sbt-test/sbt-community-build/single-dep/build.sbt @@ -9,7 +9,6 @@ lazy val a = project ) lazy val b = project - .settings(onlyThisTestResolverSettings) .settings( name := "b", libraryDependencies := Seq(organization.value %% "a" % "0.1.0-SNAPSHOT"), diff --git a/sbt-community-build/sbt-test/sbt-community-build/single-dep/project/ThisTestPlugin.scala b/sbt-community-build/sbt-test/sbt-community-build/single-dep/project/ThisTestPlugin.scala index 38065b524de4..6c78756beabd 100644 --- a/sbt-community-build/sbt-test/sbt-community-build/single-dep/project/ThisTestPlugin.scala +++ b/sbt-community-build/sbt-test/sbt-community-build/single-dep/project/ThisTestPlugin.scala @@ -24,10 +24,4 @@ object ThisTestPlugin extends AutoPlugin { deleteDepsFile := IO.delete(file(sys.props("dotty.communitybuild.dir")) / "dotty-community-build-deps"), ) } - - object autoImport { - def onlyThisTestResolverSettings: Seq[Setting[_]] = Seq( - externalResolvers := thisTestResolver.value :: Nil - ) - } } diff --git a/sbt-community-build/sbt-test/sbt-community-build/single-dep/project/plugins.sbt b/sbt-community-build/sbt-test/sbt-community-build/single-dep/project/plugins.sbt index c9ff25c194ee..b90dfe2ab4fd 100644 --- a/sbt-community-build/sbt-test/sbt-community-build/single-dep/project/plugins.sbt +++ b/sbt-community-build/sbt-test/sbt-community-build/single-dep/project/plugins.sbt @@ -1,2 +1 @@ addSbtPlugin("ch.epfl.lamp" % "sbt-community-build" % sys.props("plugin.version")) -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.sbtDottyVersion")) diff --git a/sbt-community-build/sbt-test/sbt-community-build/transitive-dep/build.sbt b/sbt-community-build/sbt-test/sbt-community-build/transitive-dep/build.sbt index 731326994993..2e9d3630e7ba 100644 --- a/sbt-community-build/sbt-test/sbt-community-build/transitive-dep/build.sbt +++ b/sbt-community-build/sbt-test/sbt-community-build/transitive-dep/build.sbt @@ -16,7 +16,6 @@ lazy val b = project ) lazy val c = project - .settings(onlyThisTestResolverSettings) .settings( name := "c", libraryDependencies := Seq(organization.value %% "b" % "1.3.0-SNAPSHOT"), diff --git a/sbt-community-build/sbt-test/sbt-community-build/transitive-dep/project/ThisTestPlugin.scala b/sbt-community-build/sbt-test/sbt-community-build/transitive-dep/project/ThisTestPlugin.scala index 38065b524de4..6c78756beabd 100644 --- a/sbt-community-build/sbt-test/sbt-community-build/transitive-dep/project/ThisTestPlugin.scala +++ b/sbt-community-build/sbt-test/sbt-community-build/transitive-dep/project/ThisTestPlugin.scala @@ -24,10 +24,4 @@ object ThisTestPlugin extends AutoPlugin { deleteDepsFile := IO.delete(file(sys.props("dotty.communitybuild.dir")) / "dotty-community-build-deps"), ) } - - object autoImport { - def onlyThisTestResolverSettings: Seq[Setting[_]] = Seq( - externalResolvers := thisTestResolver.value :: Nil - ) - } } diff --git a/sbt-community-build/sbt-test/sbt-community-build/transitive-dep/project/plugins.sbt b/sbt-community-build/sbt-test/sbt-community-build/transitive-dep/project/plugins.sbt index c9ff25c194ee..b90dfe2ab4fd 100644 --- a/sbt-community-build/sbt-test/sbt-community-build/transitive-dep/project/plugins.sbt +++ b/sbt-community-build/sbt-test/sbt-community-build/transitive-dep/project/plugins.sbt @@ -1,2 +1 @@ addSbtPlugin("ch.epfl.lamp" % "sbt-community-build" % sys.props("plugin.version")) -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.sbtDottyVersion")) diff --git a/sbt-dotty/sbt-test/compilerReporter/i7442/project/plugins.sbt b/sbt-dotty/sbt-test/compilerReporter/i7442/project/plugins.sbt deleted file mode 100644 index c17caab2d98c..000000000000 --- a/sbt-dotty/sbt-test/compilerReporter/i7442/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-dotty/sbt-test/compilerReporter/simple/project/plugins.sbt b/sbt-dotty/sbt-test/compilerReporter/simple/project/plugins.sbt deleted file mode 100644 index c17caab2d98c..000000000000 --- a/sbt-dotty/sbt-test/compilerReporter/simple/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-dotty/sbt-test/discovery/test-discovery/project/plugins.sbt b/sbt-dotty/sbt-test/discovery/test-discovery/project/plugins.sbt deleted file mode 100644 index c17caab2d98c..000000000000 --- a/sbt-dotty/sbt-test/discovery/test-discovery/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-dotty/sbt-test/sbt-dotty/analyzer-plugin/project/plugins.sbt b/sbt-dotty/sbt-test/sbt-dotty/analyzer-plugin/project/plugins.sbt deleted file mode 100644 index c17caab2d98c..000000000000 --- a/sbt-dotty/sbt-test/sbt-dotty/analyzer-plugin/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-dotty/sbt-test/sbt-dotty/compiler-plugin/project/plugins.sbt b/sbt-dotty/sbt-test/sbt-dotty/compiler-plugin/project/plugins.sbt deleted file mode 100644 index c17caab2d98c..000000000000 --- a/sbt-dotty/sbt-test/sbt-dotty/compiler-plugin/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-dotty/sbt-test/sbt-dotty/example-project/build.sbt b/sbt-dotty/sbt-test/sbt-dotty/example-project/build.sbt index 4949483897d9..f2781e4097d8 100644 --- a/sbt-dotty/sbt-test/sbt-dotty/example-project/build.sbt +++ b/sbt-dotty/sbt-test/sbt-dotty/example-project/build.sbt @@ -1,4 +1,4 @@ scalaVersion := sys.props("plugin.scalaVersion") libraryDependencies += -("org.scala-lang.modules" %% "scala-xml" % "1.2.0").withDottyCompat(scalaVersion.value) +("org.scala-lang.modules" %% "scala-xml" % "1.2.0").cross(CrossVersion.for3Use2_13) diff --git a/sbt-dotty/sbt-test/sbt-dotty/example-project/project/plugins.sbt b/sbt-dotty/sbt-test/sbt-dotty/example-project/project/plugins.sbt deleted file mode 100644 index c17caab2d98c..000000000000 --- a/sbt-dotty/sbt-test/sbt-dotty/example-project/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-dotty/sbt-test/sbt-dotty/i7897/project/plugins.sbt b/sbt-dotty/sbt-test/sbt-dotty/i7897/project/plugins.sbt deleted file mode 100644 index c17caab2d98c..000000000000 --- a/sbt-dotty/sbt-test/sbt-dotty/i7897/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-dotty/sbt-test/sbt-dotty/quoted-example-project/project/plugins.sbt b/sbt-dotty/sbt-test/sbt-dotty/quoted-example-project/project/plugins.sbt deleted file mode 100644 index c17caab2d98c..000000000000 --- a/sbt-dotty/sbt-test/sbt-dotty/quoted-example-project/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-dotty/sbt-test/sbt-dotty/scala2/project/plugins.sbt b/sbt-dotty/sbt-test/sbt-dotty/scala2/project/plugins.sbt deleted file mode 100644 index c17caab2d98c..000000000000 --- a/sbt-dotty/sbt-test/sbt-dotty/scala2/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-dotty/sbt-test/sbt-dotty/scaladoc-empty-test/project/plugins.sbt b/sbt-dotty/sbt-test/sbt-dotty/scaladoc-empty-test/project/plugins.sbt deleted file mode 100644 index c17caab2d98c..000000000000 --- a/sbt-dotty/sbt-test/sbt-dotty/scaladoc-empty-test/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-dotty/sbt-test/sbt-dotty/scaladoc/project/plugins.sbt b/sbt-dotty/sbt-test/sbt-dotty/scaladoc/project/plugins.sbt deleted file mode 100644 index c17caab2d98c..000000000000 --- a/sbt-dotty/sbt-test/sbt-dotty/scaladoc/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-dotty/sbt-test/sbt-dotty/tasty-inspector-example-project/project/plugins.sbt b/sbt-dotty/sbt-test/sbt-dotty/tasty-inspector-example-project/project/plugins.sbt deleted file mode 100644 index c17caab2d98c..000000000000 --- a/sbt-dotty/sbt-test/sbt-dotty/tasty-inspector-example-project/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-dotty/sbt-test/scala2-compat/akka/build.sbt b/sbt-dotty/sbt-test/scala2-compat/akka/build.sbt index 296e8e082fed..3e34f19ca7aa 100644 --- a/sbt-dotty/sbt-test/scala2-compat/akka/build.sbt +++ b/sbt-dotty/sbt-test/scala2-compat/akka/build.sbt @@ -4,5 +4,5 @@ libraryDependencies ++= { Seq( ("com.typesafe.akka" %% "akka-http" % "10.1.10"), ("com.typesafe.akka" %% "akka-stream" % "2.6.0") - ).map(_.withDottyCompat(scalaVersion.value)) + ).map(_.cross(CrossVersion.for3Use2_13)) } diff --git a/sbt-dotty/sbt-test/scala2-compat/akka/project/plugins.sbt b/sbt-dotty/sbt-test/scala2-compat/akka/project/plugins.sbt deleted file mode 100644 index c17caab2d98c..000000000000 --- a/sbt-dotty/sbt-test/scala2-compat/akka/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-dotty/sbt-test/scala2-compat/eff/build.sbt b/sbt-dotty/sbt-test/scala2-compat/eff/build.sbt index 953439793ce9..70cdfb03cf9e 100644 --- a/sbt-dotty/sbt-test/scala2-compat/eff/build.sbt +++ b/sbt-dotty/sbt-test/scala2-compat/eff/build.sbt @@ -1,4 +1,4 @@ scalaVersion := sys.props("plugin.scalaVersion") libraryDependencies += - ("org.atnos" %% "eff" % "5.5.2").withDottyCompat(scalaVersion.value) + ("org.atnos" %% "eff" % "5.5.2").cross(CrossVersion.for3Use2_13) diff --git a/sbt-dotty/sbt-test/scala2-compat/eff/project/plugins.sbt b/sbt-dotty/sbt-test/scala2-compat/eff/project/plugins.sbt deleted file mode 100644 index c17caab2d98c..000000000000 --- a/sbt-dotty/sbt-test/scala2-compat/eff/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-dotty/sbt-test/scala2-compat/i8001/project/plugins.sbt b/sbt-dotty/sbt-test/scala2-compat/i8001/project/plugins.sbt deleted file mode 100644 index c17caab2d98c..000000000000 --- a/sbt-dotty/sbt-test/scala2-compat/i8001/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-dotty/sbt-test/scala2-compat/i8847/project/plugins.sbt b/sbt-dotty/sbt-test/scala2-compat/i8847/project/plugins.sbt deleted file mode 100644 index c17caab2d98c..000000000000 --- a/sbt-dotty/sbt-test/scala2-compat/i8847/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-dotty/sbt-test/scala2-compat/i9916a/project/plugins.sbt b/sbt-dotty/sbt-test/scala2-compat/i9916a/project/plugins.sbt deleted file mode 100644 index c17caab2d98c..000000000000 --- a/sbt-dotty/sbt-test/scala2-compat/i9916a/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-dotty/sbt-test/scala2-compat/i9916b/project/plugins.sbt b/sbt-dotty/sbt-test/scala2-compat/i9916b/project/plugins.sbt deleted file mode 100644 index c17caab2d98c..000000000000 --- a/sbt-dotty/sbt-test/scala2-compat/i9916b/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-dotty/sbt-test/scala2-compat/longnames/project/plugins.sbt b/sbt-dotty/sbt-test/scala2-compat/longnames/project/plugins.sbt deleted file mode 100644 index c17caab2d98c..000000000000 --- a/sbt-dotty/sbt-test/scala2-compat/longnames/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-dotty/sbt-test/scalajs/basic/build.sbt b/sbt-dotty/sbt-test/scalajs/basic/build.sbt index 53f8bc4e52e6..92c44049aeef 100644 --- a/sbt-dotty/sbt-test/scalajs/basic/build.sbt +++ b/sbt-dotty/sbt-test/scalajs/basic/build.sbt @@ -3,6 +3,6 @@ enablePlugins(ScalaJSPlugin) scalaVersion := sys.props("plugin.scalaVersion") // Test withDottyCompat for %%% dependencies -libraryDependencies += ("org.scala-js" %%% "scalajs-dom" % "1.1.0").withDottyCompat(scalaVersion.value) +libraryDependencies += ("org.scala-js" %%% "scalajs-dom" % "1.1.0").cross(CrossVersion.for3Use2_13) scalaJSUseMainModuleInitializer := true diff --git a/sbt-dotty/sbt-test/scalajs/basic/project/plugins.sbt b/sbt-dotty/sbt-test/scalajs/basic/project/plugins.sbt index f69df9c39cc7..b9ebfd07bf1f 100644 --- a/sbt-dotty/sbt-test/scalajs/basic/project/plugins.sbt +++ b/sbt-dotty/sbt-test/scalajs/basic/project/plugins.sbt @@ -1,2 +1 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) addSbtPlugin("org.scala-js" % "sbt-scalajs" % sys.props("plugin.scalaJSVersion")) diff --git a/sbt-dotty/sbt-test/source-dependencies/abstract-override/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/abstract-override/project/plugins.sbt deleted file mode 100644 index c17caab2d98c..000000000000 --- a/sbt-dotty/sbt-test/source-dependencies/abstract-override/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-dotty/sbt-test/source-dependencies/abstract-type-override/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/abstract-type-override/project/plugins.sbt deleted file mode 100644 index c17caab2d98c..000000000000 --- a/sbt-dotty/sbt-test/source-dependencies/abstract-type-override/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-dotty/sbt-test/source-dependencies/abstract-type/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/abstract-type/project/plugins.sbt deleted file mode 100644 index c17caab2d98c..000000000000 --- a/sbt-dotty/sbt-test/source-dependencies/abstract-type/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-dotty/sbt-test/source-dependencies/added/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/added/project/plugins.sbt deleted file mode 100644 index c17caab2d98c..000000000000 --- a/sbt-dotty/sbt-test/source-dependencies/added/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-dotty/sbt-test/source-dependencies/anon-class-java-depends-on-scala/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/anon-class-java-depends-on-scala/project/plugins.sbt deleted file mode 100644 index c17caab2d98c..000000000000 --- a/sbt-dotty/sbt-test/source-dependencies/anon-class-java-depends-on-scala/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-dotty/sbt-test/source-dependencies/anon-java-scala-class/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/anon-java-scala-class/project/plugins.sbt deleted file mode 100644 index c17caab2d98c..000000000000 --- a/sbt-dotty/sbt-test/source-dependencies/anon-java-scala-class/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-dotty/sbt-test/source-dependencies/as-seen-from-a/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/as-seen-from-a/project/plugins.sbt deleted file mode 100644 index c17caab2d98c..000000000000 --- a/sbt-dotty/sbt-test/source-dependencies/as-seen-from-a/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-dotty/sbt-test/source-dependencies/as-seen-from-b/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/as-seen-from-b/project/plugins.sbt deleted file mode 100644 index c17caab2d98c..000000000000 --- a/sbt-dotty/sbt-test/source-dependencies/as-seen-from-b/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-dotty/sbt-test/source-dependencies/backtick-quoted-names/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/backtick-quoted-names/project/plugins.sbt deleted file mode 100644 index c17caab2d98c..000000000000 --- a/sbt-dotty/sbt-test/source-dependencies/backtick-quoted-names/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-dotty/sbt-test/source-dependencies/binary/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/binary/project/plugins.sbt deleted file mode 100644 index c17caab2d98c..000000000000 --- a/sbt-dotty/sbt-test/source-dependencies/binary/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-dotty/sbt-test/source-dependencies/by-name/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/by-name/project/plugins.sbt deleted file mode 100644 index c17caab2d98c..000000000000 --- a/sbt-dotty/sbt-test/source-dependencies/by-name/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-dotty/sbt-test/source-dependencies/canon/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/canon/project/plugins.sbt deleted file mode 100644 index c17caab2d98c..000000000000 --- a/sbt-dotty/sbt-test/source-dependencies/canon/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-dotty/sbt-test/source-dependencies/changedTypeOfChildOfSealed/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/changedTypeOfChildOfSealed/project/plugins.sbt deleted file mode 100644 index c17caab2d98c..000000000000 --- a/sbt-dotty/sbt-test/source-dependencies/changedTypeOfChildOfSealed/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-dotty/sbt-test/source-dependencies/check-classes/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/check-classes/project/plugins.sbt deleted file mode 100644 index c17caab2d98c..000000000000 --- a/sbt-dotty/sbt-test/source-dependencies/check-classes/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-dotty/sbt-test/source-dependencies/check-dependencies/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/check-dependencies/project/plugins.sbt deleted file mode 100644 index c17caab2d98c..000000000000 --- a/sbt-dotty/sbt-test/source-dependencies/check-dependencies/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-dotty/sbt-test/source-dependencies/check-products/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/check-products/project/plugins.sbt deleted file mode 100644 index c17caab2d98c..000000000000 --- a/sbt-dotty/sbt-test/source-dependencies/check-products/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-dotty/sbt-test/source-dependencies/check-recompilations/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/check-recompilations/project/plugins.sbt deleted file mode 100644 index c17caab2d98c..000000000000 --- a/sbt-dotty/sbt-test/source-dependencies/check-recompilations/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-dotty/sbt-test/source-dependencies/class-based-inheritance/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/class-based-inheritance/project/plugins.sbt deleted file mode 100644 index c17caab2d98c..000000000000 --- a/sbt-dotty/sbt-test/source-dependencies/class-based-inheritance/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-dotty/sbt-test/source-dependencies/class-based-memberRef/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/class-based-memberRef/project/plugins.sbt deleted file mode 100644 index c17caab2d98c..000000000000 --- a/sbt-dotty/sbt-test/source-dependencies/class-based-memberRef/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-dotty/sbt-test/source-dependencies/compactify/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/compactify/project/plugins.sbt deleted file mode 100644 index c17caab2d98c..000000000000 --- a/sbt-dotty/sbt-test/source-dependencies/compactify/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-dotty/sbt-test/source-dependencies/constructors-unrelated/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/constructors-unrelated/project/plugins.sbt deleted file mode 100644 index c17caab2d98c..000000000000 --- a/sbt-dotty/sbt-test/source-dependencies/constructors-unrelated/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-dotty/sbt-test/source-dependencies/continuations/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/continuations/project/plugins.sbt deleted file mode 100644 index c17caab2d98c..000000000000 --- a/sbt-dotty/sbt-test/source-dependencies/continuations/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-dotty/sbt-test/source-dependencies/cross-source/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/cross-source/project/plugins.sbt deleted file mode 100644 index c17caab2d98c..000000000000 --- a/sbt-dotty/sbt-test/source-dependencies/cross-source/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-dotty/sbt-test/source-dependencies/default-params/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/default-params/project/plugins.sbt deleted file mode 100644 index c17caab2d98c..000000000000 --- a/sbt-dotty/sbt-test/source-dependencies/default-params/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-dotty/sbt-test/source-dependencies/dup-class/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/dup-class/project/plugins.sbt deleted file mode 100644 index c17caab2d98c..000000000000 --- a/sbt-dotty/sbt-test/source-dependencies/dup-class/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-dotty/sbt-test/source-dependencies/empty-a/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/empty-a/project/plugins.sbt deleted file mode 100644 index c17caab2d98c..000000000000 --- a/sbt-dotty/sbt-test/source-dependencies/empty-a/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-dotty/sbt-test/source-dependencies/empty-modified-names/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/empty-modified-names/project/plugins.sbt deleted file mode 100644 index c17caab2d98c..000000000000 --- a/sbt-dotty/sbt-test/source-dependencies/empty-modified-names/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-dotty/sbt-test/source-dependencies/empty-package/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/empty-package/project/plugins.sbt deleted file mode 100644 index c17caab2d98c..000000000000 --- a/sbt-dotty/sbt-test/source-dependencies/empty-package/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-dotty/sbt-test/source-dependencies/erasure/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/erasure/project/plugins.sbt deleted file mode 100644 index c17caab2d98c..000000000000 --- a/sbt-dotty/sbt-test/source-dependencies/erasure/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-dotty/sbt-test/source-dependencies/expanded-type-projection/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/expanded-type-projection/project/plugins.sbt deleted file mode 100644 index c17caab2d98c..000000000000 --- a/sbt-dotty/sbt-test/source-dependencies/expanded-type-projection/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-dotty/sbt-test/source-dependencies/export-clauses/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/export-clauses/project/plugins.sbt deleted file mode 100644 index c17caab2d98c..000000000000 --- a/sbt-dotty/sbt-test/source-dependencies/export-clauses/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-dotty/sbt-test/source-dependencies/export-jars/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/export-jars/project/plugins.sbt deleted file mode 100644 index c17caab2d98c..000000000000 --- a/sbt-dotty/sbt-test/source-dependencies/export-jars/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-dotty/sbt-test/source-dependencies/export-jars2/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/export-jars2/project/plugins.sbt deleted file mode 100644 index c17caab2d98c..000000000000 --- a/sbt-dotty/sbt-test/source-dependencies/export-jars2/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-dotty/sbt-test/source-dependencies/false-error/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/false-error/project/plugins.sbt deleted file mode 100644 index c17caab2d98c..000000000000 --- a/sbt-dotty/sbt-test/source-dependencies/false-error/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-dotty/sbt-test/source-dependencies/fbounded-existentials/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/fbounded-existentials/project/plugins.sbt deleted file mode 100644 index c17caab2d98c..000000000000 --- a/sbt-dotty/sbt-test/source-dependencies/fbounded-existentials/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-dotty/sbt-test/source-dependencies/implicit-params/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/implicit-params/project/plugins.sbt deleted file mode 100644 index c17caab2d98c..000000000000 --- a/sbt-dotty/sbt-test/source-dependencies/implicit-params/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-dotty/sbt-test/source-dependencies/implicit-search-companion-scope/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/implicit-search-companion-scope/project/plugins.sbt deleted file mode 100644 index c17caab2d98c..000000000000 --- a/sbt-dotty/sbt-test/source-dependencies/implicit-search-companion-scope/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-dotty/sbt-test/source-dependencies/implicit-search-higher-kinded/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/implicit-search-higher-kinded/project/plugins.sbt deleted file mode 100644 index c17caab2d98c..000000000000 --- a/sbt-dotty/sbt-test/source-dependencies/implicit-search-higher-kinded/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-dotty/sbt-test/source-dependencies/implicit-search/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/implicit-search/project/plugins.sbt deleted file mode 100644 index c17caab2d98c..000000000000 --- a/sbt-dotty/sbt-test/source-dependencies/implicit-search/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-dotty/sbt-test/source-dependencies/implicit/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/implicit/project/plugins.sbt deleted file mode 100644 index c17caab2d98c..000000000000 --- a/sbt-dotty/sbt-test/source-dependencies/implicit/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-dotty/sbt-test/source-dependencies/import-class/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/import-class/project/plugins.sbt deleted file mode 100644 index c17caab2d98c..000000000000 --- a/sbt-dotty/sbt-test/source-dependencies/import-class/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-dotty/sbt-test/source-dependencies/import-package/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/import-package/project/plugins.sbt deleted file mode 100644 index c17caab2d98c..000000000000 --- a/sbt-dotty/sbt-test/source-dependencies/import-package/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-dotty/sbt-test/source-dependencies/inherited-deps-java/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/inherited-deps-java/project/plugins.sbt deleted file mode 100644 index c17caab2d98c..000000000000 --- a/sbt-dotty/sbt-test/source-dependencies/inherited-deps-java/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-dotty/sbt-test/source-dependencies/inherited_type_params/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/inherited_type_params/project/plugins.sbt deleted file mode 100644 index c17caab2d98c..000000000000 --- a/sbt-dotty/sbt-test/source-dependencies/inherited_type_params/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-dotty/sbt-test/source-dependencies/inline-inherited/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/inline-inherited/project/plugins.sbt deleted file mode 100644 index c17caab2d98c..000000000000 --- a/sbt-dotty/sbt-test/source-dependencies/inline-inherited/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-dotty/sbt-test/source-dependencies/inline/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/inline/project/plugins.sbt deleted file mode 100644 index c17caab2d98c..000000000000 --- a/sbt-dotty/sbt-test/source-dependencies/inline/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-dotty/sbt-test/source-dependencies/inner-class-java-depends-on-scala/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/inner-class-java-depends-on-scala/project/plugins.sbt deleted file mode 100644 index c17caab2d98c..000000000000 --- a/sbt-dotty/sbt-test/source-dependencies/inner-class-java-depends-on-scala/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-dotty/sbt-test/source-dependencies/inner-class/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/inner-class/project/plugins.sbt deleted file mode 100644 index c17caab2d98c..000000000000 --- a/sbt-dotty/sbt-test/source-dependencies/inner-class/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-dotty/sbt-test/source-dependencies/inner-object/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/inner-object/project/plugins.sbt deleted file mode 100644 index c17caab2d98c..000000000000 --- a/sbt-dotty/sbt-test/source-dependencies/inner-object/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-dotty/sbt-test/source-dependencies/intermediate-error/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/intermediate-error/project/plugins.sbt deleted file mode 100644 index c17caab2d98c..000000000000 --- a/sbt-dotty/sbt-test/source-dependencies/intermediate-error/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-dotty/sbt-test/source-dependencies/java-analysis-serialization-error/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/java-analysis-serialization-error/project/plugins.sbt deleted file mode 100644 index c17caab2d98c..000000000000 --- a/sbt-dotty/sbt-test/source-dependencies/java-analysis-serialization-error/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-dotty/sbt-test/source-dependencies/java-anonymous/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/java-anonymous/project/plugins.sbt deleted file mode 100644 index c17caab2d98c..000000000000 --- a/sbt-dotty/sbt-test/source-dependencies/java-anonymous/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-dotty/sbt-test/source-dependencies/java-basic/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/java-basic/project/plugins.sbt deleted file mode 100644 index c17caab2d98c..000000000000 --- a/sbt-dotty/sbt-test/source-dependencies/java-basic/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-dotty/sbt-test/source-dependencies/java-enum/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/java-enum/project/plugins.sbt deleted file mode 100644 index c17caab2d98c..000000000000 --- a/sbt-dotty/sbt-test/source-dependencies/java-enum/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-dotty/sbt-test/source-dependencies/java-generic-workaround/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/java-generic-workaround/project/plugins.sbt deleted file mode 100644 index c17caab2d98c..000000000000 --- a/sbt-dotty/sbt-test/source-dependencies/java-generic-workaround/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-dotty/sbt-test/source-dependencies/java-inner/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/java-inner/project/plugins.sbt deleted file mode 100644 index c17caab2d98c..000000000000 --- a/sbt-dotty/sbt-test/source-dependencies/java-inner/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-dotty/sbt-test/source-dependencies/java-lambda-typeparams/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/java-lambda-typeparams/project/plugins.sbt deleted file mode 100644 index c17caab2d98c..000000000000 --- a/sbt-dotty/sbt-test/source-dependencies/java-lambda-typeparams/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-dotty/sbt-test/source-dependencies/java-mixed/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/java-mixed/project/plugins.sbt deleted file mode 100644 index c17caab2d98c..000000000000 --- a/sbt-dotty/sbt-test/source-dependencies/java-mixed/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-dotty/sbt-test/source-dependencies/java-name-with-dollars/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/java-name-with-dollars/project/plugins.sbt deleted file mode 100644 index c17caab2d98c..000000000000 --- a/sbt-dotty/sbt-test/source-dependencies/java-name-with-dollars/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-dotty/sbt-test/source-dependencies/java-static/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/java-static/project/plugins.sbt deleted file mode 100644 index c17caab2d98c..000000000000 --- a/sbt-dotty/sbt-test/source-dependencies/java-static/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-dotty/sbt-test/source-dependencies/lazy-val/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/lazy-val/project/plugins.sbt deleted file mode 100644 index c17caab2d98c..000000000000 --- a/sbt-dotty/sbt-test/source-dependencies/lazy-val/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-dotty/sbt-test/source-dependencies/less-inter-inv-java/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/less-inter-inv-java/project/plugins.sbt deleted file mode 100644 index c17caab2d98c..000000000000 --- a/sbt-dotty/sbt-test/source-dependencies/less-inter-inv-java/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-dotty/sbt-test/source-dependencies/less-inter-inv/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/less-inter-inv/project/plugins.sbt deleted file mode 100644 index c17caab2d98c..000000000000 --- a/sbt-dotty/sbt-test/source-dependencies/less-inter-inv/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-dotty/sbt-test/source-dependencies/linearization/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/linearization/project/plugins.sbt deleted file mode 100644 index c17caab2d98c..000000000000 --- a/sbt-dotty/sbt-test/source-dependencies/linearization/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-dotty/sbt-test/source-dependencies/local-class-inheritance-from-java/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/local-class-inheritance-from-java/project/plugins.sbt deleted file mode 100644 index c17caab2d98c..000000000000 --- a/sbt-dotty/sbt-test/source-dependencies/local-class-inheritance-from-java/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-dotty/sbt-test/source-dependencies/local-class-inheritance/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/local-class-inheritance/project/plugins.sbt deleted file mode 100644 index c17caab2d98c..000000000000 --- a/sbt-dotty/sbt-test/source-dependencies/local-class-inheritance/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-dotty/sbt-test/source-dependencies/macro-expansion-dependencies-1/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/macro-expansion-dependencies-1/project/plugins.sbt deleted file mode 100644 index c17caab2d98c..000000000000 --- a/sbt-dotty/sbt-test/source-dependencies/macro-expansion-dependencies-1/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-dotty/sbt-test/source-dependencies/macro-expansion-dependencies-2/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/macro-expansion-dependencies-2/project/plugins.sbt deleted file mode 100644 index c17caab2d98c..000000000000 --- a/sbt-dotty/sbt-test/source-dependencies/macro-expansion-dependencies-2/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-dotty/sbt-test/source-dependencies/macro-expansion-dependencies-3/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/macro-expansion-dependencies-3/project/plugins.sbt deleted file mode 100644 index c17caab2d98c..000000000000 --- a/sbt-dotty/sbt-test/source-dependencies/macro-expansion-dependencies-3/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-dotty/sbt-test/source-dependencies/malformed-class-name-with-dollar/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/malformed-class-name-with-dollar/project/plugins.sbt deleted file mode 100644 index c17caab2d98c..000000000000 --- a/sbt-dotty/sbt-test/source-dependencies/malformed-class-name-with-dollar/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-dotty/sbt-test/source-dependencies/malformed-class-name/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/malformed-class-name/project/plugins.sbt deleted file mode 100644 index c17caab2d98c..000000000000 --- a/sbt-dotty/sbt-test/source-dependencies/malformed-class-name/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-dotty/sbt-test/source-dependencies/missing-annot/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/missing-annot/project/plugins.sbt deleted file mode 100644 index c17caab2d98c..000000000000 --- a/sbt-dotty/sbt-test/source-dependencies/missing-annot/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-dotty/sbt-test/source-dependencies/named/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/named/project/plugins.sbt deleted file mode 100644 index c17caab2d98c..000000000000 --- a/sbt-dotty/sbt-test/source-dependencies/named/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-dotty/sbt-test/source-dependencies/nested-case-class/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/nested-case-class/project/plugins.sbt deleted file mode 100644 index c17caab2d98c..000000000000 --- a/sbt-dotty/sbt-test/source-dependencies/nested-case-class/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-dotty/sbt-test/source-dependencies/nested-type-params/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/nested-type-params/project/plugins.sbt deleted file mode 100644 index c17caab2d98c..000000000000 --- a/sbt-dotty/sbt-test/source-dependencies/nested-type-params/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-dotty/sbt-test/source-dependencies/new-cyclic/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/new-cyclic/project/plugins.sbt deleted file mode 100644 index c17caab2d98c..000000000000 --- a/sbt-dotty/sbt-test/source-dependencies/new-cyclic/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-dotty/sbt-test/source-dependencies/new-pkg-dep/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/new-pkg-dep/project/plugins.sbt deleted file mode 100644 index c17caab2d98c..000000000000 --- a/sbt-dotty/sbt-test/source-dependencies/new-pkg-dep/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-dotty/sbt-test/source-dependencies/override/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/override/project/plugins.sbt deleted file mode 100644 index c17caab2d98c..000000000000 --- a/sbt-dotty/sbt-test/source-dependencies/override/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-dotty/sbt-test/source-dependencies/package-object-implicit/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/package-object-implicit/project/plugins.sbt deleted file mode 100644 index c17caab2d98c..000000000000 --- a/sbt-dotty/sbt-test/source-dependencies/package-object-implicit/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-dotty/sbt-test/source-dependencies/package-object-name/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/package-object-name/project/plugins.sbt deleted file mode 100644 index c17caab2d98c..000000000000 --- a/sbt-dotty/sbt-test/source-dependencies/package-object-name/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-dotty/sbt-test/source-dependencies/package-object-nested-class/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/package-object-nested-class/project/plugins.sbt deleted file mode 100644 index c17caab2d98c..000000000000 --- a/sbt-dotty/sbt-test/source-dependencies/package-object-nested-class/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-dotty/sbt-test/source-dependencies/packageobject-and-traits/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/packageobject-and-traits/project/plugins.sbt deleted file mode 100644 index c17caab2d98c..000000000000 --- a/sbt-dotty/sbt-test/source-dependencies/packageobject-and-traits/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-dotty/sbt-test/source-dependencies/parent-change/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/parent-change/project/plugins.sbt deleted file mode 100644 index c17caab2d98c..000000000000 --- a/sbt-dotty/sbt-test/source-dependencies/parent-change/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-dotty/sbt-test/source-dependencies/parent-member-change/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/parent-member-change/project/plugins.sbt deleted file mode 100644 index c17caab2d98c..000000000000 --- a/sbt-dotty/sbt-test/source-dependencies/parent-member-change/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-dotty/sbt-test/source-dependencies/pkg-private-class/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/pkg-private-class/project/plugins.sbt deleted file mode 100644 index c17caab2d98c..000000000000 --- a/sbt-dotty/sbt-test/source-dependencies/pkg-private-class/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-dotty/sbt-test/source-dependencies/pkg-self/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/pkg-self/project/plugins.sbt deleted file mode 100644 index c17caab2d98c..000000000000 --- a/sbt-dotty/sbt-test/source-dependencies/pkg-self/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-dotty/sbt-test/source-dependencies/recorded-products/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/recorded-products/project/plugins.sbt deleted file mode 100644 index c17caab2d98c..000000000000 --- a/sbt-dotty/sbt-test/source-dependencies/recorded-products/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-dotty/sbt-test/source-dependencies/remove-test-a/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/remove-test-a/project/plugins.sbt deleted file mode 100644 index c17caab2d98c..000000000000 --- a/sbt-dotty/sbt-test/source-dependencies/remove-test-a/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-dotty/sbt-test/source-dependencies/remove-test-b/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/remove-test-b/project/plugins.sbt deleted file mode 100644 index c17caab2d98c..000000000000 --- a/sbt-dotty/sbt-test/source-dependencies/remove-test-b/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-dotty/sbt-test/source-dependencies/repeated-parameters/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/repeated-parameters/project/plugins.sbt deleted file mode 100644 index c17caab2d98c..000000000000 --- a/sbt-dotty/sbt-test/source-dependencies/repeated-parameters/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-dotty/sbt-test/source-dependencies/replace-test-a/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/replace-test-a/project/plugins.sbt deleted file mode 100644 index c17caab2d98c..000000000000 --- a/sbt-dotty/sbt-test/source-dependencies/replace-test-a/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-dotty/sbt-test/source-dependencies/resident-java/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/resident-java/project/plugins.sbt deleted file mode 100644 index c17caab2d98c..000000000000 --- a/sbt-dotty/sbt-test/source-dependencies/resident-java/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-dotty/sbt-test/source-dependencies/resident-package-object/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/resident-package-object/project/plugins.sbt deleted file mode 100644 index c17caab2d98c..000000000000 --- a/sbt-dotty/sbt-test/source-dependencies/resident-package-object/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-dotty/sbt-test/source-dependencies/restore-classes/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/restore-classes/project/plugins.sbt deleted file mode 100644 index c17caab2d98c..000000000000 --- a/sbt-dotty/sbt-test/source-dependencies/restore-classes/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-dotty/sbt-test/source-dependencies/same-file-used-names/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/same-file-used-names/project/plugins.sbt deleted file mode 100644 index c17caab2d98c..000000000000 --- a/sbt-dotty/sbt-test/source-dependencies/same-file-used-names/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-dotty/sbt-test/source-dependencies/sealed/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/sealed/project/plugins.sbt deleted file mode 100644 index c17caab2d98c..000000000000 --- a/sbt-dotty/sbt-test/source-dependencies/sealed/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-dotty/sbt-test/source-dependencies/signature-change/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/signature-change/project/plugins.sbt deleted file mode 100644 index c17caab2d98c..000000000000 --- a/sbt-dotty/sbt-test/source-dependencies/signature-change/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-dotty/sbt-test/source-dependencies/specialized/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/specialized/project/plugins.sbt deleted file mode 100644 index c17caab2d98c..000000000000 --- a/sbt-dotty/sbt-test/source-dependencies/specialized/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-dotty/sbt-test/source-dependencies/stability-change/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/stability-change/project/plugins.sbt deleted file mode 100644 index c17caab2d98c..000000000000 --- a/sbt-dotty/sbt-test/source-dependencies/stability-change/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-dotty/sbt-test/source-dependencies/struct-projection/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/struct-projection/project/plugins.sbt deleted file mode 100644 index c17caab2d98c..000000000000 --- a/sbt-dotty/sbt-test/source-dependencies/struct-projection/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-dotty/sbt-test/source-dependencies/struct-usage/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/struct-usage/project/plugins.sbt deleted file mode 100644 index c17caab2d98c..000000000000 --- a/sbt-dotty/sbt-test/source-dependencies/struct-usage/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-dotty/sbt-test/source-dependencies/struct/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/struct/project/plugins.sbt deleted file mode 100644 index c17caab2d98c..000000000000 --- a/sbt-dotty/sbt-test/source-dependencies/struct/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-dotty/sbt-test/source-dependencies/trait-member-modified/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/trait-member-modified/project/plugins.sbt deleted file mode 100644 index c17caab2d98c..000000000000 --- a/sbt-dotty/sbt-test/source-dependencies/trait-member-modified/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-dotty/sbt-test/source-dependencies/trait-private-val/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/trait-private-val/project/plugins.sbt deleted file mode 100644 index c17caab2d98c..000000000000 --- a/sbt-dotty/sbt-test/source-dependencies/trait-private-val/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-dotty/sbt-test/source-dependencies/trait-private-var/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/trait-private-var/project/plugins.sbt deleted file mode 100644 index c17caab2d98c..000000000000 --- a/sbt-dotty/sbt-test/source-dependencies/trait-private-var/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-dotty/sbt-test/source-dependencies/trait-super/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/trait-super/project/plugins.sbt deleted file mode 100644 index c17caab2d98c..000000000000 --- a/sbt-dotty/sbt-test/source-dependencies/trait-super/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-dotty/sbt-test/source-dependencies/transitive-a/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/transitive-a/project/plugins.sbt deleted file mode 100644 index c17caab2d98c..000000000000 --- a/sbt-dotty/sbt-test/source-dependencies/transitive-a/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-dotty/sbt-test/source-dependencies/transitive-b/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/transitive-b/project/plugins.sbt deleted file mode 100644 index c17caab2d98c..000000000000 --- a/sbt-dotty/sbt-test/source-dependencies/transitive-b/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-dotty/sbt-test/source-dependencies/transitive-class/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/transitive-class/project/plugins.sbt deleted file mode 100644 index c17caab2d98c..000000000000 --- a/sbt-dotty/sbt-test/source-dependencies/transitive-class/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-dotty/sbt-test/source-dependencies/transitive-inherit-java/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/transitive-inherit-java/project/plugins.sbt deleted file mode 100644 index c17caab2d98c..000000000000 --- a/sbt-dotty/sbt-test/source-dependencies/transitive-inherit-java/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-dotty/sbt-test/source-dependencies/transitive-inherit/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/transitive-inherit/project/plugins.sbt deleted file mode 100644 index c17caab2d98c..000000000000 --- a/sbt-dotty/sbt-test/source-dependencies/transitive-inherit/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-dotty/sbt-test/source-dependencies/transitive-memberRef/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/transitive-memberRef/project/plugins.sbt deleted file mode 100644 index c17caab2d98c..000000000000 --- a/sbt-dotty/sbt-test/source-dependencies/transitive-memberRef/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-dotty/sbt-test/source-dependencies/type-member-nested-object/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/type-member-nested-object/project/plugins.sbt deleted file mode 100644 index c17caab2d98c..000000000000 --- a/sbt-dotty/sbt-test/source-dependencies/type-member-nested-object/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-dotty/sbt-test/source-dependencies/type-parameter/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/type-parameter/project/plugins.sbt deleted file mode 100644 index c17caab2d98c..000000000000 --- a/sbt-dotty/sbt-test/source-dependencies/type-parameter/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-dotty/sbt-test/source-dependencies/typeargref/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/typeargref/project/plugins.sbt deleted file mode 100644 index c17caab2d98c..000000000000 --- a/sbt-dotty/sbt-test/source-dependencies/typeargref/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-dotty/sbt-test/source-dependencies/typeref-only/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/typeref-only/project/plugins.sbt deleted file mode 100644 index c17caab2d98c..000000000000 --- a/sbt-dotty/sbt-test/source-dependencies/typeref-only/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-dotty/sbt-test/source-dependencies/typeref-return/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/typeref-return/project/plugins.sbt deleted file mode 100644 index c17caab2d98c..000000000000 --- a/sbt-dotty/sbt-test/source-dependencies/typeref-return/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-dotty/sbt-test/source-dependencies/types-in-used-names-a/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/types-in-used-names-a/project/plugins.sbt deleted file mode 100644 index c17caab2d98c..000000000000 --- a/sbt-dotty/sbt-test/source-dependencies/types-in-used-names-a/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-dotty/sbt-test/source-dependencies/types-in-used-names-b/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/types-in-used-names-b/project/plugins.sbt deleted file mode 100644 index c17caab2d98c..000000000000 --- a/sbt-dotty/sbt-test/source-dependencies/types-in-used-names-b/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-dotty/sbt-test/source-dependencies/value-class-underlying/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/value-class-underlying/project/plugins.sbt deleted file mode 100644 index c17caab2d98c..000000000000 --- a/sbt-dotty/sbt-test/source-dependencies/value-class-underlying/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-dotty/sbt-test/source-dependencies/value-class/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/value-class/project/plugins.sbt deleted file mode 100644 index c17caab2d98c..000000000000 --- a/sbt-dotty/sbt-test/source-dependencies/value-class/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-dotty/sbt-test/source-dependencies/var/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/var/project/plugins.sbt deleted file mode 100644 index c17caab2d98c..000000000000 --- a/sbt-dotty/sbt-test/source-dependencies/var/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-dotty/sbt-test/source-dependencies/variance/project/plugins.sbt b/sbt-dotty/sbt-test/source-dependencies/variance/project/plugins.sbt deleted file mode 100644 index c17caab2d98c..000000000000 --- a/sbt-dotty/sbt-test/source-dependencies/variance/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) diff --git a/sbt-dotty/src/dotty/tools/sbtplugin/DottyIDEPlugin.scala b/sbt-dotty/src/dotty/tools/sbtplugin/DottyIDEPlugin.scala index d85e3baa36d8..f455692a2672 100644 --- a/sbt-dotty/src/dotty/tools/sbtplugin/DottyIDEPlugin.scala +++ b/sbt-dotty/src/dotty/tools/sbtplugin/DottyIDEPlugin.scala @@ -13,7 +13,6 @@ import dotty.tools.languageserver.config.ProjectConfig import com.fasterxml.jackson.databind.ObjectMapper import scala.collection.mutable.ListBuffer -import DottyPlugin.autoImport._ object DottyIDEPlugin extends AutoPlugin { object autoImport {