[zig] Update zap to 0.11 (#10805)

* [zig] Update zap to 0.11

* [zig] Zap 0.11 dockerfile fix

* [zig] Added maintainers to zap

Author: dragosv

frameworks/Zig/zap/.gitignore

@@ -1,2 +1,2 @@
-zig-cache/**/*',
-zig-out: 'zig-out/**/*',
+.zig-cache/
+zig-out/

frameworks/Zig/zap/benchmark_config.json

@@ -1,5 +1,6 @@
 {
   "framework": "zap",
+  "maintainers": ["dragosv"],
   "tests": [{
     "default": {
       "json_url": "/json",

frameworks/Zig/zap/build.zig

@@ -1,80 +1,41 @@
 const std = @import("std");
-const ModuleMap = std.StringArrayHashMap(*std.Build.Module);
-var gpa = std.heap.GeneralPurposeAllocator(.{}){};
-const allocator = gpa.allocator();
 
-// Although this function looks imperative, note that its job is to
-// declaratively construct a build graph that will be executed by an external
-// runner.
-pub fn build(b: *std.Build) !void {
-    // Standard target options allows the person running `zig build` to choose
-    // what target to build for. Here we do not override the defaults, which
-    // means any target is allowed, and the default is native. Other options
-    // for restricting supported target set are available.
+pub fn build(b: *std.Build) void {
     const target = b.standardTargetOptions(.{});
-
-    // Standard optimization options allow the person running `zig build` to select
-    // between Debug, ReleaseSafe, ReleaseFast, and ReleaseSmall. Here we do nots
-    // set a preferred release mode, allowing the user to decide how to optimize.
     const optimize = b.standardOptimizeOption(.{});
 
-    const dep_opts = .{ .target = target, .optimize = optimize };
-
-    const exe = b.addExecutable(.{
-        .name = "zap",
-        // In this case the main source file is merely a path, however, in more
-        // complicated build scripts, this could be a generated file.
-        .root_source_file = b.path("src/main.zig"),
+    const zap = b.dependency("zap", .{
         .target = target,
         .optimize = optimize,
+        .openssl = false,
     });
 
-    const zap = b.dependency("zap", .{
+    const pg = b.dependency("pg", .{
         .target = target,
         .optimize = optimize,
-        .openssl = false, // set to true to enable TLS support
     });
 
-    var modules = ModuleMap.init(allocator);
-    defer modules.deinit();
-
-    const zap_module = b.dependency("zap", dep_opts).module("zap");
-    const pg_module = b.dependency("pg", dep_opts).module("pg");
-
-    try modules.put("zap", zap_module);
-    try modules.put("pg", pg_module);
-
-    //     // Expose this as a module that others can import
-    exe.root_module.addImport("zap", zap_module);
-    exe.root_module.addImport("pg", pg_module);
-
-    exe.linkLibrary(zap.artifact("facil.io"));
+    const exe = b.addExecutable(.{
+        .name = "zap",
+        .root_module = b.createModule(.{
+            .root_source_file = b.path("src/main.zig"),
+            .target = target,
+            .optimize = optimize,
+            .imports = &.{
+                .{ .name = "zap", .module = zap.module("zap") },
+                .{ .name = "pg", .module = pg.module("pg") },
+            },
+        }),
+    });
 
-    // This declares intent for the executable to be installed into the
-    // standard location when the user invokes the "install" step (the default
-    // step when running `zig build`).
     b.installArtifact(exe);
 
-    // This *creates* a Run step in the build graph, to be executed when another
-    // step is evaluated that depends on it. The next line below will establish
-    // such a dependency.
     const run_cmd = b.addRunArtifact(exe);
-
-    // By making the run step depend on the install step, it will be run from the
-    // installation directory rather than directly from within the cache directory.
-    // This is not necessary, however, if the application depends on other installed
-    // files, this ensures they will be present and in the expected location.
     run_cmd.step.dependOn(b.getInstallStep());
-
-    // This allows the user to pass arguments to the application in the build
-    // command itself, like this: `zig build run -- arg1 arg2 etc`
     if (b.args) |args| {
         run_cmd.addArgs(args);
     }
 
-    // This creates a build step. It will be visible in the `zig build --help` menu,
-    // and can be selected like this: `zig build run`
-    // This will evaluate the `run` step rather than the default, which is "install".
     const run_step = b.step("run", "Run the app");
     run_step.dependOn(&run_cmd.step);
 }

frameworks/Zig/zap/build.zig.zon

@@ -1,12 +1,20 @@
-.{ .name = "Zap testing", .version = "0.1.1", .paths = .{
-    "build.zig",
-    "build.zig.zon",
-    "src",
-}, .dependencies = .{
-    .zap = .{
-        .url = "https://github.com/zigzap/zap/archive/refs/tags/v0.8.0.tar.gz",
-        .hash = "12209936c3333b53b53edcf453b1670babb9ae8c2197b1ca627c01e72670e20c1a21",
+.{
+    .name = .zap_testing,
+    .version = "0.2.1",
+    .fingerprint = 0x40157312a106e70e,
+    .paths = .{
+        "build.zig",
+        "build.zig.zon",
+        "src",
     },
-    .pg = .{ .url = "https://github.com/karlseguin/pg.zig/archive/239a4468163a49d8c0d03285632eabe96003e9e2.tar.gz", 
-        .hash = "1220a1d7e51e2fa45e547c76a9e099c09d06e14b0b9bfc6baa89367f56f1ded399a0" },
-} }
+    .dependencies = .{
+        .zap = .{
+            .url = "git+https://github.com/zigzap/zap?ref=v0.11.0#66c5dc42c781bbb8a9100afda3c7e69ee96eddf3",
+            .hash = "zap-0.10.6-GoeB8xCEJABLgoiZjWZMMT5TsoZ5OO2EZe6j24RTUYEH",
+        },
+        .pg = .{
+            .url = "git+https://github.com/karlseguin/pg.zig?ref=master#e58b318b7867ef065b3135983f829219c5eef891",
+            .hash = "pg-0.0.0-Wp_7gXFoBgD0fQ72WICKa-bxLga03AXXQ3BbIsjjohQ3",
+        },
+    },
+}