diff --git a/LICENSE b/LICENSE index 9d752d4..059dd33 100644 --- a/LICENSE +++ b/LICENSE @@ -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 . +pekko-sbt-paradox contains scripting adapted from sbt-paradox-material-theme version 0.6.0, +which was released under an MIT license . - 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 diff --git a/build.sbt b/build.sbt index b42bc67..293e3a6 100644 --- a/build.sbt +++ b/build.sbt @@ -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) @@ -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}") diff --git a/plugin/src/main/scala/org/apache/pekko/PekkoParadoxPlugin.scala b/plugin/src/main/scala/org/apache/pekko/PekkoParadoxPlugin.scala index f249a86..5849112 100644 --- a/plugin/src/main/scala/org/apache/pekko/PekkoParadoxPlugin.scala +++ b/plugin/src/main/scala/org/apache/pekko/PekkoParadoxPlugin.scala @@ -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._ diff --git a/plugin/src/main/scala/org/apache/pekko/SearchIndex.scala b/plugin/src/main/scala/org/apache/pekko/SearchIndex.scala index 0aaa5dc..86d564a 100644 --- a/plugin/src/main/scala/org/apache/pekko/SearchIndex.scala +++ b/plugin/src/main/scala/org/apache/pekko/SearchIndex.scala @@ -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 diff --git a/project/plugins.sbt b/project/plugins.sbt index a87033b..36a8c93 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -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") diff --git a/theme/src/main/assets/page.st b/theme/src/main/assets/page.st index b1c4b1b..d5c51c5 100644 --- a/theme/src/main/assets/page.st +++ b/theme/src/main/assets/page.st @@ -20,8 +20,8 @@ $! FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. !$ - - + + diff --git a/theme/src/main/assets/partials/footer.st b/theme/src/main/assets/partials/footer.st index 7e7408e..c654281 100644 --- a/theme/src/main/assets/partials/footer.st +++ b/theme/src/main/assets/partials/footer.st @@ -20,8 +20,8 @@ $! FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. !$ - - + +