Skip to content

Rename community build sbt-dotty.sbt to sbt-dotty-sbt #5903

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 12, 2019
Merged

Rename community build sbt-dotty.sbt to sbt-dotty-sbt #5903

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9b074e8
Fix #5898: Rename sbt-dotty{.,-}sbt
OlivierBlanvillain Feb 11, 2019
1ea4798
Fix .gitignore to properly ignore these files
OlivierBlanvillain Feb 12, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 0 additions & 1 deletion community-build/dotty-bootstrapped.version
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion community-build/sbt-dotty.sbt
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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(
Expand Down
4 changes: 2 additions & 2 deletions project/Build.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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).
Expand All @@ -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,
Expand Down