Skip to content

Commit a07d717

Browse files
authored
Merge pull request #155 from sjrd/fix-publishing
Move repository-wide settings to `inThisBuild` to fix publishing.
2 parents 9f07743 + d2b8ee1 commit a07d717

File tree

2 files changed

+22
-24
lines changed

2 files changed

+22
-24
lines changed

build.sbt

+22-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,28 @@ import Extra._
22

33
inThisBuild(
44
Def.settings(
5-
scalaVersion := "2.12.10"
5+
scalaVersion := "2.12.10",
6+
scalacOptions ++= Seq(
7+
"-deprecation",
8+
"-unchecked",
9+
"-feature",
10+
"-encoding",
11+
"utf8"
12+
),
13+
organization := "org.portable-scala",
14+
versionScheme := Some("semver-spec"),
15+
homepage := Some(
16+
url("https://github.com/portable-scala/sbt-crossproject")),
17+
licenses := Seq(
18+
"BSD-like" -> url("http://www.scala-lang.org/downloads/license.html")
19+
),
20+
scmInfo := Some(
21+
ScmInfo(
22+
url("https://github.com/portable-scala/sbt-crossproject"),
23+
"scm:git:git@github.com:portable-scala/sbt-crossproject.git",
24+
Some("scm:git:git@github.com:portable-scala/sbt-crossproject.git")
25+
)
26+
)
627
))
728

829
lazy val `sbt-crossproject-root` =

project/Extra.scala

-23
Original file line numberDiff line numberDiff line change
@@ -12,33 +12,10 @@ object Extra {
1212
val newScalaBinaryVersionsInThisRelease: Set[String] = Set()
1313

1414
val sbtPluginSettings = Def.settings(
15-
organization := "org.portable-scala",
16-
versionScheme := Some("semver-spec"),
17-
scalacOptions ++= Seq(
18-
"-deprecation",
19-
"-unchecked",
20-
"-feature",
21-
"-encoding",
22-
"utf8"
23-
),
2415
sbtVersion := "1.2.1"
2516
)
2617

2718
lazy val publishSettings = Seq(
28-
Compile / publishArtifact := true,
29-
Test / publishArtifact := false,
30-
homepage := Some(
31-
url("https://github.com/portable-scala/sbt-crossproject")),
32-
licenses := Seq(
33-
"BSD-like" -> url("http://www.scala-lang.org/downloads/license.html")
34-
),
35-
scmInfo := Some(
36-
ScmInfo(
37-
url("https://github.com/portable-scala/sbt-crossproject"),
38-
"scm:git:git@github.com:portable-scala/sbt-crossproject.git",
39-
Some("scm:git:git@github.com:portable-scala/sbt-crossproject.git")
40-
)
41-
),
4219
// Publishing
4320
pomExtra := (
4421
<developers>

0 commit comments

Comments
 (0)