Skip to content

Commit

Permalink
Use sbt-paradox-material-theme 0.7.0
Browse files Browse the repository at this point in the history
  • Loading branch information
mdedetrich committed Feb 14, 2024
1 parent 8f3804a commit 264e07e
Show file tree
Hide file tree
Showing 8 changed files with 14 additions and 14 deletions.
4 changes: 2 additions & 2 deletions LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -202,8 +202,8 @@

---------------

pekko-sbt-paradox contains scripting adapted from paradox-material-theme version 0.6.0,
which was released under an MIT license <https://github.com/jonas/paradox-material-theme>.
pekko-sbt-paradox contains scripting adapted from sbt-paradox-material-theme version 0.6.0,
which was released under an MIT license <https://github.com/sbt/sbt-paradox-material-theme>.
- plugin/src/main/scala/org/apache/pekko/SearchIndex.scala
- theme/src/main/assets/page.st
- theme/src/main/assets/assets/javascripts/paradox-material-theme.js
Expand Down
4 changes: 2 additions & 2 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ lazy val pekkoTheme = project
.settings(
name := "pekko-theme-paradox",
libraryDependencies ++= Seq(
"io.github.jonas" % "paradox-material-theme" % "0.6.0",
"com.github.sbt" % "paradox-material-theme" % "0.7.0",
"org.webjars" % "foundation" % "6.2.4" % "provided"))
.settings(publishSettings)

Expand All @@ -78,7 +78,7 @@ lazy val pekkoPlugin = project
"com.lightbend.paradox" % "sbt-paradox" % "0.10.3"),
addSbtPlugin("com.lightbend.paradox" % "sbt-paradox-apidoc" % "1.0.0"),
addSbtPlugin("com.lightbend.paradox" % "sbt-paradox-project-info" % "3.0.0"),
addSbtPlugin("io.github.jonas" % "sbt-paradox-material-theme" % "0.6.0"),
addSbtPlugin("com.github.sbt" % "sbt-paradox-material-theme" % "0.7.0"),
Compile / resourceGenerators += Def.task {
val file = (Compile / resourceManaged).value / "pekko-paradox.properties"
IO.write(file, s"pekko.paradox.version=${version.value}")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ package org.apache.pekko

import com.lightbend.paradox.sbt.ParadoxPlugin
import com.typesafe.sbt.web.Import.{ Assets, WebKeys }
import io.github.jonas.paradox.material.theme.ParadoxMaterialThemePlugin
import io.github.jonas.paradox.material.theme.ParadoxMaterialThemePlugin.autoImport._
import com.github.sbt.paradox.material.theme.ParadoxMaterialThemePlugin
import com.github.sbt.paradox.material.theme.ParadoxMaterialThemePlugin.autoImport._
import sbt._
import sbt.Keys._

Expand Down
2 changes: 1 addition & 1 deletion plugin/src/main/scala/org/apache/pekko/SearchIndex.scala
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copied and adapted from https://github.com/jonas/paradox-material-theme/blob/2d57fe0567ea9fe7e8de14faef4fa777841d505a/plugin/src/main/scala/io.github.jonas.paradox.material.theme/SearchIndex.scala
// Copied and adapted from https://github.com/sbt/sbt-paradox-material-theme/blob/2d57fe0567ea9fe7e8de14faef4fa777841d505a/plugin/src/main/scala/io.github.jonas.paradox.material.theme/SearchIndex.scala

package org.apache.pekko

Expand Down
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

// When updating the sbt-paradox version,
// remember to also update build.sbt
addSbtPlugin("com.lightbend.paradox" % "sbt-paradox-theme" % "0.10.3")
addSbtPlugin("com.lightbend.paradox" % "sbt-paradox-theme" % "0.10.6")
addSbtPlugin("com.dwijnand" % "sbt-dynver" % "4.1.1")
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.6")
addSbtPlugin("org.mdedetrich" % "sbt-apache-sonatype" % "0.1.10")
Expand Down
4 changes: 2 additions & 2 deletions theme/src/main/assets/page.st
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ $!
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
IN THE SOFTWARE.
!$
<!-- Adapted from paradox-material-theme version 0.6.0 -->
<!-- https://github.com/jonas/paradox-material-theme/blob/2d57fe0567ea9fe7e8de14faef4fa777841d505a/theme/src/main/assets/page.st -->
<!-- Adapted from sbt-paradox-material-theme version 0.6.0 -->
<!-- https://github.com/sbt/sbt-paradox-material-theme/blob/2d57fe0567ea9fe7e8de14faef4fa777841d505a/theme/src/main/assets/page.st -->
<!DOCTYPE html>
<html lang="$page.properties.("material.language"); null="en"$" class="no-js">
<head>
Expand Down
4 changes: 2 additions & 2 deletions theme/src/main/assets/partials/footer.st
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ $!
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
IN THE SOFTWARE.
!$
<!-- Adapted from paradox-material-theme version 0.6.0 -->
<!-- https://github.com/jonas/paradox-material-theme/blob/2d57fe0567ea9fe7e8de14faef4fa777841d505a/theme/src/main/assets/partials/footer.st -->
<!-- Adapted from sbt-paradox-material-theme version 0.6.0 -->
<!-- https://github.com/sbt/sbt-paradox-material-theme/blob/2d57fe0567ea9fe7e8de14faef4fa777841d505a/theme/src/main/assets/partials/footer.st -->
<footer class="md-footer">
$ if (page.next.html || page.prev.html) $
<div class="md-footer-nav">
Expand Down
4 changes: 2 additions & 2 deletions theme/src/main/assets/partials/nav.st
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ $!
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
IN THE SOFTWARE.
!$
<!-- Adapted from paradox-material-theme version 0.6.0 -->
<!-- https://github.com/jonas/paradox-material-theme/blob/2d57fe0567ea9fe7e8de14faef4fa777841d505a/theme/src/main/assets/partials/nav.st -->
<!-- Adapted from sbt-paradox-material-theme version 0.6.0 -->
<!-- https://github.com/sbt/sbt-paradox-material-theme/blob/2d57fe0567ea9fe7e8de14faef4fa777841d505a/theme/src/main/assets/partials/nav.st -->
<nav class="md-nav md-nav--primary" data-md-level="0" style="visibility: hidden">
<label class="md-nav__title md-nav__title--site" for="drawer">
<a href="$page.home.href$" title="$page.home.title$" class="md-nav__button md-logo">
Expand Down

0 comments on commit 264e07e

Please sign in to comment.