From ad11547b04c5c3cd7686a6c5c72d6747b4f97194 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Francisco=20Nevitt=20Gon=C3=A7alves?= <git@francisco.wiki>
Date: Tue, 2 Jun 2026 10:56:25 +0100
Subject: [PATCH] Bump Zig version to 0.16.0

Based on #6.

Co-authored-by: Lukas Kastern <work@lukaskastern.com>
---
 .github/workflows/build.yml |  2 +-
 .gitignore                  |  1 +
 build.zig                   | 28 +++++++++++++++-------------
 build.zig.zon               |  2 +-
 4 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index f3233db..4908cba 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -34,7 +34,7 @@ jobs:
       - name: Setup Zig
         uses: mlugg/setup-zig@v2
         with:
-          version: 0.15.2
+          version: 0.16.0
 
       - name: Build
         run: zig build samples -Dtarget=${{ matrix.target }} -Doptimize=${{ matrix.optimize }}
diff --git a/.gitignore b/.gitignore
index 880cd5d..45ec3bb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 zig-out
 .zig-cache
+zig-pkg
diff --git a/build.zig b/build.zig
index 2bd954c..abc4b00 100644
--- a/build.zig
+++ b/build.zig
@@ -11,9 +11,10 @@ pub fn build(b: *std.Build) void {
         .root_module = b.createModule(.{
             .target = target,
             .optimize = optimize,
+            .link_libcpp = true,
         }),
     });
-    gtest.linkLibCpp();
+
     gtest.root_module.addCSourceFile(.{
         .file = gtest_dep.path("googletest/src/gtest-all.cc"),
         .flags = &.{"-std=c++17"},
@@ -28,9 +29,9 @@ pub fn build(b: *std.Build) void {
         .root_module = b.createModule(.{
             .target = target,
             .optimize = optimize,
+            .link_libcpp = true,
         }),
     });
-    gtest_main.linkLibCpp();
     gtest_main.root_module.addCSourceFile(.{
         .file = gtest_dep.path("googletest/src/gtest_main.cc"),
         .flags = &.{"-std=c++17"},
@@ -45,17 +46,18 @@ pub fn build(b: *std.Build) void {
         .root_module = b.createModule(.{
             .target = target,
             .optimize = optimize,
+            .link_libcpp = true,
         }),
     });
     gmock.root_module.addCSourceFile(.{
         .file = gtest_dep.path("googlemock/src/gmock-all.cc"),
         .flags = &.{"-std=c++17"},
     });
-    gmock.linkLibCpp();
-    gmock.addIncludePath(gtest_dep.path("googlemock/include"));
-    gmock.addIncludePath(gtest_dep.path("googlemock"));
+
+    gmock.root_module.addIncludePath(gtest_dep.path("googlemock/include"));
+    gmock.root_module.addIncludePath(gtest_dep.path("googlemock"));
     gmock.installHeadersDirectory(gtest_dep.path("googlemock/include"), ".", .{});
-    gmock.linkLibrary(gtest);
+    gmock.root_module.linkLibrary(gtest);
     b.installArtifact(gmock);
 
     const samples_exe = b.addExecutable(.{
@@ -65,7 +67,7 @@ pub fn build(b: *std.Build) void {
             .optimize = optimize,
         }),
     });
-    samples_exe.addCSourceFiles(.{
+    samples_exe.root_module.addCSourceFiles(.{
         .root = gtest_dep.path("googletest/samples"),
         .files = &.{
             "sample1_unittest.cc",
@@ -81,8 +83,8 @@ pub fn build(b: *std.Build) void {
             "sample8_unittest.cc",
         },
     });
-    samples_exe.linkLibrary(gtest);
-    samples_exe.linkLibrary(gtest_main);
+    samples_exe.root_module.linkLibrary(gtest);
+    samples_exe.root_module.linkLibrary(gtest_main);
     b.installArtifact(samples_exe);
 
     // Samples 9 and 10 define their own entrypoint.
@@ -93,13 +95,13 @@ pub fn build(b: *std.Build) void {
             .optimize = optimize,
         }),
     });
-    sample9_exe.addCSourceFiles(.{
+    sample9_exe.root_module.addCSourceFiles(.{
         .root = gtest_dep.path("googletest/samples"),
         .files = &.{
             "sample9_unittest.cc",
         },
     });
-    sample9_exe.linkLibrary(gtest);
+    sample9_exe.root_module.linkLibrary(gtest);
     b.installArtifact(sample9_exe);
 
     const sample10_exe = b.addExecutable(.{
@@ -109,11 +111,11 @@ pub fn build(b: *std.Build) void {
             .optimize = optimize,
         }),
     });
-    sample10_exe.addCSourceFiles(.{
+    sample10_exe.root_module.addCSourceFiles(.{
         .root = gtest_dep.path("googletest/samples"),
         .files = &.{"sample10_unittest.cc"},
     });
-    sample10_exe.linkLibrary(gtest);
+    sample10_exe.root_module.linkLibrary(gtest);
     b.installArtifact(sample10_exe);
 
     const samples_step = b.step("samples", "Build the sample tests");
diff --git a/build.zig.zon b/build.zig.zon
index 45ac0fb..3a00bee 100644
--- a/build.zig.zon
+++ b/build.zig.zon
@@ -12,6 +12,6 @@
         "build.zig.zon",
         "LICENSE",
     },
-    .minimum_zig_version = "0.15.2",
+    .minimum_zig_version = "0.16.0",
     .fingerprint = 0xc36e6f7ae639b5bc,
 }