diff --git a/akka-actor-tests/build.sbt b/akka-actor-tests/build.sbt index 9fe53bec61..0653f125b5 100644 --- a/akka-actor-tests/build.sbt +++ b/akka-actor-tests/build.sbt @@ -1,11 +1,6 @@ import akka.{ AkkaBuild, Dependencies, Formatting } AkkaBuild.defaultSettings - -Formatting.formatSettings - -publishArtifact in Compile := false - -Dependencies.actorTests - AkkaBuild.dontPublishSettings +Formatting.formatSettings +Dependencies.actorTests diff --git a/akka-docs/_sphinx/exts/includecode2.py b/akka-docs/_sphinx/exts/includecode2.py index 9e6a12dc09..37f518fa26 100644 --- a/akka-docs/_sphinx/exts/includecode2.py +++ b/akka-docs/_sphinx/exts/includecode2.py @@ -43,7 +43,7 @@ class IncludeCode2(Directive): encoding = self.options.get('encoding', env.config.source_encoding) codec_info = codecs.lookup(encoding) try: - f = codecs.StreamReaderWriter(open(fn, 'U'), + f = codecs.StreamReaderWriter(open(fn, 'Ub'), codec_info[2], codec_info[3], 'strict') lines = f.readlines() f.close() diff --git a/akka-http-core/build.sbt b/akka-http-core/build.sbt index 4570f1f854..57883e2458 100644 --- a/akka-http-core/build.sbt +++ b/akka-http-core/build.sbt @@ -2,13 +2,8 @@ import akka._ import com.typesafe.tools.mima.plugin.MimaKeys AkkaBuild.defaultSettings - +AkkaBuild.experimentalSettings Formatting.formatSettings - OSGi.httpCore - Dependencies.httpCore - MimaKeys.previousArtifacts := akkaStreamAndHttpPreviousArtifacts("akka-http-core").value - -disablePlugins(Unidoc) // TODO remove me \ No newline at end of file diff --git a/akka-http-marshallers-java/akka-http-jackson/build.sbt b/akka-http-marshallers-java/akka-http-jackson/build.sbt index 48cab297af..2cd830951e 100644 --- a/akka-http-marshallers-java/akka-http-jackson/build.sbt +++ b/akka-http-marshallers-java/akka-http-jackson/build.sbt @@ -2,12 +2,8 @@ import akka._ import com.typesafe.tools.mima.plugin.MimaKeys AkkaBuild.defaultSettings - +AkkaBuild.experimentalSettings Formatting.formatSettings - OSGi.httpJackson - Dependencies.httpJackson - MimaKeys.previousArtifacts := akkaStreamAndHttpPreviousArtifacts("akka-http-jackson").value - diff --git a/akka-http-marshallers-scala/akka-http-spray-json/build.sbt b/akka-http-marshallers-scala/akka-http-spray-json/build.sbt index 545be0d0ea..ae6e21b61f 100644 --- a/akka-http-marshallers-scala/akka-http-spray-json/build.sbt +++ b/akka-http-marshallers-scala/akka-http-spray-json/build.sbt @@ -2,11 +2,8 @@ import akka._ import com.typesafe.tools.mima.plugin.MimaKeys AkkaBuild.defaultSettings - +AkkaBuild.experimentalSettings Formatting.formatSettings - OSGi.httpSprayJson - Dependencies.httpSprayJson - MimaKeys.previousArtifacts := akkaStreamAndHttpPreviousArtifacts("akka-http-spray-json").value diff --git a/akka-http-marshallers-scala/akka-http-xml/build.sbt b/akka-http-marshallers-scala/akka-http-xml/build.sbt index c0514c54c8..dc6013cdc6 100644 --- a/akka-http-marshallers-scala/akka-http-xml/build.sbt +++ b/akka-http-marshallers-scala/akka-http-xml/build.sbt @@ -2,11 +2,8 @@ import akka._ import com.typesafe.tools.mima.plugin.MimaKeys AkkaBuild.defaultSettings - +AkkaBuild.experimentalSettings Formatting.formatSettings - OSGi.httpXml - Dependencies.httpXml - MimaKeys.previousArtifacts := akkaStreamAndHttpPreviousArtifacts("akka-http-xml").value diff --git a/akka-http-testkit/build.sbt b/akka-http-testkit/build.sbt index 6c614d7103..fa3003fbd6 100644 --- a/akka-http-testkit/build.sbt +++ b/akka-http-testkit/build.sbt @@ -2,11 +2,10 @@ import akka._ import com.typesafe.tools.mima.plugin.MimaKeys AkkaBuild.defaultSettings - +AkkaBuild.experimentalSettings Formatting.formatSettings - OSGi.httpTestkit - Dependencies.httpTestkit - MimaKeys.previousArtifacts := akkaStreamAndHttpPreviousArtifacts("akka-http-testkit").value + +scalacOptions in Compile += "-language:postfixOps" diff --git a/akka-http-tests/build.sbt b/akka-http-tests/build.sbt index 1450547167..3efb382ca1 100644 --- a/akka-http-tests/build.sbt +++ b/akka-http-tests/build.sbt @@ -1,8 +1,13 @@ import akka._ -import com.typesafe.tools.mima.plugin.MimaKeys AkkaBuild.defaultSettings - +AkkaBuild.dontPublishSettings +AkkaBuild.experimentalSettings Formatting.formatSettings - Dependencies.httpTests + +// don't ignore Suites which is the default for the junit-interface +testOptions += Tests.Argument(TestFrameworks.JUnit, "--ignore-runners=") + +scalacOptions in Compile += "-language:_" +mainClass in run in Test := Some("akka.http.javadsl.SimpleServerApp") diff --git a/akka-http/build.sbt b/akka-http/build.sbt index 06f7792b6e..b73b827a90 100644 --- a/akka-http/build.sbt +++ b/akka-http/build.sbt @@ -3,13 +3,11 @@ import com.typesafe.tools.mima.plugin.MimaKeys import spray.boilerplate.BoilerplatePlugin._ AkkaBuild.defaultSettings - +AkkaBuild.experimentalSettings Formatting.formatSettings - OSGi.http - Dependencies.http - MimaKeys.previousArtifacts := akkaStreamAndHttpPreviousArtifacts("akka-http").value - Boilerplate.settings + +scalacOptions in Compile += "-language:_" diff --git a/akka-http/src/main/scala/akka/http/impl/server/RequestContextImpl.scala b/akka-http/src/main/scala/akka/http/impl/server/RequestContextImpl.scala index c40cbf0e43..2885cfa374 100644 --- a/akka-http/src/main/scala/akka/http/impl/server/RequestContextImpl.scala +++ b/akka-http/src/main/scala/akka/http/impl/server/RequestContextImpl.scala @@ -40,7 +40,7 @@ private[http] final case class RequestContextImpl(underlying: ScalaRequestContex case MarshallerImpl(m) ⇒ implicit val marshaller = m(underlying.executionContext) underlying.complete(value) - case _ ⇒ throw new IllegalArgumentException("Unsupported marshaller: $marshaller") + case _ ⇒ throw new IllegalArgumentException(s"Unsupported marshaller: $marshaller") } def complete(response: jm.HttpResponse): RouteResult = underlying.complete(response.asScala) diff --git a/akka-parsing/build.sbt b/akka-parsing/build.sbt index 2f96cc40ec..26d424e57b 100644 --- a/akka-parsing/build.sbt +++ b/akka-parsing/build.sbt @@ -1,22 +1,18 @@ import akka._ -import akka.ValidatePullRequest._ -import com.typesafe.sbt.SbtScalariform.ScalariformKeys -import com.typesafe.sbt.SbtSite.site -import com.typesafe.sbt.site.SphinxSupport._ import com.typesafe.tools.mima.plugin.MimaKeys -enablePlugins(ScaladocNoVerificationOfDiagrams) - AkkaBuild.defaultSettings - +AkkaBuild.dontPublishSettings +AkkaBuild.experimentalSettings Formatting.docFormatSettings - site.settings - OSGi.parsing - Dependencies.parsing unmanagedSourceDirectories in ScalariformKeys.format in Test <<= unmanagedSourceDirectories in Test +scalacOptions += "-language:_" -AkkaBuild.dontPublishSettings +// ScalaDoc doesn't like the macros +sources in doc in Compile := List() + +enablePlugins(ScaladocNoVerificationOfDiagrams) diff --git a/akka-samples/akka-sample-main-java-lambda/build.sbt b/akka-samples/akka-sample-main-java-lambda/build.sbt index bd0906ce3f..33c2db7cca 100644 --- a/akka-samples/akka-sample-main-java-lambda/build.sbt +++ b/akka-samples/akka-sample-main-java-lambda/build.sbt @@ -1,10 +1,9 @@ name := "akka-sample-main-java-lambda" -version := "1.0" +version := "2.4-SNAPSHOT" scalaVersion := "2.11.7" libraryDependencies ++= Seq( "com.typesafe.akka" %% "akka-actor" % "2.4-SNAPSHOT" ) - diff --git a/akka-samples/akka-sample-main-java-lambda/pom.xml b/akka-samples/akka-sample-main-java-lambda/pom.xml index eae724100a..8a84daaa01 100644 --- a/akka-samples/akka-sample-main-java-lambda/pom.xml +++ b/akka-samples/akka-sample-main-java-lambda/pom.xml @@ -7,7 +7,7 @@ akka-sample-main-java-lambda com.typesafe.akka.samples Akka Main in Java - 1.0 + 2.4-SNAPSHOT UTF-8 diff --git a/akka-samples/akka-sample-persistence-java-lambda/build.sbt b/akka-samples/akka-sample-persistence-java-lambda/build.sbt index ec375a371e..6d51987855 100644 --- a/akka-samples/akka-sample-persistence-java-lambda/build.sbt +++ b/akka-samples/akka-sample-persistence-java-lambda/build.sbt @@ -1,6 +1,6 @@ name := "akka-sample-persistence-java-lambda" -version := "1.0" +version := "2.4-SNAPSHOT" scalaVersion := "2.11.7" @@ -13,4 +13,3 @@ libraryDependencies ++= Seq( "org.iq80.leveldb" % "leveldb" % "0.7", "org.fusesource.leveldbjni" % "leveldbjni-all" % "1.8" ) - diff --git a/akka-samples/akka-sample-supervision-java-lambda/build.sbt b/akka-samples/akka-sample-supervision-java-lambda/build.sbt index e9eb2697d8..fb4563bbac 100644 --- a/akka-samples/akka-sample-supervision-java-lambda/build.sbt +++ b/akka-samples/akka-sample-supervision-java-lambda/build.sbt @@ -1,6 +1,6 @@ name := "akka-supervision-java-lambda" -version := "1.0" +version := "2.4-SNAPSHOT" scalaVersion := "2.11.7" diff --git a/akka-samples/akka-sample-supervision-java-lambda/pom.xml b/akka-samples/akka-sample-supervision-java-lambda/pom.xml index 639f639b32..0f69d0d122 100644 --- a/akka-samples/akka-sample-supervision-java-lambda/pom.xml +++ b/akka-samples/akka-sample-supervision-java-lambda/pom.xml @@ -11,7 +11,7 @@ sample akka-supervision-java-lambda jar - 1.0 + 2.4-SNAPSHOT diff --git a/akka-stream-and-http/build.sbt b/akka-stream-and-http/build.sbt deleted file mode 100644 index eb3e5d5e8e..0000000000 --- a/akka-stream-and-http/build.sbt +++ /dev/null @@ -1 +0,0 @@ -enablePlugins(akka.UnidocRoot, akka.TimeStampede, akka.UnidocWithPrValidation) diff --git a/akka-stream-testkit/build.sbt b/akka-stream-testkit/build.sbt index 312af423fe..fb0fa86982 100644 --- a/akka-stream-testkit/build.sbt +++ b/akka-stream-testkit/build.sbt @@ -2,11 +2,8 @@ import akka._ import com.typesafe.tools.mima.plugin.MimaKeys AkkaBuild.defaultSettings - +AkkaBuild.experimentalSettings Formatting.formatSettings - OSGi.streamTestkit - Dependencies.streamTestkit - MimaKeys.previousArtifacts := akkaStreamAndHttpPreviousArtifacts("akka-stream-testkit").value diff --git a/akka-stream-tests-tck/build.sbt b/akka-stream-tests-tck/build.sbt index e01202db4d..497bb32918 100644 --- a/akka-stream-tests-tck/build.sbt +++ b/akka-stream-tests-tck/build.sbt @@ -2,7 +2,6 @@ import akka._ import com.typesafe.tools.mima.plugin.MimaKeys AkkaBuild.defaultSettings - +AkkaBuild.experimentalSettings Formatting.formatSettings - Dependencies.streamTestsTck diff --git a/akka-stream-tests/build.sbt b/akka-stream-tests/build.sbt index 683bf4cdf4..a8ad627a33 100644 --- a/akka-stream-tests/build.sbt +++ b/akka-stream-tests/build.sbt @@ -2,7 +2,7 @@ import akka._ import com.typesafe.tools.mima.plugin.MimaKeys AkkaBuild.defaultSettings - +AkkaBuild.dontPublishSettings +AkkaBuild.experimentalSettings Formatting.formatSettings - Dependencies.streamTests diff --git a/akka-stream/build.sbt b/akka-stream/build.sbt index 732a686579..ec1ddb47ed 100644 --- a/akka-stream/build.sbt +++ b/akka-stream/build.sbt @@ -3,13 +3,9 @@ import com.typesafe.tools.mima.plugin.MimaKeys import spray.boilerplate.BoilerplatePlugin._ AkkaBuild.defaultSettings - +AkkaBuild.experimentalSettings Formatting.formatSettings - OSGi.stream - Dependencies.stream - MimaKeys.previousArtifacts := akkaStreamAndHttpPreviousArtifacts("akka-stream").value - Boilerplate.settings diff --git a/akka-typed/build.sbt b/akka-typed/build.sbt index ed0858db51..abcc7414ed 100644 --- a/akka-typed/build.sbt +++ b/akka-typed/build.sbt @@ -2,7 +2,5 @@ import akka.{ AkkaBuild, Formatting, OSGi, Dependencies } import com.typesafe.tools.mima.plugin.MimaKeys AkkaBuild.defaultSettings - AkkaBuild.experimentalSettings - Formatting.formatSettings diff --git a/project/AkkaBuild.scala b/project/AkkaBuild.scala index e82c78d89a..0f5e54556a 100644 --- a/project/AkkaBuild.scala +++ b/project/AkkaBuild.scala @@ -45,15 +45,6 @@ object AkkaBuild extends Build { Protobuf.settings ++ Seq( parallelExecution in GlobalScope := System.getProperty("akka.parallelExecution", parallelExecutionByDefault.toString).toBoolean, Dist.distExclude := Seq(actorTests.id, docs.id, samples.id, osgi.id), - - // FIXME problem with scalaunidoc:doc, there must be a better way - unidocProjectFilter in (ScalaUnidoc, unidoc) := inAnyProject -- inProjects(protobuf, samples, - sampleCamelJava, sampleCamelScala, sampleClusterJava, sampleClusterScala, sampleFsmScala, sampleFsmJavaLambda, - sampleMainJava, sampleMainScala, sampleMainJavaLambda, sampleMultiNodeScala, - samplePersistenceJava, samplePersistenceScala, samplePersistenceJavaLambda, - sampleRemoteJava, sampleRemoteScala, sampleSupervisionJavaLambda, - sampleDistributedDataScala, sampleDistributedDataJava), - S3.host in S3.upload := "downloads.typesafe.com.s3.amazonaws.com", S3.progress in S3.upload := true, mappings in S3.upload <<= (Release.releaseDirectory, version) map { (d, v) => @@ -67,8 +58,7 @@ object AkkaBuild extends Build { slf4j, agent, persistence, persistenceQuery, persistenceTck, kernel, osgi, docs, contrib, samples, multiNodeTestkit, benchJmh, typed, protobuf, // streamAndHttp, // does not seem to work stream, streamTestkit, streamTests, streamTestsTck, - httpCore, http, httpSprayJson, httpXml, httpJackson, httpTests, httpTestkit, - docsDev // TODO merge with `docs` + httpCore, http, httpSprayJson, httpXml, httpJackson, httpTests, httpTestkit ) ) @@ -82,8 +72,7 @@ object AkkaBuild extends Build { slf4j, persistence, persistenceQuery, persistenceTck, kernel, osgi, contrib, multiNodeTestkit, benchJmh, typed, protobuf, // streamAndHttp, // does not seem to work stream, streamTestkit, streamTests, streamTestsTck, - httpCore, http, httpSprayJson, httpXml, httpJackson, httpTests, httpTestkit, - docsDev // TODO merge with `docs` + httpCore, http, httpSprayJson, httpXml, httpJackson, httpTests, httpTestkit ) ).disablePlugins(ValidatePullRequest) @@ -213,103 +202,34 @@ object AkkaBuild extends Build { dependencies = Seq(persistence % "compile;provided->provided;test->test", testkit % "compile;test->test") ) - lazy val streamAndHttp = Project( - id = "akka-stream-and-http-experimental", - base = file("akka-stream-and-http"), - settings = parentSettings ++ Release.settings ++ - SphinxDoc.akkaSettings ++ - Dist.settings ++ - Protobuf.settings ++ Seq( - Dist.distExclude := Seq(), - // testMailbox in GlobalScope := System.getProperty("akka.testMailbox", "false").toBoolean, - parallelExecution in GlobalScope := System.getProperty("akka.parallelExecution", "false").toBoolean, - Publish.defaultPublishTo in ThisBuild <<= crossTarget / "repository" -// javacOptions in JavaDoc ++= Seq("-Xdoclint:none"), TODO likely still needed - // artifactName in packageDoc in JavaDoc := ((sv, mod, art) => "" + mod.name + "_" + sv.binary + "-" + mod.revision + "-javadoc.jar"), - // packageDoc in Compile <<= packageDoc in JavaDoc, - - // // generate online version of docs - // sphinxInputs in Sphinx <<= sphinxInputs in Sphinx in LocalProject(docsDev.id) map { inputs => inputs.copy(tags = inputs.tags :+ "online") }, - // // don't regenerate the pdf, just reuse the akka-docs version - // generatedPdf in Sphinx <<= generatedPdf in Sphinx in LocalProject(docsDev.id) map identity, - // generatedEpub in Sphinx <<= generatedEpub in Sphinx in LocalProject(docsDev.id) map identity, - - // publishArtifact in packageSite := false - ), - aggregate = Seq(parsing, stream, streamTestkit, streamTests, streamTestsTck, httpParent) - ) - - lazy val httpParent = Project( - id = "akka-http-parent-experimental", - base = file("akka-http-parent"), - settings = parentSettings, - aggregate = Seq( - httpCore, - http, - httpTestkit, - httpTests, - httpMarshallersScala, httpMarshallersJava - ) - ) - lazy val httpCore = Project( id = "akka-http-core-experimental", base = file("akka-http-core"), - dependencies = Seq(stream, parsing, streamTestkit % "test->test"), - settings = defaultSettings - ).disablePlugins(Unidoc) // TODO remove me + dependencies = Seq(stream, parsing, streamTestkit % "test->test") + ) lazy val http = Project( id = "akka-http-experimental", base = file("akka-http"), - dependencies = Seq(httpCore), - settings = - defaultSettings ++ - Seq( - scalacOptions in Compile += "-language:_" - ) + dependencies = Seq(httpCore) ) lazy val streamTestkit = Project( id = "akka-stream-testkit", base = file("akka-stream-testkit"), // TODO that persistence dependency - dependencies = Seq(stream, persistence % "compile;provided->provided;test->test", testkit % "compile;test->test"), - settings = defaultSettings ++ experimentalSettings + dependencies = Seq(stream, persistence % "compile;provided->provided;test->test", testkit % "compile;test->test") ) lazy val httpTestkit = Project( id = "akka-http-testkit-experimental", base = file("akka-http-testkit"), - dependencies = Seq(http, streamTestkit), - settings = - defaultSettings ++ Seq( - scalacOptions in Compile += "-language:_" - ) + dependencies = Seq(http, streamTestkit) ) lazy val httpTests = Project( id = "akka-http-tests-experimental", base = file("akka-http-tests"), - dependencies = Seq(httpTestkit % "test", httpSprayJson, httpXml, httpJackson), - settings = - defaultSettings ++ Seq( - publishArtifact := false, - scalacOptions in Compile += "-language:_", - // test discovery is broken when sbt isn't run with a Java 8 compatible JVM, so we define a single - // Suite where all tests need to be registered - definedTests in Test := { - def pseudoJUnitRunWithFingerprint = - // we emulate a junit-interface fingerprint here which cannot be accessed statically - new sbt.testing.AnnotatedFingerprint { - def annotationName = "org.junit.runner.RunWith" - def isModule = false - } - Seq(new TestDefinition("AllJavaTests", pseudoJUnitRunWithFingerprint, false, Array.empty)) - }, - // don't ignore Suites which is the default for the junit-interface - testOptions += Tests.Argument(TestFrameworks.JUnit, "--ignore-runners="), - mainClass in run in Test := Some("akka.http.javadsl.SimpleServerApp") - ) + dependencies = Seq(httpTestkit % "test", httpSprayJson, httpXml, httpJackson) ) lazy val httpMarshallersScala = Project( @@ -323,13 +243,11 @@ object AkkaBuild extends Build { lazy val httpSprayJson = httpMarshallersScalaSubproject("spray-json") - .settings(Dependencies.httpSprayJson) - .settings(OSGi.httpSprayJson: _*) lazy val httpMarshallersJava = Project( id = "akka-http-marshallers-java-experimental", base = file("akka-http-marshallers-java"), - settings = defaultSettings ++ parentSettings + settings = parentSettings ).aggregate(httpJackson) lazy val httpJackson = @@ -339,47 +257,37 @@ object AkkaBuild extends Build { Project( id = s"akka-http-$name-experimental", base = file(s"akka-http-marshallers-scala/akka-http-$name"), - dependencies = Seq(http), - settings = defaultSettings + dependencies = Seq(http) ) def httpMarshallersJavaSubproject(name: String) = Project( id = s"akka-http-$name-experimental", base = file(s"akka-http-marshallers-java/akka-http-$name"), - dependencies = Seq(http), - settings = defaultSettings + dependencies = Seq(http) ) lazy val parsing = Project( id = "akka-parsing-experimental", - base = file("akka-parsing"), - settings = defaultSettings ++ Seq( - scalacOptions += "-language:_", - // ScalaDoc doesn't like the macros - sources in doc in Compile := List() - ) + base = file("akka-parsing") ) lazy val stream = Project( id = "akka-stream-experimental", base = file("akka-stream"), - dependencies = Seq(actor), - settings = defaultSettings ++ experimentalSettings + dependencies = Seq(actor) ) lazy val streamTests = Project( id = "akka-stream-tests-experimental", base = file("akka-stream-tests"), - dependencies = Seq(streamTestkit % "test->test", stream), - settings = defaultSettings ++ experimentalSettings + dependencies = Seq(streamTestkit % "test->test", stream) ) lazy val streamTestsTck = Project( id = "akka-stream-tests-tck-experimental", base = file("akka-stream-tests-tck"), - dependencies = Seq(streamTestkit % "test->test", stream), - settings = defaultSettings ++ experimentalSettings + dependencies = Seq(streamTestkit % "test->test", stream) ) lazy val kernel = Project( @@ -415,13 +323,6 @@ object AkkaBuild extends Build { ) ) - lazy val docsDev = Project( - id = "akka-docs-dev", - base = file("akka-docs-dev"), - dependencies = Seq(streamTestkit % "test->test", stream, httpCore, http, httpTestkit, httpSprayJson, httpXml), - settings = defaultSettings - ) - lazy val contrib = Project( id = "akka-contrib", base = file("akka-contrib"), @@ -489,7 +390,8 @@ object AkkaBuild extends Build { val dontPublishSettings = Seq( publishSigned := (), - publish := () + publish := (), + publishArtifact in Compile := false ) override lazy val settings = diff --git a/project/Doc.scala b/project/Doc.scala index 08c86b7cab..9ca5bb8889 100644 --- a/project/Doc.scala +++ b/project/Doc.scala @@ -5,7 +5,7 @@ package akka import sbt._ import sbtunidoc.Plugin.UnidocKeys._ -import sbtunidoc.Plugin.{ ScalaUnidoc, JavaUnidoc, scalaJavaUnidocSettings, genjavadocExtraSettings, scalaUnidocSettings } +import sbtunidoc.Plugin.{ ScalaUnidoc, JavaUnidoc, Genjavadoc, scalaJavaUnidocSettings, genjavadocExtraSettings, scalaUnidocSettings } import sbt.Keys._ import sbt.File import scala.annotation.tailrec @@ -120,7 +120,7 @@ object UnidocRoot extends AutoPlugin { override lazy val projectSettings = CliOptions.genjavadocEnabled.ifTrue(scalaJavaUnidocSettings).getOrElse(scalaUnidocSettings) ++ - settings(Seq(AkkaBuild.samples), Seq(AkkaBuild.remoteTests, AkkaBuild.benchJmh)) + settings(Seq(AkkaBuild.samples), Seq(AkkaBuild.remoteTests, AkkaBuild.benchJmh, AkkaBuild.parsing, AkkaBuild.protobuf)) } /** @@ -134,7 +134,9 @@ object Unidoc extends AutoPlugin { override lazy val projectSettings = UnidocRoot.CliOptions.genjavadocEnabled.ifTrue( genjavadocExtraSettings ++ Seq( scalacOptions in Compile += "-P:genjavadoc:fabricateParams=true", - unidocGenjavadocVersion in Global := "0.9" + unidocGenjavadocVersion in Global := "0.9", + // FIXME: see #18056 + sources in(Genjavadoc, doc) ~= (_.filterNot(_.getPath.contains("Access$minusControl$minusAllow$minusOrigin"))) ) ).getOrElse(Seq.empty) } diff --git a/project/build.properties b/project/build.properties index 748703f770..817bc38df8 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=0.13.7 +sbt.version=0.13.9