diff options
| author | Jim Lawson | 2019-01-22 13:13:06 -0800 |
|---|---|---|
| committer | GitHub | 2019-01-22 13:13:06 -0800 |
| commit | 40f4d3edf93cf48294bd6555a1deaa07571b2d3d (patch) | |
| tree | 6b2aef1726c67c6e5788ff720fb83066c6a99b91 | |
| parent | eb6ddf4e0da1d3fa9e506e0b5f26ff87c411665e (diff) | |
Remove ghpages (#992)
* Remove GhpagesPlugin. (#966)
* Restore old SCM reference (after removing ghpages)
| -rw-r--r-- | build.sbt | 10 | ||||
| -rw-r--r-- | project/plugins.sbt | 2 |
2 files changed, 6 insertions, 6 deletions
@@ -2,8 +2,6 @@ enablePlugins(SiteScaladocPlugin) -enablePlugins(GhpagesPlugin) - def scalacOptionsVersion(scalaVersion: String): Seq[String] = { Seq() ++ { // If we're building with Scala > 2.11, enable the compile option @@ -39,7 +37,6 @@ lazy val commonSettings = Seq ( ), organization := "edu.berkeley.cs", version := "3.2-SNAPSHOT", - git.remoteRepo := "git@github.com:freechipsproject/chisel3.git", autoAPIMappings := true, scalaVersion := "2.12.6", crossScalaVersions := Seq("2.12.6", "2.11.12"), @@ -65,7 +62,8 @@ lazy val publishSettings = Seq ( publishMavenStyle := true, publishArtifact in Test := false, pomIncludeRepository := { x => false }, - // Don't add 'scm' elements if we have a git.remoteRepo definition. + // Don't add 'scm' elements if we have a git.remoteRepo definition, + // but since we don't (with the removal of ghpages), add them in below. pomExtra := <url>http://chisel.eecs.berkeley.edu/</url> <licenses> <license> @@ -74,6 +72,10 @@ lazy val publishSettings = Seq ( <distribution>repo</distribution> </license> </licenses> + <scm> + <url>https://github.com/freechipsproject/chisel3.git</url> + <connection>scm:git:github.com/freechipsproject/chisel3.git</connection> + </scm> <developers> <developer> <id>jackbackrack</id> diff --git a/project/plugins.sbt b/project/plugins.sbt index 0768a361..4a06a51b 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -8,8 +8,6 @@ addSbtPlugin("org.scalastyle" %% "scalastyle-sbt-plugin" % "1.0.0") addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.5.1") -addSbtPlugin("com.typesafe.sbt" % "sbt-ghpages" % "0.6.2") - addSbtPlugin("com.typesafe.sbt" % "sbt-site" % "1.3.1") addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.7.0") |