[couchdb] branch feat/3.x/otp23 updated: feat: update deps to support otp23 in a full build

[ja...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

jan pushed a commit to branch feat/3.x/otp23
in repository https://gitbox.apache.org/repos/asf/couchdb.git


The following commit(s) were added to refs/heads/feat/3.x/otp23 by this push:
     new 4c2b033  feat: update deps to support otp23 in a full build
4c2b033 is described below

commit 4c2b033656f9cfe456ffe45976671beceddfc61d
Author: Jan Lehnardt <ja...@apache.org>
AuthorDate: Sat Mar 13 20:42:01 2021 +0100

    feat: update deps to support otp23 in a full build
---
 configure           | 1 +
 rebar.config.script | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/configure b/configure
index b902fe2..af40aa8 100755
--- a/configure
+++ b/configure
@@ -238,6 +238,7 @@ install_local_rebar() {
     if [ ! -x "${rootdir}/bin/rebar" ]; then
         if [ ! -d "${rootdir}/src/rebar" ]; then
             git clone --depth 1 https://github.com/apache/couchdb-rebar.git ${rootdir}/src/rebar
+            git checkout feat/otp23
         fi
         make -C ${rootdir}/src/rebar
         mv ${rootdir}/src/rebar/rebar ${rootdir}/bin/rebar
diff --git a/rebar.config.script b/rebar.config.script
index cbb2192..39a9594 100644
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -148,7 +148,7 @@ DepDescs = [
 {b64url,           "b64url",           {tag, "1.0.2"}},
 {ets_lru,          "ets-lru",          {tag, "1.1.0"}},
 {khash,            "khash",            {tag, "1.1.0"}},
-{snappy,           "snappy",           {tag, "CouchDB-1.0.4"}},
+{snappy,           "snappy",           {tag, "feat/otp23"}},
 
 %% Non-Erlang deps
 {docs,             {url, "https://github.com/apache/couchdb-documentation"},
@@ -159,7 +159,7 @@ DepDescs = [
 {folsom,           "folsom",           {tag, "CouchDB-0.8.3"}},
 {hyper,            "hyper",            {tag, "CouchDB-2.2.0-6"}},
 {ibrowse,          "ibrowse",          {tag, "CouchDB-4.0.1-1"}},
-{jiffy,            "jiffy",            {tag, "CouchDB-1.0.4-1"}},
+{jiffy,            "jiffy",            {tag, "main"}},
 {mochiweb,         "mochiweb",         {tag, "v2.20.0"}},
 {meck,             "meck",             {tag, "0.8.8"}},
 {recon,            "recon",            {tag, "2.5.0"}}