From 079baf2b1d7a69ea9b5e1e642b211565e8ba2171 Mon Sep 17 00:00:00 2001 From: Liu Fengyun Date: Tue, 16 Feb 2021 11:33:15 +0100 Subject: [PATCH] Revert changes to shapeless To avoid unnecessary conflicts, we disable -Ycheck-init on shapeless. --- community-build/community-projects/shapeless | 2 +- .../src/scala/dotty/communitybuild/projects.scala | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/community-build/community-projects/shapeless b/community-build/community-projects/shapeless index 52ca352fefa3..bfa5dba99d64 160000 --- a/community-build/community-projects/shapeless +++ b/community-build/community-projects/shapeless @@ -1 +1 @@ -Subproject commit 52ca352fefa3090e91cbcddba4e7145a23fa5c1a +Subproject commit bfa5dba99d6402336a1fbaf687f5cb29b3e78fe2 diff --git a/community-build/src/scala/dotty/communitybuild/projects.scala b/community-build/src/scala/dotty/communitybuild/projects.scala index 8d588b468851..38589ec1c070 100644 --- a/community-build/src/scala/dotty/communitybuild/projects.scala +++ b/community-build/src/scala/dotty/communitybuild/projects.scala @@ -377,7 +377,8 @@ object projects: lazy val shapeless = SbtCommunityProject( project = "shapeless", sbtTestCommand = "test", - sbtDocCommand = forceDoc("typeable", "deriving", "data") + sbtDocCommand = forceDoc("typeable", "deriving", "data"), + scalacOptions = Nil // disable -Ycheck-init, due to -Xfatal-warnings ) lazy val xmlInterpolator = SbtCommunityProject( @@ -537,7 +538,7 @@ object projects: sbtTestCommand = "test", sbtPublishCommand = "coreJVM/publishLocal;coreJS/publishLocal", dependencies = List(discipline), - scalacOptions = Nil // disabble -Ycheck-init + scalacOptions = Nil // disable -Ycheck-init ) lazy val simulacrumScalafixAnnotations = SbtCommunityProject(