Merge branch 'release/2.23.1'

lrascao · Jan 19, 2024 · 108074e · 108074e
2 parents 84dbe2e + 7208124
commit 108074e
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -19,7 +19,7 @@ Add the plugin to your rebar config:
 {erl_opts, [{i, "./_build/default/plugins/gpb/include"}]}.
 
 {plugins, [
-    { rebar3_gpb_plugin, "2.23.0" }
+    { rebar3_gpb_plugin, "2.23.1" }
 ]}.
 ```
 

diff --git a/rebar.lock b/rebar.lock
@@ -1,8 +1,8 @@
 {"1.2.0",
-[{<<"gpb">>,{pkg,<<"gpb">>,<<"4.20.0">>},0}]}.
+[{<<"gpb">>,{pkg,<<"gpb">>,<<"4.21.0">>},0}]}.
 [
 {pkg_hash,[
- {<<"gpb">>, <<"3617FB7762801C1BED0460ED496D5BAB0F4D76E26B923A9AD9ABF026C2220E8A">>}]},
+ {<<"gpb">>, <<"7A2EB8DD0F3032B7B46B04DCDB490FFABE43EAB3A9A1F905BD03C9EC35BABB0F">>}]},
 {pkg_hash_ext,[
- {<<"gpb">>, <<"4268756A98674D5159EEAA0FD4501B7E43B2DD7F10A1F052499E9B09F107D40B">>}]}
+ {<<"gpb">>, <<"DA45984D26048D8D508D3BBFFA6F4A5A5163841CEFBF40809622BF92B4640DE4">>}]}
 ].
diff --git a/src/rebar3_gpb_compiler.erl b/src/rebar3_gpb_compiler.erl
@@ -102,8 +102,11 @@ discover(AppDir, SourceDir, Opts) ->
     SourceExtRe = "^[^._].*\\" ++ ".proto" ++ [$$],
 
     Recursive = proplists:get_value(recursive, Opts, true),
+    SearchDirectory = filename:join([AppDir, SourceDir]),
+    rebar_api:debug("searching .proto files from ~p [recursive=~p]",
+                    [SearchDirectory, Recursive]),
     %% Find all possible source files
-    rebar_utils:find_files(filename:join([AppDir, SourceDir]),
+    rebar_utils:find_files(SearchDirectory,
                            SourceExtRe, Recursive).
 
 compile([], _TargetErlDir, _GpbOpts, _Protos) -> ok;

diff --git a/src/rebar3_gpb_plugin.app.src b/src/rebar3_gpb_plugin.app.src
@@ -1,6 +1,6 @@
 {application, rebar3_gpb_plugin, [
         {description, "A rebar3 gpb plugin for compiling .proto files"},
-        {vsn, "2.23.0"},
+        {vsn, "2.23.1"},
         {registered, []},
         {applications,
             [