From bfc822ce512063ab032f5956b0ccf1bf51ea98f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Patrik=20Br=C3=A4nnstr=C3=B6m?= <patrik.brannstrom@cygni.se>
Date: Tue, 8 Sep 2020 11:26:57 +0200
Subject: [PATCH 1/2] Upgrade kotlin and kotlin-coroutines to versions 1.3.72
 and 1.3.9

The CoroutineScope.publish(...) method was deprecated in favour of the global publish(...) method. See Publish.kt in kotlinx-coroutines-reactive lib.
---
 pom.xml                                                   | 4 ++--
 .../kotlin/graphql/kickstart/tools/SchemaParserOptions.kt | 5 ++---
 .../graphql/kickstart/tools/SchemaParserSpec.groovy       | 8 ++++----
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/pom.xml b/pom.xml
index a30103a6..03146bf8 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.70</kotlin.version>
-        <kotlin-coroutines.version>1.2.1</kotlin-coroutines.version>
+        <kotlin.version>1.3.72</kotlin.version>
+        <kotlin-coroutines.version>1.3.9</kotlin-coroutines.version>
         <jackson.version>2.10.3</jackson.version>
         <graphql-java.version>15.0</graphql-java.version>
 
diff --git a/src/main/kotlin/graphql/kickstart/tools/SchemaParserOptions.kt b/src/main/kotlin/graphql/kickstart/tools/SchemaParserOptions.kt
index c7c9c82b..f64b1d46 100644
--- a/src/main/kotlin/graphql/kickstart/tools/SchemaParserOptions.kt
+++ b/src/main/kotlin/graphql/kickstart/tools/SchemaParserOptions.kt
@@ -5,7 +5,6 @@ import graphql.kickstart.tools.proxy.*
 import graphql.kickstart.tools.relay.RelayConnectionFactory
 import graphql.kickstart.tools.util.JavaType
 import graphql.kickstart.tools.util.ParameterizedTypeImpl
-import graphql.kickstart.tools.util.coroutineScope
 import graphql.schema.DataFetchingEnvironment
 import graphql.schema.visibility.GraphqlFieldVisibility
 import kotlinx.coroutines.Dispatchers
@@ -136,8 +135,8 @@ data class SchemaParserOptions internal constructor(
                     GenericWrapper(CompletableFuture::class, 0),
                     GenericWrapper(CompletionStage::class, 0),
                     GenericWrapper(Publisher::class, 0),
-                    GenericWrapper.withTransformer(ReceiveChannel::class, 0, { receiveChannel, environment ->
-                        environment.coroutineScope().publish(coroutineContextProvider.provide()) {
+                    GenericWrapper.withTransformer(ReceiveChannel::class, 0, { receiveChannel, _ ->
+                        publish(coroutineContextProvider.provide()) {
                             try {
                                 for (item in receiveChannel) {
                                     send(item)
diff --git a/src/test/groovy/graphql/kickstart/tools/SchemaParserSpec.groovy b/src/test/groovy/graphql/kickstart/tools/SchemaParserSpec.groovy
index b1f31f47..7e190df4 100644
--- a/src/test/groovy/graphql/kickstart/tools/SchemaParserSpec.groovy
+++ b/src/test/groovy/graphql/kickstart/tools/SchemaParserSpec.groovy
@@ -266,10 +266,10 @@ class SchemaParserSpec extends Specification {
         when:
         GraphQLSchema schema = SchemaParser.newParser()
                 .schemaString('''\
-                                type Query {
-                                    id: ID!
-                                }
-                            '''.stripIndent())
+                type Query {
+                    id: ID!
+                }
+                '''.stripIndent())
                 .resolvers(new QueryWithIdResolver())
                 .build()
                 .makeExecutableSchema()

From c3c7fe81bafbc0de567eb128d387c65f7875a136 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Patrik=20Br=C3=A4nnstr=C3=B6m?= <patrik.brannstrom@cygni.se>
Date: Wed, 9 Sep 2020 08:27:12 +0200
Subject: [PATCH 2/2] Reformat and use stripMargin() instead of stripIndent().

---
 .../graphql/kickstart/tools/SchemaParserSpec.groovy       | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/test/groovy/graphql/kickstart/tools/SchemaParserSpec.groovy b/src/test/groovy/graphql/kickstart/tools/SchemaParserSpec.groovy
index 7e190df4..d08df14c 100644
--- a/src/test/groovy/graphql/kickstart/tools/SchemaParserSpec.groovy
+++ b/src/test/groovy/graphql/kickstart/tools/SchemaParserSpec.groovy
@@ -266,10 +266,10 @@ class SchemaParserSpec extends Specification {
         when:
         GraphQLSchema schema = SchemaParser.newParser()
                 .schemaString('''\
-                type Query {
-                    id: ID!
-                }
-                '''.stripIndent())
+                    |type Query {
+                    |    id: ID!
+                    |}
+                '''.stripMargin())
                 .resolvers(new QueryWithIdResolver())
                 .build()
                 .makeExecutableSchema()