Skip to content

Upgrade dependencies #606

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

Merged
merged 1 commit into from
Feb 20, 2020
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
10 changes: 5 additions & 5 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@ org.gradle.parallel=true
systemProp.org.gradle.internal.publish.checksums.insecure=true

# dependencies
kotlinVersion = 1.3.60
kotlinVersion = 1.3.61
kotlinCoroutinesVersion = 1.3.3

graphQLJavaVersion = 14.0
jacksonVersion = 2.10.2
springBootVersion = 2.2.4.RELEASE
classGraphVersion = 4.8.60
classGraphVersion = 4.8.65
reactorVersion = 3.3.2.RELEASE
reactorExtensionsVersion = 1.0.2.RELEASE

Expand All @@ -24,10 +24,10 @@ junitVersion = 5.6.0
mockkVersion = 1.9.3

# plugin versions
detektVersion = 1.4.0
dokkaVersion = 0.10.0
detektVersion = 1.5.1
dokkaVersion = 0.10.1
jacocoVersion = 0.8.5
ktlintVersion = 0.36.0
ktlintPluginVersion = 9.1.1
ktlintPluginVersion = 9.2.1
nexusPublishPluginVersion = 0.4.0
stagingPluginVersion = 0.21.2
4 changes: 2 additions & 2 deletions graphql-kotlin-schema-generator/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ val graphQLJavaVersion: String by project
val jacksonVersion: String by project
val kotlinVersion: String by project
val kotlinCoroutinesVersion: String by project
val rxjavaVersion = "2.2.17"
val rxjavaVersion = "3.0.0"

dependencies {
api("com.graphql-java:graphql-java:$graphQLJavaVersion")
Expand All @@ -14,7 +14,7 @@ dependencies {
api("org.jetbrains.kotlin:kotlin-reflect:$kotlinVersion")
api("io.github.classgraph:classgraph:$classGraphVersion")
api("com.fasterxml.jackson.module:jackson-module-kotlin:$jacksonVersion")
testImplementation("io.reactivex.rxjava2:rxjava:$rxjavaVersion")
testImplementation("io.reactivex.rxjava3:rxjava:$rxjavaVersion")
}

tasks {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ import com.expediagroup.graphql.testSchemaConfig
import com.expediagroup.graphql.toSchema
import graphql.schema.GraphQLNamedType
import graphql.schema.GraphQLNonNull
import io.reactivex.Maybe
import io.reactivex.Observable
import io.reactivex.Single
import io.reactivex.rxjava3.core.Maybe
import io.reactivex.rxjava3.core.Observable
import io.reactivex.rxjava3.core.Single
import org.junit.jupiter.api.Test
import java.util.concurrent.CompletableFuture
import kotlin.reflect.KType
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ import graphql.schema.FieldCoordinates
import graphql.schema.GraphQLList
import graphql.schema.GraphQLNonNull
import graphql.schema.GraphQLTypeUtil
import io.reactivex.Flowable
import io.reactivex.rxjava3.core.Flowable
import org.junit.jupiter.api.Test
import org.reactivestreams.Publisher
import java.util.UUID
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import com.expediagroup.graphql.exceptions.InvalidSubscriptionTypeException
import com.expediagroup.graphql.hooks.SchemaGeneratorHooks
import graphql.schema.GraphQLFieldDefinition
import io.mockk.every
import io.reactivex.Flowable
import io.reactivex.rxjava3.core.Flowable
import org.junit.jupiter.api.Test
import org.junit.jupiter.api.assertThrows
import org.reactivestreams.Publisher
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
package com.expediagroup.graphql.generator.types.utils

import graphql.execution.DataFetcherResult
import io.reactivex.Flowable
import io.reactivex.rxjava3.core.Flowable
import org.junit.jupiter.api.Test
import org.reactivestreams.Publisher
import java.util.concurrent.CompletableFuture
Expand Down