Merge remote-tracking branch 'origin/master' into dev

README.md

@@ -29,6 +29,7 @@ Kotlin serialization consists of a compiler plugin, that generates visitor code
   * [Android](#android)
   * [Multiplatform (Common, JS, Native)](#multiplatform-common-js-native)
   * [Maven](#maven)
+  * [Bazel](#bazel)
 
 <!--- END -->
 
@@ -309,3 +310,9 @@ Add dependency on serialization runtime library:
     <version>${serialization.version}</version>
 </dependency>
 ```
+
+### Bazel
+
+To setup the Kotlin compiler plugin for Bazel, follow [the
+example](https://github.com/bazelbuild/rules_kotlin/tree/master/examples/plugin/src/serialization)
+from the `rules_kotlin` repository.

docs/json.md

@@ -551,7 +551,7 @@ Note that the execution will fail if the structure of the data is otherwise diff
 ### Json element builders
 
 You can construct instances of specific [JsonElement] subtypes using the respective builder functions
-[buildJsonArray] and [buildJsonObject]. They provide a DSL to define the resulting JSON structure. It is
+[buildJsonArray] and [buildJsonObject]. They provide a DSL to define the resulting JSON structure. It 
 is similar to Kotlin standard library collection builders, but with a JSON-specific convenience
 of more type-specific overloads and inner builder functions. The following example shows
 all the key features:

formats/README.md

@@ -159,3 +159,11 @@ There are still some limitations (ordered properties).
 
 Allows serialization and deserialization of [Fixed Length Format files](https://www.ibm.com/docs/en/psfa/7.2.1?topic=format-fixed-length-files).
 Each property must be annotated with `@FixedLength` and there are still some limitations due to missing delimiters.
+
+### JSON5
+
+* GitHub repo: [xn32/json5k](https://github.com/xn32/json5k)
+* Artifact ID: `io.github.xn32:json5k`
+* Platform: JVM only
+
+Library for the serialization to and deserialization from [JSON5](https://json5.org) text.