Merge pull request #432 from brannstrom/upgrade-kotlin-coroutines-version

Upgrade kotlin and kotlin-coroutines to versions 1.3.72 and 1.3.9

Author: vojtapol

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>
 

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)

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()