From 62ed2d9212209e56b3e210c97a1c07f5547e16cf Mon Sep 17 00:00:00 2001 From: Matthew de Detrich Date: Sun, 11 Feb 2024 21:41:45 +1100 Subject: [PATCH] Use com.github.sbt package and deprecate io.github.jonas --- .../material/theme}/ParadoxMaterialTheme.scala | 2 +- .../theme}/ParadoxMaterialThemePlugin.scala | 6 +++--- .../paradox/material/theme}/SearchIndex.scala | 2 +- .../jonas/paradox/material/theme/package.scala | 18 ++++++++++++++++++ 4 files changed, 23 insertions(+), 5 deletions(-) rename plugin/src/main/scala/{io.github.jonas.paradox.material.theme => com/github/sbt/paradox/material/theme}/ParadoxMaterialTheme.scala (99%) rename plugin/src/main/scala/{io.github.jonas.paradox.material.theme => com/github/sbt/paradox/material/theme}/ParadoxMaterialThemePlugin.scala (88%) rename plugin/src/main/scala/{io.github.jonas.paradox.material.theme => com/github/sbt/paradox/material/theme}/SearchIndex.scala (98%) create mode 100644 plugin/src/main/scala/io/github/jonas/paradox/material/theme/package.scala diff --git a/plugin/src/main/scala/io.github.jonas.paradox.material.theme/ParadoxMaterialTheme.scala b/plugin/src/main/scala/com/github/sbt/paradox/material/theme/ParadoxMaterialTheme.scala similarity index 99% rename from plugin/src/main/scala/io.github.jonas.paradox.material.theme/ParadoxMaterialTheme.scala rename to plugin/src/main/scala/com/github/sbt/paradox/material/theme/ParadoxMaterialTheme.scala index 000d9b1..ea1c403 100644 --- a/plugin/src/main/scala/io.github.jonas.paradox.material.theme/ParadoxMaterialTheme.scala +++ b/plugin/src/main/scala/com/github/sbt/paradox/material/theme/ParadoxMaterialTheme.scala @@ -1,4 +1,4 @@ -package io.github.jonas.paradox.material.theme +package com.github.sbt.paradox.material.theme import java.net.{ URI, URLEncoder } import java.util.Locale diff --git a/plugin/src/main/scala/io.github.jonas.paradox.material.theme/ParadoxMaterialThemePlugin.scala b/plugin/src/main/scala/com/github/sbt/paradox/material/theme/ParadoxMaterialThemePlugin.scala similarity index 88% rename from plugin/src/main/scala/io.github.jonas.paradox.material.theme/ParadoxMaterialThemePlugin.scala rename to plugin/src/main/scala/com/github/sbt/paradox/material/theme/ParadoxMaterialThemePlugin.scala index 86c7051..efcca35 100644 --- a/plugin/src/main/scala/io.github.jonas.paradox.material.theme/ParadoxMaterialThemePlugin.scala +++ b/plugin/src/main/scala/com/github/sbt/paradox/material/theme/ParadoxMaterialThemePlugin.scala @@ -1,4 +1,4 @@ -package io.github.jonas.paradox.material.theme +package com.github.sbt.paradox.material.theme import com.lightbend.paradox.sbt.ParadoxPlugin import sbt._ @@ -6,8 +6,8 @@ import sbt.Keys._ object ParadoxMaterialThemePlugin extends AutoPlugin { object autoImport { - type ParadoxMaterialTheme = _root_.io.github.jonas.paradox.material.theme.ParadoxMaterialTheme - val ParadoxMaterialTheme = _root_.io.github.jonas.paradox.material.theme.ParadoxMaterialTheme + type ParadoxMaterialTheme = _root_.com.github.sbt.paradox.material.theme.ParadoxMaterialTheme + val ParadoxMaterialTheme = _root_.com.github.sbt.paradox.material.theme.ParadoxMaterialTheme val paradoxMaterialTheme = settingKey[ParadoxMaterialTheme]("Material theme options") } diff --git a/plugin/src/main/scala/io.github.jonas.paradox.material.theme/SearchIndex.scala b/plugin/src/main/scala/com/github/sbt/paradox/material/theme/SearchIndex.scala similarity index 98% rename from plugin/src/main/scala/io.github.jonas.paradox.material.theme/SearchIndex.scala rename to plugin/src/main/scala/com/github/sbt/paradox/material/theme/SearchIndex.scala index de01447..fd11f99 100644 --- a/plugin/src/main/scala/io.github.jonas.paradox.material.theme/SearchIndex.scala +++ b/plugin/src/main/scala/com/github/sbt/paradox/material/theme/SearchIndex.scala @@ -1,4 +1,4 @@ -package io.github.jonas.paradox.material.theme +package com.github.sbt.paradox.material.theme import scala.collection.JavaConverters._ import com.lightbend.paradox.sbt.ParadoxPlugin.autoImport.paradoxMarkdownToHtml diff --git a/plugin/src/main/scala/io/github/jonas/paradox/material/theme/package.scala b/plugin/src/main/scala/io/github/jonas/paradox/material/theme/package.scala new file mode 100644 index 0000000..23dac39 --- /dev/null +++ b/plugin/src/main/scala/io/github/jonas/paradox/material/theme/package.scala @@ -0,0 +1,18 @@ +package io.github.jonas.paradox.material + +package object theme { + @deprecated("Use com.github.sbt.paradox.material.theme.ParadoxMaterialTheme instead", "0.7.0") + val ParadoxMaterialTheme = com.github.sbt.paradox.material.theme.ParadoxMaterialTheme + + @deprecated("Use com.github.sbt.paradox.material.theme.ParadoxMaterialTheme instead", "0.7.0") + type ParadoxMaterialTheme = com.github.sbt.paradox.material.theme.ParadoxMaterialTheme + + @deprecated("Use com.github.sbt.paradox.material.theme.ParadoxMaterialThemePlugin instead", "0.7.0") + val ParadoxMaterialThemePlugin = com.github.sbt.paradox.material.theme.ParadoxMaterialThemePlugin + + @deprecated("Use com.github.sbt.paradox.material.theme.SearchIndex instead", "0.7.0") + val SearchIndex = com.github.sbt.paradox.material.theme.SearchIndex + + @deprecated("Use com.github.sbt.paradox.material.theme.SearchIndex instead", "0.7.0") + type SearchIndex = com.github.sbt.paradox.material.theme.SearchIndex +}