Skip to content

Commit 900303c

Browse files
dariuszkucdariuszkuc
committed
chore: update to latest dependencies
NOTE: We are upgrading to latest dependencies that are still using Kotlin 1.8
1 parent ddc81be commit 900303c

File tree

26 files changed

+102
-36
lines changed

26 files changed

+102
-36
lines changed

‎clients/graphql-kotlin-ktor-client/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ dependencies {
1313
testImplementation(projects.graphqlKotlinClientJackson)
1414
testImplementation(libs.ktor.client.logging)
1515
testImplementation(libs.ktor.client.okhttp)
16-
testImplementation(libs.wiremock.jre8)
16+
testImplementation(libs.wiremock.lib)
1717
}
1818

1919
tasks {

‎clients/graphql-kotlin-spring-client/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ dependencies {
1212
api(libs.spring.webflux)
1313
api(libs.spring.boot.netty)
1414
testImplementation(projects.graphqlKotlinClientSerialization)
15-
testImplementation(libs.wiremock.jre8)
15+
testImplementation(libs.wiremock.lib)
1616
}
1717

1818
tasks {

‎generator/graphql-kotlin-federation/src/test/kotlin/com/expediagroup/graphql/generator/federation/FederatedSchemaGeneratorTest.kt

+7-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2023 Expedia, Inc
2+
* Copyright 2024 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.
@@ -60,6 +60,9 @@ class FederatedSchemaGeneratorTest {
6060
"Space separated list of primary keys needed to access federated object"
6161
directive @key(fields: _FieldSet!) repeatable on OBJECT | INTERFACE
6262
63+
"Indicates an Input Object is a OneOf Input Object."
64+
directive @oneOf on INPUT_OBJECT
65+
6366
"Specifies the base type field set that will be selectable by the gateway"
6467
directive @provides(fields: _FieldSet!) on FIELD_DEFINITION
6568
@@ -179,6 +182,9 @@ class FederatedSchemaGeneratorTest {
179182
"Space separated list of primary keys needed to access federated object"
180183
directive @key(fields: _FieldSet!) repeatable on OBJECT | INTERFACE
181184
185+
"Indicates an Input Object is a OneOf Input Object."
186+
directive @oneOf on INPUT_OBJECT
187+
182188
"Specifies the base type field set that will be selectable by the gateway"
183189
directive @provides(fields: _FieldSet!) on FIELD_DEFINITION
184190

‎generator/graphql-kotlin-federation/src/test/kotlin/com/expediagroup/graphql/generator/federation/FederatedSchemaV2GeneratorTest.kt

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2023 Expedia, Inc
2+
* Copyright 2024 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.
@@ -57,6 +57,9 @@ class FederatedSchemaV2GeneratorTest {
5757
"Links definitions within the document to external schemas."
5858
directive @link(as: String, import: [link__Import], url: String!) repeatable on SCHEMA
5959
60+
"Indicates an Input Object is a OneOf Input Object."
61+
directive @oneOf on INPUT_OBJECT
62+
6063
"Specifies the base type field set that will be selectable by the gateway"
6164
directive @provides(fields: FieldSet!) on FIELD_DEFINITION
6265

‎generator/graphql-kotlin-federation/src/test/kotlin/com/expediagroup/graphql/generator/federation/directives/compose/ComposeDirectiveTest.kt

+3
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,9 @@ class ComposeDirectiveTest {
7070
"Links definitions within the document to external schemas."
7171
directive @link(as: String, import: [link__Import], url: String!) repeatable on SCHEMA
7272
73+
"Indicates an Input Object is a OneOf Input Object."
74+
directive @oneOf on INPUT_OBJECT
75+
7376
"Directs the executor to skip this field or fragment when the `if` argument is true."
7477
directive @skip(
7578
"Skipped when true."

‎generator/graphql-kotlin-federation/src/test/kotlin/com/expediagroup/graphql/generator/federation/directives/contact/ContactDirectiveTest.kt

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2023 Expedia, Inc
2+
* Copyright 2024 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.
@@ -52,6 +52,9 @@ class ContactDirectiveTest {
5252
"Links definitions within the document to external schemas."
5353
directive @link(as: String, import: [link__Import], url: String!) repeatable on SCHEMA
5454
55+
"Indicates an Input Object is a OneOf Input Object."
56+
directive @oneOf on INPUT_OBJECT
57+
5558
"Directs the executor to skip this field or fragment when the `if` argument is true."
5659
directive @skip(
5760
"Skipped when true."

‎generator/graphql-kotlin-federation/src/test/kotlin/com/expediagroup/graphql/generator/federation/directives/link/LinkDirectiveTest.kt

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2023 Expedia, Inc
2+
* Copyright 2024 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.
@@ -67,6 +67,9 @@ class LinkDirectiveTest {
6767
"Space separated list of primary keys needed to access federated object"
6868
directive @myKey(fields: fed__FieldSet!, resolvable: Boolean = true) repeatable on OBJECT | INTERFACE
6969
70+
"Indicates an Input Object is a OneOf Input Object."
71+
directive @oneOf on INPUT_OBJECT
72+
7073
"Directs the executor to skip this field or fragment when the `if` argument is true."
7174
directive @skip(
7275
"Skipped when true."

‎generator/graphql-kotlin-federation/src/test/kotlin/com/expediagroup/graphql/generator/federation/directives/policy/PolicyDirectiveTest.kt

+3
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,9 @@ class PolicyDirectiveTest {
5757
"Links definitions within the document to external schemas."
5858
directive @link(as: String, import: [link__Import], url: String!) repeatable on SCHEMA
5959
60+
"Indicates an Input Object is a OneOf Input Object."
61+
directive @oneOf on INPUT_OBJECT
62+
6063
"Directs the executor to skip this field or fragment when the `if` argument is true."
6164
directive @skip(
6265
"Skipped when true."

‎generator/graphql-kotlin-federation/src/test/kotlin/com/expediagroup/graphql/generator/federation/directives/requiresscope/RequiresScopesDirectiveTest.kt

+3
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,9 @@ class RequiresScopesDirectiveTest {
5757
"Links definitions within the document to external schemas."
5858
directive @link(as: String, import: [link__Import], url: String!) repeatable on SCHEMA
5959
60+
"Indicates an Input Object is a OneOf Input Object."
61+
directive @oneOf on INPUT_OBJECT
62+
6063
"Directs the executor to skip this field or fragment when the `if` argument is true."
6164
directive @skip(
6265
"Skipped when true."

‎generator/graphql-kotlin-schema-generator/src/test/kotlin/com/expediagroup/graphql/generator/extensions/GraphQLSchemaExtensionsTest.kt

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2023 Expedia, Inc
2+
* Copyright 2024 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.
@@ -270,6 +270,9 @@ class GraphQLSchemaExtensionsTest {
270270
if: Boolean!
271271
) on FIELD | FRAGMENT_SPREAD | INLINE_FRAGMENT
272272
273+
"Indicates an Input Object is a OneOf Input Object."
274+
directive @oneOf on INPUT_OBJECT
275+
273276
"Directs the executor to skip this field or fragment when the `if` argument is true."
274277
directive @skip(
275278
"Skipped when true."

‎gradle/libs.versions.toml

+26-22
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,52 @@
11
[versions]
22
android-plugin = "8.1.1"
3-
classgraph = "4.8.162"
4-
dataloader = "3.2.0"
5-
federation = "4.1.0"
6-
graphql-java = "21.1"
7-
graalvm = "0.9.28"
8-
jackson = "2.15.2"
3+
classgraph = "4.8.170"
4+
dataloader = "3.2.2"
5+
federation = "4.4.1"
6+
graphql-java = "21.5"
7+
graalvm = "0.10.1"
8+
jackson = "2.15.4"
99
# kotlin version has to match the compile-testing compiler version
1010
kotlin = "1.8.22"
1111
# TODO kotlin 1.9 upgrade -> kotlinx-benchaamrk 0.4.9+ uses kotlin 1.9
1212
kotlinx-benchmark = "0.4.8"
13+
# TODO kotlin 1.9 upgrade -> kotlinx-coroutines 1.8+ uses kotlin 1.9
1314
kotlinx-coroutines = "1.7.3"
1415
# TODO kotlin 1.9 upgrade -> kotlinx-serialization 1.6.0+ uses kotlin 1.9
1516
kotlinx-serialization = "1.5.1"
16-
ktor = "2.3.7"
17-
maven-plugin-annotation = "3.9.0"
18-
maven-plugin-api = "3.9.4"
17+
ktor = "2.3.10"
18+
maven-plugin-annotation = "3.12.0"
19+
maven-plugin-api = "3.9.6"
1920
maven-project = "2.2.1"
21+
# TODO kotlin 1.9 upgrade -> kotlinxpoet 1.15+ uses kotlin 1.9
2022
poet = "1.14.2"
2123
## reactor and spring versions should be the same as defined in spring-boot-dependencies
22-
reactor-core = "3.5.9"
24+
reactor-core = "3.5.15"
2325
reactor-extensions = "1.2.2"
24-
slf4j = "2.0.7"
25-
spring = "6.0.11"
26-
spring-boot = "3.1.2"
26+
slf4j = "2.0.12"
27+
spring = "6.0.18"
28+
# TODO kotlin 1.9 upgrade -> spring boot 3.2+ uses kotlin 1.9
29+
spring-boot = "3.1.10"
2730

2831
# test dependencies
2932
compile-testing = "0.3.2"
30-
icu = "73.2"
31-
junit = "5.10.0"
32-
logback = "1.4.11"
33+
icu = "74.2"
34+
junit = "5.10.2"
35+
logback = "1.5.4"
36+
# TODO kotlin 1.9 upgrade -> mockk 1.13.8+ uses kotlin 1.9
3337
mockk = "1.13.7"
34-
rxjava = "3.1.7"
35-
wiremock = "3.0.1"
38+
rxjava = "3.1.8"
39+
wiremock = "3.5.2"
3640

3741
# plugins
3842
# TODO kotlin 1.9 upgrade -> detekt 1.23.1+ uses kotlin 1.9
3943
detekt = "1.23.0"
4044
dokka = "1.8.20"
41-
jacoco = "0.8.10"
45+
jacoco = "0.8.12"
4246
# klint gradle plugin breaks with 0.46.x+
4347
ktlint-core = "0.45.2"
4448
ktlint-plugin = "10.3.0"
45-
maven-plugin-development = "0.4.2"
49+
maven-plugin-development = "0.4.3"
4650
nexus-publish-plugin = "1.3.0"
4751
plugin-publish = "1.2.1"
4852

@@ -109,8 +113,8 @@ reactor-extensions = { group = "io.projectreactor.kotlin", name = "reactor-kotli
109113
reactor-test = { group = "io.projectreactor", name = "reactor-test", version.ref = "reactor-core" }
110114
rxjava = { group = "io.reactivex.rxjava3", name = "rxjava", version.ref = "rxjava" }
111115
spring-boot-test = { group = "org.springframework.boot", name = "spring-boot-starter-test", version.ref = "spring-boot" }
112-
wiremock-jre8 = { group = "com.github.tomakehurst", name = "wiremock-jre8", version.ref = "wiremock" }
113-
wiremock-standalone = { group = "com.github.tomakehurst", name = "wiremock-jre8-standalone", version.ref = "wiremock" }
116+
wiremock-lib = { group = "org.wiremock", name = "wiremock", version.ref = "wiremock" }
117+
wiremock-standalone = { group = "org.wiremock", name = "wiremock-standalone", version.ref = "wiremock" }
114118

115119
# build src plugin libraries
116120
detekt-plugin = { group = "io.gitlab.arturbosch.detekt", name = "detekt-gradle-plugin", version.ref = "detekt" }

‎gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

‎integration/gradle-plugin-integration-tests/src/integration/resources/sdl/custom.graphql

+3
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@ directive @include(
1717
"Links definitions within the document to external schemas."
1818
directive @link(as: String, import: [link__Import], url: String!) repeatable on SCHEMA
1919

20+
"Indicates an Input Object is a OneOf Input Object."
21+
directive @oneOf on INPUT_OBJECT
22+
2023
"Directs the executor to skip this field or fragment when the `if` argument is true."
2124
directive @skip(
2225
"Skipped when true."

‎integration/gradle-plugin-integration-tests/src/integration/resources/sdl/federated.graphql

+3
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@ directive @include(
1717
"Links definitions within the document to external schemas."
1818
directive @link(as: String, import: [link__Import], url: String!) repeatable on SCHEMA
1919

20+
"Indicates an Input Object is a OneOf Input Object."
21+
directive @oneOf on INPUT_OBJECT
22+
2023
"Directs the executor to skip this field or fragment when the `if` argument is true."
2124
directive @skip(
2225
"Skipped when true."

‎integration/gradle-plugin-integration-tests/src/integration/resources/sdl/schema.graphql

+3
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@ directive @include(
1414
if: Boolean!
1515
) on FIELD | FRAGMENT_SPREAD | INLINE_FRAGMENT
1616

17+
"Indicates an Input Object is a OneOf Input Object."
18+
directive @oneOf on INPUT_OBJECT
19+
1720
"Directs the executor to skip this field or fragment when the `if` argument is true."
1821
directive @skip(
1922
"Skipped when true."

‎integration/maven-plugin-integration-tests/integration/generate-sdl-federated/src/test/kotlin/com/expediagroup/graphql/plugin/maven/GenerateSDLMojoTest.kt

+3
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,9 @@ class GenerateSDLMojoTest {
5555
"Links definitions within the document to external schemas."
5656
directive @link(as: String, import: [link__Import], url: String!) repeatable on SCHEMA
5757
58+
"Indicates an Input Object is a OneOf Input Object."
59+
directive @oneOf on INPUT_OBJECT
60+
5861
"Directs the executor to skip this field or fragment when the `if` argument is true."
5962
directive @skip(
6063
"Skipped when true."

‎integration/maven-plugin-integration-tests/integration/generate-sdl-hooks/src/test/kotlin/com/expediagroup/graphql/plugin/maven/GenerateSDLMojoTest.kt

+3
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,9 @@ class GenerateSDLMojoTest {
5555
"Links definitions within the document to external schemas."
5656
directive @link(as: String, import: [link__Import], url: String!) repeatable on SCHEMA
5757
58+
"Indicates an Input Object is a OneOf Input Object."
59+
directive @oneOf on INPUT_OBJECT
60+
5861
"Directs the executor to skip this field or fragment when the `if` argument is true."
5962
directive @skip(
6063
"Skipped when true."

‎integration/maven-plugin-integration-tests/integration/generate-sdl/src/test/kotlin/com/expediagroup/graphql/plugin/maven/GenerateSDLMojoTest.kt

+3
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,9 @@ class GenerateSDLMojoTest {
5252
if: Boolean!
5353
) on FIELD | FRAGMENT_SPREAD | INLINE_FRAGMENT
5454
55+
"Indicates an Input Object is a OneOf Input Object."
56+
directive @oneOf on INPUT_OBJECT
57+
5558
"Directs the executor to skip this field or fragment when the `if` argument is true."
5659
directive @skip(
5760
"Skipped when true."

‎integration/maven-plugin-integration-tests/integration/wiremock/__files/testSchema.graphql

+2
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ directive @include(
77
"Included when true."
88
if: Boolean!
99
) on FIELD | FRAGMENT_SPREAD | INLINE_FRAGMENT
10+
"Indicates an Input Object is a OneOf Input Object."
11+
directive @oneOf on INPUT_OBJECT
1012
"Directs the executor to skip this field or fragment when the `if` argument is true."
1113
directive @skip(
1214
"Skipped when true."

‎plugins/client/graphql-kotlin-client-generator/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ dependencies {
2121
implementation(libs.slf4j)
2222
testImplementation(projects.graphqlKotlinClientJackson)
2323
testImplementation(projects.graphqlKotlinClientSerialization)
24-
testImplementation(libs.wiremock.jre8)
24+
testImplementation(libs.wiremock.lib)
2525
testImplementation(libs.compile.testing) {
2626
// there is no kotlin compile testing release supporting kotlin 1.8.22
2727
// explicitly downgrading kotlin version to match project version

‎plugins/client/graphql-kotlin-client-generator/src/test/kotlin/com/expediagroup/graphql/plugin/client/IntrospectSchemaTest.kt

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2022 Expedia, Inc
2+
* Copyright 2024 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.
@@ -59,6 +59,9 @@ class IntrospectSchemaTest {
5959
if: Boolean!
6060
) on FIELD | FRAGMENT_SPREAD | INLINE_FRAGMENT
6161
62+
"Indicates an Input Object is a OneOf Input Object."
63+
directive @oneOf on INPUT_OBJECT
64+
6265
"Directs the executor to skip this field or fragment when the `if` argument is true."
6366
directive @skip(
6467
"Skipped when true."

‎plugins/graphql-kotlin-gradle-plugin/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ dependencies {
1515
compileOnly(projects.graphqlKotlinSdlGenerator)
1616
compileOnly(projects.graphqlKotlinGraalvmMetadataGenerator)
1717

18-
testImplementation(libs.wiremock.jre8)
18+
testImplementation(libs.wiremock.lib)
1919
testImplementation(libs.junit.params)
2020
}
2121

‎plugins/schema/graphql-kotlin-sdl-generator/src/integrationTest/kotlin/com/expediagroup/graphql/plugin/schema/GenerateCustomSDLTest.kt

+3
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,9 @@ class GenerateCustomSDLTest {
4444
"Links definitions within the document to external schemas."
4545
directive @link(as: String, import: [link__Import], url: String!) repeatable on SCHEMA
4646
47+
"Indicates an Input Object is a OneOf Input Object."
48+
directive @oneOf on INPUT_OBJECT
49+
4750
"Directs the executor to skip this field or fragment when the `if` argument is true."
4851
directive @skip(
4952
"Skipped when true."

‎plugins/schema/graphql-kotlin-sdl-generator/src/test/kotlin/com/expediagroup/graphql/plugin/schema/GenerateSDLTest.kt

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2022 Expedia, Inc
2+
* Copyright 2024 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.
@@ -42,6 +42,9 @@ class GenerateSDLTest {
4242
if: Boolean!
4343
) on FIELD | FRAGMENT_SPREAD | INLINE_FRAGMENT
4444
45+
"Indicates an Input Object is a OneOf Input Object."
46+
directive @oneOf on INPUT_OBJECT
47+
4548
"Directs the executor to skip this field or fragment when the `if` argument is true."
4649
directive @skip(
4750
"Skipped when true."

‎servers/graphql-kotlin-ktor-server/src/test/kotlin/com/expediagroup/graphql/server/ktor/GraphQLPluginTest.kt

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2023 Expedia, Inc
2+
* Copyright 2024 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.
@@ -80,6 +80,9 @@ class GraphQLPluginTest {
8080
if: Boolean!
8181
) on FIELD | FRAGMENT_SPREAD | INLINE_FRAGMENT
8282
83+
"Indicates an Input Object is a OneOf Input Object."
84+
directive @oneOf on INPUT_OBJECT
85+
8386
"Directs the executor to skip this field or fragment when the `if` argument is true."
8487
directive @skip(
8588
"Skipped when true."

‎servers/graphql-kotlin-spring-server/src/test/kotlin/com/expediagroup/graphql/server/spring/routes/RouteConfigurationIT.kt

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2023 Expedia, Inc
2+
* Copyright 2024 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.
@@ -85,6 +85,9 @@ class RouteConfigurationIT(@Autowired private val testClient: WebTestClient) {
8585
if: Boolean!
8686
) on FIELD | FRAGMENT_SPREAD | INLINE_FRAGMENT
8787
88+
"Indicates an Input Object is a OneOf Input Object."
89+
directive @oneOf on INPUT_OBJECT
90+
8891
"Directs the executor to skip this field or fragment when the `if` argument is true."
8992
directive @skip(
9093
"Skipped when true."

0 commit comments

Comments
 (0)