From b52271da1c1dbe5132163347dfc1d2347f6b9b8b Mon Sep 17 00:00:00 2001 From: Christopher Batey Date: Mon, 25 Nov 2019 13:36:09 +0000 Subject: [PATCH] Don't include protobuf settings for all projects #28227 Only akka-actor got the protobuf files due to the assembled jar being added to the unmanaged jars for ease of use when importing into Intellij. Removing that from default settings seems to have fixed it. Fixes * Remove protobuf Any import from doc spec --- .../scala/docs/akka/typed/extensions/ExtensionDocSpec.scala | 1 - project/AkkaBuild.scala | 2 -- 2 files changed, 3 deletions(-) diff --git a/akka-actor-typed-tests/src/test/scala/docs/akka/typed/extensions/ExtensionDocSpec.scala b/akka-actor-typed-tests/src/test/scala/docs/akka/typed/extensions/ExtensionDocSpec.scala index 6b3d406ee2..2ed1edbf61 100644 --- a/akka-actor-typed-tests/src/test/scala/docs/akka/typed/extensions/ExtensionDocSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/docs/akka/typed/extensions/ExtensionDocSpec.scala @@ -9,7 +9,6 @@ import akka.actor.typed.Behavior import akka.actor.typed.Extension import akka.actor.typed.ExtensionId import akka.actor.typed.scaladsl.Behaviors -import akka.protobufv3.internal.Any import com.github.ghik.silencer.silent import com.typesafe.config.ConfigFactory diff --git a/project/AkkaBuild.scala b/project/AkkaBuild.scala index b114b4f613..7a660386ba 100644 --- a/project/AkkaBuild.scala +++ b/project/AkkaBuild.scala @@ -129,8 +129,6 @@ object AkkaBuild { lazy val defaultSettings: Seq[Setting[_]] = Def.settings( resolverSettings, TestExtras.Filter.settings, - Protobuf.settings, - // compile options scalacOptions in Compile ++= DefaultScalacOptions, scalacOptions in Compile ++=