From 5bd84113c24ba68b936b8ce749850302866e3cc8 Mon Sep 17 00:00:00 2001
From: Bob Ippolito <bob@redivi.com>
Date: Thu, 20 Apr 2023 13:47:28 -0700
Subject: [PATCH] Fix rebar edoc and test in CI

---
 .github/workflows/ci.yml      | 9 +++++----
 .github/workflows/release.yml | 4 ++--
 CHANGES.md                    | 5 +++++
 erlang_ls.config              | 5 +++++
 rebar.config                  | 1 +
 src/mochiweb.app.src          | 2 +-
 6 files changed, 19 insertions(+), 7 deletions(-)
 create mode 100644 erlang_ls.config

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ced0e12c..6005c403 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -15,15 +15,16 @@ jobs:
         os:
           - ubuntu-latest
         otp:
-          - "25.1.1"
-          - "24.3.4.0"
-          - "23.3.4.14"
+          - "25.3.0.0"
+          - "24.3.4.10"
+          - "23.3.4.18"
           - "22.3.4.26"
           - "21.3.8.24"
           - "20.3.8.26"
           - "19.3.6.13"
           - "18.3.4.11"
     steps:
-      - uses: actions/checkout@v2.3.2
+      - uses: actions/checkout@v3
       - run: make test
+      - run: make edoc
       - run: REBAR=rebar make test
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 20e5bfa8..f155eed1 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -9,9 +9,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Publish to Hex.pm
-        uses: erlangpack/github-action@v1
+        uses: erlangpack/github-action@v3
         env:
           HEX_API_KEY: ${{ secrets.HEX_API_KEY }}
diff --git a/CHANGES.md b/CHANGES.md
index b14ceec7..a5030d9d 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,8 @@
+Version 3.1.2 released 2023-04-20
+
+* Fix rebar edoc settings
+  https://github.com/mochi/mochiweb/pull/257
+
 Version 3.1.1 released 2022-10-11
 
 * OTP 25 added to test matrix
diff --git a/erlang_ls.config b/erlang_ls.config
new file mode 100644
index 00000000..ed6b8cb8
--- /dev/null
+++ b/erlang_ls.config
@@ -0,0 +1,5 @@
+apps_dirs:
+  - "_build/default/lib/*"
+include_dirs:
+  - "_build/default/lib/*/include"
+  - "include"
diff --git a/rebar.config b/rebar.config
index 07df66e4..9aeb7716 100644
--- a/rebar.config
+++ b/rebar.config
@@ -5,6 +5,7 @@
             {platform_define, "^21-", otp_21}]}.
 {cover_enabled, true}.
 {eunit_opts, [verbose, {report,{eunit_surefire,[{dir,"."}]}}]}.
+{edoc_opts, [{preprocess, true}]}.
 {dialyzer_opts, [{warnings, [no_return,
                              no_unused,
                              no_improper_lists,
diff --git a/src/mochiweb.app.src b/src/mochiweb.app.src
index a130893c..d117a91b 100644
--- a/src/mochiweb.app.src
+++ b/src/mochiweb.app.src
@@ -1,7 +1,7 @@
 %% This is generated from src/mochiweb.app.src
 {application, mochiweb,
  [{description, "MochiMedia Web Server"},
-  {vsn, "3.1.1"},
+  {vsn, "3.1.2"},
   {modules, []},
   {registered, []},
   {env, []},