Skip to content

Commit ae85908

Browse files
committed
Drop support for old experimental in community-build
1 parent 35c7d74 commit ae85908

File tree

2 files changed

+8
-22
lines changed

2 files changed

+8
-22
lines changed

Diff for: community-build/src/scala/dotty/communitybuild/CommunityBuildRunner.scala

+6-7
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,12 @@ object CommunityBuildRunner:
1616
* and avoid network overhead. See https://github.com/lampepfl/dotty-drone
1717
* for more infrastructural details.
1818
*/
19-
extension (self: CommunityProject) def run()(using suite: CommunityBuildRunner): Unit =
20-
if self.requiresExperimental && !compilerSupportExperimental then
21-
log(s"Skipping ${self.project} - it needs experimental features unsupported in this build.")
22-
return
23-
self.dependencies.foreach(_.publish())
24-
self.testOnlyDependencies().foreach(_.publish())
25-
suite.runProject(self)
19+
extension (self: CommunityProject)
20+
def run()(using suite: CommunityBuildRunner): Unit =
21+
self.dependencies.foreach(_.publish())
22+
self.testOnlyDependencies().foreach(_.publish())
23+
suite.runProject(self)
24+
end extension
2625

2726
trait CommunityBuildRunner:
2827

Diff for: community-build/src/scala/dotty/communitybuild/projects.scala

+2-15
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,6 @@ lazy val compilerVersion: String =
1010
val file = communitybuildDir.resolve("scala3-bootstrapped.version")
1111
new String(Files.readAllBytes(file), UTF_8)
1212

13-
lazy val compilerSupportExperimental: Boolean =
14-
compilerVersion.contains("SNAPSHOT") || compilerVersion.contains("NIGHTLY")
15-
1613
lazy val sbtPluginFilePath: String =
1714
// Workaround for https://github.com/sbt/sbt/issues/4395
1815
new File(sys.props("user.home") + "/.sbt/1.0/plugins").mkdirs()
@@ -43,7 +40,6 @@ sealed trait CommunityProject:
4340
val testOnlyDependencies: () => List[CommunityProject]
4441
val binaryName: String
4542
val runCommandsArgs: List[String] = Nil
46-
val requiresExperimental: Boolean
4743
val environment: Map[String, String] = Map.empty
4844

4945
final val projectDir = communitybuildDir.resolve("community-projects").resolve(project)
@@ -53,7 +49,6 @@ sealed trait CommunityProject:
5349

5450
/** Publish this project to the local Maven repository */
5551
final def publish(): Unit =
56-
// TODO what should this do with .requiresExperimental?
5752
if !published then
5853
publishDependencies()
5954
log(s"Publishing $project")
@@ -65,11 +60,6 @@ sealed trait CommunityProject:
6560
published = true
6661

6762
final def doc(): Unit =
68-
if this.requiresExperimental && !compilerSupportExperimental then
69-
log(
70-
s"Skipping ${this.project} - it needs experimental features unsupported in this build."
71-
)
72-
return
7363
publishDependencies()
7464
log(s"Documenting $project")
7565
if docCommand eq null then
@@ -89,8 +79,7 @@ final case class MillCommunityProject(
8979
baseCommand: String,
9080
dependencies: List[CommunityProject] = Nil,
9181
testOnlyDependencies: () => List[CommunityProject] = () => Nil,
92-
ignoreDocs: Boolean = false,
93-
requiresExperimental: Boolean = false,
82+
ignoreDocs: Boolean = false
9483
) extends CommunityProject:
9584
override val binaryName: String = "./mill"
9685
override val testCommand = s"$baseCommand.test"
@@ -109,8 +98,7 @@ final case class SbtCommunityProject(
10998
testOnlyDependencies: () => List[CommunityProject] = () => Nil,
11099
sbtPublishCommand: String = null,
111100
sbtDocCommand: String = null,
112-
scalacOptions: List[String] = SbtCommunityProject.scalacOptions,
113-
requiresExperimental: Boolean = false,
101+
scalacOptions: List[String] = SbtCommunityProject.scalacOptions
114102
) extends CommunityProject:
115103
override val binaryName: String = "sbt"
116104

@@ -260,7 +248,6 @@ object projects:
260248
project = "intent",
261249
sbtTestCommand = "test",
262250
sbtDocCommand = "doc",
263-
requiresExperimental = true,
264251
)
265252

266253
lazy val scalacheck = SbtCommunityProject(

0 commit comments

Comments
 (0)