Skip to content

Commit

Permalink
Release 0.3.11.
Browse files Browse the repository at this point in the history
- Make build `+test` friendly.  sbt 1.0 `+` uses the sbt-doge `very` semantics.
- Remove scm info and add explicit depedency on sbt-git.
  Fixes "Duplicate scm" errors from sonatype encountered while publishing,
  explained here
  lihaoyi#60 (comment).
  sbt-git is pulled in transitively via sbt-ghpages, a recent release of
  sbt-git added a feature where scmInfo is automatically populated, see
  sbt/sbt-git#117 (comment)
- I skipped 0.3.10 because of a `java.io.IOException: destination
  file exists and overwrite == false` error. I don't know where the
  destination file is, I've removed ~/.ivy2/local cache, target, ~/.m2 and
  the error still appears.
  • Loading branch information
olafurpg committed Aug 13, 2017
1 parent 8abda8b commit 1e43567
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 5 deletions.
7 changes: 3 additions & 4 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,6 @@ lazy val sharedSettings = Seq(
<url>http://www.opensource.org/licenses/mit-license.php</url>
</license>
</licenses>
<scm>
<url>git://github.com/lihaoyi/Scalatex.git</url>
<connection>scm:git://github.com/lihaoyi/Scalatex.git</connection>
</scm>
<developers>
<developer>
<id>lihaoyi</id>
Expand Down Expand Up @@ -57,6 +53,7 @@ lazy val scalatexSbtPlugin = project.settings(sharedSettings:_*)
if (sbtVersion.in(pluginCrossBuild).value.startsWith("0.13")) Constants.scala210
else Constants.scala212
},
crossScalaVersions := List(Constants.scala212),
// scalatexSbtPlugin/publish uses sbt 1.0 by default. To publish for 0.13, run
// ^^ 0.13.16 # similar as ++2.12.3 but for sbtVersion instead.
// scalatexSbtPlugin/publish
Expand Down Expand Up @@ -95,6 +92,7 @@ lazy val site =
lazy val scrollspy = project
.enablePlugins(ScalaJSPlugin)
.settings(
sharedSettings,
scalaVersion := Constants.scala212,
crossScalaVersions:= Seq(Constants.scala211, Constants.scala212),
scalacOptions += "-P:scalajs:suppressExportDeprecations", // see https://github.com/scala-js/scala-js/issues/3092
Expand All @@ -114,6 +112,7 @@ lazy val readme = scalatex.ScalatexReadme(
source = "Readme"
)
.settings(
sharedSettings,
siteSourceDirectory := target.value / "scalatex",
git.remoteRepo := "git@github.com:lihaoyi/scalatex.git",
libraryDependencies := libraryDependencies.value.filter(_.name == "scalatex-site"),
Expand Down
2 changes: 1 addition & 1 deletion project/Constants.scala
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package scalatex
object Constants{
val version = "0.3.11"
val scalaTags = "0.6.2"
val upickle = "0.4.4"
val scala210 = "2.10.6"
val scala211 = "2.11.11"
val scala212 = "2.12.3"
val version = "0.3.9"
}
2 changes: 2 additions & 0 deletions project/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,5 @@ addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.0-M1")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.19")

addSbtPlugin("com.typesafe.sbt" % "sbt-ghpages" % "0.6.2")

addSbtPlugin("com.typesafe.sbt" % "sbt-git" % "0.9.3")
4 changes: 4 additions & 0 deletions readme/Readme.scalatex
Original file line number Diff line number Diff line change
Expand Up @@ -590,6 +590,10 @@
The limitations are not fundamental, but purely a matter of how Scalatex is being used now: static documents, rather than dynamic pages. If there's interest removing them would not be hard.

@sect{Changelog}
@sect{0.3.11}
@ul
@li
sbt 1.0 support for scalatex-sbt-plugin.
@sect{0.3.9}
@ul
@li
Expand Down

0 comments on commit 1e43567

Please sign in to comment.