From ffebebe681de3b7c858d56c3f36427dc4567c437 Mon Sep 17 00:00:00 2001
From: Mathieu Carbou <mathieu.carbou@gmail.com>
Date: Tue, 21 Jan 2025 15:07:50 +0100
Subject: [PATCH] Switch to https://github.com/esp32async

---
 .github/workflows/ci.yml | 17 +++--------------
 library.json             |  4 ++--
 platformio.ini           | 17 +++++++++--------
 3 files changed, 14 insertions(+), 24 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 7aef35c..cc530f9 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -64,13 +64,13 @@ jobs:
         run: arduino-cli core install --additional-urls "${{ matrix.index_url }}" ${{ matrix.core }}
 
       - name: Install AsyncTCP
-        run: ARDUINO_LIBRARY_ENABLE_UNSAFE_INSTALL=true arduino-cli lib install --git-url https://github.com/mathieucarbou/AsyncTCP#v3.2.10
+        run: ARDUINO_LIBRARY_ENABLE_UNSAFE_INSTALL=true arduino-cli lib install --git-url https://github.com/ESP32Async/AsyncTCP#v3.3.2
 
       - name: Install ESPAsyncTCP
-        run: ARDUINO_LIBRARY_ENABLE_UNSAFE_INSTALL=true arduino-cli lib install --git-url https://github.com/mathieucarbou/esphome-ESPAsyncTCP#v2.0.0
+        run: ARDUINO_LIBRARY_ENABLE_UNSAFE_INSTALL=true arduino-cli lib install --git-url https://github.com/ESP32Async/ESPAsyncTCP#v2.0.0
 
       - name: Install ESPAsyncWebServer
-        run: ARDUINO_LIBRARY_ENABLE_UNSAFE_INSTALL=true arduino-cli lib install --git-url https://github.com/mathieucarbou/ESPAsyncWebServer#v3.3.17
+        run: ARDUINO_LIBRARY_ENABLE_UNSAFE_INSTALL=true arduino-cli lib install --git-url https://github.com/ESP32Async/ESPAsyncWebServer#v3.6.0
 
       - name: Build Demo
         run: arduino-cli compile --library . --warnings none -b ${{ matrix.board }} "examples/Demo/Demo.ino"
@@ -112,17 +112,6 @@ jobs:
           - env: ci-arduino-3
             board: esp32-c6-devkitc-1
 
-          - env: ci-arduino-310rc1
-            board: esp32dev
-          - env: ci-arduino-310rc1
-            board: esp32-s2-saola-1
-          - env: ci-arduino-310rc1
-            board: esp32-s3-devkitc-1
-          - env: ci-arduino-310rc1
-            board: esp32-c3-devkitc-02
-          - env: ci-arduino-310rc1
-            board: esp32-c6-devkitc-1
-
           - env: ci-esp8266
             board: huzzah
           - env: ci-esp8266
diff --git a/library.json b/library.json
index 8d105f5..8890395 100644
--- a/library.json
+++ b/library.json
@@ -17,9 +17,9 @@
   ],
   "dependencies": [
     {
-      "owner": "mathieucarbou",
+      "owner": "ESP32Async",
       "name": "ESPAsyncWebServer",
-      "version": "^3.3.11",
+      "version": "^3.6.0",
       "platforms": ["espressif8266", "espressif32"]
     }
   ],
diff --git a/platformio.ini b/platformio.ini
index 0123d3d..950649d 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -6,7 +6,8 @@ src_dir = examples/AsyncDemo
 [env]
 framework = arduino
 lib_deps = 
-  mathieucarbou/ESPAsyncWebServer@^3.3.11
+  ESP32Async/AsyncTCP@^3.3.2
+  ESP32Async/ESPAsyncWebServer@^3.6.0
 lib_compat_mode = strict
 upload_protocol = esptool
 monitor_speed = 115200
@@ -30,7 +31,7 @@ board = esp32-s3-devkitc-1
 
 [env:arduino-3]
 build_flags = ${env.build_flags} ${dev.build_flags}
-platform = https://github.com/pioarduino/platform-espressif32/releases/download/53.03.10-rc1/platform-espressif32.zip
+platform = https://github.com/pioarduino/platform-espressif32/releases/download/53.03.11/platform-espressif32.zip
 board = esp32-s3-devkitc-1
 
 [env:esp8266]
@@ -38,13 +39,17 @@ build_flags = ${env.build_flags} ${dev.build_flags}
 platform = espressif8266
 board = huzzah
 lib_deps = 
-  mathieucarbou/ESPAsyncWebServer@^3.3.11
+  ESP32Async/ESPAsyncTCP@^2.0.0
+  ESP32Async/ESPAsyncWebServer@^3.6.0
 
 [env:pico]
 platform = https://github.com/maxgerhardt/platform-raspberrypi.git
 board = pico
 framework = arduino
 board_build.core = earlephilhower
+lib_deps = 
+  khoih-prog/AsyncTCP_RP2040W@^1.2.0
+  ESP32Async/ESPAsyncWebServer@^3.6.0
 
 ;  CI
 
@@ -53,11 +58,7 @@ platform = espressif32@6.9.0
 board = ${sysenv.PIO_BOARD}
 
 [env:ci-arduino-3]
-platform = https://github.com/pioarduino/platform-espressif32/releases/download/51.03.05/platform-espressif32.zip
-board = ${sysenv.PIO_BOARD}
-
-[env:ci-arduino-310rc1]
-platform = https://github.com/pioarduino/platform-espressif32/releases/download/53.03.10-rc1/platform-espressif32.zip
+platform = https://github.com/pioarduino/platform-espressif32/releases/download/53.03.11/platform-espressif32.zip
 board = ${sysenv.PIO_BOARD}
 
 [env:ci-esp8266]