From d713fcafb184d28cb4ad6536abcfebb7a4192c06 Mon Sep 17 00:00:00 2001
From: Adrian Kunz <clashsoft@hotmail.com>
Date: Wed, 26 Aug 2020 15:08:57 +0200
Subject: [PATCH] Release v1.2.2

---
 CHANGELOG.md | 22 ++++++++++++++++++++++
 README.md    |  2 +-
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5acc8dba..7d82e22f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -76,3 +76,25 @@
 * All new members now correctly generate leading whitespace. #35 #36
 * `toString` methods are no longer generated in classes without suitable attributes. #39 #41
 * `removeYou` methods are no longer generated in classes without associations. #40 #42
+
+# fulib v1.2.2
+
+## Improvements
+
+* Improved JavaDocs in `FileFragmentMap`. #50
+* Improved the merging of class and attribute declarations from original source and newly generated code. #60
+  * Class declarations are now mostly kept intact, only the type in the extends clause is updated.
+  * Attribute declarations are now mostly kept intact, only the type and initializer are updated.
+
+## Bugfixes
+
+* The code generator no longer generates duplicate members when an attribute has a generic or annotated types. #43 #59
+* The code generator no longer generates duplicate methods with parameters of generic or annotated types. #43 #59
+* The code generator now treats the types `void` and `boolean` as primitives. #46
+* The code generator no longer removes newlines at the end of existing files. #47
+* The code generator now correctly determines when classes are empty and removes them if necessary. #49
+* The `FMethod.setDeclaration` method no longer ignores varargs `...`. #54 #55
+* The Java parser now supports C-style arrays for parameters. #56
+* The `FMethod.setDeclaration` method now supports C-style arrays for parameters. #56
+* The code generator no longer generates duplicate members when mixing attributes with methods. #58
+* The code generator now intelligently merges the original source with new class and attribute declarations again. #60
diff --git a/README.md b/README.md
index 1fc2905d..6a69200c 100644
--- a/README.md
+++ b/README.md
@@ -43,7 +43,7 @@ dependencies {
 
     // optional, to override the version of fulib used by fulibScenarios:
     // https://mvnrepository.com/artifact/org.fulib/fulib
-    fulibScenarios group: 'org.fulib', name: 'fulib', version: '1.2.1'
+    fulibScenarios group: 'org.fulib', name: 'fulib', version: '1.2.2'
 }
 ```