From d17806ca6e06a2841bccfe98b7ada9db4c523c2f Mon Sep 17 00:00:00 2001 From: Boris Date: Fri, 5 Mar 2021 22:33:15 +0100 Subject: [PATCH 1/2] Added scopt. --- .gitmodules | 3 +++ community-build/community-projects/scopt | 1 + .../src/scala/dotty/communitybuild/projects.scala | 9 +++++++++ .../scala/dotty/communitybuild/CommunityBuildTest.scala | 2 ++ 4 files changed, 15 insertions(+) create mode 160000 community-build/community-projects/scopt diff --git a/.gitmodules b/.gitmodules index 72af6f16258c..75fa96ef401b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -187,6 +187,9 @@ [submodule "community-build/community-projects/protoquill"] path = community-build/community-projects/protoquill url = https://github.com/dotty-staging/protoquill.git +[submodule "community-build/community-projects/scopt"] + path = community-build/community-projects/scopt + url = https://github.com/scopt/scopt.git [submodule "community-build/community-projects/onnx-scala"] path = community-build/community-projects/onnx-scala url = https://github.com/dotty-staging/onnx-scala.git diff --git a/community-build/community-projects/scopt b/community-build/community-projects/scopt new file mode 160000 index 000000000000..0e307a23c239 --- /dev/null +++ b/community-build/community-projects/scopt @@ -0,0 +1 @@ +Subproject commit 0e307a23c239c9e00d3676f13e2d312c9e3e12c9 diff --git a/community-build/src/scala/dotty/communitybuild/projects.scala b/community-build/src/scala/dotty/communitybuild/projects.scala index dc989d4bd65c..48e68926d12c 100644 --- a/community-build/src/scala/dotty/communitybuild/projects.scala +++ b/community-build/src/scala/dotty/communitybuild/projects.scala @@ -406,6 +406,14 @@ object projects: dependencies = List(munit, scodecBits) ) + lazy val scopt = SbtCommunityProject( + project = "scopt", + sbtTestCommand = "scoptJVM/test", + // Adds package + dependencies = List(verify) + ) + + lazy val scalaParserCombinators = SbtCommunityProject( project = "scala-parser-combinators", sbtTestCommand = "parserCombinatorsJVM/test", @@ -690,6 +698,7 @@ def allProjects = List( projects.discipline, projects.disciplineMunit, projects.disciplineSpecs2, + projects.scopt, projects.simulacrumScalafixAnnotations, projects.cats, projects.catsMtl, diff --git a/community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala b/community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala index bb22a7ef2679..ade4445d3547 100644 --- a/community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala +++ b/community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala @@ -93,6 +93,8 @@ class CommunityBuildTestA extends CommunityBuildTest: @Test def geny = projects.geny.run() @Test def izumiReflect = projects.izumiReflect.run() @Test def oslib = projects.oslib.run() + @Test def scopt = projects.scopt.run() + // @Test def oslibWatch = projects.oslibWatch.run() @Test def pprint = projects.pprint.run() @Test def requests = projects.requests.run() From 9f813b19b17943b4a2e68339044a930aa09f35c9 Mon Sep 17 00:00:00 2001 From: Boris Date: Sat, 6 Mar 2021 14:54:32 +0100 Subject: [PATCH 2/2] added sbtPublish commands. --- .../src/scala/dotty/communitybuild/projects.scala | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/community-build/src/scala/dotty/communitybuild/projects.scala b/community-build/src/scala/dotty/communitybuild/projects.scala index 48e68926d12c..5a22e27f71a2 100644 --- a/community-build/src/scala/dotty/communitybuild/projects.scala +++ b/community-build/src/scala/dotty/communitybuild/projects.scala @@ -409,7 +409,7 @@ object projects: lazy val scopt = SbtCommunityProject( project = "scopt", sbtTestCommand = "scoptJVM/test", - // Adds package + sbtPublishCommand = "scoptJVM/publishLocal", dependencies = List(verify) ) @@ -484,7 +484,8 @@ object projects: project = "verify", sbtTestCommand = "verifyJVM/test", sbtDocCommand = "verifyJVM/doc", - scalacOptions = SbtCommunityProject.scalacOptions.filter(_ != "-Xcheck-macros") // TODO enable -Xcheck-macros + scalacOptions = SbtCommunityProject.scalacOptions.filter(_ != "-Xcheck-macros"), // TODO enable -Xcheck-macros + sbtPublishCommand = "verifyJVM/publishLocal", ) lazy val discipline = SbtCommunityProject(