TD-222: Update Erlang bits wrt valitydev/thrift 0.14.2.3 (#28)

* Bump to valitydev/damsel@9362c086
* Mention damsel as explicit dependency

.github/workflows/erlang-pr.yml

@@ -7,28 +7,11 @@ on:
 
 jobs:
   build:
-    name: Build and verify
+    uses: valitydev/erlang-workflows/.github/workflows/erlang-simple-build.yml@v1
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-
-      - uses: valitydev/action-setup-thrift@v1
-
-      - uses: erlef/setup-beam@v1
-        id: beam
     with:
-          otp-version: "24"
+      otp-version: 24
-          rebar3-version: "3.18"
+      rebar-version: 3
-
+      use-thrift: true
-      - name: Restore PLT cache
+      thrift-version: 0.14.2.3
-        uses: actions/cache@v2
+      run-eunit: false
-        id: plt-cache
+      run-common-test: false
-        with:
-          key: |
-            ${{ runner.os }}-${{ steps.beam.outputs.otp-version }}-plt
-          path: |
-            _build/default/rebar3_*_plt
-
-      - run: rebar3 compile
-      - run: rebar3 xref
-      - run: rebar3 dialyzer

proto/payout_manager.thrift

@@ -2,7 +2,7 @@ include "proto/base.thrift"
 include "proto/domain.thrift"
 
 namespace java dev.vality.payout.manager
-namespace erlang payouts
+namespace erlang pmproto.payouts
 
 typedef base.ID PayoutID
 

rebar.config

@@ -1,6 +1,5 @@
 %% Common project erlang options.
 {erl_opts, [
-
     % mandatory
     debug_info,
     warnings_as_errors,
@@ -26,10 +25,7 @@
 ]}.
 
 {deps, [
-    {damsel,
+    {damsel, {git, "https://github.com/valitydev/damsel.git", {branch, "master"}}}
-        {git, "https://github.com/valitydev/damsel.git",
-        {branch, "master"}}
-    }
 ]}.
 
 %% XRef checks
@@ -57,18 +53,17 @@
 
 {plugins, [
     {rebar3_thrift_compiler,
-        {git, "https://github.com/valitydev/rebar3_thrift_compiler.git", {branch, "master"}}}
+        {git, "https://github.com/valitydev/rebar3_thrift_compiler.git", {tag, "0.4"}}}
 ]}.
 
 {provider_hooks, [
     {pre, [
         {compile, {thrift, compile}},
-        {clean  , {thrift, clean  }}
+        {clean, {thrift, clean}}
     ]}
 ]}.
 
 {thrift_compiler_opts, [
     {in_dir, "proto"},
-    {in_files, all},
+    {gen, "erlang:app_namespaces"}
-    {gen, "erlang:scoped_typenames"}
 ]}.

rebar.lock

@@ -1,4 +1,4 @@
 [{<<"damsel">>,
-  {git,"https://github.com/valitydev/damsel",
+  {git,"https://github.com/valitydev/damsel.git",
-       {ref,"318a7a6588c4813bd7d5c170af58fa9b6a80e401"}},
+       {ref,"9362c08657d1681240d70f923fc04642bbfecc0a"}},
   0}].

src/payout_manager_proto.app.src

@@ -3,6 +3,7 @@
     {vsn, "0.1.0"},
     {applications, [
         kernel,
-        stdlib
+        stdlib,
+        damsel
     ]}
 ]}.