Merge branch 'current' into next

Doxygen

@@ -38,7 +38,7 @@ PROJECT_NAME           = "ESPHome"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 2024.4.0b3
+PROJECT_NUMBER         = 2024.4.0
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a

Makefile

@@ -1,5 +1,5 @@
 ESPHOME_PATH = ../esphome
-ESPHOME_REF = 2024.4.0b3
+ESPHOME_REF = 2024.4.0
 
 .PHONY: html html-strict cleanhtml deploy help live-html Makefile netlify netlify-api api netlify-dependencies svg2png copy-svg2png minify
 

_static/version

@@ -1 +1 @@
-2024.4.0b3
+2024.4.0

changelog/2024.4.0.rst

@@ -158,6 +158,9 @@ All changes
 - Add dooya remote transmitter test :esphomepr:`6508` by :ghuser:`jesserockz`
 - ads1115: remove auto-load and split sensor into platform folder :esphomepr:`5981` by :ghuser:`jesserockz` (new-platform)
 - Bump esphome-dashboard to 20240412.0 :esphomepr:`6517` by :ghuser:`jesserockz`
+- Fix missing ifdefs in voice assistant :esphomepr:`6520` by :ghuser:`jesserockz`
+- Fix project version longer than 30 characters breaking compilation :esphomepr:`6535` by :ghuser:`jesserockz`
+- Fix no-release bug on ft6x36 :esphomepr:`6527` by :ghuser:`clydebarrow`
 
 Past Changelogs
 ---------------

conf.py

@@ -69,7 +69,7 @@ author = "ESPHome"
 # The short X.Y version.
 version = "2024.4"
 # The full version, including alpha/beta/rc tags.
-release = "2024.4.0b3"
+release = "2024.4.0"
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

guides/supporters.rst

@@ -1345,4 +1345,4 @@ Contributors
 - `Christian Zufferey (@zuzu59) <https://github.com/zuzu59>`__
 - `Zynth-dev (@Zynth-dev) <https://github.com/Zynth-dev>`__
 
-*This page was last updated April 15, 2024.*
+*This page was last updated April 17, 2024.*