raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 10

Cleanup cross building (#30981)

Browse source 
* wip

* Don't set crossScalaVersions at the toplevel

* scalafmtSbt

* Accidentally commited

* Set default scalaVersion

* Set top-level scala version to default

* Add comment explaining why to +~
This commit is contained in:
Arnout Engelen 2021-12-14 11:00:02 +01:00 • committed by GitHub
parent ad3a8a965d
commit 5fafdced8e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 50 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

32
build.sbt
View file

@ -2,6 +2,8 @@ import akka.{ AutomaticModuleName, CopyrightHeaderForBuild, Paradox, ScalafixIgn
ThisBuild / scalafixScalaBinaryVersion := scalaBinaryVersion.value
scalaVersion := Dependencies.allScalaVersions.head
enablePlugins(
UnidocRoot,
UnidocWithPrValidation,
@ -99,8 +101,6 @@ lazy val root = Project(id = "akka", base = file("."))
serialversionRemoverPlugin))
.settings(Compile / headerCreate / unmanagedSources := (baseDirectory.value / "project").**("*.scala").get)
.enablePlugins(CopyrightHeaderForBuild)
// TODO https://github.com/akka/akka/issues/30243
.settings(crossScalaVersions := Nil)
lazy val actor = akkaModule("akka-actor")
.settings(Dependencies.actor)
@ -113,8 +113,6 @@ lazy val actor = akkaModule("akka-actor")
.settings(VersionGenerator.settings)
.settings(serialversionRemoverPluginSettings)
.enablePlugins(BoilerplatePlugin)
// TODO https://github.com/akka/akka/issues/30243
.settings(crossScalaVersions += akka.Dependencies.scala3Version)
lazy val actorTests = akkaModule("akka-actor-tests")
.dependsOn(testkit % "compile->compile;test->test")
@ -150,8 +148,6 @@ lazy val cluster = akkaModule("akka-cluster")
.settings(Test / parallelExecution := false)
.configs(MultiJvm)
.enablePlugins(MultiNodeScalaTest)
// TODO https://github.com/akka/akka/issues/30243
.settings(crossScalaVersions -= akka.Dependencies.scala3Version)
lazy val clusterMetrics = akkaModule("akka-cluster-metrics")
.dependsOn(
@ -263,8 +259,6 @@ lazy val jackson = akkaModule("akka-serialization-jackson")
.settings(OSGi.jackson)
.settings(javacOptions += "-parameters")
.enablePlugins(ScaladocNoVerificationOfDiagrams)
// TODO https://github.com/akka/akka/issues/30243
.settings(crossScalaVersions -= akka.Dependencies.scala3Version)
lazy val multiNodeTestkit = akkaModule("akka-multi-node-testkit")
.dependsOn(remote, testkit)
@ -278,7 +272,7 @@ lazy val osgi = akkaModule("akka-osgi")
.settings(Dependencies.osgi)
.settings(AutomaticModuleName.settings("akka.osgi"))
.settings(OSGi.osgi)
.settings(Test / parallelExecution := false)
.settings(Test / parallelExecution := false, crossScalaVersions -= akka.Dependencies.scala3Version)
lazy val persistence = akkaModule("akka-persistence")
.dependsOn(actor, stream, testkit % "test->test")
@ -287,8 +281,6 @@ lazy val persistence = akkaModule("akka-persistence")
.settings(OSGi.persistence)
.settings(Protobuf.settings)
.settings(Test / fork := true)
// TODO https://github.com/akka/akka/issues/30243
.settings(crossScalaVersions -= akka.Dependencies.scala3Version)
lazy val persistenceQuery = akkaModule("akka-persistence-query")
.dependsOn(
@ -344,8 +336,6 @@ lazy val persistenceTypedTests = akkaModule("akka-persistence-typed-tests")
.settings(javacOptions += "-parameters") // for Jackson
.disablePlugins(MimaPlugin)
.enablePlugins(NoPublish)
// TODO https://github.com/akka/akka/issues/30243
.settings(crossScalaVersions -= akka.Dependencies.scala3Version)
lazy val protobuf = akkaModule("akka-protobuf")
.settings(OSGi.protobuf)
@ -408,8 +398,6 @@ lazy val remote =
.settings(Test / parallelExecution := false)
.settings(serialversionRemoverPluginSettings)
.enablePlugins(Jdk9)
// TODO https://github.com/akka/akka/issues/30243
.settings(crossScalaVersions -= akka.Dependencies.scala3Version)
lazy val remoteTests = akkaModule("akka-remote-tests")
.dependsOn(
@ -424,8 +412,6 @@ lazy val remoteTests = akkaModule("akka-remote-tests")
.configs(MultiJvm)
.enablePlugins(MultiNodeScalaTest, NoPublish)
.disablePlugins(MimaPlugin)
// TODO https://github.com/akka/akka/issues/30243
.settings(crossScalaVersions -= akka.Dependencies.scala3Version)
lazy val slf4j = akkaModule("akka-slf4j")
.dependsOn(actor, testkit % "test->test")
@ -446,8 +432,6 @@ lazy val streamTestkit = akkaModule("akka-stream-testkit")
.settings(Dependencies.streamTestkit)
.settings(AutomaticModuleName.settings("akka.stream.testkit"))
.settings(OSGi.streamTestkit)
// TODO https://github.com/akka/akka/issues/30243
.settings(crossScalaVersions -= akka.Dependencies.scala3Version)
lazy val streamTests = akkaModule("akka-stream-tests")
.configs(akka.Jdk9.TestJdk9)
@ -509,8 +493,6 @@ lazy val persistenceTyped = akkaModule("akka-persistence-typed")
// To be able to import ContainerFormats.proto
.settings(Protobuf.importPath := Some(baseDirectory.value / ".." / "akka-remote" / "src" / "main" / "protobuf"))
.settings(OSGi.persistenceTyped)
// TODO https://github.com/akka/akka/issues/30243
.settings(crossScalaVersions -= akka.Dependencies.scala3Version)
lazy val clusterTyped = akkaModule("akka-cluster-typed")
.dependsOn(
@ -552,8 +534,6 @@ lazy val clusterShardingTyped = akkaModule("akka-cluster-sharding-typed")
.settings(Protobuf.importPath := Some(baseDirectory.value / ".." / "akka-remote" / "src" / "main" / "protobuf"))
.configs(MultiJvm)
.enablePlugins(MultiNodeScalaTest)
// TODO https://github.com/akka/akka/issues/30243
.settings(crossScalaVersions -= akka.Dependencies.scala3Version)
lazy val streamTyped = akkaModule("akka-stream-typed")
.dependsOn(
@ -569,8 +549,6 @@ lazy val actorTestkitTyped = akkaModule("akka-actor-testkit-typed")
.dependsOn(actorTyped, slf4j, testkit % "compile->compile;test->test")
.settings(AutomaticModuleName.settings("akka.actor.testkit.typed"))
.settings(Dependencies.actorTestkitTyped)
// TODO https://github.com/akka/akka/issues/30243
.settings(crossScalaVersions -= akka.Dependencies.scala3Version)
lazy val actorTypedTests = akkaModule("akka-actor-typed-tests")
.dependsOn(actorTyped % "compile->CompileJdk9", actorTestkitTyped % "compile->compile;test->test")
@ -583,16 +561,12 @@ lazy val discovery = akkaModule("akka-discovery")
.settings(Dependencies.discovery)
.settings(AutomaticModuleName.settings("akka.discovery"))
.settings(OSGi.discovery)
// TODO https://github.com/akka/akka/issues/30243
.settings(crossScalaVersions -= akka.Dependencies.scala3Version)
lazy val coordination = akkaModule("akka-coordination")
.dependsOn(actor, testkit % "test->test", actorTests % "test->test")
.settings(Dependencies.coordination)
.settings(AutomaticModuleName.settings("akka.coordination"))
.settings(OSGi.coordination)
// TODO https://github.com/akka/akka/issues/30243
.settings(crossScalaVersions -= akka.Dependencies.scala3Version)
lazy val billOfMaterials = Project("akka-bill-of-materials", file("akka-bill-of-materials"))
.enablePlugins(BillOfMaterialsPlugin)