diff --git a/src/rebar_app_discover.erl b/src/rebar_app_discover.erl index 0a5bede5..de6566bb 100644 --- a/src/rebar_app_discover.erl +++ b/src/rebar_app_discover.erl @@ -364,8 +364,9 @@ create_app_info(AppInfo, AppDir, AppFile) -> Applications = proplists:get_value(applications, AppDetails, []), IncludedApplications = proplists:get_value(included_applications, AppDetails, []), AppInfo1 = rebar_app_info:name( - rebar_app_info:original_vsn( - rebar_app_info:dir(AppInfo, AppDir), AppVsn), AppName), + rebar_app_info:vsn( + rebar_app_info:original_vsn( + rebar_app_info:dir(AppInfo, AppDir), AppVsn), AppVsn), AppName), AppInfo2 = rebar_app_info:applications( rebar_app_info:app_details(AppInfo1, AppDetails), Applications), AppInfo3 = rebar_app_info:included_applications(AppInfo2, IncludedApplications), diff --git a/src/rebar_otp_app.erl b/src/rebar_otp_app.erl index 892b22fe..a95cee8c 100644 --- a/src/rebar_otp_app.erl +++ b/src/rebar_otp_app.erl @@ -85,17 +85,16 @@ validate_app_modules(State, App, AppData) -> %% In general, the list of modules is an important thing to validate %% for compliance with OTP guidelines and upgrade procedures. %% However, some people prefer not to validate this list. - AppVsn = proplists:get_value(vsn, AppData), case rebar_state:get(State, validate_app_modules, true) of true -> case rebar_app_utils:validate_application_info(App, AppData) of true -> - {ok, rebar_app_info:original_vsn(rebar_app_info:vsn(App, AppVsn), AppVsn)}; + {ok, App}; Error -> Error end; false -> - {ok, rebar_app_info:original_vsn(rebar_app_info:vsn(App, AppVsn), AppVsn)} + {ok, App} end. preprocess(State, AppInfo, AppSrcFile) ->