add flakes, envrc, fix mockserver to 1.0.5

.envrc

@@ -0,0 +1 @@
+use flake

build.sbt

@@ -13,7 +13,7 @@ ThisBuild / sonatypeCredentialHost := sonatypeCentralHost
 
 ThisBuild / publishTo := sonatypePublishToBundle.value
 
-ThisBuild / version := "0.9.1"
+ThisBuild / version := "0.9.3"
 
 ThisBuild / resolvers += "Mulesoft".at(
   "https://repository.mulesoft.org/nexus/content/repositories/public/"

flake.nix

@@ -0,0 +1,27 @@
+{
+  inputs = {
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+    systems.url = "github:nix-systems/default";
+  };
+  outputs = { systems, nixpkgs, ... }:
+    let
+      eachSystem = f:
+        nixpkgs.lib.genAttrs (import systems)
+        (system: f nixpkgs.legacyPackages.${system});
+    in {
+      devShells = eachSystem (pkgs: {
+        default = pkgs.mkShell {
+          buildInputs = with pkgs; [
+            scala_2_13
+            jdk21
+            metals
+            sbt
+            scalafmt
+            scalafix
+            scala-cli
+            coursier
+          ];
+        };
+      });
+    };
+}

zzspec/src/main/scala/io/github/jjba23/zzspec/mockserver/MockServer.scala

@@ -19,3 +19,4 @@ object MockServer {
 
   case class Client(value: MockServerClient)
 }
+

zzspec/src/main/scala/io/github/jjba23/zzspec/mockserver/MockServerContainer.scala

@@ -7,33 +7,42 @@ import zio._
 
 object MockServerContainer {
 
-  val layer: ZLayer[
+  def layer(
+    image: String = "docker.io/xdevsoftware/mockserver",
+    version: String = "1.0.5"
+  ): ZLayer[
     Network with Slf4jLogConsumer,
     Throwable,
     Container,
   ] = ZLayer.scoped {
     for {
       network     <- ZIO.service[Network]
       logConsumer <- ZIO.service[Slf4jLogConsumer]
-      mockServer  <- scopedTestContainer(logConsumer, network)
-      _           <-
+      mockServer  <- scopedTestContainer(
+                       DockerImageName
+                         .parse(image)
+                         .withTag(version),
+                       logConsumer,
+                       network
+                     )
+
+      _ <-
         ZIO.logInfo(
           s"[ZZSpec] MockServer started at: http://${mockServer.getHost}:${mockServer.getMappedPort(1080)})"
         )
     } yield Container(mockServer)
   }
-  private val mockServerVersion      = "latest"
-  private val image: DockerImageName = DockerImageName
-    .parse("docker.io/xdevsoftware/mockserver")
-    .withTag(mockServerVersion)
 
   private def scopedTestContainer(
+    dockerImageName: DockerImageName,
     logConsumer: Slf4jLogConsumer,
     network: Network,
   ): URIO[Any with Scope, GenericContainer[_]] =
     ZIO.acquireRelease(
       ZIO
-        .attempt(new GenericContainer(image))
+        .attempt(
+          new GenericContainer(dockerImageName)
+        )
         .tap(container =>
           ZIO.attempt(containerSetup(container, logConsumer, network))
         )

zzspec/src/test/scala/mockservertest/MockServerSpec.scala

@@ -16,7 +16,7 @@ object MockServerSpec extends ZIOSpecDefault {
       Scope.default,
       networkLayer,
       containerLogger(),
-      MockServerContainer.layer,
+      MockServerContainer.layer(),
       MockServer.layer,
       Client.default,
     ) @@ TestAspect.withLiveClock