Skip to content

Upgrade kotlin and kotlin-coroutines to versions 1.3.72 and 1.3.9 #432

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 28, 2020
Merged

Upgrade kotlin and kotlin-coroutines to versions 1.3.72 and 1.3.9 #432

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bfc822c
Upgrade kotlin and kotlin-coroutines to versions 1.3.72 and 1.3.9
Sep 8, 2020
c3c7fe8
Reformat and use stripMargin() instead of stripIndent().
Sep 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
5 changes: 2 additions & 3 deletions src/main/kotlin/graphql/kickstart/tools/SchemaParserOptions.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand Down
8 changes: 4 additions & 4 deletions src/test/groovy/graphql/kickstart/tools/SchemaParserSpec.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down