Skip to content

Commit 520011b

Browse files
author
Dariusz Kuc
authored
[build] update to latest version of dependencies (#1358)
Also bumps up Gradle to the latest.
1 parent 0bab35d commit 520011b

File tree

10 files changed

+29
-36
lines changed

10 files changed

+29
-36
lines changed

build.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import io.gitlab.arturbosch.detekt.detekt
21
import org.jetbrains.dokka.gradle.DokkaTask
32
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
43
import java.time.Duration

examples/build.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import io.gitlab.arturbosch.detekt.detekt
21
import java.util.Properties
32

43
plugins {
285 Bytes
Binary file not shown.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

gradle.properties

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -15,40 +15,40 @@ org.gradle.jvmargs=-Xmx2g -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError
1515

1616
# dependencies
1717
kotlinJvmVersion = 1.8
18-
kotlinVersion = 1.5.31
19-
kotlinCoroutinesVersion = 1.5.2
20-
kotlinxSerializationVersion = 1.3.0
18+
kotlinVersion = 1.6.10
19+
kotlinCoroutinesVersion = 1.6.0
20+
kotlinxSerializationVersion = 1.3.1
2121

2222
androidPluginVersion = 7.0.1
23-
classGraphVersion = 4.8.131
23+
classGraphVersion = 4.8.138
2424
federationGraphQLVersion = 0.6.5
2525
graphQLJavaVersion = 17.2
26-
jacksonVersion = 2.12.5
27-
kotlinPoetVersion = 1.10.1
26+
jacksonVersion = 2.13.1
27+
kotlinPoetVersion = 1.10.2
2828
ktorVersion = 1.6.3
29-
reactorVersion = 3.4.9
30-
reactorExtensionsVersion = 1.1.3
31-
slf4jVersion = 1.7.32
32-
springBootVersion = 2.5.5
33-
springVersion = 5.3.10
29+
reactorVersion = 3.4.14
30+
reactorExtensionsVersion = 1.1.5
31+
slf4jVersion = 1.7.33
32+
springBootVersion = 2.6.3
33+
springVersion = 5.3.15
3434

3535
# test dependency versions
36-
# kotlin-compile-testing has to be using same kotlin version as the kotlinx-serialization compiler
37-
compileTestingVersion = 1.4.5
38-
icuVersion=69.1
39-
junitVersion = 5.7.2
40-
mockkVersion = 1.12.0
36+
# kotlin-compile-testing has to be using the same kotlin version as the kotlinx-serialization compiler
37+
compileTestingVersion = 1.4.7
38+
icuVersion=70.1
39+
junitVersion = 5.8.2
40+
mockkVersion = 1.12.2
4141
mustacheVersion = 0.9.10
42-
rxjavaVersion = 3.1.0
43-
wireMockVersion = 2.30.1
44-
kotlinxBenchmarkVersion = 0.4.0
42+
rxjavaVersion = 3.1.3
43+
wireMockVersion = 2.32.0
44+
kotlinxBenchmarkVersion = 0.4.2
4545

4646
# plugin versions
47-
detektVersion = 1.18.0
48-
dokkaVersion = 1.5.0
47+
detektVersion = 1.19.0
48+
dokkaVersion = 1.6.10
4949
jacocoVersion = 0.8.7
50-
ktlintVersion = 0.42.1
51-
ktlintPluginVersion = 10.1.0
50+
ktlintVersion = 0.43.2
51+
ktlintPluginVersion = 10.2.1
5252
mavenPluginDevelopmentVersion = 0.3.1
5353
nexusPublishPluginVersion = 1.1.0
54-
pluginPublishPluginVersion = 0.15.0
54+
pluginPublishPluginVersion = 0.20.0

gradle/wrapper/gradle-wrapper.jar

285 Bytes
Binary file not shown.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

servers/graphql-kotlin-spring-server/src/main/kotlin/com/expediagroup/graphql/server/spring/execution/SpringDataFetcher.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2020 Expedia, Inc
2+
* Copyright 2022 Expedia, Inc
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -38,7 +38,6 @@ open class SpringDataFetcher(
3838
private val applicationContext: ApplicationContext
3939
) : FunctionDataFetcher(target, fn, objectMapper) {
4040

41-
@ExperimentalStdlibApi
4241
override fun mapParameterToValue(param: KParameter, environment: DataFetchingEnvironment): Pair<KParameter, Any?>? =
4342
if (param.hasAnnotation<Autowired>()) {
4443
val qualifier = param.findAnnotation<Qualifier>()?.value

servers/graphql-kotlin-spring-server/src/main/kotlin/com/expediagroup/graphql/server/spring/subscriptions/ApolloSubscriptionProtocolHandler.kt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2021 Expedia, Inc
2+
* Copyright 2022 Expedia, Inc
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -30,7 +30,6 @@ import com.expediagroup.graphql.server.types.GraphQLRequest
3030
import com.fasterxml.jackson.databind.ObjectMapper
3131
import com.fasterxml.jackson.module.kotlin.convertValue
3232
import com.fasterxml.jackson.module.kotlin.readValue
33-
import kotlinx.coroutines.ExperimentalCoroutinesApi
3433
import kotlinx.coroutines.reactor.asFlux
3534
import kotlinx.coroutines.runBlocking
3635
import org.slf4j.LoggerFactory
@@ -57,7 +56,6 @@ class ApolloSubscriptionProtocolHandler(
5756
private val basicConnectionErrorMessage = SubscriptionOperationMessage(type = GQL_CONNECTION_ERROR.type)
5857
private val acknowledgeMessage = SubscriptionOperationMessage(GQL_CONNECTION_ACK.type)
5958

60-
@ExperimentalCoroutinesApi
6159
@Suppress("Detekt.TooGenericExceptionCaught")
6260
fun handle(payload: String, session: WebSocketSession): Flux<SubscriptionOperationMessage> {
6361
val operationMessage = convertToMessageOrNull(payload) ?: return Flux.just(basicConnectionErrorMessage)

servers/graphql-kotlin-spring-server/src/main/kotlin/com/expediagroup/graphql/server/spring/subscriptions/SubscriptionWebSocketHandler.kt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2021 Expedia, Inc
2+
* Copyright 2022 Expedia, Inc
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -17,7 +17,6 @@
1717
package com.expediagroup.graphql.server.spring.subscriptions
1818

1919
import com.fasterxml.jackson.databind.ObjectMapper
20-
import kotlinx.coroutines.ExperimentalCoroutinesApi
2120
import org.springframework.web.reactive.socket.WebSocketHandler
2221
import org.springframework.web.reactive.socket.WebSocketSession
2322
import reactor.core.publisher.Mono
@@ -30,7 +29,6 @@ class SubscriptionWebSocketHandler(
3029
private val objectMapper: ObjectMapper
3130
) : WebSocketHandler {
3231

33-
@ExperimentalCoroutinesApi
3432
@Suppress("ForbiddenVoid")
3533
override fun handle(session: WebSocketSession): Mono<Void> {
3634
val response = session.receive()

0 commit comments

Comments
 (0)