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

Remove org.apache.pekko package from sbt build

Browse source
This commit is contained in:
Matthew de Detrich 2023-07-30 11:55:14 +02:00 • committed by Matthew de Detrich
parent 12dfc46136
commit b7fdada663
36 changed files with 21 additions and 99 deletions
Download patch file Download diff file Expand all files Collapse all files

5
build.sbt
View file

@ -8,7 +8,6 @@
*/
import net.bzzt.reproduciblebuilds.ReproducibleBuildsPlugin.reproducibleBuildsCheckResolver
import org.apache.pekko._
ThisBuild / scalafixScalaBinaryVersion := scalaBinaryVersion.value
@ -47,8 +46,8 @@ addCommandAlias(
addCommandAlias(name = "sortImports", value = ";scalafixEnable; scalafixAll SortImports; scalafmtAll")
import org.apache.pekko.PekkoBuild._
import com.typesafe.sbt.MultiJvmPlugin.MultiJvmKeys.MultiJvm
import PekkoBuild._
import MultiJvmPlugin.MultiJvmKeys.MultiJvm
import com.typesafe.tools.mima.plugin.MimaPlugin
import sbt.Keys.{ initialCommands, parallelExecution }
import spray.boilerplate.BoilerplatePlugin

4
project/AddLogTimestamps.scala
View file

@ -11,15 +11,13 @@
* Copyright (C) 2019-2022 Lightbend Inc. <https://www.lightbend.com>
*/
package org.apache.pekko
import java.io.PrintWriter
import java.time.LocalDateTime
import java.time.ZoneId
import java.time.format.DateTimeFormatter
import sbt.{ Def, _ }
import Keys._
import sbt.internal.{ AppenderSupplier, LogManager }
import sbt.internal.LogManager
import sbt.internal.util.ConsoleOut
object AddLogTimestamps extends AutoPlugin {

2
project/AutomaticModuleName.scala
View file

@ -11,8 +11,6 @@
* Copyright (C) 2016-2022 Lightbend Inc. <https://www.lightbend.com>
*/
package org.apache.pekko
import sbt.{ Def, _ }
import sbt.Keys._

2
project/CliOptions.scala
View file

@ -11,8 +11,6 @@
* Copyright (C) 2009-2022 Lightbend Inc. <https://www.lightbend.com>
*/
package org.apache.pekko
case class CliOption[T](private val value: T) {
def get: T = value
}

5
project/CopyrightHeader.scala
View file

@ -11,15 +11,14 @@
* Copyright (C) 2018-2022 Lightbend Inc. <https://www.lightbend.com>
*/
package org.apache.pekko
import de.heikoseeberger.sbtheader.HeaderPlugin.autoImport._
import de.heikoseeberger.sbtheader.{ CommentCreator, HeaderPlugin, NewLine }
import com.typesafe.sbt.MultiJvmPlugin.MultiJvmKeys._
import org.apache.commons.lang3.StringUtils
import sbt.Keys._
import sbt._
import MultiJvmPlugin.MultiJvmKeys._
trait CopyrightHeader extends AutoPlugin {
override def requires: Plugins = HeaderPlugin

2
project/CopyrightHeaderForBoilerplate.scala
View file

@ -11,8 +11,6 @@
* Copyright (C) 2019-2022 Lightbend Inc. <https://www.lightbend.com>
*/
package org.apache.pekko
import de.heikoseeberger.sbtheader.HeaderPlugin
import de.heikoseeberger.sbtheader.HeaderPlugin.autoImport._
import sbt.Keys.sourceDirectory

2
project/CopyrightHeaderForBuild.scala
View file

@ -11,8 +11,6 @@
* Copyright (C) 2019-2022 Lightbend Inc. <https://www.lightbend.com>
*/
package org.apache.pekko
import de.heikoseeberger.sbtheader.HeaderPlugin.autoImport.{ headerMappings, headerSources, HeaderFileType }
import sbt.Keys.baseDirectory
import sbt.{ inConfig, Compile, Def, PluginTrigger, Test, _ }

2
project/CopyrightHeaderForJdk9.scala
View file

@ -11,8 +11,6 @@
* Copyright (C) 2019-2022 Lightbend Inc. <https://www.lightbend.com>
*/
package org.apache.pekko
import de.heikoseeberger.sbtheader.HeaderPlugin.autoImport.headerSources
import sbt.Keys.sourceDirectory
import sbt.{ Compile, Def, Test, _ }

2
project/CopyrightHeaderForProtobuf.scala
View file

@ -11,8 +11,6 @@
* Copyright (C) 2019-2022 Lightbend Inc. <https://www.lightbend.com>
*/
package org.apache.pekko
import de.heikoseeberger.sbtheader.HeaderPlugin.autoImport.{ headerMappings, headerSources, HeaderFileType }
import sbt.Keys.sourceDirectory
import sbt.{ inConfig, Compile, Def, Test, _ }

2
project/Dependencies.scala
View file

@ -11,8 +11,6 @@
* Copyright (C) 2016-2022 Lightbend Inc. <https://www.lightbend.com>
*/
package org.apache.pekko
import sbt._
import Keys._
import scala.language.implicitConversions

2
project/Doc.scala
View file

@ -11,8 +11,6 @@
* Copyright (C) 2009-2022 Lightbend Inc. <https://www.lightbend.com>
*/
package org.apache.pekko
import sbt._
import sbtunidoc.BaseUnidocPlugin.autoImport.{ unidoc, unidocAllSources, unidocProjectFilter }
import sbtunidoc.JavaUnidocPlugin.autoImport.JavaUnidoc

2
project/GitHub.scala
View file

@ -11,8 +11,6 @@
* Copyright (C) 2016-2022 Lightbend Inc. <https://www.lightbend.com>
*/
package org.apache.pekko
object GitHub {
def envTokenOrThrow: Option[String] =

1
project/JavaFormatter.scala
View file

@ -11,7 +11,6 @@
* Copyright (C) 2019-2022 Lightbend Inc. <https://www.lightbend.com>
*/
import org.apache.pekko.ProjectFileIgnoreSupport
import com.lightbend.sbt.JavaFormatterPlugin
import sbt.{ AutoPlugin, PluginTrigger, Plugins }

2
project/Jdk9.scala
View file

@ -11,8 +11,6 @@
* Copyright (C) 2017-2022 Lightbend Inc. <https://www.lightbend.com>
*/
package org.apache.pekko
import sbt._
import sbt.Keys._

4
project/JdkOptions.scala
View file

@ -11,12 +11,8 @@
* Copyright (C) 2009-2022 Lightbend Inc. <https://www.lightbend.com>
*/
package org.apache.pekko
import java.io.File
import scala.annotation.tailrec
import scala.collection.immutable.ListMap
import sbt._
import sbt.librarymanagement.SemanticSelector
import sbt.librarymanagement.VersionNumber

2
project/Jvm.scala
View file

@ -11,8 +11,6 @@
* Copyright (C) 2009-2022 Lightbend Inc. <https://www.lightbend.com>
*/
package com.typesafe.sbt.multijvm
import java.io.File
import java.lang.{ ProcessBuilder => JProcessBuilder }

2
project/MiMa.scala
View file

@ -11,8 +11,6 @@
* Copyright (C) 2009-2022 Lightbend Inc. <https://www.lightbend.com>
*/
package org.apache.pekko
import scala.collection.immutable
import sbt._
import sbt.Keys._

10
project/MultiNode.scala
View file

@ -11,12 +11,10 @@
* Copyright (C) 2009-2022 Lightbend Inc. <https://www.lightbend.com>
*/
package org.apache.pekko
import TestExtras.Filter.Keys._
import MultiJvmPlugin.MultiJvmKeys.multiJvmCreateLogger
import MultiJvmPlugin.MultiJvmKeys._
import org.apache.pekko.TestExtras.Filter.Keys._
import com.typesafe.sbt.MultiJvmPlugin.MultiJvmKeys.multiJvmCreateLogger
import com.typesafe.sbt.{ MultiJvmPlugin => SbtMultiJvm }
import com.typesafe.sbt.MultiJvmPlugin.MultiJvmKeys._
import sbt.{ Def, _ }
import sbt.Keys._
import de.heikoseeberger.sbtheader.HeaderPlugin.autoImport._
@ -74,7 +72,7 @@ object MultiNode extends AutoPlugin {
private val anyConfigsInThisProject = ScopeFilter(configurations = inAnyConfiguration)
private val multiJvmSettings =
SbtMultiJvm.multiJvmSettings ++
MultiJvmPlugin.multiJvmSettings ++
inConfig(MultiJvm)(scalafmtConfigSettings) ++
Seq(
// Hack because 'provided' dependencies by default are not picked up by the multi-jvm plugin:

2
project/OSGi.scala
View file

@ -11,8 +11,6 @@
* Copyright (C) 2016-2022 Lightbend Inc. <https://www.lightbend.com>
*/
package org.apache.pekko
import com.typesafe.sbt.osgi.OsgiKeys
import com.typesafe.sbt.osgi.SbtOsgi._
import sbt._

2
project/Paradox.scala
View file

@ -11,8 +11,6 @@
* Copyright (C) 2019-2022 Lightbend Inc. <https://www.lightbend.com>
*/
package org.apache.pekko
import com.lightbend.paradox.sbt.ParadoxPlugin
import com.lightbend.paradox.sbt.ParadoxPlugin.autoImport._
import com.lightbend.paradox.apidoc.ApidocPlugin

2
project/ParadoxBrowse.scala
View file

@ -11,8 +11,6 @@
* Copyright (C) 2018-2022 Lightbend Inc. <https://www.lightbend.com>
*/
package org.apache.pekko
import com.lightbend.paradox.sbt.ParadoxPlugin
import com.lightbend.paradox.sbt.ParadoxPlugin.autoImport._
import sbt.Keys._

5
project/PekkoBuild.scala
View file

@ -11,11 +11,10 @@
* Copyright (C) 2009-2022 Lightbend Inc. <https://www.lightbend.com>
*/
package org.apache.pekko
import JdkOptions.autoImport._
import MultiJvmPlugin.autoImport.MultiJvm
import org.apache.pekko.JdkOptions.autoImport._
import com.lightbend.paradox.projectinfo.ParadoxProjectInfoPluginKeys._
import com.typesafe.sbt.MultiJvmPlugin.autoImport.MultiJvm
import sbt.Def
import sbt.Keys._
import sbt._

2
project/PekkoDisciplinePlugin.scala
View file

@ -11,8 +11,6 @@
* Copyright (C) 2019-2022 Lightbend Inc. <https://www.lightbend.com>
*/
package org.apache.pekko
import sbt._
import Keys.{ scalacOptions, _ }
import sbt.plugins.JvmPlugin

2
project/ProjectFileIgnoreSupport.scala
View file

@ -11,8 +11,6 @@
* Copyright (C) 2019-2022 Lightbend Inc. <https://www.lightbend.com>
*/
package org.apache.pekko
import java.io.File
import com.typesafe.config.ConfigFactory

2
project/Protobuf.scala
View file

@ -11,8 +11,6 @@
* Copyright (C) 2009-2022 Lightbend Inc. <https://www.lightbend.com>
*/
package org.apache.pekko
import java.io.File
import java.io.PrintWriter

2
project/Publish.scala
View file

@ -11,8 +11,6 @@
* Copyright (C) 2009-2022 Lightbend Inc. <https://www.lightbend.com>
*/
package org.apache.pekko
import sbt._
import sbt.Keys._
import org.mdedetrich.apache.sonatype.ApacheSonatypePlugin

3
project/SbtMultiJvm.scala
View file

@ -11,9 +11,6 @@
* Copyright (C) 2009-2022 Lightbend Inc. <https://www.lightbend.com>
*/
package com.typesafe.sbt
import com.typesafe.sbt.multijvm.{ Jvm, JvmLogger }
import scala.sys.process.Process
import sjsonnew.BasicJsonProtocol._
import sbt._

4
project/ScalaFixExtraRulesPlugin.scala
View file

@ -11,9 +11,7 @@
* Copyright (C) 2020-2022 Lightbend Inc. <https://www.lightbend.com>
*/
package org.apache.pekko
import sbt.{ AutoPlugin, PluginTrigger, Plugins, ScalafixSupport }
import sbt.{ AutoPlugin, PluginTrigger, Plugins }
import scalafix.sbt.ScalafixPlugin
object ScalaFixExtraRulesPlugin extends AutoPlugin with ScalafixSupport {

5
project/ScalaFixForJdk9Plugin.scala
View file

@ -11,10 +11,9 @@
* Copyright (C) 2020-2022 Lightbend Inc. <https://www.lightbend.com>
*/
package org.apache.pekko
import sbt.{ AutoPlugin, PluginTrigger, Plugins, ScalafixSupport }
import sbt.{ AutoPlugin, PluginTrigger, Plugins }
import scalafix.sbt.ScalafixPlugin
object ScalaFixForJdk9Plugin extends AutoPlugin with ScalafixSupport {
override def trigger: PluginTrigger = allRequirements
import Jdk9._

5
project/ScalafixForMultiNodePlugin.scala
View file

@ -11,10 +11,7 @@
* Copyright (C) 2018-2022 Lightbend Inc. <https://www.lightbend.com>
*/
package org.apache.pekko
import com.typesafe.sbt.MultiJvmPlugin
import sbt.{ inConfig, AutoPlugin, Def, PluginTrigger, Plugins, ScalafixSupport, Setting }
import sbt.{ inConfig, AutoPlugin, Def, PluginTrigger, Plugins, Setting }
import scalafix.sbt.ScalafixPlugin
import scalafix.sbt.ScalafixPlugin.autoImport.scalafixConfigSettings

4
project/ScalafixIgnoreFilePlugin.scala
View file

@ -11,10 +11,8 @@
* Copyright (C) 2018-2022 Lightbend Inc. <https://www.lightbend.com>
*/
package org.apache.pekko
import sbt.plugins.JvmPlugin
import sbt.{ AutoPlugin, PluginTrigger, Plugins, ScalafixSupport }
import sbt.{ AutoPlugin, PluginTrigger, Plugins }
import scalafix.sbt.ScalafixPlugin
object ScalafixIgnoreFilePlugin extends AutoPlugin with ScalafixSupport {

17
project/ScalafixSupport.scala
View file

@ -11,11 +11,9 @@
* Copyright (C) 2018-2022 Lightbend Inc. <https://www.lightbend.com>
*/
package sbt
import Keys.baseDirectory
import sbt._
import org.apache.pekko.ProjectFileIgnoreSupport
import sbt.Keys.unmanagedSources
import Keys._
trait ScalafixSupport {
private val ignoreConfigFileName: String = ".scalafix.conf"
@ -32,13 +30,9 @@ trait ScalafixSupport {
}
}
import sbt.Keys._
def addProjectCommandsIfAbsent(alias: String, value: String): Def.Setting[Seq[Command]] = {
commands := {
val currentCommands = commands.value.collect {
case command: SimpleCommand => command.name
}.toSet
val currentCommands = commands.value.flatMap(_.nameOption).toSet
val isPresent = currentCommands(alias)
if (isPresent)
commands.value
@ -49,10 +43,7 @@ trait ScalafixSupport {
def updateProjectCommands(alias: String, value: String): Def.Setting[Seq[Command]] = {
commands := {
commands.value.filterNot {
case command: SimpleCommand => command.name == alias
case _ => false
} :+ BasicCommands.newAlias(name = alias, value = value)
commands.value.filterNot(_.nameOption.contains("alias")) :+ BasicCommands.newAlias(name = alias, value = value)
}
}
}

2
project/SigarLoader.scala
View file

@ -11,8 +11,6 @@
* Copyright (C) 2009-2022 Lightbend Inc. <https://www.lightbend.com>
*/
package org.apache.pekko
import sbt._
import sbt.Keys._

2
project/TestExtras.scala
View file

@ -11,8 +11,6 @@
* Copyright (C) 2016-2022 Lightbend Inc. <https://www.lightbend.com>
*/
package org.apache.pekko
import sbt.Keys._
import sbt._

4
project/ValidatePullRequest.scala
View file

@ -11,8 +11,6 @@
* Copyright (C) 2009-2022 Lightbend Inc. <https://www.lightbend.com>
*/
package org.apache.pekko
import com.hpe.sbt.ValidatePullRequest
import com.hpe.sbt.ValidatePullRequest.PathGlobFilter
import com.lightbend.paradox.sbt.ParadoxPlugin
@ -87,7 +85,7 @@ object PekkoValidatePullRequest extends AutoPlugin {
*/
object MultiNodeWithPrValidation extends AutoPlugin {
import PekkoValidatePullRequest._
import com.typesafe.sbt.MultiJvmPlugin.MultiJvmKeys.MultiJvm
import MultiJvmPlugin.MultiJvmKeys.MultiJvm
override def trigger = allRequirements
override def requires = PekkoValidatePullRequest && MultiNode

2
project/VersionGenerator.scala
View file

@ -11,8 +11,6 @@
* Copyright (C) 2016-2022 Lightbend Inc. <https://www.lightbend.com>
*/
package org.apache.pekko
import sbt._
import sbt.Keys._