diff options
| -rw-r--r-- | index/cowlib.mk | 2 | ||||
| -rw-r--r-- | index/ranch.mk | 2 | ||||
| -rw-r--r-- | test/core_compat.mk | 4 | ||||
| -rw-r--r-- | test/core_deps.mk | 18 | ||||
| -rw-r--r-- | test/plugin_cover.mk | 8 | ||||
| -rw-r--r-- | test/plugin_escript.mk | 4 | ||||
| -rw-r--r-- | test/plugin_relx.mk | 6 |
7 files changed, 22 insertions, 22 deletions
diff --git a/index/cowlib.mk b/index/cowlib.mk index 0650ff9..b237a1b 100644 --- a/index/cowlib.mk +++ b/index/cowlib.mk @@ -4,4 +4,4 @@ pkg_cowlib_description = Support library for manipulating Web protocols. pkg_cowlib_homepage = http://ninenines.eu pkg_cowlib_fetch = git pkg_cowlib_repo = https://github.com/ninenines/cowlib -pkg_cowlib_commit = 1.0.2 +pkg_cowlib_commit = master diff --git a/index/ranch.mk b/index/ranch.mk index f3c0f98..b4027a5 100644 --- a/index/ranch.mk +++ b/index/ranch.mk @@ -4,4 +4,4 @@ pkg_ranch_description = Socket acceptor pool for TCP protocols. pkg_ranch_homepage = http://ninenines.eu pkg_ranch_fetch = git pkg_ranch_repo = https://github.com/ninenines/ranch -pkg_ranch_commit = 1.2.1 +pkg_ranch_commit = master diff --git a/test/core_compat.mk b/test/core_compat.mk index e6316de..c8c570d 100644 --- a/test/core_compat.mk +++ b/test/core_compat.mk @@ -195,7 +195,7 @@ core-compat-rebar-deps-hex: init $t $(MAKE) -C $(APP) -f erlang.mk bootstrap-lib $v $i "Add Cowboy as a dependency" - $t perl -ni.bak -e 'print;if ($$.==1) {print "DEPS = cowboy\ndep_cowboy = hex 1.0.0\n"}' $(APP)/Makefile + $t perl -ni.bak -e 'print;if ($$.==1) {print "DEPS = cowboy\ndep_cowboy = hex 2.12.0\n"}' $(APP)/Makefile $i "Run 'make rebar.config'" $t $(MAKE) -C $(APP) rebar.config $v @@ -206,7 +206,7 @@ core-compat-rebar-deps-hex: init $i "Check that Cowboy is listed in rebar.config" $t $(ERL) -eval " \ {ok, C} = file:consult(\"$(APP)/rebar.config\"), \ - {_, [{cowboy, \"1.0.0\"}]} = lists:keyfind(deps, 1, C), \ + {_, [{cowboy, \"2.12.0\"}]} = lists:keyfind(deps, 1, C), \ halt()" $i "Distclean the application" diff --git a/test/core_deps.mk b/test/core_deps.mk index da57c1d..7c792f5 100644 --- a/test/core_deps.mk +++ b/test/core_deps.mk @@ -401,8 +401,8 @@ core-deps-dep-commit: init $t cp ../erlang.mk $(APP)/ $t $(MAKE) -C $(APP) -f erlang.mk bootstrap-lib $v - $i "Add Cowboy 1.0.0 to the list of dependencies" - $t perl -ni.bak -e 'print;if ($$.==1) {print "DEPS = cowboy\ndep_cowboy_commit = 1.0.0\n"}' $(APP)/Makefile + $i "Add Cowboy 2.12.0 to the list of dependencies" + $t perl -ni.bak -e 'print;if ($$.==1) {print "DEPS = cowboy\ndep_cowboy_commit = 2.12.0\n"}' $(APP)/Makefile ifdef LEGACY $i "Add Cowboy to the applications key in the .app.src file" @@ -422,7 +422,7 @@ endif [ok = application:load(App) || App <- [$(APP), cowboy, cowlib, ranch]], \ {ok, Deps} = application:get_key($(APP), applications), \ true = lists:member(cowboy, Deps), \ - {ok, \"1.0.0\"} = application:get_key(cowboy, vsn), \ + {ok, \"2.12.0\"} = application:get_key(cowboy, vsn), \ halt()" core-deps-dir: init @@ -586,8 +586,8 @@ core-deps-fetch-git: init $t cp ../erlang.mk $(APP)/ $t $(MAKE) -C $(APP) -f erlang.mk bootstrap-lib $v - $i "Add Cowboy 1.0.0 to the list of dependencies" - $t perl -ni.bak -e 'print;if ($$.==1) {print "DEPS = cowboy\ndep_cowboy = git https://github.com/ninenines/cowboy 1.0.0\n"}' $(APP)/Makefile + $i "Add Cowboy 2.12.0 to the list of dependencies" + $t perl -ni.bak -e 'print;if ($$.==1) {print "DEPS = cowboy\ndep_cowboy_commit = 2.12.0\n"}' $(APP)/Makefile ifdef LEGACY $i "Add Cowboy to the applications key in the .app.src file" @@ -607,7 +607,7 @@ endif [ok = application:load(App) || App <- [$(APP), cowboy, cowlib, ranch]], \ {ok, Deps} = application:get_key($(APP), applications), \ true = lists:member(cowboy, Deps), \ - {ok, \"1.0.0\"} = application:get_key(cowboy, vsn), \ + {ok, \"2.12.0\"} = application:get_key(cowboy, vsn), \ halt()" core-deps-fetch-git-subfolder: init @@ -712,8 +712,8 @@ core-deps-fetch-hex: init $t cp ../erlang.mk $(APP)/ $t $(MAKE) -C $(APP) -f erlang.mk bootstrap-lib $v - $i "Add Cowboy 1.0.0 and SystemD 0.6.0 to the list of dependencies" - $t perl -ni.bak -e 'print;if ($$.==1) {print "DEPS = cowboy systemd\ndep_cowboy = hex 1.0.0\ndep_systemd = hex 0.6.0\n"}' $(APP)/Makefile + $i "Add Cowboy 2.12.0 and SystemD 0.6.0 to the list of dependencies" + $t perl -ni.bak -e 'print;if ($$.==1) {print "DEPS = cowboy systemd\ndep_cowboy = hex 2.12.0\ndep_systemd = hex 0.6.0\n"}' $(APP)/Makefile ifdef LEGACY $i "Add Cowboy and SystemD to the applications key in the .app.src file" @@ -736,7 +736,7 @@ endif {ok, Deps} = application:get_key($(APP), applications), \ true = lists:member(cowboy, Deps), \ true = lists:member(systemd, Deps), \ - {ok, \"1.0.0\"} = application:get_key(cowboy, vsn), \ + {ok, \"2.12.0\"} = application:get_key(cowboy, vsn), \ {ok, \"0.6.0\"} = application:get_key(systemd, vsn), \ halt()" diff --git a/test/plugin_cover.mk b/test/plugin_cover.mk index 0e1ff5b..0883fa0 100644 --- a/test/plugin_cover.mk +++ b/test/plugin_cover.mk @@ -151,8 +151,8 @@ cover-ct-incl-deps: init $t cp ../erlang.mk $(APP)/ $t $(MAKE) -C $(APP) -f erlang.mk bootstrap $v - $i "Add Cowboy 1.0.0 to the list of dependencies" - $t perl -ni.bak -e 'print;if ($$.==1) {print "DEPS = cowboy\ndep_cowboy_commit = 1.0.0\n"}' $(APP)/Makefile + $i "Add Cowboy 2.12.0 to the list of dependencies" + $t perl -ni.bak -e 'print;if ($$.==1) {print "DEPS = cowboy\ndep_cowboy_commit = 2.12.0\n"}' $(APP)/Makefile ifdef LEGACY $i "Add Cowboy to the applications key in the .app.src file" @@ -437,8 +437,8 @@ cover-eunit-incl-deps: init $t cp ../erlang.mk $(APP)/ $t $(MAKE) -C $(APP) -f erlang.mk bootstrap $v - $i "Add Cowboy 1.0.0 to the list of dependencies" - $t perl -ni.bak -e 'print;if ($$.==1) {print "DEPS = cowboy\ndep_cowboy_commit = 1.0.0\n"}' $(APP)/Makefile + $i "Add Cowboy 2.12.0 to the list of dependencies" + $t perl -ni.bak -e 'print;if ($$.==1) {print "DEPS = cowboy\ndep_cowboy_commit = 2.12.0\n"}' $(APP)/Makefile ifdef LEGACY $i "Add Cowboy to the applications key in the .app.src file" diff --git a/test/plugin_escript.mk b/test/plugin_escript.mk index d816198..d2dd1e6 100644 --- a/test/plugin_escript.mk +++ b/test/plugin_escript.mk @@ -97,8 +97,8 @@ escript-deps-with-deps: init $t cp ../erlang.mk $(APP)/ $t $(MAKE) -C $(APP) -f erlang.mk bootstrap-lib $v - $i "Add Cowboy 1.0.0 to the list of dependencies" - $t perl -ni.bak -e 'print;if ($$.==1) {print "DEPS = cowboy\ndep_cowboy_commit = 1.0.0\n"}' $(APP)/Makefile + $i "Add Cowboy 2.12.0 to the list of dependencies" + $t perl -ni.bak -e 'print;if ($$.==1) {print "DEPS = cowboy\ndep_cowboy_commit = 2.12.0\n"}' $(APP)/Makefile $i "Generate a module containing a function main/1" $t printf "%s\n" \ diff --git a/test/plugin_relx.mk b/test/plugin_relx.mk index 9b8f3c4..c91a26b 100644 --- a/test/plugin_relx.mk +++ b/test/plugin_relx.mk @@ -63,8 +63,8 @@ relx-apps-with-deps: init $i "Include my_app in the release" $t perl -pi.bak -e 's/$(APP),/$(APP), my_app,/' $(APP)/relx.config - $i "Add Cowlib to the list of dependencies for my_app" - $t perl -ni.bak -e 'print;if ($$.==1) {print "DEPS = cowlib\n"}' $(APP)/apps/my_app/Makefile + $i "Add Cowlib 2.13.0 to the list of dependencies for my_app" + $t perl -ni.bak -e 'print;if ($$.==1) {print "DEPS = cowlib\ndep_cowlib_commit = 2.13.0\n"}' $(APP)/apps/my_app/Makefile ifdef LEGACY $i "Add Cowlib to the applications key in the my_app.app.src file" @@ -82,7 +82,7 @@ endif $t test -f $(APP)/deps/cowlib/ebin/cowlib.app $i "Check that Cowlib was included in the release" - $t test -d $(APP)/_rel/test_relx_apps_with_deps_release/lib/cowlib-1.0.2 + $t test -d $(APP)/_rel/test_relx_apps_with_deps_release/lib/cowlib-2.13.0 relx-bare-rel: init |