diff --git a/.github/variables/cpp-sdk-versions.env b/.github/variables/cpp-sdk-versions.env index 5831dda..e02acde 100644 --- a/.github/variables/cpp-sdk-versions.env +++ b/.github/variables/cpp-sdk-versions.env @@ -1,2 +1,2 @@ -sdk=3.10.1 -redis_source=2.1.19 +sdk=3.13.0 +redis_source=2.4.0 diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 068a40f..8d39fd5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -33,7 +33,7 @@ jobs: strategy: fail-fast: false matrix: - version: ["5.1", "5.2", "5.3", "luajit-2.0.5"] + version: ["5.1", "5.2", "5.3", "luajit-2.1"] package: ${{ fromJSON(needs.rockspecs.outputs.matrix) }} steps: diff --git a/.github/workflows/install-lua-sdk.yml b/.github/workflows/install-lua-sdk.yml index 6680146..ad7d600 100644 --- a/.github/workflows/install-lua-sdk.yml +++ b/.github/workflows/install-lua-sdk.yml @@ -23,7 +23,7 @@ on: - '5.1' - '5.2' - '5.3' - - 'luajit-2.0.5' + - 'luajit-2.1' default: '5.3' cpp-sdk-version: description: "Version of the C++ Server-side SDK." diff --git a/README.md b/README.md index a4862a5..63f3844 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ LaunchDarkly overview Supported Lua versions ----------- -This version of the LaunchDarkly SDK is known to be compatible with the Lua 5.1-5.3 interpreter, and LuaJIT 2.0.5. +This version of the LaunchDarkly SDK is known to be compatible with the Lua 5.1-5.3 interpreter, and LuaJIT 2.1. Supported C++ server-side SDK versions ----------- diff --git a/examples/hello-debian/Dockerfile b/examples/hello-debian/Dockerfile index b5b6402..11dc14c 100644 --- a/examples/hello-debian/Dockerfile +++ b/examples/hello-debian/Dockerfile @@ -4,7 +4,7 @@ FROM debian:bookworm ARG VERSION=2.1.3 # {{ x-release-please-end }} -ARG CPP_SDK_VERSION=3.10.1 +ARG CPP_SDK_VERSION=3.13.0 # For unknown reasons, it appears that boost.json and boost.url aren't included in the # libboost-all package. diff --git a/examples/hello-haproxy/Dockerfile b/examples/hello-haproxy/Dockerfile index bad2c0a..847ce7a 100644 --- a/examples/hello-haproxy/Dockerfile +++ b/examples/hello-haproxy/Dockerfile @@ -4,7 +4,7 @@ FROM ubuntu:22.04 ARG VERSION=2.1.3 # {{ x-release-please-end }} -ARG CPP_SDK_VERSION=3.10.1 +ARG CPP_SDK_VERSION=3.13.0 RUN apt-get update && apt-get install -y \ curl luarocks lua5.3 lua5.3-dev \ diff --git a/examples/hello-nginx/Dockerfile b/examples/hello-nginx/Dockerfile index e7f14f4..e6c8b1a 100644 --- a/examples/hello-nginx/Dockerfile +++ b/examples/hello-nginx/Dockerfile @@ -7,7 +7,7 @@ FROM openresty/openresty:1.21.4.1-0-jammy ARG VERSION=2.1.3 # {{ x-release-please-end }} -ARG CPP_SDK_VERSION=3.10.1 +ARG CPP_SDK_VERSION=3.13.0 RUN apt-get update && apt-get install -y \ git netbase curl libssl-dev apt-transport-https ca-certificates \ diff --git a/launchdarkly-server-sdk-redis.c b/launchdarkly-server-sdk-redis.c index 171e5c8..e4f26e7 100644 --- a/launchdarkly-server-sdk-redis.c +++ b/launchdarkly-server-sdk-redis.c @@ -56,24 +56,6 @@ static const struct luaL_Reg launchdarkly_functions[] = { { NULL, NULL} }; -#if !defined LUA_VERSION_NUM || LUA_VERSION_NUM==501 -/* -** Adapted from Lua 5.2.0 -*/ -static void luaL_setfuncs (lua_State *L, const luaL_Reg *l, int nup) { - luaL_checkstack(L, nup+1, "too many upvalues"); - for (; l->name != NULL; l++) { /* fill the table with given functions */ - int i; - lua_pushstring(L, l->name); - for (i = 0; i < nup; i++) /* copy upvalues to the top */ - lua_pushvalue(L, -(nup+1)); - lua_pushcclosure(L, l->func, nup); /* closure with those upvalues */ - lua_settable(L, -(nup + 3)); - } - lua_pop(L, nup); /* remove upvalues */ -} -#endif - int luaopen_launchdarkly_server_sdk_redis(lua_State *const l) {