zig 0.14.0

Author: agagniere

.github/workflows/ci.yml

@@ -14,7 +14,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        zig-version: ["0.12.1", "0.13.0", "master"]
+        zig-version: ["0.14.0", "master"]
         os: [ubuntu-latest]
 
     runs-on: ${{ matrix.os }}

README.md

@@ -6,22 +6,22 @@ Provides a package to be used by the zig package manager for C programs.
 
 For now the hard-coded config assumes linux.
 
-| Refname | json-c version         | Zig `0.12.x` | Zig `0.13.x` | Zig `0.14.0-dev` |
-|---------|------------------------|--------------|--------------|------------------|
-| `0.17`  | `json-c-0.17-20230812` | ✅           | ✅           | ✅               |
-| `0.18`  | `json-c-0.18-20240915` | ✅           | ✅           | ✅               |
-
+| Refname  | json-c version         | Zig `0.12.x` | Zig `0.13.x` | Zig `0.14.x` |
+|----------|------------------------|--------------|--------------|--------------|
+| `0.17`   | `json-c-0.17-20230812` | ✅           | ✅           | ❌           |
+| `0.18`   | `json-c-0.18-20240915` | ✅           | ✅           | ❌           |
+| `0.18+1` | `json-c-0.18-20240915` | ❌           | ❌           | ✅           |
 
 ## Use
 
 Add the dependency in your `build.zig.zon` by running the following command:
 ```bash
-zig fetch --save git+https://github.com/allyourcodebase/json-c#0.18
+zig fetch --save git+https://github.com/allyourcodebase/json-c#0.18+1
 ```
 
 Then, in your `build.zig`:
 ```zig
-const jsonc = b.dependency("json-c", { .target = target, .optimize = optimize });
+const jsonc = b.dependency("jsonc", { .target = target, .optimize = optimize });
 const libjsonc = jsonc.artifact("json-c");
 // wherever needed:
 exe.linkLibrary(libjsonc);

build.zig

@@ -39,6 +39,14 @@ pub fn build(b: *std.Build) !void {
             ,
         },
     );
+    config.addValues(.{
+        .SIZEOF_INT = target.result.cTypeByteSize(.int),
+        .SIZEOF_INT64_T = @sizeOf(i64),
+        .SIZEOF_LONG = target.result.cTypeByteSize(.long),
+        .SIZEOF_LONG_LONG = target.result.cTypeByteSize(.longlong),
+        .SIZEOF_SIZE_T = @sizeOf(usize),
+        .SIZEOF_SSIZE_T = @sizeOf(isize),
+    });
 
     const lib = b.addStaticLibrary(.{
         .name = "json-c",
@@ -158,12 +166,6 @@ const cmake_config = .{
     .HAVE_STRTOULL = 1,
     .HAVE___THREAD = 1,
     .JSON_C_HAVE_INTTYPES_H = 1,
-    .SIZEOF_INT = @sizeOf(c_int),
-    .SIZEOF_INT64_T = @sizeOf(i64),
-    .SIZEOF_LONG = @sizeOf(c_long),
-    .SIZEOF_LONG_LONG = @sizeOf(c_longlong),
-    .SIZEOF_SIZE_T = @sizeOf(usize),
-    .SIZEOF_SSIZE_T = @sizeOf(isize),
     .SPEC___THREAD = "__thread",
     .STDC_HEADERS = 1,
 

build.zig.zon

@@ -1,7 +1,8 @@
 .{
-    .name = "json-c",
+    .name = .jsonc,
     .version = "0.18.0",
-    .minimum_zig_version = "0.12.0",
+    .minimum_zig_version = "0.14.0",
+    .fingerprint = 0x646d55b66fb40d,
     .dependencies = .{
         .upstream = .{
             .url = "git+https://github.com/json-c/json-c?ref=json-c-0.18-20240915#41a55cfcedb54d9c1874f2f0eb07b504091d7e37",