From e48107c71c8319e7c622e38b9fa3c046f92378ce Mon Sep 17 00:00:00 2001 From: Jules Ivanic Date: Wed, 27 Sep 2023 12:44:08 +0400 Subject: [PATCH] Fix publishing of codegen and "big data" modules for Scala 2.13 (#2877) --- build.sbt | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/build.sbt b/build.sbt index 8df35756ba..5ad5f77c0d 100644 --- a/build.sbt +++ b/build.sbt @@ -140,24 +140,15 @@ lazy val filteredModules = { println("SBT =:> Invoking Aggregate Project") Seq[sbt.ClasspathDep[sbt.ProjectReference]]() case _ | "all" => - // Workaround for https://github.com/sbt/sbt/issues/3465 - if (isScala213) { - println("SBT =:> Compiling Scala 2.13 Modules") - baseModules ++ dbModules ++ jasyncModules - } else { - println("SBT =:> Compiling All Modules") - allModules - // Note, can't do this because things like inform (i.e. formatting) actually do run for all modules - // throw new IllegalStateException("Tried to build all modules. Not allowed.") - } + println("SBT =:> Compiling All Modules") + allModules } val selectedModules = { val modules = moduleStrings - .map(matchModules(_)) - .map(seq => ListSet(seq: _*)) - .flatMap(elem => elem) + .map(matchModules) + .flatMap(seq => ListSet(seq: _*)) if (isScala213) { println("SBT =:> Compiling 2.13 Modules Only")