diff --git a/.gitignore b/.gitignore index 234c7485c5d3..4c65f9b5126f 100644 --- a/.gitignore +++ b/.gitignore @@ -79,5 +79,6 @@ bench/compile.txt # The vscode app for testing vscode-dotty/.vscode-test -dotty-bootstrapped.version -sbt-dotty.sbt + +community-build/dotty-bootstrapped.version +community-build/sbt-dotty-sbt diff --git a/community-build/dotty-bootstrapped.version b/community-build/dotty-bootstrapped.version deleted file mode 100644 index ac36af3c02fb..000000000000 --- a/community-build/dotty-bootstrapped.version +++ /dev/null @@ -1 +0,0 @@ -0.13.0-bin-SNAPSHOT \ No newline at end of file diff --git a/community-build/sbt-dotty.sbt b/community-build/sbt-dotty.sbt deleted file mode 100644 index 557a03e88d2f..000000000000 --- a/community-build/sbt-dotty.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % "0.2.7-SNAPSHOT") \ No newline at end of file diff --git a/community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala b/community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala index a702dbc73511..e68fe9a6aa8f 100644 --- a/community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala +++ b/community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala @@ -17,7 +17,7 @@ class CommunityBuildTest { /** Build the given project with the published local compiler and sbt plugin. * * This test reads the compiler version from community-build/dotty-bootstrapped.version - * and expects community-build/sbt-dotty.sbt to set the compiler plugin. + * and expects community-build/sbt-dotty-sbt to set the compiler plugin. * * @param project The project name, should be a git submodule in community-build/ * @param command The sbt command used to build the project @@ -51,7 +51,7 @@ class CommunityBuildTest { // Workaround for https://github.com/sbt/sbt/issues/4395 new File(sys.props("user.home") + "/.sbt/1.0/plugins").mkdirs() - val pluginFilePath = communitybuildDir.resolve("sbt-dotty.sbt").toAbsolutePath().toString() + val pluginFilePath = communitybuildDir.resolve("sbt-dotty-sbt").toAbsolutePath().toString() // Run the sbt command with the compiler version and sbt plugin set in the build val arguments = Seq( diff --git a/project/Build.scala b/project/Build.scala index 64cd553b7eac..1a1e67ec979f 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -962,7 +962,7 @@ object Build { }.dependsOn(compile in Compile).evaluated ) - val prepareCommunityBuild = taskKey[Unit]("Publish local the compiler and the sbt plugin. Also store the versions of the published local artefacts in two files, community-build/{dotty-bootstrapped.version,sbt-dotty.sbt}.") + val prepareCommunityBuild = taskKey[Unit]("Publish local the compiler and the sbt plugin. Also store the versions of the published local artefacts in two files, community-build/{dotty-bootstrapped.version,sbt-dotty-sbt}.") lazy val `community-build` = project.in(file("community-build")). settings(commonNonBootstrappedSettings). @@ -978,7 +978,7 @@ object Build { (publishLocal in `sbt-dotty`).value (publishLocal in `dotty-bootstrapped`).value val pluginText = s"""addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % "$sbtDottyVersion")""" - IO.write(baseDirectory.value / "sbt-dotty.sbt", pluginText) + IO.write(baseDirectory.value / "sbt-dotty-sbt", pluginText) IO.write(baseDirectory.value / "dotty-bootstrapped.version", dottyVersion) }, (Test / testOnly) := ((Test / testOnly) dependsOn prepareCommunityBuild).evaluated,