Merge pull request #59 from keynslug/main

feat: update to Erlang/OTP 27 and gun 2.1
emqx · Jan 7, 2025 · 2e9faa2 · 2e9faa2
2 parents 34f4c22 + 2e92d4f
commit 2e9faa2
Show file tree

Hide file tree

Showing 6 changed files with 216 additions and 128 deletions.
diff --git a/.github/workflows/erlang.yml b/.github/workflows/erlang.yml
@@ -15,9 +15,13 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        otp:
-          - 26.1
-          - 25.3
+        erlang:
+          - otp: "25"
+            rebar3: "3.22"
+          - otp: "26"
+            rebar3: "3.22"
+          - otp: "27"
+            rebar3: "3.24"
 
     steps:
     - uses: actions/checkout@v3
@@ -27,8 +31,8 @@ jobs:
       run: git fetch --tags
     - uses: erlef/setup-beam@v1
       with:
-        otp-version: ${{ matrix.otp }}
-        rebar3-version: 3
+        otp-version: ${{ matrix.erlang.otp }}
+        rebar3-version: ${{ matrix.erlang.rebar3 }}
     - name: Ensure style
       run: ./check-style.sh
     - name: setup tinyproxy

diff --git a/Makefile b/Makefile
@@ -6,6 +6,7 @@ all: compile eunit xref dialyzer
 
 compile:
 	@$(REBAR) compile
+
 xref:
 	@$(REBAR) xref
 

diff --git a/rebar.config b/rebar.config
@@ -1,11 +1,11 @@
 %% -*- mode: erlang; -*-
 
-{minimum_otp_vsn, "21.0"}.
+{minimum_otp_vsn, "25.0"}.
 
 {deps, [
-    {gun, {git, "https://github.com/emqx/gun", {tag, "1.3.11"}}},
+    {gun, "2.1.0"},
     {gproc, {git, "https://github.com/emqx/gproc", {tag, "0.9.0.1"}}},
-    {snabbkaffe, {git, "https://github.com/kafka4beam/snabbkaffe.git", {tag, "1.0.7"}}}
+    {snabbkaffe, {git, "https://github.com/kafka4beam/snabbkaffe.git", {tag, "1.0.10"}}}
 ]}.
 
 {erl_opts, [
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,6 +6,7 @@ all: compile eunit xref dialyzer @@
     compile:
     	@$(REBAR) compile
     xref:
     	@$(REBAR) xref
@@ Expand Down @@