Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bump dependencies #132

Merged
merged 1 commit into from
Aug 5, 2017
Merged

bump dependencies #132

merged 1 commit into from
Aug 5, 2017

Conversation

larsrh
Copy link
Contributor

@larsrh larsrh commented Aug 5, 2017

In preparation for sbt 1.0.x.

@larsrh
Copy link
Contributor Author

larsrh commented Aug 5, 2017

I have another patch that updates sbt-web to 1.4.1:

diff --git a/plugin/src/main/scala/com/lightbend/paradox/sbt/ParadoxPlugin.scala b/plugin/src/main/scala/com/lightbend/paradox/sbt/ParadoxPlugin.scala
index 95d00d1..24bc290 100644
--- a/plugin/src/main/scala/com/lightbend/paradox/sbt/ParadoxPlugin.scala
+++ b/plugin/src/main/scala/com/lightbend/paradox/sbt/ParadoxPlugin.scala
@@ -104,7 +104,7 @@ object ParadoxPlugin extends AutoPlugin {
     WebKeys.deduplicators in paradoxTheme += SbtWeb.selectFileFrom((sourceDirectory in paradoxTheme).value),
     mappings in paradoxTheme := SbtWeb.deduplicateMappings((mappings in paradoxTheme).value, (WebKeys.deduplicators in paradoxTheme).value),
     target in paradoxTheme := target.value / "paradox" / "theme",
-    paradoxThemeDirectory := SbtWeb.syncMappings(streams.value.cacheDirectory, (mappings in paradoxTheme).value, (target in paradoxTheme).value),
+    paradoxThemeDirectory := SbtWeb.syncMappings(streams.value.cacheDirectory, "sync-mappings", (mappings in paradoxTheme).value, (target in paradoxTheme).value),
 
     paradoxTemplate := {
       val dir = paradoxThemeDirectory.value
@@ -164,7 +164,7 @@ object ParadoxPlugin extends AutoPlugin {
 
     watchSources in Defaults.ConfigGlobal ++= (sourceDirectories in paradox).value.***.get,
 
-    paradox := SbtWeb.syncMappings(streams.value.cacheDirectory, (mappings in paradox).value, (target in paradox).value)
+    paradox := SbtWeb.syncMappings(streams.value.cacheDirectory, "sync-mappings", (mappings in paradox).value, (target in paradox).value)
   ))
 
   def shortVersion(version: String): String = version.replace("-SNAPSHOT", "*")
diff --git a/plugin/src/sbt-test/paradox/template/test b/plugin/src/sbt-test/paradox/template/test
index c6b77e1..044fe00 100644
--- a/plugin/src/sbt-test/paradox/template/test
+++ b/plugin/src/sbt-test/paradox/template/test
@@ -10,6 +10,7 @@ $ must-mirror target/paradox/site/main/page.html expected/page2.html
 
 # switch to a different default template
 > 'set paradoxDefaultTemplateName := "alt"'
+> clean
 > paradox
 $ must-mirror target/paradox/site/main/page.html expected/page3.html
 
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index 062c70f..aa16b7f 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -21,7 +21,7 @@ object Version {
   val jtidy      = "r938"
   val pegdown    = "1.6.0"
   val prettify   = "4-Mar-2013"
-  val sbtWeb     = "1.1.1"
+  val sbtWeb     = "1.4.1"
   val scalatest  = "3.0.3"
   val st4        = "4.0.8"
 }
diff --git a/project/plugins.sbt b/project/plugins.sbt
index 735b77b..42c7c33 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -30,7 +30,7 @@ lazy val metaThemePlugin = (project in file("theme-plugin"))
   .settings(
     sbtPlugin := true,
     scalaVersion := "2.10.6",
-    addSbtPlugin("com.typesafe.sbt" % "sbt-web" % "1.1.1"),
+    addSbtPlugin("com.typesafe.sbt" % "sbt-web" % "1.4.1"),
     unmanagedSourceDirectories in Compile :=
       mirrorScalaSource((baseDirectory in ThisBuild).value.getParentFile / "theme-plugin")
   )

Unfortunately, this fails the build when running docs/paradox.

Copy link
Contributor

@eed3si9n eed3si9n left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you!

@eed3si9n eed3si9n merged commit 2b47d89 into lightbend:master Aug 5, 2017
@larsrh larsrh deleted the topic/sbt branch August 5, 2017 18:35
@larsrh larsrh mentioned this pull request Aug 23, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants