Skip to content

Commit 188f912

Browse files
authored
Merge pull request #57 from eed3si9n/wip/fixbuild
Build: Fix publishing
2 parents 8cefae6 + 119f811 commit 188f912

File tree

1 file changed

+27
-26
lines changed

1 file changed

+27
-26
lines changed

build.sbt

Lines changed: 27 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -11,32 +11,10 @@ val V = new {
1111
val scalaJsDom = "0.9.7"
1212
}
1313

14+
ThisBuild / scalaVersion := V.scala2_13
1415

15-
16-
val GlobalSettings = nocomma {
17-
ThisBuild / name := "pine"
18-
ThisBuild / organization := "tech.sparse"
19-
ThisBuild / scalaVersion := V.scala2_13
20-
21-
ThisBuild / pomExtra :=
22-
<url>https://github.com/sparsetech/pine</url>
23-
<licenses>
24-
<license>
25-
<name>Apache-2.0</name>
26-
<url>https://www.apache.org/licenses/LICENSE-2.0.html</url>
27-
</license>
28-
</licenses>
29-
<scm>
30-
<url>git@github.com:sparsetech/pine.git</url>
31-
</scm>
32-
<developers>
33-
<developer>
34-
<id>tindzk</id>
35-
<name>Tim Nieradzik</name>
36-
<url>http://github.com/tindzk</url>
37-
</developer>
38-
</developers>
39-
16+
val commonSettings = nocomma {
17+
name := "pine"
4018
convertMDN := MDNParser.createFiles(new File("src/main/scala"))
4119

4220
// See https://github.com/sbt/sbt/pull/2659
@@ -148,7 +126,7 @@ val NativeSettings = nocomma {
148126
}
149127

150128
lazy val pine = (projectMatrix in file("."))
151-
.settings( GlobalSettings )
129+
.settings(commonSettings)
152130
.jvmPlatform( Seq(V.scala2_13), JvmSettings ++ Scala13Settings)
153131
.jvmPlatform( Seq(V.scala2_12), JvmSettings ++ Scala12Settings)
154132
.jvmPlatform( Seq(V.scala2_11), JvmSettings ++ Scala11Settings)
@@ -157,3 +135,26 @@ lazy val pine = (projectMatrix in file("."))
157135
.jsPlatform( Seq(V.scala2_11), JsSettings ++ Scala11Settings)
158136
.nativePlatform( Seq(V.scala2_11), NativeSettings ++ Pre13Settings)
159137

138+
// root settings. src/ is handled by sbt-projectmatrix
139+
publish / skip := false
140+
Compile / sources := List()
141+
Test / sources := List()
142+
143+
// publish settings
144+
ThisBuild / organization := "tech.sparse"
145+
ThisBuild / homepage := Some(url("https://github.com/sparsetech/pine"))
146+
ThisBuild / licenses := List("Apache 2" -> url("https://www.apache.org/licenses/LICENSE-2.0.html"))
147+
ThisBuild / scmInfo := Some(
148+
ScmInfo(
149+
url("https://github.com/sparsetech/pine"),
150+
"scm:git@github.com:sparsetech/pine.git"
151+
)
152+
)
153+
ThisBuild / developers := List(
154+
Developer(
155+
id = "tindzk",
156+
name = "Tim Nieradzik",
157+
email = "@tindzk",
158+
url = url("http://github.com/tindzk")
159+
)
160+
)

0 commit comments

Comments
 (0)