Skip to content

Commit a9d04a8

Browse files
committed
build cleanup: use 'publish / skip' instead of rolling our own
1 parent 00e180e commit a9d04a8

File tree

1 file changed

+9
-14
lines changed

1 file changed

+9
-14
lines changed

build.sbt

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,10 @@ lazy val commonSettings = Seq(
1919
lazy val root = project
2020
.in(file("."))
2121
.settings(commonSettings)
22-
.settings(name := "scala-collection-compat")
23-
.settings(dontPublish)
22+
.settings(
23+
name := "scala-collection-compat",
24+
publish / skip := true
25+
)
2426
.aggregate(
2527
compat211JVM,
2628
compat211JS,
@@ -173,7 +175,7 @@ lazy val `scalafix-data` = MultiScalaProject(
173175
"scalafix/data",
174176
_.settings(sharedScalafixSettings)
175177
.settings(commonSettings)
176-
.settings(dontPublish)
178+
.settings(publish / skip := true)
177179
)
178180

179181
val `scalafix-data211` = `scalafix-data`(scala211, _.dependsOn(compat211JVM))
@@ -184,9 +186,9 @@ lazy val `scalafix-input` = project
184186
.in(file("scalafix/input"))
185187
.settings(commonSettings)
186188
.settings(sharedScalafixSettings)
187-
.settings(dontPublish)
188189
.settings(
189190
scalaVersion := scalafixScala212,
191+
publish / skip := true,
190192
addCompilerPlugin(scalafixSemanticdb),
191193
scalacOptions ++= Seq(
192194
"-Yrangepos",
@@ -200,7 +202,7 @@ val `scalafix-output` = MultiScalaProject(
200202
"scalafix/output",
201203
_.settings(sharedScalafixSettings)
202204
.settings(commonSettings)
203-
.settings(dontPublish)
205+
.settings(publish / skip := true)
204206
.disablePlugins(ScalafixPlugin)
205207
)
206208

@@ -242,15 +244,15 @@ lazy val `scalafix-output213-failure` = project
242244
.in(file("scalafix/output213-failure"))
243245
.settings(commonSettings)
244246
.settings(sharedScalafixSettings)
245-
.settings(dontPublish)
247+
.settings(publish / skip := true)
246248

247249
lazy val `scalafix-tests` = project
248250
.in(file("scalafix/tests"))
249251
.settings(commonSettings)
250252
.settings(sharedScalafixSettings)
251-
.settings(dontPublish)
252253
.settings(
253254
scalaVersion := scalafixScala212,
255+
publish / skip := true,
254256
libraryDependencies += "ch.epfl.scala" % "scalafix-testkit" % scalafixVersion % Test cross CrossVersion.full,
255257
scalafixTestkitOutputSourceDirectories := Seq(
256258
outputCross.value,
@@ -264,13 +266,6 @@ lazy val `scalafix-tests` = project
264266
.dependsOn(`scalafix-input`, `scalafix-rules`)
265267
.enablePlugins(BuildInfoPlugin, ScalafixTestkitPlugin)
266268

267-
lazy val dontPublish = Seq(
268-
publishArtifact := false,
269-
packagedArtifacts := Map.empty,
270-
publish := {},
271-
publishLocal := {},
272-
)
273-
274269
val travisScalaVersion = sys.env.get("TRAVIS_SCALA_VERSION").flatMap(Version.parse)
275270
val isTravisTag = sys.env.get("TRAVIS_TAG").exists(_.nonEmpty)
276271
val isScalaJs = sys.env.get("SCALAJS_VERSION").exists(_.nonEmpty)

0 commit comments

Comments
 (0)