Skip to content

Commit 00013ab

Browse files
committed
Update plugins & tidy site generation
1 parent 679c9ac commit 00013ab

File tree

10 files changed

+40
-76
lines changed

10 files changed

+40
-76
lines changed

build.sbt

Lines changed: 35 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,31 @@
1-
import PgpKeys.{publishLocalSigned, publishSigned}
2-
import com.typesafe.sbt.SbtGit.GitKeys._
1+
val javaVersion = "1.8"
32

4-
organization := "software.purpledragon.xml"
5-
version := "1.0.3-SNAPSHOT"
6-
7-
scalaVersion := "2.13.1"
8-
crossScalaVersions := Seq(scalaVersion.value, "2.11.12", "2.12.10")
9-
10-
// dependencies common for all sub-projects
11-
libraryDependencies ++= Seq(
12-
"org.scala-lang.modules" %% "scala-xml" % "1.2.0"
13-
)
3+
inThisBuild(
4+
Seq(
5+
organization := "software.purpledragon.xml",
6+
version := "1.0.3-SNAPSHOT",
7+
scalaVersion := "2.13.1",
8+
crossScalaVersions := Seq(scalaVersion.value, "2.11.12", "2.12.10"),
9+
licenses += ("Apache-2.0", url("https://opensource.org/licenses/Apache-2.0")),
10+
developers := List(
11+
Developer("stringbean", "Michael Stringer", "@the_stringbean", url("https://github.com/stringbean"))
12+
),
13+
organizationName := "Michael Stringer",
14+
organizationHomepage := Some(url("https://purpledragon.software")),
15+
homepage := Some(url("https://stringbean.github.io/scala-xml-compare")),
16+
startYear := Some(2017),
17+
scmInfo := Some(
18+
ScmInfo(
19+
url("https://github.com/stringbean/scala-xml-compare"),
20+
"https://github.com/stringbean/scala-xml-compare.git")),
21+
autoAPIMappings := true,
22+
javacOptions ++= Seq("-source", javaVersion, "-target", javaVersion, "-Xlint"),
23+
scalacOptions ++= Seq(s"-target:jvm-$javaVersion", "-deprecation", "-feature", "-unchecked"),
24+
// dependencies common for all sub-projects
25+
libraryDependencies ++= Seq(
26+
"org.scala-lang.modules" %% "scala-xml" % "1.2.0"
27+
),
28+
))
1429

1530
lazy val xmlCompare = Project("xml-compare", file("xml-compare"))
1631
.settings(
@@ -32,35 +47,26 @@ lazy val xmlSpecs2 = Project("xml-specs2", file("xml-specs2"))
3247
previewAuto := {}
3348
)
3449

35-
lazy val root = project
36-
.in(file("."))
50+
lazy val root = Project("scala-xml-compare", file("."))
3751
.aggregate(
3852
xmlCompare,
3953
xmlScalatest,
4054
xmlSpecs2
4155
)
4256
.settings(
43-
publish := {},
44-
publishSigned := {},
45-
publishLocal := {},
46-
publishLocalSigned := {},
47-
test := {},
48-
testOnly := {},
49-
bintrayUnpublish := {},
50-
bintraySyncMavenCentral := {},
57+
publishArtifact := false,
58+
// ghpages
59+
git.remoteRepo := scmInfo.value.get.connection.replace("scm:git:", ""),
60+
ghpagesNoJekyll := true,
61+
// site/paradox
5162
siteSubdirName in ScalaUnidoc := "api",
5263
addMappingsToSiteDir(mappings in (ScalaUnidoc, packageDoc), siteSubdirName in ScalaUnidoc),
53-
gitRemoteRepo := "git@github.com:stringbean/scala-xml-compare.git",
54-
ghpagesNoJekyll := true,
55-
paradoxTheme := Some(builtinParadoxTheme("generic")),
56-
sourceDirectory in Paradox := baseDirectory.value / "docs",
57-
sourceDirectory in Paradox in paradoxTheme := baseDirectory.value / "docs" / "_template",
58-
git.remoteRepo := "git@github.com:stringbean/scala-xml-compare.git",
5964
paradoxProperties in Paradox ++= Map(
6065
"scaladoc.software.purpledragon.xml.base_url" -> ".../api"
6166
),
6267
scalacOptions in Compile in doc ++= Seq(
63-
"-doc-root-content", baseDirectory.value + "/root-scaladoc.txt"
68+
"-doc-root-content",
69+
baseDirectory.value + "/root-scaladoc.txt"
6470
)
6571
)
6672
.enablePlugins(ScalaUnidocPlugin, GhpagesPlugin, ParadoxSitePlugin)

project/SettingsPlugin.scala

Lines changed: 0 additions & 42 deletions
This file was deleted.

project/plugins.sbt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@ addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.2-1")
1010

1111
// documentation
1212
addSbtPlugin("com.eed3si9n" % "sbt-unidoc" % "0.4.2")
13-
addSbtPlugin("com.typesafe.sbt" % "sbt-ghpages" % "0.6.2")
14-
addSbtPlugin("com.typesafe.sbt" % "sbt-site" % "1.3.2")
15-
addSbtPlugin("com.lightbend.paradox" % "sbt-paradox" % "0.3.3")
13+
addSbtPlugin("com.typesafe.sbt" % "sbt-ghpages" % "0.6.3")
14+
addSbtPlugin("com.typesafe.sbt" % "sbt-site" % "1.4.0")
15+
addSbtPlugin("com.lightbend.paradox" % "sbt-paradox" % "0.6.5")
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

xml-compare/build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name := "xml-compare"
22

33
libraryDependencies ++= Seq(
4-
"org.scalatest" %% "scalatest" % scalatestVersion.value % Test
4+
"org.scalatest" %% "scalatest" % "3.0.8" % Test
55
)

xml-scalatest/build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name := "xml-scalatest"
22

33
libraryDependencies ++= Seq(
4-
"org.scalatest" %% "scalatest" % scalatestVersion.value % Provided
4+
"org.scalatest" %% "scalatest" % "3.0.8" % Provided
55
)

0 commit comments

Comments
 (0)