diff --git a/build.sbt b/build.sbt index f950620..418ab9d 100644 --- a/build.sbt +++ b/build.sbt @@ -1,17 +1,6 @@ import Dependencies._ - - Global / onChangedBuildSource := ReloadOnSourceChanges -Compile / doc / scalacOptions ++= Seq( - "-groups", - "-project-footer", - "Monterey Bay Aquarium Research Institute", - "-siteroot", - "src/docs", - "-doc-root-content", - "src/docs/index.md" -) ThisBuild / javacOptions ++= Seq("-target", "21", "-source", "21") ThisBuild / licenses := Seq("Apache-2.0" -> url("http://www.apache.org/licenses/LICENSE-2.0")) @@ -30,6 +19,7 @@ ThisBuild / scalacOptions ++= Seq( "-language:higherKinds", "-language:implicitConversions", "-unchecked" + ) ThisBuild / startYear := Some(2024) //ThisBuild / updateOptions := updateOptions.value.withCachedResolution(true) @@ -112,6 +102,15 @@ lazy val oni = project tapirSwagger, tapirVertex, typesafeConfig + ), + scalacOptions ++= Seq( + "-groups", + "-project-footer", + "Monterey Bay Aquarium Research Institute", + "-siteroot", + "oni/src/docs", + "-doc-root-content", + "oni/src/docs/index.md" ) ) diff --git a/oni/src/docs/_docs/development/development.md b/oni/src/docs/_docs/development/development.md index bd73533..5060dd9 100644 --- a/oni/src/docs/_docs/development/development.md +++ b/oni/src/docs/_docs/development/development.md @@ -16,5 +16,5 @@ This is a normal [sbt](https://www.scala-sbt.org) project. You can compile code Documentation can be added as markdown files in `docs` and will be included automatically when you run `scaladoc`. -When updating SBT version, make sure to update the devcontainer image in [devcontainer.json](.devcontainer/devcontainer.json). It's versions are `eclipse-temurin-__` +When updating SBT version, make sure to update the devcontainer image in devcontainer.json. It's versions are `eclipse-temurin-__` diff --git a/oni/src/docs/_docs/development/nima.md b/oni/src/docs/_docs/development/nima.md index 82a4448..008fbcd 100644 --- a/oni/src/docs/_docs/development/nima.md +++ b/oni/src/docs/_docs/development/nima.md @@ -1,6 +1,6 @@ # nima -Oni uses Helidon's Webserver (aka Nima) to serve the web application. +Oni was originally written using Helidon's Webserver (aka Nima) to serve the web application. Currently, Oni uses Vert.X. The notes below are in case we switch back to Nima. ## Supporting gzip diff --git a/oni/src/docs/index.md b/oni/src/docs/index.md index 5da279d..7f4c139 100644 --- a/oni/src/docs/index.md +++ b/oni/src/docs/index.md @@ -1,5 +1,5 @@ # oni -![MBARI logo](_assets/images/logo-mbari-3b.png) +![MBARI logo](images/logo-mbari-3b.png) [Scala API](api/index.html)