From 977705678aeeb271788107b045f5d4ee94548656 Mon Sep 17 00:00:00 2001 From: "David Sugar (r4gus)" Date: Fri, 23 Aug 2024 21:44:30 +0200 Subject: [PATCH] fixed file exists in mulitple modules --- build.zig | 1 + build.zig.zon | 2 +- lib/client/cbor_commands.zig | 2 +- lib/client/transports/ctaphid/ctaphid.zig | 2 +- lib/main.zig | 3 --- 5 files changed, 4 insertions(+), 6 deletions(-) diff --git a/build.zig b/build.zig index aaa80f7..13620b4 100644 --- a/build.zig +++ b/build.zig @@ -57,6 +57,7 @@ pub fn build(b: *std.Build) !void { .root_source_file = b.path("lib/client.zig"), .imports = &.{ .{ .name = "zbor", .module = zbor_module }, + .{ .name = "keylib", .module = keylib_module }, }, }); try b.modules.put(b.dupe("clientlib"), client_module); diff --git a/build.zig.zon b/build.zig.zon index c298205..cedfa07 100644 --- a/build.zig.zon +++ b/build.zig.zon @@ -1,6 +1,6 @@ .{ .name = "keylib", - .version = "0.4.0", + .version = "0.5.1", .dependencies = .{ .zbor = .{ .url = "https://github.com/r4gus/zbor/archive/refs/tags/0.15.0.tar.gz", diff --git a/lib/client/cbor_commands.zig b/lib/client/cbor_commands.zig index 0e88239..53bb1b8 100644 --- a/lib/client/cbor_commands.zig +++ b/lib/client/cbor_commands.zig @@ -1,5 +1,5 @@ const std = @import("std"); -const keylib = @import("../main.zig"); +const keylib = @import("keylib"); const cbor = @import("zbor"); const Transport = @import("Transport.zig"); const err = @import("error.zig"); diff --git a/lib/client/transports/ctaphid/ctaphid.zig b/lib/client/transports/ctaphid/ctaphid.zig index 4ca7e82..6bca077 100644 --- a/lib/client/transports/ctaphid/ctaphid.zig +++ b/lib/client/transports/ctaphid/ctaphid.zig @@ -2,7 +2,7 @@ const std = @import("std"); -const keylib = @import("../../../main.zig"); +const keylib = @import("keylib"); const ctaphid = keylib.ctap.transports.ctaphid; const Cmd = ctaphid.Cmd; const ErrorCodes = ctaphid.authenticator.ErrorCodes; diff --git a/lib/main.zig b/lib/main.zig index a95cb1f..2eaf6c3 100644 --- a/lib/main.zig +++ b/lib/main.zig @@ -247,10 +247,7 @@ pub const ctap = struct { } }; -pub const client = @import("client.zig"); - test "library tests" { _ = common; _ = ctap; - _ = client; }