Skip to content

Commit

Permalink
Merge pull request #15 from inaka/elbrujohalcon.15.bump_version_to_1_1_0
Browse files Browse the repository at this point in the history
Bump Version to 1.1.0
  • Loading branch information
elbrujohalcon authored Dec 11, 2018
2 parents 03221d8 + a378e8f commit 1b07c46
Show file tree
Hide file tree
Showing 5 changed files with 57 additions and 18 deletions.
13 changes: 13 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,23 @@
# Change Log

## [1.1.0](https://github.com/inaka/mixer/tree/1.1.0) (2018-12-11)
[Full Changelog](https://github.com/inaka/mixer/compare/1.0.1...1.1.0)

**Closed issues:**

- Migrate to rebar3 [\#11](https://github.com/inaka/mixer/issues/11)

**Merged pull requests:**

- Migrate to rebar3 [\#16](https://github.com/inaka/mixer/pull/16) ([nilium](https://github.com/nilium))
- \[\#13\] Initial attempt at fixing spec generation [\#14](https://github.com/inaka/mixer/pull/14) ([elbrujohalcon](https://github.com/elbrujohalcon))

## [1.0.1](https://github.com/inaka/mixer/tree/1.0.1) (2018-07-10)
[Full Changelog](https://github.com/inaka/mixer/compare/1.0.0...1.0.1)

**Merged pull requests:**

- Bump Version to 1.0.1 [\#12](https://github.com/inaka/mixer/pull/12) ([elbrujohalcon](https://github.com/elbrujohalcon))
- Use reserved words as function name [\#10](https://github.com/inaka/mixer/pull/10) ([f3c0](https://github.com/f3c0))

## [1.0.0](https://github.com/inaka/mixer/tree/1.0.0) (2017-10-11)
Expand Down
14 changes: 0 additions & 14 deletions Makefile

This file was deleted.

42 changes: 41 additions & 1 deletion rebar.config
Original file line number Diff line number Diff line change
@@ -1,2 +1,42 @@
{eunit_first_files, ["src/wm_delegate.erl", "test/foo.erl", "test/bar.erl"]}.
{erl_opts, [debug_info, warnings_as_errors]}.
%% Erlang compiler options
{erl_opts, [ warn_unused_vars
, ewarn_export_all
, warn_shadow_vars
, warn_unused_import
, warn_unused_function
, warn_bif_clash
, warn_unused_record
, warn_deprecated_function
, warn_obsolete_guard
, strict_validation
, warn_export_vars
, warn_exported_vars
, warn_missing_spec
, debug_info
]}.

{cover_enabled, true}.
{cover_opts, [verbose]}.

{edoc_opts, [ {report_missing_types, true}
, {source_path, ["src"]}
, {report_missing_types, true}
, {todo, true}
, {packages, false}
, {subpackages, false}
]}.

{dialyzer, [
{warnings, [ race_conditions
, no_return
, unmatched_returns
, error_handling
, unknown
]},
{plt_apps, all_deps},
{plt_extra_apps, [erts, kernel, stdlib]},
{plt_location, local},
{base_plt_apps, [stdlib, kernel]},
{base_plt_location, global}
]}.
4 changes: 2 additions & 2 deletions src/mixer.app.src
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@
{application, mixer,
[
{description, "Mix in public functions from external modules"},
{vsn, "1.0.1"},
{vsn, "1.1.0"},
{registered, []},
{applications, [kernel, stdlib]},
{env, []},
{pkg_name, inaka_mixer},
{maintainers, ["Inaka"]},
{licenses, ["Apache 2.0"]},
{links, [{"Github", "https://github.com/inaka/mixer"}]},
{build_tools, ["make", "rebar"]}
{build_tools, ["rebar3"]}
]}.
2 changes: 1 addition & 1 deletion src/mixer.erl
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@

-spec parse_transform([term()], [term()]) -> [term()].
parse_transform(Forms, _Options) ->
[set_mod_info(Form) || Form <- Forms],
lists:foreach(fun set_mod_info/1, Forms),
set_mod_info(Forms),
{EOF, Forms1} = strip_eof(Forms),
case parse_and_expand_mixins(Forms1, {[], [], none}) of
Expand Down

0 comments on commit 1b07c46

Please sign in to comment.