Bump lua-zlib from 1.2 to 1.4 as part of Lua 5.5 support (#1858)

* chore(deps): bump lua-zlib to 1.4

* refactor: adjust static lib for `lua-zlib` 1.4 rockspec

* refactor(ci): remove unused copy of zlib import lib for MSVC

3 files changed, 24 insertions, 8 deletions

diff --git a/binary/Makefile.windows b/binary/Makefile.windows
index 65445c47..c243a0a7 100644
--- a/binary/Makefile.windows
+++ b/binary/Makefile.windows
@@ -57,7 +57,7 @@ $(WINDOWS_DEPS_DIR)/lib/libz.a: $(BUILD_WINDOWS_DEPS_DIR)/zlib-$(ZLIB_VERSION)
         cd $(BUILD_WINDOWS_DEPS_DIR)/zlib-$(ZLIB_VERSION) && cp zlib.h zconf.h ../../$(WINDOWS_DEPS_DIR)/include
         cd $(BUILD_WINDOWS_DEPS_DIR)/zlib-$(ZLIB_VERSION) && $(MINGW_PREFIX)-strip -g libz.a
         mkdir -p $(@D)
-        cd $(BUILD_WINDOWS_DEPS_DIR)/zlib-$(ZLIB_VERSION) && cp libz.a ../../$(WINDOWS_DEPS_DIR)/lib
+        cd $(BUILD_WINDOWS_DEPS_DIR)/zlib-$(ZLIB_VERSION) && cp libz.a ../../$(WINDOWS_DEPS_DIR)/lib/libzlib.a
 
 $(BUILD_WINDOWS_DEPS_DIR)/bzip2-$(BZIP2_VERSION).tar.gz:
         mkdir -p $(@D)
diff --git a/binary/all_in_one b/binary/all_in_one
index 1b096936..4e0fa4d9 100755
--- a/binary/all_in_one
+++ b/binary/all_in_one
@@ -465,7 +465,7 @@ local function main()
       md5 = "md5",
       luasocket = "./binary/luasocket-3.1.0-1.rockspec",
       luasec = "./binary/luasec-1.3.2-1.rockspec",
-      ["lua-zlib"] = "./binary/lua-zlib-1.2-0.rockspec",
+      ["lua-zlib"] = "./binary/lua-zlib-1.4-0.rockspec",
       ["lua-bz2"] = "./binary/lua-bz2-0.2.1-1.rockspec",
       luaposix = if_platform("unix", "./binary/luaposix-35.1-1.rockspec"),
       luafilesystem = "luafilesystem",
diff --git a/binary/lua-zlib-1.2-0.rockspec b/binary/lua-zlib-1.4-0.rockspec
index 9d3adc8f..bd6cbec3 100644
--- a/binary/lua-zlib-1.2-0.rockspec
+++ b/binary/lua-zlib-1.4-0.rockspec
@@ -1,8 +1,8 @@
 package = "lua-zlib"
-version = "1.2-0"
+version = "1.4-0"
 source = {
    url = "git+https://github.com/brimworks/lua-zlib.git",
-   tag = "v1.2",
+   tag = "v1.4",
 }
 description = {
    summary = "Simple streaming interface to zlib for Lua.",
@@ -16,12 +16,11 @@ description = {
    license = "MIT"
 }
 dependencies = {
-   "lua >= 5.1, <= 5.4"
+   "lua >= 5.1, <= 5.5"
 }
 external_dependencies = {
     ZLIB = {
-       header = "zlib.h",
-       library = "z",
+       header = "zlib.h"
     }
 }
 
@@ -33,7 +32,24 @@ build = {
          libraries = { "z" },
          defines = { "LZLIB_COMPAT" },
          incdirs = { "$(ZLIB_INCDIR)" },
-         libdirs = { "$(ZLIB_LIBDIR)" },
+         libdirs = { "$(ZLIB_LIBDIR)" }
       }
    },
+   platforms = {
+      windows = {
+         modules = {
+            zlib = {
+               libraries = { "zlib" }
+            }
+         }
+      },
+      mingw = {
+         modules = {
+            zlib = {
+               libraries = { "zlib1" },
+               libdirs = { "$(ZLIB_INCDIR)/../bin" }
+            }
+         }
+      }
+   }
 }