updated sbt version

This commit is contained in:
2021-07-13 09:52:30 +02:00
parent 5362e83118
commit 76608d5713
6 changed files with 10 additions and 12 deletions

4
.gitmodules vendored
View File

@@ -1,3 +1,3 @@
[submodule "nim/htmlutils"] [submodule "nim/lib/htmlutils"]
path = nim/lib/htmlutils path = nim/lib/htmlutils
url = ssh://git.woggioni.net:1122/mnt/git/htmlutils url = git.woggioni.net:htmlutils

View File

@@ -1,5 +1,5 @@
import org.oggio88.sbt.{NimPlugin, WildflyPlugin} import net.woggioni.sbt.{NimPlugin, WildflyPlugin}
import org.oggio88.sbt.ConfigurationFile._ import net.woggioni.sbt.ConfigurationFile._
name := "jpacrepo" name := "jpacrepo"
@@ -32,7 +32,6 @@ libraryDependencies += "org.jboss.resteasy" % "resteasy-client" % Versions.restE
libraryDependencies += "org.jboss.resteasy" % "resteasy-jackson2-provider" % Versions.restEasy % Test libraryDependencies += "org.jboss.resteasy" % "resteasy-jackson2-provider" % Versions.restEasy % Test
libraryDependencies += "org.scalatest" %% "scalatest" % Versions.scalatest % Test libraryDependencies += "org.scalatest" %% "scalatest" % Versions.scalatest % Test
enablePlugins(WarPlugin) enablePlugins(WarPlugin)
enablePlugins(WildflyPlugin) enablePlugins(WildflyPlugin)
enablePlugins(NimPlugin) enablePlugins(NimPlugin)
@@ -71,4 +70,4 @@ resourceGenerators in Compile += Def.task({
(resourceManaged in Compile).value / "META-INF" / "persistence.xml", (resourceManaged in Compile).value / "META-INF" / "persistence.xml",
Map("dataSourceJNDI" -> datasourceJNDI.value, Map("dataSourceJNDI" -> datasourceJNDI.value,
"dataBaseAction" -> databaseAction.value))) "dataBaseAction" -> databaseAction.value)))
}).taskValue }).taskValue

View File

@@ -2,7 +2,6 @@ import dom
import htmlutils/tree import htmlutils/tree
import htmlutils/utils import htmlutils/utils
import json import json
import streams
import tables import tables
import strutils import strutils
import sets import sets
@@ -25,7 +24,7 @@ type DownloadPanel = ref object
proc newDownloadPanel(parent : Element) : DownloadPanel = proc newDownloadPanel(parent : Element) : DownloadPanel =
let dp = DownloadPanel() let dp = DownloadPanel()
dp.pkgs = initSet[string]() dp.pkgs = initHashSet[string]()
htmlTreeAppend(parent): htmlTreeAppend(parent):
"div": "div":
classList = ["panel", "panel-default"] classList = ["panel", "panel-default"]
@@ -168,7 +167,7 @@ proc newPkgTable(parent: Element, searchString : string) : PkgTable =
for key, value in pkgMap: for key, value in pkgMap:
for fragment in fragments: for fragment in fragments:
if fragment in key: if fragment in key:
searchResult.add(key, value) searchResult[key] = value
for table in document.querySelectorAll("table.pkgtable"): for table in document.querySelectorAll("table.pkgtable"):
table.parentNode.removeChild(table) table.parentNode.removeChild(table)
htmlTreeAppend(parent): htmlTreeAppend(parent):

View File

@@ -1 +1 @@
sbt.version=1.3.9 sbt.version=1.4.1

View File

@@ -1,2 +1,2 @@
addSbtPlugin("com.earldouglas" % "xsbt-web-plugin" % "4.0.1") addSbtPlugin("com.earldouglas" % "xsbt-web-plugin" % "4.0.1")
addSbtPlugin("org.oggio88" % "xsbt-misc-plugin" % "0.1") addSbtPlugin("net.woggioni" % "xsbt-misc-plugin" % "0.1")