3 files changed, 14 insertions, 3 deletions

diff --git a/src/luarocks/cfg.lua b/src/luarocks/cfg.lua
index 21cfbf6d..1207d600 100644
--- a/src/luarocks/cfg.lua
+++ b/src/luarocks/cfg.lua
@@ -483,6 +483,11 @@ if cfg.lua_version >= "5.2" then
    defaults.rocks_provided["bit32"] = cfg.lua_version.."-1"
 end
 
+if cfg.lua_version >= "5.3" then
+   -- Lua 5.3+
+   defaults.rocks_provided["utf8"] = cfg.lua_version.."-1"
+end
+
 if package.loaded.jit then
    -- LuaJIT
    local lj_version = package.loaded.jit.version:match("LuaJIT (.*)"):gsub("%-","")
diff --git a/src/luarocks/util.lua b/src/luarocks/util.lua
index 7e34fe0e..a70e726d 100644
--- a/src/luarocks/util.lua
+++ b/src/luarocks/util.lua
@@ -321,7 +321,7 @@ function util.sortedpairs(tbl, sort_function)
 end
 
 function util.lua_versions()
-   local versions = { "5.1", "5.2" }
+   local versions = { "5.1", "5.2", "5.3" }
    local i = 0
    return function()
       i = i + 1
diff --git a/src/luarocks/write_rockspec.lua b/src/luarocks/write_rockspec.lua
index a194201d..20d35701 100644
--- a/src/luarocks/write_rockspec.lua
+++ b/src/luarocks/write_rockspec.lua
@@ -31,8 +31,8 @@ rockspec, and is not guaranteed to be complete or correct.
 --summary="<txt>"     A short one-line description summary.
 --description="<txt>" A longer description string.
 --homepage=<url>      Project homepage.
---lua-version=<ver>   Supported Lua versions. Accepted values are "5.1", "5.2"
-                      or "5.1,5.2".
+--lua-version=<ver>   Supported Lua versions. Accepted values are "5.1", "5.2",
+                      "5.3", "5.1,5.2", "5.2,5.3", or "5.1,5.2,5.3".
 --tag=<tag>           Tag to use. Will attempt to extract version number from it.
 --lib=<lib>[,<lib>]   A comma-separated list of libraries that C files need to
                       link to.
@@ -63,8 +63,14 @@ local function configure_lua_version(rockspec, luaver)
       table.insert(rockspec.dependencies, "lua ~> 5.1")
    elseif luaver == "5.2" then
       table.insert(rockspec.dependencies, "lua ~> 5.2")
+   elseif luaver == "5.3" then
+      table.insert(rockspec.dependencies, "lua ~> 5.3")
    elseif luaver == "5.1,5.2" then
       table.insert(rockspec.dependencies, "lua >= 5.1, < 5.3")
+   elseif luaver == "5.2,5.3" then
+      table.insert(rockspec.dependencies, "lua >= 5.2, < 5.4")
+   elseif luaver == "5.1,5.2,5.3" then
+      table.insert(rockspec.dependencies, "lua >= 5.1, < 5.4")
    else
       util.warning("Please specify supported Lua version with --lua-version=<ver>. "..util.see_help("write_rockspec"))
    end