Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 6 additions & 30 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ ThisBuild / organizationName := "WorldWide Conferencing, LLC"
val scala213Version = "2.13.16"
val scala3LTSVersion = "3.3.6"


ThisBuild / scalaVersion := scala213Version
ThisBuild / crossScalaVersions := Seq(scala213Version, scala3LTSVersion)

Expand Down Expand Up @@ -52,7 +51,7 @@ lazy val framework =
// Core Projects
// -------------
lazy val core: Seq[ProjectReference] =
Seq(common, actor, markdown, json, json_scalaz7, json_ext, util)
Seq(common, actor, markdown, util)

lazy val common =
coreProject("common")
Expand All @@ -77,38 +76,14 @@ lazy val markdown =
libraryDependencies ++= Seq(scalatest, scala_xml, scala_parser)
)

lazy val json =
coreProject("json")
.settings(
description := "JSON Library",
Test / parallelExecution := false,
libraryDependencies ++= Seq(scalap(scalaVersion.value), paranamer, scala_xml)
)

lazy val documentationHelpers =
coreProject("documentation-helpers")
.settings(description := "Documentation Helpers")
.dependsOn(util)

lazy val json_scalaz7 =
coreProject("json-scalaz7")
.dependsOn(json)
.settings(
description := "JSON Library based on Scalaz 7",
libraryDependencies ++= Seq(scalaz7)
)

lazy val json_ext =
coreProject("json-ext")
.dependsOn(common, json)
.settings(
description := "Extentions to JSON Library",
libraryDependencies ++= Seq(commons_codec, joda_time, joda_convert)
)

lazy val util =
coreProject("util")
.dependsOn(actor, json, markdown)
.dependsOn(actor, markdown)
.settings(
description := "Utilities Library",
Test / parallelExecution := false,
Expand All @@ -121,7 +96,8 @@ lazy val util =
log4j,
htmlparser,
xerces,
jbcrypt
jbcrypt,
json4s_native,
)
)

Expand All @@ -135,7 +111,7 @@ lazy val testkit =
.dependsOn(util)
.settings(
description := "Testkit for Webkit Library",
libraryDependencies ++= Seq(commons_httpclient, servlet_api)
libraryDependencies ++= Seq(commons_httpclient, servlet_api, json4s_native, json4s_xml)
)

lazy val webkit =
Expand All @@ -151,7 +127,7 @@ lazy val webkit =
specs2Prov,
specs2MatchersProv,
jetty11,
jettywebapp,
jettywebapp,
jwebunit,
mockito_scalatest,
jquery,
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

Loading