updating docs and other things

PurpleKingdomGames · Aug 16, 2023 · 68a5cb4 · 68a5cb4
1 parent 1a51340
commit 68a5cb4
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 17 deletions.
diff --git a/indigo/build.sbt b/indigo/build.sbt
@@ -11,12 +11,12 @@ ThisBuild / scalaVersion                                   := scala3Version
 
 lazy val indigoVersion = IndigoVersion.getVersion
 // For the docs site
-lazy val indigoDocsVersion  = "0.14.0"
-lazy val tyrianDocsVersion  = "0.6.0"
+lazy val indigoDocsVersion  = "0.15.0-RC3"
+lazy val tyrianDocsVersion  = "0.7.1"
 lazy val scalaJsDocsVersion = "1.13.1"
 lazy val scalaDocsVersion   = "3.3.0"
-lazy val sbtDocsVersion     = "1.9.0"
-lazy val millDocsVersion    = "0.10.12"
+lazy val sbtDocsVersion     = "1.9.2"
+lazy val millDocsVersion    = "0.11.1"
 
 lazy val commonSettings: Seq[sbt.Def.Setting[_]] = Seq(
   version            := indigoVersion,
@@ -193,9 +193,9 @@ lazy val jsdocs = project
     libraryDependencies ++= Seq(
       "io.indigoengine" %%% "indigo-json-circe"    % indigoDocsVersion,
       "io.indigoengine" %%% "indigo"               % indigoDocsVersion,
-      "io.indigoengine" %%% "indigo-extras"        % indigoDocsVersion,
-      "io.indigoengine" %%% "tyrian-io"            % tyrianDocsVersion,
-      "io.indigoengine" %%% "tyrian-indigo-bridge" % tyrianDocsVersion
+      "io.indigoengine" %%% "indigo-extras"        % indigoDocsVersion
+      // "io.indigoengine" %%% "tyrian-io"            % tyrianDocsVersion,
+      // "io.indigoengine" %%% "tyrian-indigo-bridge" % tyrianDocsVersion
     ),
     tpolecatCiModeOptions ~= { opts =>
       opts.filterNot(

diff --git a/indigo/docs/gameloop/events.md b/indigo/docs/gameloop/events.md
@@ -145,7 +145,7 @@ Used to load and save data from local storage.
 - `Load(key)` - Load the data stored with the given key
 - `Delete(key)` - Delete the data stored against the given key
 - `DeleteAll` - Delete all stored data
-- `Loaded(key, data)` - Response event when data has been loaded
+- `Loaded(data)` - Response event when data has been loaded
 
 Should any of the above fail one of the following `StorageEventError` types will
 be raised as a separate event.

diff --git a/indigo/docs/guides/howto-fire-shader.md b/indigo/docs/guides/howto-fire-shader.md
@@ -48,7 +48,7 @@ final case class Fire(
     ShaderData(
       Fire.shaderId,
       UniformBlock(
-        "FireData",
+        UniformBlockName("FireData"),
         Batch(
           Uniform("OFFSET")       -> float(offset),
           Uniform("COLOR_OUTER")  -> vec3(outer.r, outer.g, outer.b),
@@ -172,7 +172,7 @@ def toShaderData: ShaderData =
   ShaderData(
     Fire.shaderId,
     UniformBlock(
-      "FireData",
+      UniformBlockName("FireData"),
       Batch(
         Uniform("OFFSET")       -> float(offset),
         Uniform("COLOR_OUTER")  -> vec3(outer.r, outer.g, outer.b),

diff --git a/indigo/docs/guides/howto-hello-indigo-tyrian.md b/indigo/docs/guides/howto-hello-indigo-tyrian.md
@@ -57,7 +57,7 @@ follow [this guide](howto-indigo-game.md)
 or replace `HelloIndigo.scala` with
 [this](https://gist.github.com/hobnob/c24f00936e91a7b7e5d644d19e4f1b32)
 
-```scala mdoc:js:shared
+```scala
 import indigo.*
 import indigo.scenes.*
 import tyrian.TyrianSubSystem
@@ -373,7 +373,7 @@ Create a new file called `HelloTyrian.scala` inside the `helloindigo/src` folder
 and add the following contents found below, or
 [here](https://gist.github.com/hobnob/436318b3ae5eed5891ba2b18bb8c264b).
 
-```scala mdoc:js
+```scala
 import cats.effect.IO
 import tyrian.*
 import tyrian.Html.*

diff --git a/indigo/docs/presentation/clones-and-mutants.md b/indigo/docs/presentation/clones-and-mutants.md
@@ -127,7 +127,7 @@ Mutants(
   Array(
     Batch(
       UniformBlock(
-        "MutantData",
+        UniformBlockName("MutantData"),
         Batch(
           Uniform("MOVE_TO")  -> vec2(10.0, 10.0),
           Uniform("SCALE_TO") -> vec2(2.0, 2.0),

diff --git a/indigo/docs/shaders/shader-overview.md b/indigo/docs/shaders/shader-overview.md
@@ -230,7 +230,7 @@ final case class MyColoredEntity(position: Point, depth: Depth, color: RGBA) ext
     ShaderData(
       MyColoredEntity.shader.id,
       UniformBlock(
-        "MyCustomData",
+        UniformBlockName("MyCustomData"),
         Batch(Uniform("MY_COLOR") -> vec4(color.r, color.g, color.b, color.a))
       )
     )

diff --git a/indigo/docs/uicomponents/hit-area.md b/indigo/docs/uicomponents/hit-area.md
@@ -18,7 +18,6 @@ Here is an example:
 ```scala mdoc:js:shared
 import indigo.*
 import indigoextras.ui.*
-import indigo.shared.geometry.*
 
 final case class Log(message: String) extends GlobalEvent
 final case class ViewModel(hitArea: HitArea):

diff --git a/website2/build.sh b/website2/build.sh
@@ -18,4 +18,4 @@ hugo --cleanDestinationDir
 
 # -----
 # Publish
-sbt clean makeSite ghpagesPushSite
+sbt clean publishIndigoSite
diff --git a/website2/project/build.properties b/website2/project/build.properties
@@ -1 +1 @@
-sbt.version=1.8.2
+sbt.version=1.9.2