From 92a58f3041eeb9e5068fc54411306465d08ba0bd Mon Sep 17 00:00:00 2001 From: Hamza REMMAL Date: Fri, 17 May 2024 17:50:56 +0200 Subject: [PATCH 1/3] Add gears to the community-build projects --- .gitmodules | 3 +++ community-build/community-projects/gears | 1 + .../src/scala/dotty/communitybuild/projects.scala | 9 +++++++++ 3 files changed, 13 insertions(+) create mode 160000 community-build/community-projects/gears diff --git a/.gitmodules b/.gitmodules index 8f87e992013a..78d685311122 100644 --- a/.gitmodules +++ b/.gitmodules @@ -221,3 +221,6 @@ [submodule "community-build/community-projects/shapeless-3"] path = community-build/community-projects/shapeless-3 url = https://github.com/dotty-staging/shapeless-3.git +[submodule "community-build/community-projects/gears"] + path = community-build/community-projects/gears + url = https://github.com/dotty-staging/gears.git diff --git a/community-build/community-projects/gears b/community-build/community-projects/gears new file mode 160000 index 000000000000..316d1d083673 --- /dev/null +++ b/community-build/community-projects/gears @@ -0,0 +1 @@ +Subproject commit 316d1d083673c35e74871c9b551b3ae3956e5424 diff --git a/community-build/src/scala/dotty/communitybuild/projects.scala b/community-build/src/scala/dotty/communitybuild/projects.scala index a0444505801a..0bdf82bec6f7 100644 --- a/community-build/src/scala/dotty/communitybuild/projects.scala +++ b/community-build/src/scala/dotty/communitybuild/projects.scala @@ -755,6 +755,14 @@ object projects: dependencies = List(utest, scalacheck) ) + lazy val gears = SbtCommunityProject( + project = "gears", + sbtTestCommand = "rootJVM/test", + sbtPublishCommand = "rootJVM/publishLocal", + scalacOptions = Nil, + dependencies = Nil + ) + end projects def allProjects = List( @@ -836,6 +844,7 @@ def allProjects = List( projects.spire, projects.http4s, projects.parboiled2, + projects.gears ) lazy val projectMap = allProjects.groupBy(_.project) From cee984630839c8d202a0b71465034969e328aa4f Mon Sep 17 00:00:00 2001 From: Hamza Remmal Date: Fri, 14 Jun 2024 11:15:44 +0100 Subject: [PATCH 2/3] trigger CLA --- community-build/src/scala/dotty/communitybuild/projects.scala | 1 + 1 file changed, 1 insertion(+) diff --git a/community-build/src/scala/dotty/communitybuild/projects.scala b/community-build/src/scala/dotty/communitybuild/projects.scala index 0bdf82bec6f7..b751cc864477 100644 --- a/community-build/src/scala/dotty/communitybuild/projects.scala +++ b/community-build/src/scala/dotty/communitybuild/projects.scala @@ -487,6 +487,7 @@ object projects: dependencies = List(scalacheck) ) + lazy val scalaCollectionCompat = SbtCommunityProject( project = "scala-collection-compat", sbtTestCommand = "compat30/test", From 222f642b26a38b17d648935de0c945eb04ba44c2 Mon Sep 17 00:00:00 2001 From: Hamza Remmal Date: Fri, 14 Jun 2024 11:17:20 +0100 Subject: [PATCH 3/3] should not trigger the CLA --- community-build/src/scala/dotty/communitybuild/projects.scala | 1 + 1 file changed, 1 insertion(+) diff --git a/community-build/src/scala/dotty/communitybuild/projects.scala b/community-build/src/scala/dotty/communitybuild/projects.scala index b751cc864477..81a0dfc0ee31 100644 --- a/community-build/src/scala/dotty/communitybuild/projects.scala +++ b/community-build/src/scala/dotty/communitybuild/projects.scala @@ -10,6 +10,7 @@ lazy val compilerVersion: String = val file = communitybuildDir.resolve("scala3-bootstrapped.version") new String(Files.readAllBytes(file), UTF_8) + lazy val compilerSupportExperimental: Boolean = compilerVersion.contains("SNAPSHOT") || compilerVersion.contains("NIGHTLY")