Skip to content

Commit 73015db

Browse files
fix publish failed in build.sbt (#487)
* fix publish failed in build.sbt * Fix indentation in build.sbt * Update build.sbt
1 parent 3d7f544 commit 73015db

File tree

1 file changed

+33
-27
lines changed

1 file changed

+33
-27
lines changed

build.sbt

Lines changed: 33 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,33 @@ val scalacOption = Def.setting {
1616
}
1717

1818
lazy val root = (project in file(".")).aggregate(core, scala2macros)
19+
.settings(
20+
publish / skip := true
21+
)
22+
23+
lazy val publishSettings = Seq(
24+
licenses := Seq("Apache 2.0 License" -> url("http://www.apache.org/licenses/LICENSE-2.0.html")),
25+
homepage := Some(url("https://github.com/lightbend/scala-logging")),
26+
Test / publishArtifact := false,
27+
pomIncludeRepository := (_ => false),
28+
scmInfo := Some(
29+
ScmInfo(url("https://github.com/lightbend/scala-logging"), "scm:git:[email protected]:lightbend/scala-logging.git")
30+
),
31+
developers := List(
32+
Developer(
33+
id = "hseeberger",
34+
name = "Heiko Seeberger",
35+
email = "",
36+
url = url("http://heikoseeberger.de")
37+
),
38+
Developer(
39+
id = "analytically",
40+
name = "Mathias Bogaert",
41+
email = "",
42+
url = url("http://twitter.com/analytically")
43+
)
44+
)
45+
)
1946

2047
lazy val core = (project in file("core"))
2148
.enablePlugins(SbtOsgi)
@@ -37,34 +64,13 @@ lazy val core = (project in file("core"))
3764
|import org.slf4j.{ Logger => Underlying, _ }""".stripMargin
3865
).settings(
3966
// OSGi
40-
osgiSettings
67+
osgiSettings,
68+
publishSettings
4169
).settings(
4270
OsgiKeys.bundleSymbolicName := "com.typesafe.scala-logging",
4371
OsgiKeys.privatePackage := Seq(),
44-
OsgiKeys.exportPackage := Seq("com.typesafe.scalalogging*"),
45-
46-
// publishing
47-
licenses := Seq("Apache 2.0 License" -> url("http://www.apache.org/licenses/LICENSE-2.0.html")),
48-
homepage := Some(url("https://github.com/lightbend/scala-logging")),
49-
Test / publishArtifact := false,
50-
pomIncludeRepository := (_ => false),
51-
scmInfo := Some(
52-
ScmInfo(url("https://github.com/lightbend/scala-logging"), "scm:git:[email protected]:lightbend/scala-logging.git")
53-
),
54-
developers := List(
55-
Developer(
56-
id = "hseeberger",
57-
name = "Heiko Seeberger",
58-
email = "",
59-
url = url("http://heikoseeberger.de")
60-
),
61-
Developer(
62-
id = "analytically",
63-
name = "Mathias Bogaert",
64-
email = "",
65-
url = url("http://twitter.com/analytically")
66-
)
67-
))
72+
OsgiKeys.exportPackage := Seq("com.typesafe.scalalogging*")
73+
)
6874
.dependsOn(scala2macros)
6975

7076
lazy val scala2macros = project
@@ -73,7 +79,7 @@ lazy val scala2macros = project
7379
scalaVersion := scala213,
7480
crossScalaVersions := scala2,
7581
libraryDependencies ++= Dependencies.scalaLogging(scalaVersion.value, false),
76-
)
82+
).settings(publishSettings)
7783

7884
lazy val `integration-test` = project.in(file("integration-test"))
7985
.settings(
@@ -92,4 +98,4 @@ lazy val `integration-test` = project.in(file("integration-test"))
9298
scalaTest % "test"
9399
)
94100
)
95-
.dependsOn(core)
101+
.dependsOn(core)

0 commit comments

Comments
 (0)