From 991898b3c4960680a450b1f0059aef8018a48a8f Mon Sep 17 00:00:00 2001
From: oliemansm <oliemans@scopisto.com>
Date: Sat, 16 Jan 2021 15:46:43 +0100
Subject: [PATCH 1/3] Upgrade kotlin to 1.4.10 and kotlin coroutines to 1.4.2

---
 pom.xml                                                       | 4 ++--
 src/test/kotlin/graphql/kickstart/tools/EndToEndSpecHelper.kt | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 5452d6ee..4da5140c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,8 +14,8 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <java.version>1.8</java.version>
-        <kotlin.version>1.3.72</kotlin.version>
-        <kotlin-coroutines.version>1.3.9</kotlin-coroutines.version>
+        <kotlin.version>1.4.10</kotlin.version>
+        <kotlin-coroutines.version>1.4.2</kotlin-coroutines.version>
         <jackson.version>2.10.3</jackson.version>
         <graphql-java.version>16.1</graphql-java.version>
 
diff --git a/src/test/kotlin/graphql/kickstart/tools/EndToEndSpecHelper.kt b/src/test/kotlin/graphql/kickstart/tools/EndToEndSpecHelper.kt
index 8b9801ec..e9480e40 100644
--- a/src/test/kotlin/graphql/kickstart/tools/EndToEndSpecHelper.kt
+++ b/src/test/kotlin/graphql/kickstart/tools/EndToEndSpecHelper.kt
@@ -232,7 +232,7 @@ val thirdItems = listOf(
 )
 
 val propetyHashMapItems = listOf(
-    hashMapOf("name" to "bob", "age" to 55)
+    hashMapOf<String, Any>("name" to "bob", "age" to 55)
 )
 
 val propertyMapMissingNamePropItems = listOf(

From 7d1ff2bc020afc449a7c4638875089f467032b52 Mon Sep 17 00:00:00 2001
From: oliemansm <oliemans@scopisto.com>
Date: Sat, 16 Jan 2021 15:46:43 +0100
Subject: [PATCH 2/3] Upgrade kotlin to 1.4.10 and kotlin coroutines to 1.4.2

---
 pom.xml                                                       | 4 ++--
 src/test/kotlin/graphql/kickstart/tools/EndToEndSpecHelper.kt | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 5452d6ee..4da5140c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,8 +14,8 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <java.version>1.8</java.version>
-        <kotlin.version>1.3.72</kotlin.version>
-        <kotlin-coroutines.version>1.3.9</kotlin-coroutines.version>
+        <kotlin.version>1.4.10</kotlin.version>
+        <kotlin-coroutines.version>1.4.2</kotlin-coroutines.version>
         <jackson.version>2.10.3</jackson.version>
         <graphql-java.version>16.1</graphql-java.version>
 
diff --git a/src/test/kotlin/graphql/kickstart/tools/EndToEndSpecHelper.kt b/src/test/kotlin/graphql/kickstart/tools/EndToEndSpecHelper.kt
index 8b9801ec..e9480e40 100644
--- a/src/test/kotlin/graphql/kickstart/tools/EndToEndSpecHelper.kt
+++ b/src/test/kotlin/graphql/kickstart/tools/EndToEndSpecHelper.kt
@@ -232,7 +232,7 @@ val thirdItems = listOf(
 )
 
 val propetyHashMapItems = listOf(
-    hashMapOf("name" to "bob", "age" to 55)
+    hashMapOf<String, Any>("name" to "bob", "age" to 55)
 )
 
 val propertyMapMissingNamePropItems = listOf(

From a33c751157707d7a7a1cfcdccb2d0b63ca32962a Mon Sep 17 00:00:00 2001
From: Michiel Oliemans <oliemans@scopisto.com>
Date: Tue, 19 Jan 2021 08:17:27 +0100
Subject: [PATCH 3/3] Update pom.xml

Co-authored-by: Alexander Diehm <alexander.volz@netpioneer.de>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 4da5140c..0e14abc8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <java.version>1.8</java.version>
-        <kotlin.version>1.4.10</kotlin.version>
+        <kotlin.version>1.4.21</kotlin.version>
         <kotlin-coroutines.version>1.4.2</kotlin-coroutines.version>
         <jackson.version>2.10.3</jackson.version>
         <graphql-java.version>16.1</graphql-java.version>