Skip to content

Commit eff7014

Browse files
authored
Merge pull request #5903 from dotty-staging/rename-community-build-sbt-dotty-sbt
Rename community build sbt-dotty.sbt to sbt-dotty-sbt
2 parents 66f57a0 + 1ea4798 commit eff7014

File tree

5 files changed

+7
-8
lines changed

5 files changed

+7
-8
lines changed

.gitignore

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,5 +79,6 @@ bench/compile.txt
7979

8080
# The vscode app for testing
8181
vscode-dotty/.vscode-test
82-
dotty-bootstrapped.version
83-
sbt-dotty.sbt
82+
83+
community-build/dotty-bootstrapped.version
84+
community-build/sbt-dotty-sbt

community-build/dotty-bootstrapped.version

Lines changed: 0 additions & 1 deletion
This file was deleted.

community-build/sbt-dotty.sbt

Lines changed: 0 additions & 1 deletion
This file was deleted.

community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ class CommunityBuildTest {
1717
/** Build the given project with the published local compiler and sbt plugin.
1818
*
1919
* This test reads the compiler version from community-build/dotty-bootstrapped.version
20-
* and expects community-build/sbt-dotty.sbt to set the compiler plugin.
20+
* and expects community-build/sbt-dotty-sbt to set the compiler plugin.
2121
*
2222
* @param project The project name, should be a git submodule in community-build/
2323
* @param command The sbt command used to build the project
@@ -51,7 +51,7 @@ class CommunityBuildTest {
5151

5252
// Workaround for https://github.com/sbt/sbt/issues/4395
5353
new File(sys.props("user.home") + "/.sbt/1.0/plugins").mkdirs()
54-
val pluginFilePath = communitybuildDir.resolve("sbt-dotty.sbt").toAbsolutePath().toString()
54+
val pluginFilePath = communitybuildDir.resolve("sbt-dotty-sbt").toAbsolutePath().toString()
5555

5656
// Run the sbt command with the compiler version and sbt plugin set in the build
5757
val arguments = Seq(

project/Build.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -962,7 +962,7 @@ object Build {
962962
}.dependsOn(compile in Compile).evaluated
963963
)
964964

965-
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}.")
965+
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}.")
966966

967967
lazy val `community-build` = project.in(file("community-build")).
968968
settings(commonNonBootstrappedSettings).
@@ -978,7 +978,7 @@ object Build {
978978
(publishLocal in `sbt-dotty`).value
979979
(publishLocal in `dotty-bootstrapped`).value
980980
val pluginText = s"""addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % "$sbtDottyVersion")"""
981-
IO.write(baseDirectory.value / "sbt-dotty.sbt", pluginText)
981+
IO.write(baseDirectory.value / "sbt-dotty-sbt", pluginText)
982982
IO.write(baseDirectory.value / "dotty-bootstrapped.version", dottyVersion)
983983
},
984984
(Test / testOnly) := ((Test / testOnly) dependsOn prepareCommunityBuild).evaluated,

0 commit comments

Comments
 (0)