From e798a5e8f64479463143f10261c5f37f8b446b24 Mon Sep 17 00:00:00 2001
From: Onno Vos <onno-vos-dev@users.noreply.github.com>
Date: Fri, 27 Jan 2023 14:52:00 +0100
Subject: [PATCH] Remove dependency on Erlangpack and fix publishing of hex
 docs

---
 .github/workflows/build.yml   |  2 +-
 .github/workflows/release.yml |  7 +++++--
 rebar.config                  | 17 +++++++++++------
 src/aws.app.src               |  1 -
 4 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 626049ff..3eddf859 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -41,7 +41,7 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       run: rebar3 cover
     - name: Produce Documentation
-      run: rebar3 edoc || true
+      run: rebar3 ex_doc || true
     - name: Publish Documentation
       uses: actions/upload-artifact@v1
       with:
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 72f9b96a..ff84e0ed 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -23,12 +23,15 @@ jobs:
       - name: Run EUnit Tests
         run: rebar3 eunit
 
+      - name: Generate docs
+        run: rebar3 ex_doc
+
       - uses: ncipollo/release-action@v1
         with:
           generateReleaseNotes: true
           token: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Publish to Hex.pm
-        uses: erlangpack/github-action@v3
+      - name: Publish to hex.pm
         env:
           HEX_API_KEY: ${{ secrets.HEX_API_KEY }}
+        run: rebar3 hex publish -r hexpm --yes
diff --git a/rebar.config b/rebar.config
index d259f7f9..fc5798af 100644
--- a/rebar.config
+++ b/rebar.config
@@ -1,12 +1,17 @@
 {erl_opts, [debug_info, {d, maps_support}]}.
-{edoc_opts, [{dir, "doc"}]}.
 {deps, [{erlware_commons, "1.6.0"},
         {hackney, "1.18.0"},
         {jsx, "3.0.0"}
        ]}.
-{project_plugins, [rebar3_ex_doc]}.
-{hex, [{doc, ex_doc}]}.
+{project_plugins, [rebar3_hex, rebar3_ex_doc]}.
+{hex, [{doc, #{provider => ex_doc}}]}.
+
 {ex_doc, [
-          {source_url, <<"https://github.com/aws-beam/aws-erlang/">>},
-          {extras, [<<"README.md">>, <<"LICENSE.md">>]},
-          {main, <<"readme">>}]}.
+    {extras, [
+          {'README.md', #{title => <<"Overview">>}},
+          {'LICENSE.md', #{title => <<"License">>}}
+    ]},
+    {main, <<"readme">>},
+    {homepage_url, <<"https://github.com/aws-beam/aws-erlang">>},
+    {source_url, <<"https://github.com/aws-beam/aws-erlang">>}
+]}.
diff --git a/src/aws.app.src b/src/aws.app.src
index 3ade32f8..55fa59c5 100644
--- a/src/aws.app.src
+++ b/src/aws.app.src
@@ -16,6 +16,5 @@
  , {pkg_name, "aws_erlang"}
  , {licenses, ["Apache-2.0"]}
  , {build_tools, ["rebar3"]}
- , {doc, "doc"}
  , {links, [{"GitHub", "https://github.com/aws-beam/aws-erlang"}]}
  ]}.