Skip to content

Commit

Permalink
Merge branch 'master' into native-0.5
Browse files Browse the repository at this point in the history
  • Loading branch information
JD557 authored Feb 24, 2024
2 parents eb421ed + c56acc4 commit 7bd9269
Show file tree
Hide file tree
Showing 26 changed files with 26 additions and 26 deletions.
2 changes: 1 addition & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ val sharedSettings = Seq()

val testSettings = Seq(
Test / libraryDependencies ++= Seq(
"org.scalameta" %%% "munit" % "1.0.0-M10" % Test
"org.scalameta" %%% "munit" % "1.0.0-M11" % Test
),
Test / testFrameworks += new TestFramework("munit.Framework")
)
Expand Down
2 changes: 1 addition & 1 deletion examples/release/01-introduction.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ The simplest way to use Minart is to simply include the `minart` library, which

```scala
//> using scala "3.3.1"
//> using lib "eu.joaocosta::minart::0.6.0-M2"
//> using dep "eu.joaocosta::minart::0.6.0-M2"
```

As for the imports, the `eu.joaocosta.minart.backend.defaults` package contains the givens with the backend-specific (JVM/JS/Native) logic.
Expand Down
2 changes: 1 addition & 1 deletion examples/release/02-portable-applications.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ Note, however, that we now also import `eu.joaocosta.minart.runtime.*`, which pr

```scala
//> using scala "3.3.1"
//> using lib "eu.joaocosta::minart::0.6.0-M2"
//> using dep "eu.joaocosta::minart::0.6.0-M2"

import eu.joaocosta.minart.backend.defaults.given
import eu.joaocosta.minart.graphics.*
Expand Down
2 changes: 1 addition & 1 deletion examples/release/03-animation.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ As before, let's import the backend, graphics and runtime.

```scala
//> using scala "3.3.1"
//> using lib "eu.joaocosta::minart::0.6.0-M2"
//> using dep "eu.joaocosta::minart::0.6.0-M2"

import eu.joaocosta.minart.backend.defaults.given
import eu.joaocosta.minart.graphics.*
Expand Down
2 changes: 1 addition & 1 deletion examples/release/04-pointer-input.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ We also need to import the input package. We need this to read data from input d

```scala
//> using scala "3.3.1"
//> using lib "eu.joaocosta::minart::0.6.0-M2"
//> using dep "eu.joaocosta::minart::0.6.0-M2"

import eu.joaocosta.minart.backend.defaults.given
import eu.joaocosta.minart.graphics.*
Expand Down
2 changes: 1 addition & 1 deletion examples/release/05-stateful-applications.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ The dependencies will be the same as before. We also include Scala's `Random` he

```scala
//> using scala "3.3.1"
//> using lib "eu.joaocosta::minart::0.6.0-M2"
//> using dep "eu.joaocosta::minart::0.6.0-M2"

import scala.util.Random

Expand Down
2 changes: 1 addition & 1 deletion examples/release/06-surfaces.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ For this example, we just need to use the graphics and runtime

```scala
//> using scala "3.3.1"
//> using lib "eu.joaocosta::minart::0.6.0-M2"
//> using dep "eu.joaocosta::minart::0.6.0-M2"


import eu.joaocosta.minart.backend.defaults.given
Expand Down
2 changes: 1 addition & 1 deletion examples/release/07-canvas-settings.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Here's a quick example on how to do that. In this example application, we will c

```scala
//> using scala "3.3.1"
//> using lib "eu.joaocosta::minart::0.6.0-M2"
//> using dep "eu.joaocosta::minart::0.6.0-M2"

import eu.joaocosta.minart.backend.defaults.given
import eu.joaocosta.minart.graphics.*
Expand Down
2 changes: 1 addition & 1 deletion examples/release/08-loading-images.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ This package also has an `Image` object with helpers to call the loaders.

```scala
//> using scala "3.3.1"
//> using lib "eu.joaocosta::minart::0.6.0-M2"
//> using dep "eu.joaocosta::minart::0.6.0-M2"

import eu.joaocosta.minart.backend.defaults.given
import eu.joaocosta.minart.graphics.*
Expand Down
2 changes: 1 addition & 1 deletion examples/release/09-surface-views.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ This tutorial will show how to use those

```scala
//> using scala "3.3.1"
//> using lib "eu.joaocosta::minart::0.6.0-M2"
//> using dep "eu.joaocosta::minart::0.6.0-M2"

import eu.joaocosta.minart.backend.defaults.given
import eu.joaocosta.minart.graphics.*
Expand Down
2 changes: 1 addition & 1 deletion examples/release/10-audio-playback.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Here we will see how to generate audio waves and play a simple audio clip.

```scala
//> using scala "3.3.1"
//> using lib "eu.joaocosta::minart::0.6.0-M2"
//> using dep "eu.joaocosta::minart::0.6.0-M2"

import eu.joaocosta.minart.audio.*
import eu.joaocosta.minart.backend.defaults.given
Expand Down
2 changes: 1 addition & 1 deletion examples/release/11-loading-sounds.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ This package also has an `Sound` object with helpers to call the loaders.

```scala
//> using scala "3.3.1"
//> using lib "eu.joaocosta::minart::0.6.0-M2"
//> using dep "eu.joaocosta::minart::0.6.0-M2"

import eu.joaocosta.minart.audio.*
import eu.joaocosta.minart.audio.sound.*
Expand Down
2 changes: 1 addition & 1 deletion examples/snapshot/01-introduction.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ The simplest way to use Minart is to simply include the `minart` library, which

```scala
//> using scala "3.3.1"
//> using lib "eu.joaocosta::minart::0.6.0-SNAPSHOT"
//> using dep "eu.joaocosta::minart::0.6.0-SNAPSHOT"
```

As for the imports, the `eu.joaocosta.minart.backend.defaults` package contains the givens with the backend-specific (JVM/JS/Native) logic.
Expand Down
2 changes: 1 addition & 1 deletion examples/snapshot/02-portable-applications.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ Note, however, that we now also import `eu.joaocosta.minart.runtime.*`, which pr

```scala
//> using scala "3.3.1"
//> using lib "eu.joaocosta::minart::0.6.0-SNAPSHOT"
//> using dep "eu.joaocosta::minart::0.6.0-SNAPSHOT"

import eu.joaocosta.minart.backend.defaults.given
import eu.joaocosta.minart.graphics.*
Expand Down
2 changes: 1 addition & 1 deletion examples/snapshot/03-animation.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ As before, let's import the backend, graphics and runtime.

```scala
//> using scala "3.3.1"
//> using lib "eu.joaocosta::minart::0.6.0-SNAPSHOT"
//> using dep "eu.joaocosta::minart::0.6.0-SNAPSHOT"

import eu.joaocosta.minart.backend.defaults.given
import eu.joaocosta.minart.graphics.*
Expand Down
2 changes: 1 addition & 1 deletion examples/snapshot/04-pointer-input.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ We also need to import the input package. We need this to read data from input d

```scala
//> using scala "3.3.1"
//> using lib "eu.joaocosta::minart::0.6.0-SNAPSHOT"
//> using dep "eu.joaocosta::minart::0.6.0-SNAPSHOT"

import eu.joaocosta.minart.backend.defaults.given
import eu.joaocosta.minart.graphics.*
Expand Down
2 changes: 1 addition & 1 deletion examples/snapshot/05-stateful-applications.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ The dependencies will be the same as before. We also include Scala's `Random` he

```scala
//> using scala "3.3.1"
//> using lib "eu.joaocosta::minart::0.6.0-SNAPSHOT"
//> using dep "eu.joaocosta::minart::0.6.0-SNAPSHOT"

import scala.util.Random

Expand Down
2 changes: 1 addition & 1 deletion examples/snapshot/06-surfaces.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ For this example, we just need to use the graphics and runtime

```scala
//> using scala "3.3.1"
//> using lib "eu.joaocosta::minart::0.6.0-SNAPSHOT"
//> using dep "eu.joaocosta::minart::0.6.0-SNAPSHOT"


import eu.joaocosta.minart.backend.defaults.given
Expand Down
2 changes: 1 addition & 1 deletion examples/snapshot/07-canvas-settings.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Here's a quick example on how to do that. In this example application, we will c

```scala
//> using scala "3.3.1"
//> using lib "eu.joaocosta::minart::0.6.0-SNAPSHOT"
//> using dep "eu.joaocosta::minart::0.6.0-SNAPSHOT"

import eu.joaocosta.minart.backend.defaults.given
import eu.joaocosta.minart.graphics.*
Expand Down
2 changes: 1 addition & 1 deletion examples/snapshot/08-loading-images.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ This package also has an `Image` object with helpers to call the loaders.

```scala
//> using scala "3.3.1"
//> using lib "eu.joaocosta::minart::0.6.0-SNAPSHOT"
//> using dep "eu.joaocosta::minart::0.6.0-SNAPSHOT"

import eu.joaocosta.minart.backend.defaults.given
import eu.joaocosta.minart.graphics.*
Expand Down
2 changes: 1 addition & 1 deletion examples/snapshot/09-surface-views.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ This tutorial will show how to use those

```scala
//> using scala "3.3.1"
//> using lib "eu.joaocosta::minart::0.6.0-SNAPSHOT"
//> using dep "eu.joaocosta::minart::0.6.0-SNAPSHOT"

import eu.joaocosta.minart.backend.defaults.given
import eu.joaocosta.minart.graphics.*
Expand Down
2 changes: 1 addition & 1 deletion examples/snapshot/10-audio-playback.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Here we will see how to generate audio waves and play a simple audio clip.

```scala
//> using scala "3.3.1"
//> using lib "eu.joaocosta::minart::0.6.0-SNAPSHOT"
//> using dep "eu.joaocosta::minart::0.6.0-SNAPSHOT"

import eu.joaocosta.minart.audio.*
import eu.joaocosta.minart.backend.defaults.given
Expand Down
2 changes: 1 addition & 1 deletion examples/snapshot/11-loading-sounds.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ This package also has an `Sound` object with helpers to call the loaders.

```scala
//> using scala "3.3.1"
//> using lib "eu.joaocosta::minart::0.6.0-SNAPSHOT"
//> using dep "eu.joaocosta::minart::0.6.0-SNAPSHOT"

import eu.joaocosta.minart.audio.*
import eu.joaocosta.minart.audio.sound.*
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.9.8
sbt.version=1.9.9
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.15.0")
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.5.0-SNAPSHOT")
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2")
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.10.0")
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.9")
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.10")
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version = 1.9.8
sbt.version = 1.9.9

0 comments on commit 7bd9269

Please sign in to comment.