From 6a878ee444c06bba1d355bac931ffe7f0b240cee Mon Sep 17 00:00:00 2001
From: Benoit Blanchon <git@benoitblanchon.fr>
Date: Wed, 16 Sep 2020 10:29:20 +0200
Subject: [PATCH] Fixed error "No such file or directory WString.h" (fixes
 #1381)

---
 CHANGELOG.md                                              | 1 +
 extras/tests/Helpers/Arduino.h                            | 8 ++++++++
 extras/tests/Helpers/{ => api}/Stream.h                   | 0
 extras/tests/Helpers/{WString.h => api/String.h}          | 0
 .../Deserialization/Readers/ArduinoStreamReader.hpp       | 2 +-
 .../Serialization/Writers/ArduinoStringWriter.hpp         | 2 +-
 src/ArduinoJson/Strings/ArduinoStringAdapter.hpp          | 2 +-
 src/ArduinoJson/Strings/IsWriteableString.hpp             | 2 +-
 8 files changed, 13 insertions(+), 4 deletions(-)
 create mode 100644 extras/tests/Helpers/Arduino.h
 rename extras/tests/Helpers/{ => api}/Stream.h (100%)
 rename extras/tests/Helpers/{WString.h => api/String.h} (100%)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 16657bd2..608efda3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@ HEAD
 * Added `DeserializationError::EmptyInput` which tells if the input was empty
 * Added `DeserializationError::f_str()` which returns a `const __FlashStringHelper*` (issue #846)
 * Fixed `JsonVariant::set((char*)0)` which returned false instead of true (issue #1368)
+* Fixed error `No such file or directory #include <WString.h>` (issue #1381)
 
 v6.16.1 (2020-08-04)
 -------
diff --git a/extras/tests/Helpers/Arduino.h b/extras/tests/Helpers/Arduino.h
new file mode 100644
index 00000000..51b5987f
--- /dev/null
+++ b/extras/tests/Helpers/Arduino.h
@@ -0,0 +1,8 @@
+// ArduinoJson - arduinojson.org
+// Copyright Benoit Blanchon 2014-2020
+// MIT License
+
+#pragma once
+
+#include "api/Stream.h"
+#include "api/String.h"
diff --git a/extras/tests/Helpers/Stream.h b/extras/tests/Helpers/api/Stream.h
similarity index 100%
rename from extras/tests/Helpers/Stream.h
rename to extras/tests/Helpers/api/Stream.h
diff --git a/extras/tests/Helpers/WString.h b/extras/tests/Helpers/api/String.h
similarity index 100%
rename from extras/tests/Helpers/WString.h
rename to extras/tests/Helpers/api/String.h
diff --git a/src/ArduinoJson/Deserialization/Readers/ArduinoStreamReader.hpp b/src/ArduinoJson/Deserialization/Readers/ArduinoStreamReader.hpp
index 06352585..6c46d5d8 100644
--- a/src/ArduinoJson/Deserialization/Readers/ArduinoStreamReader.hpp
+++ b/src/ArduinoJson/Deserialization/Readers/ArduinoStreamReader.hpp
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include <Stream.h>
+#include <Arduino.h>
 
 namespace ARDUINOJSON_NAMESPACE {
 
diff --git a/src/ArduinoJson/Serialization/Writers/ArduinoStringWriter.hpp b/src/ArduinoJson/Serialization/Writers/ArduinoStringWriter.hpp
index 1fac2602..801cb86c 100644
--- a/src/ArduinoJson/Serialization/Writers/ArduinoStringWriter.hpp
+++ b/src/ArduinoJson/Serialization/Writers/ArduinoStringWriter.hpp
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include <WString.h>
+#include <Arduino.h>
 
 namespace ARDUINOJSON_NAMESPACE {
 
diff --git a/src/ArduinoJson/Strings/ArduinoStringAdapter.hpp b/src/ArduinoJson/Strings/ArduinoStringAdapter.hpp
index bf3202c1..aac88726 100644
--- a/src/ArduinoJson/Strings/ArduinoStringAdapter.hpp
+++ b/src/ArduinoJson/Strings/ArduinoStringAdapter.hpp
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include <WString.h>
+#include <Arduino.h>
 
 #include <ArduinoJson/Polyfills/safe_strcmp.hpp>
 #include <ArduinoJson/Strings/IsString.hpp>
diff --git a/src/ArduinoJson/Strings/IsWriteableString.hpp b/src/ArduinoJson/Strings/IsWriteableString.hpp
index 6f1a8326..fc52c523 100644
--- a/src/ArduinoJson/Strings/IsWriteableString.hpp
+++ b/src/ArduinoJson/Strings/IsWriteableString.hpp
@@ -8,7 +8,7 @@
 #include <ArduinoJson/Polyfills/type_traits.hpp>
 
 #if ARDUINOJSON_ENABLE_ARDUINO_STRING
-#include <WString.h>
+#include <Arduino.h>
 #endif
 
 #if ARDUINOJSON_ENABLE_STD_STRING