Skip to content

Commit

Permalink
Merge pull request #155 from sjrd/fix-publishing
Browse files Browse the repository at this point in the history
Move repository-wide settings to `inThisBuild` to fix publishing.
  • Loading branch information
sjrd authored Apr 6, 2023
2 parents 9f07743 + d2b8ee1 commit a07d717
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 24 deletions.
23 changes: 22 additions & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,28 @@ import Extra._

inThisBuild(
Def.settings(
scalaVersion := "2.12.10"
scalaVersion := "2.12.10",
scalacOptions ++= Seq(
"-deprecation",
"-unchecked",
"-feature",
"-encoding",
"utf8"
),
organization := "org.portable-scala",
versionScheme := Some("semver-spec"),
homepage := Some(
url("https://github.com/portable-scala/sbt-crossproject")),
licenses := Seq(
"BSD-like" -> url("http://www.scala-lang.org/downloads/license.html")
),
scmInfo := Some(
ScmInfo(
url("https://github.com/portable-scala/sbt-crossproject"),
"scm:git:git@github.com:portable-scala/sbt-crossproject.git",
Some("scm:git:git@github.com:portable-scala/sbt-crossproject.git")
)
)
))

lazy val `sbt-crossproject-root` =
Expand Down
23 changes: 0 additions & 23 deletions project/Extra.scala
Original file line number Diff line number Diff line change
Expand Up @@ -12,33 +12,10 @@ object Extra {
val newScalaBinaryVersionsInThisRelease: Set[String] = Set()

val sbtPluginSettings = Def.settings(
organization := "org.portable-scala",
versionScheme := Some("semver-spec"),
scalacOptions ++= Seq(
"-deprecation",
"-unchecked",
"-feature",
"-encoding",
"utf8"
),
sbtVersion := "1.2.1"
)

lazy val publishSettings = Seq(
Compile / publishArtifact := true,
Test / publishArtifact := false,
homepage := Some(
url("https://github.com/portable-scala/sbt-crossproject")),
licenses := Seq(
"BSD-like" -> url("http://www.scala-lang.org/downloads/license.html")
),
scmInfo := Some(
ScmInfo(
url("https://github.com/portable-scala/sbt-crossproject"),
"scm:git:git@github.com:portable-scala/sbt-crossproject.git",
Some("scm:git:git@github.com:portable-scala/sbt-crossproject.git")
)
),
// Publishing
pomExtra := (
<developers>
Expand Down

0 comments on commit a07d717

Please sign in to comment.