From fced800033a2bb36d9d6e460aac130f31d6d458f Mon Sep 17 00:00:00 2001 From: Ayush Sharma Date: Fri, 19 Jul 2024 16:02:11 +0530 Subject: [PATCH 1/3] fix: update deps --- .github/workflows/ci.yml | 8 ++++---- library.json | 2 +- platformio.ini | 10 +++++----- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2d94b2c..b04f09e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -62,13 +62,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.1.4 + run: ARDUINO_LIBRARY_ENABLE_UNSAFE_INSTALL=true arduino-cli lib install --git-url https://github.com/mathieucarbou/AsyncTCP#v3.2.3 - 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 - name: Install ESPAsyncWebServer - run: ARDUINO_LIBRARY_ENABLE_UNSAFE_INSTALL=true arduino-cli lib install --git-url https://github.com/mathieucarbou/ESPAsyncWebServer#v3.0.2 + run: ARDUINO_LIBRARY_ENABLE_UNSAFE_INSTALL=true arduino-cli lib install --git-url https://github.com/mathieucarbou/ESPAsyncWebServer#v3.1.1 - name: Build Demo run: arduino-cli compile --library . --warnings none -b ${{ matrix.board }} "examples/Demo/Demo.ino" @@ -101,7 +101,7 @@ jobs: - name: esp32dev|arduino-3 board: esp32dev platform: espressif32 - opts: "--project-option 'lib_compat_mode = strict' --project-option 'platform_packages=platformio/framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#3.0.2, platform_packages=platformio/framework-arduinoespressif32-libs @ https://github.com/espressif/arduino-esp32/releases/download/3.0.2/esp32-arduino-libs-3.0.2.zip'" + opts: "--project-option 'lib_compat_mode = strict' --project-option 'platform_packages=platformio/framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#3.0.3, platform_packages=platformio/framework-arduinoespressif32-libs @ https://github.com/espressif/arduino-esp32/releases/download/3.0.3/esp32-arduino-libs-3.0.3.zip'" - name: esp32-s3-devkitc-1|arduino board: esp32-s3-devkitc-1 platform: espressif32 @@ -113,7 +113,7 @@ jobs: - name: esp32-s3-devkitc-1|arduino-3 board: esp32-s3-devkitc-1 platform: espressif32 - opts: "--project-option 'lib_compat_mode = strict' --project-option 'platform_packages=platformio/framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#3.0.2, platform_packages=platformio/framework-arduinoespressif32-libs @ https://github.com/espressif/arduino-esp32/releases/download/3.0.2/esp32-arduino-libs-3.0.2.zip'" + opts: "--project-option 'lib_compat_mode = strict' --project-option 'platform_packages=platformio/framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#3.0.3, platform_packages=platformio/framework-arduinoespressif32-libs @ https://github.com/espressif/arduino-esp32/releases/download/3.0.3/esp32-arduino-libs-3.0.3.zip'" - name: huzzah|espressif8266 board: huzzah platform: espressif8266 diff --git a/library.json b/library.json index 8d9a4f2..87d0e0c 100644 --- a/library.json +++ b/library.json @@ -19,7 +19,7 @@ { "owner": "mathieucarbou", "name": "ESP Async WebServer", - "version": "^3.0.2", + "version": "^3.1.1", "platforms": ["espressif8266", "espressif32"] } ], diff --git a/platformio.ini b/platformio.ini index e0f979d..e789396 100644 --- a/platformio.ini +++ b/platformio.ini @@ -6,8 +6,8 @@ build_flags = -D CORE_DEBUG_LEVEL=ARDUHAL_LOG_LEVEL_DEBUG -D ELEGANTOTA_USE_ASYNC_WEBSERVER=1 lib_deps = - mathieucarbou/Async TCP @ ^3.1.4 - mathieucarbou/ESP Async WebServer @ 3.0.2 + mathieucarbou/Async TCP @ ^3.2.3 + mathieucarbou/ESP Async WebServer @ 3.1.1 upload_protocol = esptool monitor_speed = 115200 monitor_filters = esp32_exception_decoder, log2file @@ -28,15 +28,15 @@ board = esp32-s3-devkitc-1 [env:arduino-3] platform = espressif32 platform_packages= - platformio/framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#3.0.2 - platformio/framework-arduinoespressif32-libs @ https://github.com/espressif/arduino-esp32/releases/download/3.0.2/esp32-arduino-libs-3.0.2.zip + platformio/framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#3.0.3 + platformio/framework-arduinoespressif32-libs @ https://github.com/espressif/arduino-esp32/releases/download/3.0.3/esp32-arduino-libs-3.0.3.zip board = esp32-s3-devkitc-1 [env:esp8266] platform = espressif8266 board = huzzah lib_deps = - mathieucarbou/ESP Async WebServer @ 3.0.2 + mathieucarbou/ESP Async WebServer @ 3.1.1 esphome/ESPAsyncTCP-esphome @ 2.0.0 [env:pico] From ad15dd90a2e59e89e6e066b6529f75d4aae95f83 Mon Sep 17 00:00:00 2001 From: Ayush Sharma Date: Fri, 19 Jul 2024 16:20:56 +0530 Subject: [PATCH 2/3] fix: dependencies name --- .github/workflows/ci.yml | 2 -- library.json | 2 +- platformio.ini | 8 ++++---- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b04f09e..ea2f3b8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -7,7 +7,6 @@ on: - "/keywords.txt" - "/library.json" - "/library.properties" - - "/vue-frontend" - "/docs" pull_request: paths-ignore: @@ -15,7 +14,6 @@ on: - "/keywords.txt" - "/library.json" - "/library.properties" - - "/vue-frontend" - "/docs" jobs: diff --git a/library.json b/library.json index 87d0e0c..ee04c73 100644 --- a/library.json +++ b/library.json @@ -18,7 +18,7 @@ "dependencies": [ { "owner": "mathieucarbou", - "name": "ESP Async WebServer", + "name": "ESPAsyncWebServer", "version": "^3.1.1", "platforms": ["espressif8266", "espressif32"] } diff --git a/platformio.ini b/platformio.ini index e789396..1d457b2 100644 --- a/platformio.ini +++ b/platformio.ini @@ -6,8 +6,8 @@ build_flags = -D CORE_DEBUG_LEVEL=ARDUHAL_LOG_LEVEL_DEBUG -D ELEGANTOTA_USE_ASYNC_WEBSERVER=1 lib_deps = - mathieucarbou/Async TCP @ ^3.2.3 - mathieucarbou/ESP Async WebServer @ 3.1.1 + mathieucarbou/AsyncTCP@^3.2.3 + mathieucarbou/ESPAsyncWebServer@^3.1.1 upload_protocol = esptool monitor_speed = 115200 monitor_filters = esp32_exception_decoder, log2file @@ -36,8 +36,8 @@ board = esp32-s3-devkitc-1 platform = espressif8266 board = huzzah lib_deps = - mathieucarbou/ESP Async WebServer @ 3.1.1 - esphome/ESPAsyncTCP-esphome @ 2.0.0 + mathieucarbou/ESPAsyncWebServer@^3.1.1 + esphome/ESPAsyncTCP-esphome@^2.0.0 [env:pico] platform = https://github.com/maxgerhardt/platform-raspberrypi.git From c345cbc709ffb69f4e44ec430dfd49a64c89a679 Mon Sep 17 00:00:00 2001 From: Ayush Sharma Date: Fri, 19 Jul 2024 16:21:18 +0530 Subject: [PATCH 3/3] chore: bump version --- library.json | 2 +- library.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/library.json b/library.json index ee04c73..58c6fed 100644 --- a/library.json +++ b/library.json @@ -23,7 +23,7 @@ "platforms": ["espressif8266", "espressif32"] } ], - "version": "3.1.2", + "version": "3.1.3", "frameworks": "arduino", "platforms": ["espressif8266", "espressif32", "raspberrypi"] } diff --git a/library.properties b/library.properties index e5342ff..996e59a 100644 --- a/library.properties +++ b/library.properties @@ -1,5 +1,5 @@ name=ElegantOTA -version=3.1.2 +version=3.1.3 author=Ayush Sharma category=Communication maintainer=Ayush Sharma