Skip to content

Commit c382eaf

Browse files
committed
Fix the double publishing problem once and for all
1 parent 87bced1 commit c382eaf

File tree

2 files changed

+10
-3
lines changed

2 files changed

+10
-3
lines changed

build.sbt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,8 @@ val jsonConfig210 = project
6969
name := "bloop-config",
7070
target := (file("config") / "target" / "json-config-2.10").getAbsoluteFile,
7171
scalaVersion := Scala210Version,
72+
publishM2Configuration := publishM2Configuration.value.withOverwrite(true),
73+
publishLocalConfiguration := publishLocalConfiguration.value.withOverwrite(true),
7274
// We compile in both so that the maven integration can be tested locally
7375
publishLocal := publishLocal.dependsOn(publishM2).value,
7476
libraryDependencies ++= {
@@ -92,6 +94,8 @@ val jsonConfig211 = project
9294
scalaVersion := Scala211Version,
9395
unmanagedSourceDirectories in Compile +=
9496
Keys.baseDirectory.value./("src")./("main")./("scala-2.11-12"),
97+
publishM2Configuration := publishM2Configuration.value.withOverwrite(true),
98+
publishLocalConfiguration := publishLocalConfiguration.value.withOverwrite(true),
9599
// We compile in both so that the gradle integration can be tested locally
96100
publishLocal := publishLocal.dependsOn(publishM2).value,
97101
libraryDependencies ++= {
@@ -114,6 +118,8 @@ val jsonConfig212 = project
114118
Keys.baseDirectory.value./("src")./("main")./("scala-2.11-12"),
115119
target := (file("config") / "target" / "json-config-2.12").getAbsoluteFile,
116120
scalaVersion := Keys.scalaVersion.in(backend).value,
121+
publishM2Configuration := publishM2Configuration.value.withOverwrite(true),
122+
publishLocalConfiguration := publishLocalConfiguration.value.withOverwrite(true),
117123
publishLocal := publishLocal.dependsOn(publishM2).value,
118124
libraryDependencies ++= {
119125
List(

project/BuildPlugin.scala

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,14 @@ import sbt.librarymanagement.MavenRepository
1818

1919
object BuildPlugin extends AutoPlugin {
2020
import sbt.plugins.JvmPlugin
21+
import sbt.plugins.IvyPlugin
2122
import com.typesafe.sbt.SbtPgp
2223
import ch.epfl.scala.sbt.release.ReleaseEarlyPlugin
2324
import com.lucidchart.sbt.scalafmt.ScalafmtCorePlugin
2425

2526
override def trigger: PluginTrigger = allRequirements
2627
override def requires: Plugins =
27-
JvmPlugin && ScalafmtCorePlugin && ReleaseEarlyPlugin && SbtPgp
28+
JvmPlugin && ScalafmtCorePlugin && ReleaseEarlyPlugin && SbtPgp && IvyPlugin
2829
val autoImport = BuildKeys
2930

3031
override def globalSettings: Seq[Def.Setting[_]] =
@@ -346,8 +347,8 @@ object BuildImplementation {
346347
val version = Keys.version.value
347348
BuildDefaults.publishDocAndSourceArtifact(output, version)
348349
},
349-
Keys.publishConfiguration := Keys.publishConfiguration.value.withOverwrite(true),
350-
Keys.publishLocalConfiguration := Keys.publishLocalConfiguration.value.withOverwrite(true),
350+
Keys.publishLocalConfiguration in Compile :=
351+
Keys.publishLocalConfiguration.value.withOverwrite(true)
351352
) // ++ metalsSettings
352353

353354
final val reasonableCompileOptions = (

0 commit comments

Comments
 (0)