Skip to content

Commit d780322

Browse files
authored
Merge pull request #432 from brannstrom/upgrade-kotlin-coroutines-version
Upgrade kotlin and kotlin-coroutines to versions 1.3.72 and 1.3.9
2 parents 97c4600 + c3c7fe8 commit d780322

File tree

3 files changed

+8
-9
lines changed

3 files changed

+8
-9
lines changed

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
<properties>
1515
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1616
<java.version>1.8</java.version>
17-
<kotlin.version>1.3.70</kotlin.version>
18-
<kotlin-coroutines.version>1.2.1</kotlin-coroutines.version>
17+
<kotlin.version>1.3.72</kotlin.version>
18+
<kotlin-coroutines.version>1.3.9</kotlin-coroutines.version>
1919
<jackson.version>2.10.3</jackson.version>
2020
<graphql-java.version>15.0</graphql-java.version>
2121

src/main/kotlin/graphql/kickstart/tools/SchemaParserOptions.kt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import graphql.kickstart.tools.proxy.*
55
import graphql.kickstart.tools.relay.RelayConnectionFactory
66
import graphql.kickstart.tools.util.JavaType
77
import graphql.kickstart.tools.util.ParameterizedTypeImpl
8-
import graphql.kickstart.tools.util.coroutineScope
98
import graphql.schema.DataFetchingEnvironment
109
import graphql.schema.visibility.GraphqlFieldVisibility
1110
import kotlinx.coroutines.Dispatchers
@@ -136,8 +135,8 @@ data class SchemaParserOptions internal constructor(
136135
GenericWrapper(CompletableFuture::class, 0),
137136
GenericWrapper(CompletionStage::class, 0),
138137
GenericWrapper(Publisher::class, 0),
139-
GenericWrapper.withTransformer(ReceiveChannel::class, 0, { receiveChannel, environment ->
140-
environment.coroutineScope().publish(coroutineContextProvider.provide()) {
138+
GenericWrapper.withTransformer(ReceiveChannel::class, 0, { receiveChannel, _ ->
139+
publish(coroutineContextProvider.provide()) {
141140
try {
142141
for (item in receiveChannel) {
143142
send(item)

src/test/groovy/graphql/kickstart/tools/SchemaParserSpec.groovy

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -266,10 +266,10 @@ class SchemaParserSpec extends Specification {
266266
when:
267267
GraphQLSchema schema = SchemaParser.newParser()
268268
.schemaString('''\
269-
type Query {
270-
id: ID!
271-
}
272-
'''.stripIndent())
269+
|type Query {
270+
| id: ID!
271+
|}
272+
'''.stripMargin())
273273
.resolvers(new QueryWithIdResolver())
274274
.build()
275275
.makeExecutableSchema()

0 commit comments

Comments
 (0)