Skip to content

community-build: Update stdLib213 #6137

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
Mar 22, 2019
Merged

community-build: Update stdLib213 #6137

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
48b20eb
community-build: Update stdLib213
smarter Mar 21, 2019
24a2d6f
community-build: turn off SNAPSHOT updating in the meta-build too
smarter Mar 21, 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
2 changes: 1 addition & 1 deletion community-build/community-projects/stdLib213
Open in desktop
Submodule stdLib213 updated 398 files
16 changes: 9 additions & 7 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 @@ -24,8 +24,9 @@ class CommunityBuildTest {
* @param project The project name, should be a git submodule in community-build/
* @param command The sbt command used to test the project
* @param updateCommand The sbt command used to update the project
* @param extraSbtArgs Extra arguments to pass to sbt
*/
def test(project: String, testCommand: String, updateCommand: String): Unit = {
def test(project: String, testCommand: String, updateCommand: String, extraSbtArgs: Seq[String] = Nil): Unit = {
def log(msg: String) = println(Console.GREEN + msg + Console.RESET)

log(s"Building $project with dotty-bootstrapped $compilerVersion...")
Expand Down Expand Up @@ -57,7 +58,7 @@ class CommunityBuildTest {
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(
val arguments = extraSbtArgs ++ Seq(
"-sbt-version", "1.2.7",
s"--addPluginSbtFile=$pluginFilePath",
s";clean ;set updateOptions in Global ~= (_.withLatestSnapshots(false)) ;++$compilerVersion! $testCommand"
Expand All @@ -74,8 +75,8 @@ class CommunityBuildTest {
| cd community-build/community-projects/$project
| sbt ${arguments.init.mkString(" ")} "${arguments.last}"
|
|For a faster feedback loop, one can try to extract a direct call to dotc from
|usign the sbt export command. For instance, for scalacheck, use
|For a faster feedback loop, one can try to extract a direct call to dotc
|using the sbt export command. For instance, for scalacheck, use
| sbt export jvm/test:compileIncremental
|
|""".stripMargin)
Expand Down Expand Up @@ -152,7 +153,8 @@ class CommunityBuildTest {
@Test def stdLib213 = test(
project = "stdLib213",
testCommand = "library/compile",
updateCommand = "library/update"
updateCommand = "library/update",
extraSbtArgs = Seq("-Dscala.build.compileWithDotty=true")
)

// TODO @oderky? It got broken by #5458
Expand All @@ -168,6 +170,6 @@ class UpdateCategory

@Category(Array(classOf[UpdateCategory]))
class CommunityBuildUpdate extends CommunityBuildTest {
override def test(project: String, testCommand: String, updateCommand: String): Unit =
super.test(project, updateCommand, null)
override def test(project: String, testCommand: String, updateCommand: String, extraSbtArgs: Seq[String]): Unit =
super.test(project, updateCommand, null, extraSbtArgs)
}
4 changes: 3 additions & 1 deletion project/Build.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -918,7 +918,9 @@ object Build {
(publishLocal in `dotty-compiler-bootstrapped`).value
(publishLocal in `sbt-dotty`).value
(publishLocal in `dotty-bootstrapped`).value
val pluginText = s"""addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % "$sbtDottyVersion")"""
val pluginText =
s"""updateOptions in Global ~= (_.withLatestSnapshots(false))
|addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % "$sbtDottyVersion")""".stripMargin
IO.write(baseDirectory.value / "sbt-dotty-sbt", pluginText)
IO.write(baseDirectory.value / "dotty-bootstrapped.version", dottyVersion)
},
Expand Down