You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pekko.apache.org by jr...@apache.org on 2022/11/03 11:23:58 UTC
[incubator-pekko-http] 28/47: build: fix aggregation for Scala 3
This is an automated email from the ASF dual-hosted git repository.
jrudolph pushed a commit to branch scala-3
in repository https://gitbox.apache.org/repos/asf/incubator-pekko-http.git
commit 2c00be62d0d1927efb594bcf5caacb9710911e17
Author: Johannes Rudolph <jo...@gmail.com>
AuthorDate: Mon Apr 11 14:39:26 2022 +0200
build: fix aggregation for Scala 3
To make the PR validation pass (hopefully)
Before, intermediate aggregations still pulled Scala 3 for their submodule.
---
build.sbt | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/build.sbt b/build.sbt
index c8ea71317..157a7f358 100644
--- a/build.sbt
+++ b/build.sbt
@@ -71,7 +71,7 @@ lazy val root = Project(
id = "akka-http-root",
base = file(".")
)
- .enablePlugins(UnidocRoot, NoPublish, PublishRsyncPlugin, AggregatePRValidation)
+ .enablePlugins(UnidocRoot, NoPublish, PublishRsyncPlugin, AggregatePRValidation, NoScala3)
.disablePlugins(MimaPlugin)
.settings(
// Unidoc doesn't like macro definitions
@@ -130,7 +130,7 @@ val scalaMacroSupport = Seq(
}),
)
-val scala3MigrationModeOption =
+val scala3MigrationModeOption =
scalacOptions ++= {
if (scalaVersion.value startsWith "3")
Seq("-source:3.0-migration")
@@ -295,7 +295,7 @@ lazy val httpJmhBench = project("akka-http-bench-jmh")
lazy val httpMarshallersScala = project("akka-http-marshallers-scala")
.settings(commonSettings)
- .enablePlugins(NoPublish/*, AggregatePRValidation*/)
+ .enablePlugins(NoPublish, NoScala3 /*FIXME */ /*, AggregatePRValidation*/)
.disablePlugins(MimaPlugin)
.aggregate(httpSprayJson, httpXml)
@@ -315,7 +315,7 @@ lazy val httpSprayJson =
lazy val httpMarshallersJava = project("akka-http-marshallers-java")
.settings(commonSettings)
- .enablePlugins(NoPublish/*, AggregatePRValidation*/)
+ .enablePlugins(NoPublish, NoScala3 /*FIXME */ /*, AggregatePRValidation*/)
.disablePlugins(MimaPlugin)
.aggregate(httpJackson)
@@ -507,7 +507,7 @@ lazy val compatibilityTests = Project("akka-http-compatibility-tests", file("akk
)
lazy val billOfMaterials = Project("bill-of-materials", file("akka-http-bill-of-materials"))
- .enablePlugins(BillOfMaterialsPlugin)
+ .enablePlugins(BillOfMaterialsPlugin, NoScala3 /* FIXME */)
.disablePlugins(MimaPlugin)
.settings(
name := "akka-http-bom",
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pekko.apache.org
For additional commands, e-mail: commits-help@pekko.apache.org