Skip to content
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.

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

[build] update to latest version of dependencies #1358

Merged
merged 1 commit into from
Feb 14, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import io.gitlab.arturbosch.detekt.detekt
import org.jetbrains.dokka.gradle.DokkaTask
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
import java.time.Duration
Expand Down
1 change: 0 additions & 1 deletion examples/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import io.gitlab.arturbosch.detekt.detekt
import java.util.Properties

plugins {
Expand Down
Binary file modified examples/gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion examples/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
48 changes: 24 additions & 24 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -15,40 +15,40 @@ org.gradle.jvmargs=-Xmx2g -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError

# dependencies
kotlinJvmVersion = 1.8
kotlinVersion = 1.5.31
kotlinCoroutinesVersion = 1.5.2
kotlinxSerializationVersion = 1.3.0
kotlinVersion = 1.6.10
kotlinCoroutinesVersion = 1.6.0
kotlinxSerializationVersion = 1.3.1

androidPluginVersion = 7.0.1
classGraphVersion = 4.8.131
classGraphVersion = 4.8.138
federationGraphQLVersion = 0.6.5
graphQLJavaVersion = 17.2
jacksonVersion = 2.12.5
kotlinPoetVersion = 1.10.1
jacksonVersion = 2.13.1
kotlinPoetVersion = 1.10.2
ktorVersion = 1.6.3
reactorVersion = 3.4.9
reactorExtensionsVersion = 1.1.3
slf4jVersion = 1.7.32
springBootVersion = 2.5.5
springVersion = 5.3.10
reactorVersion = 3.4.14
reactorExtensionsVersion = 1.1.5
slf4jVersion = 1.7.33
springBootVersion = 2.6.3
springVersion = 5.3.15

# test dependency versions
# kotlin-compile-testing has to be using same kotlin version as the kotlinx-serialization compiler
compileTestingVersion = 1.4.5
icuVersion=69.1
junitVersion = 5.7.2
mockkVersion = 1.12.0
# kotlin-compile-testing has to be using the same kotlin version as the kotlinx-serialization compiler
compileTestingVersion = 1.4.7
icuVersion=70.1
junitVersion = 5.8.2
mockkVersion = 1.12.2
mustacheVersion = 0.9.10
rxjavaVersion = 3.1.0
wireMockVersion = 2.30.1
kotlinxBenchmarkVersion = 0.4.0
rxjavaVersion = 3.1.3
wireMockVersion = 2.32.0
kotlinxBenchmarkVersion = 0.4.2

# plugin versions
detektVersion = 1.18.0
dokkaVersion = 1.5.0
detektVersion = 1.19.0
dokkaVersion = 1.6.10
jacocoVersion = 0.8.7
ktlintVersion = 0.42.1
ktlintPluginVersion = 10.1.0
ktlintVersion = 0.43.2
ktlintPluginVersion = 10.2.1
mavenPluginDevelopmentVersion = 0.3.1
nexusPublishPluginVersion = 1.1.0
pluginPublishPluginVersion = 0.15.0
pluginPublishPluginVersion = 0.20.0
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2020 Expedia, Inc
* Copyright 2022 Expedia, Inc
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -38,7 +38,6 @@ open class SpringDataFetcher(
private val applicationContext: ApplicationContext
) : FunctionDataFetcher(target, fn, objectMapper) {

@ExperimentalStdlibApi
override fun mapParameterToValue(param: KParameter, environment: DataFetchingEnvironment): Pair<KParameter, Any?>? =
if (param.hasAnnotation<Autowired>()) {
val qualifier = param.findAnnotation<Qualifier>()?.value
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2021 Expedia, Inc
* Copyright 2022 Expedia, Inc
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -30,7 +30,6 @@ import com.expediagroup.graphql.server.types.GraphQLRequest
import com.fasterxml.jackson.databind.ObjectMapper
import com.fasterxml.jackson.module.kotlin.convertValue
import com.fasterxml.jackson.module.kotlin.readValue
import kotlinx.coroutines.ExperimentalCoroutinesApi
import kotlinx.coroutines.reactor.asFlux
import kotlinx.coroutines.runBlocking
import org.slf4j.LoggerFactory
Expand All @@ -57,7 +56,6 @@ class ApolloSubscriptionProtocolHandler(
private val basicConnectionErrorMessage = SubscriptionOperationMessage(type = GQL_CONNECTION_ERROR.type)
private val acknowledgeMessage = SubscriptionOperationMessage(GQL_CONNECTION_ACK.type)

@ExperimentalCoroutinesApi
@Suppress("Detekt.TooGenericExceptionCaught")
fun handle(payload: String, session: WebSocketSession): Flux<SubscriptionOperationMessage> {
val operationMessage = convertToMessageOrNull(payload) ?: return Flux.just(basicConnectionErrorMessage)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2021 Expedia, Inc
* Copyright 2022 Expedia, Inc
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -17,7 +17,6 @@
package com.expediagroup.graphql.server.spring.subscriptions

import com.fasterxml.jackson.databind.ObjectMapper
import kotlinx.coroutines.ExperimentalCoroutinesApi
import org.springframework.web.reactive.socket.WebSocketHandler
import org.springframework.web.reactive.socket.WebSocketSession
import reactor.core.publisher.Mono
Expand All @@ -30,7 +29,6 @@ class SubscriptionWebSocketHandler(
private val objectMapper: ObjectMapper
) : WebSocketHandler {

@ExperimentalCoroutinesApi
@Suppress("ForbiddenVoid")
override fun handle(session: WebSocketSession): Mono<Void> {
val response = session.receive()
Expand Down