Migrate to zig 0.15.1

5 files changed, 28 insertions, 24 deletions

diff --git a/backend/build.zig b/backend/build.zig
index 3fd7c48..fc26d37 100644
--- a/backend/build.zig
+++ b/backend/build.zig
@@ -1,17 +1,21 @@
 const std = @import("std");
 
 pub fn build(b: *std.Build) void {
-    const target = b.standardTargetOptions(.{});
 
+    const target = b.standardTargetOptions(.{});
     const optimize = b.standardOptimizeOption(.{});
 
     const exe = b.addExecutable(.{
         .name = "backend",
-        .root_source_file = b.path("src/main.zig"),
-        .target = target,
-        .optimize = optimize,
+        .root_module = b.createModule(.{
+            .root_source_file = b.path("src/main.zig"),
+            .target = target,
+            .optimize = optimize,
+        }),
     });
 
+    b.installArtifact(exe);
+
     const httpz = b.dependency("httpz", .{
         .target = target,
         .optimize = optimize,
@@ -22,12 +26,10 @@ pub fn build(b: *std.Build) void {
         .target = target,
         .optimize = optimize,
     });
-    exe.linkLibC();
-    exe.linkSystemLibrary("sqlite3");
+    // exe.linkLibC();
+    // exe.linkSystemLibrary("sqlite3");
     exe.root_module.addImport("zqlite", zqlite.module("zqlite"));
 
-    b.installArtifact(exe);
-
     const run_cmd = b.addRunArtifact(exe);
     run_cmd.step.dependOn(b.getInstallStep());
     if (b.args) |args| {
@@ -38,9 +40,11 @@ pub fn build(b: *std.Build) void {
     run_step.dependOn(&run_cmd.step);
 
     const exe_unit_tests = b.addTest(.{
-        .root_source_file = b.path("src/main.zig"),
-        .target = target,
-        .optimize = optimize,
+        .root_module = b.createModule(.{
+            .root_source_file = b.path("src/main.zig"),
+            .target = target,
+            .optimize = optimize,
+        }),
     });
     const run_exe_unit_tests = b.addRunArtifact(exe_unit_tests);
 
diff --git a/backend/build.zig.zon b/backend/build.zig.zon
index 11fd851..cd8301e 100644
--- a/backend/build.zig.zon
+++ b/backend/build.zig.zon
@@ -1,11 +1,11 @@
-.{ .name = .backend, .version = "0.0.0", .fingerprint = 0x8fe5c971579344fd, .minimum_zig_version = "0.14.0", .dependencies = .{
-    .httpz = .{
-        .url = "git+https://github.com/karlseguin/http.zig?ref=master#8ecf3a330ab1bed8495604d444e549b94f08bc0f",
-        .hash = "httpz-0.0.0-PNVzrOy2BgBA2lU1zixuVrv0UUkSnVrBUIlIHl1XV0XV",
-    },
+.{ .name = .backend, .version = "0.0.0", .fingerprint = 0x8fe5c971579344fd, .minimum_zig_version = "0.15.1", .dependencies = .{
     .zqlite = .{
-            .url = "git+https://github.com/karlseguin/zqlite.zig?ref=master#3cd6edca7d735fe9a8545c699091cfcebe1feb7f",
-            .hash = "zqlite-0.0.0-RWLaY0Z7lQApOOwYrJMyZomy1GlA3vRnmtrTaWQ2BSQK",
+        .url = "git+https://github.com/karlseguin/zqlite.zig?ref=master#74e661633ffe04fadc214ad07857633fa339f79c",
+        .hash = "zqlite-0.0.0-RWLaY81-lQAbR_uUQJeKmTzYi16C9Zvl-BjrBOavQfeK",
+    },
+    .httpz = .{
+            .url = "git+https://github.com/karlseguin/http.zig?ref=master#90e7fc07ef7157a4da6922571fb4daef38b48998",
+            .hash = "httpz-0.0.0-PNVzrHLABgDoVnzqKpEbx2rZIzmMclEdoEmdJDfZmxsv",
         },
 }, .paths = .{
     "build.zig",
diff --git a/backend/src/repos/maps_repo.zig b/backend/src/repos/maps_repo.zig
index 8031827..8e38877 100644
--- a/backend/src/repos/maps_repo.zig
+++ b/backend/src/repos/maps_repo.zig
@@ -16,9 +16,9 @@ pub fn get_maps(allocator: std.mem.Allocator, conn: zqlite.Conn) !std.ArrayList(
     var rows = try conn.rows(query, .{});
     defer rows.deinit();
 
-    var list = std.ArrayList(Map).init(allocator);
+    var list: std.ArrayList(Map) = .{};
     while (rows.next()) |row| {
-        try list.append(Map{
+        try list.append(allocator, Map{
             .id = try allocator.dupe(u8, row.text(0)),
             .name = try allocator.dupe(u8, row.text(1)),
         });
diff --git a/backend/src/repos/markers_repo.zig b/backend/src/repos/markers_repo.zig
index 232b8b6..9fc2b15 100644
--- a/backend/src/repos/markers_repo.zig
+++ b/backend/src/repos/markers_repo.zig
@@ -24,9 +24,9 @@ pub fn get_markers(allocator: std.mem.Allocator, conn: zqlite.Conn, map_id: []co
 
     defer rows.deinit();
 
-    var list = std.ArrayList(Marker).init(allocator);
+    var list: std.ArrayList(Marker) = .{};
     while (rows.next()) |row| {
-        try list.append(Marker{
+        try list.append(allocator, Marker{
             .id = try allocator.dupe(u8, row.text(0)),
             .lat = row.float(1),
             .lng = row.float(2),
diff --git a/backend/src/repos/users_repo.zig b/backend/src/repos/users_repo.zig
index 0f4ea82..9bde514 100644
--- a/backend/src/repos/users_repo.zig
+++ b/backend/src/repos/users_repo.zig
@@ -39,7 +39,7 @@ pub fn check_password(allocator: std.mem.Allocator, conn: zqlite.Conn, email: []
         defer row.deinit();
         const hash = row.text(0);
         const verify_options = bcrypt.VerifyOptions{ .silently_truncate_password = false };
-        std.time.sleep(100000000 + rand.intRangeAtMost(u32, 0, 100000000));
+        std.Thread.sleep(100000000 + rand.intRangeAtMost(u32, 0, 100000000));
         bcrypt.strVerify(hash, password, verify_options) catch {
             return null;
         };
@@ -48,7 +48,7 @@ pub fn check_password(allocator: std.mem.Allocator, conn: zqlite.Conn, email: []
             .name = try allocator.dupe(u8, row.text(2)),
         };
     } else {
-        std.time.sleep(500000000 + rand.intRangeAtMost(u32, 0, 500000000));
+        std.Thread.sleep(500000000 + rand.intRangeAtMost(u32, 0, 500000000));
         return null;
     }
 }