Skip to content

Commit 9d11d44

Browse files
reneleonhardtreneleonhardt
authored
chore(deps): Update dependencies (#1974)
### Updates * Kotlin 1.8.22 to 1.9.24 * android-plugin 8.1.1 to 8.4.1 * classgraph 4.8.170 to 4.8.172 * compile-testing 0.3.2 to 0.4.1 * detekt 1.23.0 to 1.23.6 * dokka 1.8.20 to 1.9.20 * federation 4.4.1 to 5.0.0 * graalvm 0.10.1 to 0.10.2 * Gradle Wrapper (latest, no version shown) * icu 74.2 to 75.2 * jackson 2.15.4 to 2.17.1 * kotlinx-benchmark 0.4.8 to 0.4.10 * kotlinx-coroutines 1.7.3 to 1.8.1 * kotlinx-serialization 1.5.1 to 1.6.3 **(3 test cases failing in GenerateKotlinxClientIT)** * ktlint-core 0.45.2 to 1.2.1 **(many rules had to be disabled, reformat required)** * ktlint-plugin 10.3.0 to 12.1.1 * ktor 2.3.10 to 2.3.11 * logback 1.5.4 to 1.5.6 * maven-plugin-annotation 3.12.0 to 3.13.0 * mockk 1.13.7 to 1.3.11 * nexus-publish-plugin 1.3.0 to 2.0.0 * poet 1.14.2 to 1.17.0 * reactor-core 3.5.15 to 3.6.6 * slf4j 2.0.12 to 2.0.13 * spring 6.0.18 to 6.1.8 * spring-boot 3.1.10 to 3.3.0 * wiremock 3.5.2 to 3.6.0 ### Added * spring-context (was needed for spring-web in graphql-kotlin-spring-client) ### Improvements * Synchronized all covered ratio values to current values * Let Dependabot update GitHub Actions ### TODO * Fix GraphQLTestUtils and GenerateKotlinxClientIT after Kotlin 1.9 upgrade * Remove disabled rules in .editorconfig, then `./gradlew ktlintFormat`
1 parent 793c5ed commit 9d11d44

File tree

26 files changed

+127
-100
lines changed

26 files changed

+127
-100
lines changed

‎.editorconfig

+37-3
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,41 @@ indent_size = 2
1919
[*.{kt,kts}]
2020
indent_size = 4
2121
max_line_length = 200
22+
#ktlint_disabled_rules=import-ordering,filename,no-empty-first-line-in-method-block,argument-list-wrapping,spacing-between-declarations-with-annotations,spacing-between-declarations-with-comments,enum-entry-name-case,trailing-comma-on-call-site,trailing-comma-on-declaration-site,package-name,annotation,multiline-if-else
2223

23-
# ktlint rules
24-
# https://github.com/pinterest/ktlint/issues/527
25-
disabled_rules=import-ordering
24+
# TODO: Remove disabled rules then ./gradlew ktlintFormat
25+
ktlint_standard_import-ordering = disabled
26+
ktlint_standard_annotation = disabled
27+
ktlint_standard_argument-list-wrapping = disabled
28+
ktlint_standard_backing-property-naming = disabled
29+
ktlint_standard_blank-line-before-declaration = disabled
30+
ktlint_standard_class-naming = disabled
31+
ktlint_standard_enum-entry-name-case = disabled
32+
ktlint_standard_enum-wrapping = disabled
33+
ktlint_standard_filename = disabled
34+
ktlint_standard_function-naming = disabled
35+
ktlint_standard_function-signature = disabled
36+
ktlint_standard_if-else-bracing = disabled
37+
ktlint_standard_if-else-wrapping = disabled
38+
ktlint_standard_indent = disabled
39+
ktlint_standard_multiline-expression-wrapping = disabled
40+
ktlint_standard_multiline-if-else = disabled
41+
ktlint_standard_no-blank-line-in-list = disabled
42+
ktlint_standard_no-consecutive-comments = disabled
43+
ktlint_standard_no-empty-first-line-in-class-body = disabled
44+
ktlint_standard_no-empty-first-line-in-method-block = disabled
45+
ktlint_standard_no-single-line-block-comment = disabled
46+
ktlint_standard_package-name = disabled
47+
ktlint_standard_parameter-list-wrapping = disabled
48+
ktlint_standard_property-naming = disabled
49+
ktlint_standard_spacing-between-declarations-with-annotations = disabled
50+
ktlint_standard_spacing-between-declarations-with-comments = disabled
51+
ktlint_standard_statement-wrapping = disabled
52+
ktlint_standard_string-template-indent = disabled
53+
ktlint_standard_trailing-comma-on-call-site = disabled
54+
ktlint_standard_trailing-comma-on-declaration-site = disabled
55+
# https://github.com/pinterest/ktlint/releases/tag/1.3.0
56+
ktlint_standard_class-signature = disabled
57+
ktlint_standard_chain-method-continuation = disabled
58+
ktlint_standard_condition-wrapping = disabled
59+
ktlint_standard_function-expression-body = disabled

‎.github/dependabot.yml

+5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
version: 2
22
updates:
3+
- package-ecosystem: "github-actions"
4+
directory: "/"
5+
schedule:
6+
interval: "weekly"
7+
38
- package-ecosystem: "gradle"
49
directory: "/"
510
labels:

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ tasks {
1919
counter = "INSTRUCTION"
2020
value = "COVEREDRATIO"
2121
// increase it when https://github.com/Kotlin/kotlinx.serialization/issues/961 is resolved
22-
minimum = "0.70".toBigDecimal()
22+
minimum = "0.79".toBigDecimal()
2323
}
2424
}
2525
}

‎clients/graphql-kotlin-client-serialization/src/test/kotlin/com/expediagroup/graphql/client/serialization/GraphQLClientKotlinXSerializerTest.kt

+2-5
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ import com.expediagroup.graphql.client.serialization.types.KotlinxGraphQLError
3131
import com.expediagroup.graphql.client.serialization.types.KotlinxGraphQLResponse
3232
import com.expediagroup.graphql.client.serialization.types.KotlinxGraphQLSourceLocation
3333
import com.expediagroup.graphql.client.serialization.types.OptionalInput
34-
import kotlinx.serialization.decodeFromString
3534
import kotlinx.serialization.json.Json
3635
import kotlinx.serialization.json.JsonObject
3736
import org.junit.jupiter.api.Test
@@ -309,8 +308,7 @@ class GraphQLClientKotlinXSerializerTest {
309308
| "foo",
310309
| null
311310
| ],
312-
| "nonNullableElementList": [
313-
| ]
311+
| "nonNullableElementList": []
314312
| },
315313
| "query": "INPUT_QUERY",
316314
| "operationName": "InputQuery"
@@ -327,8 +325,7 @@ class GraphQLClientKotlinXSerializerTest {
327325
)
328326

329327
val expected = """{
330-
| "variables": {
331-
| },
328+
| "variables": {},
332329
| "query": "EMPTY_INPUT_QUERY",
333330
| "operationName": "EmptyInputQuery"
334331
|}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ tasks {
2323
limit {
2424
counter = "INSTRUCTION"
2525
value = "COVEREDRATIO"
26-
minimum = "0.95".toBigDecimal()
26+
minimum = "0.97".toBigDecimal()
2727
}
2828
}
2929
}

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ dependencies {
1010
api(projects.graphqlKotlinClientJackson)
1111
api(libs.kotlinx.coroutines.reactor)
1212
api(libs.spring.webflux)
13+
api(libs.spring.context)
1314
api(libs.spring.boot.netty)
1415
testImplementation(projects.graphqlKotlinClientSerialization)
1516
testImplementation(libs.wiremock.lib)
@@ -22,7 +23,7 @@ tasks {
2223
limit {
2324
counter = "INSTRUCTION"
2425
value = "COVEREDRATIO"
25-
minimum = "0.95".toBigDecimal()
26+
minimum = "0.96".toBigDecimal()
2627
}
2728
}
2829
}

‎executions/graphql-kotlin-automatic-persisted-queries/build.gradle.kts

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@ tasks {
1515
limit {
1616
counter = "INSTRUCTION"
1717
value = "COVEREDRATIO"
18-
minimum = "0.76".toBigDecimal()
18+
minimum = "0.95".toBigDecimal()
1919
}
2020
limit {
2121
counter = "BRANCH"
2222
value = "COVEREDRATIO"
23-
minimum = "0.50".toBigDecimal()
23+
minimum = "0.90".toBigDecimal()
2424
}
2525
}
2626
}

‎executions/graphql-kotlin-dataloader-instrumentation/build.gradle.kts

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@ tasks {
2020
limit {
2121
counter = "INSTRUCTION"
2222
value = "COVEREDRATIO"
23-
minimum = "0.92".toBigDecimal()
23+
minimum = "0.94".toBigDecimal()
2424
}
2525
limit {
2626
counter = "BRANCH"
2727
value = "COVEREDRATIO"
28-
minimum = "0.70".toBigDecimal()
28+
minimum = "0.76".toBigDecimal()
2929
}
3030
}
3131
}

‎executions/graphql-kotlin-dataloader/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ tasks {
1818
limit {
1919
counter = "INSTRUCTION"
2020
value = "COVEREDRATIO"
21-
minimum = "0.52".toBigDecimal()
21+
minimum = "0.58".toBigDecimal()
2222
}
2323
limit {
2424
counter = "BRANCH"

‎generator/graphql-kotlin-federation/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ tasks {
2727
limit {
2828
counter = "BRANCH"
2929
value = "COVEREDRATIO"
30-
minimum = "0.80".toBigDecimal()
30+
minimum = "0.83".toBigDecimal()
3131
}
3232
}
3333
}

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

+5-3
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,8 @@ schema {
4747
query: Query
4848
}
4949
50+
directive @custom on SCHEMA | SCALAR | OBJECT | FIELD_DEFINITION | ARGUMENT_DEFINITION | INTERFACE | UNION | ENUM | ENUM_VALUE | INPUT_OBJECT | INPUT_FIELD_DEFINITION
51+
5052
interface Product @extends @key(fields : "id") @key(fields : "upc") {
5153
id: String! @external
5254
reviews: [Review!]!
@@ -70,8 +72,8 @@ type Book implements Product @extends @key(fields : "id") @key(fields : "upc") {
7072
type Query @extends
7173
7274
type Review {
73-
body: String!
74-
content: String
75+
body: String! @custom
76+
content: String @deprecated(reason : "no longer supported, replace with use Review.body instead")
7577
customScalar: CustomScalar!
7678
id: String!
7779
}
@@ -173,7 +175,7 @@ type Query {
173175
174176
type Review {
175177
body: String! @custom
176-
content: String
178+
content: String @deprecated(reason : "no longer supported, replace with use Review.body instead")
177179
customScalar: CustomScalar!
178180
id: String!
179181
}

‎generator/graphql-kotlin-schema-generator/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ tasks {
2020
limit {
2121
counter = "INSTRUCTION"
2222
value = "COVEREDRATIO"
23-
minimum = "0.95".toBigDecimal()
23+
minimum = "0.96".toBigDecimal()
2424
}
2525
limit {
2626
counter = "BRANCH"

‎generator/graphql-kotlin-schema-generator/src/test/kotlin/com/expediagroup/graphql/generator/test/integration/OptionalInputTest.kt

-2
Original file line numberDiff line numberDiff line change
@@ -69,12 +69,10 @@ class OptionalInputTest {
6969
Arguments.of("{ inputWithOptionalValues(input: { required: \"ABC\" }) }", "argument with optional object was not specified"),
7070
Arguments.of("{ inputWithOptionalValues(input: { required: \"ABC\" optional: null }) }", "argument object value: null"),
7171
Arguments.of("{ inputWithOptionalValues(input: { required: \"ABC\" optional: { id: 1, name: \"XYZ\" } }) }", "argument object value: SimpleArgument(id=1, name=XYZ)"),
72-
/* ktlint-disable */
7372
Arguments.of(
7473
"{ inputWithNestedOptionalValues(input: { optional: { nestedOptionalScalar: \"ABC\", nestedOptionalInt: null } } )}",
7574
"HasNestedOptionalArguments(optional=Defined(value=DeeplyNestedArguments(nestedOptional=UNDEFINED, nestedOptionalScalar=Defined(value=ABC), nestedOptionalInt=Defined(value=null))), optionalScalar=UNDEFINED)"
7675
)
77-
/* ktlint-enable */
7876
)
7977
}
8078
}

‎gradle/libs.versions.toml

+29-35
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,46 @@
11
[versions]
2-
android-plugin = "8.1.1"
3-
classgraph = "4.8.170"
2+
android-plugin = "8.5.0"
3+
classgraph = "4.8.174"
44
dataloader = "3.3.0"
5-
federation = "4.4.1"
5+
federation = "5.1.0"
66
graphql-java = "22.1"
7-
graalvm = "0.10.1"
8-
jackson = "2.15.4"
7+
graalvm = "0.10.2"
8+
jackson = "2.17.1"
99
# kotlin version has to match the compile-testing compiler version
10-
kotlin = "1.8.22"
11-
# TODO kotlin 1.9 upgrade -> kotlinx-benchaamrk 0.4.9+ uses kotlin 1.9
12-
kotlinx-benchmark = "0.4.8"
13-
# TODO kotlin 1.9 upgrade -> kotlinx-coroutines 1.8+ uses kotlin 1.9
14-
kotlinx-coroutines = "1.7.3"
15-
# TODO kotlin 1.9 upgrade -> kotlinx-serialization 1.6.0+ uses kotlin 1.9
16-
kotlinx-serialization = "1.5.1"
17-
ktor = "2.3.10"
18-
maven-plugin-annotation = "3.12.0"
19-
maven-plugin-api = "3.9.6"
10+
kotlin = "1.9.24"
11+
kotlinx-benchmark = "0.4.11"
12+
kotlinx-coroutines = "1.8.1"
13+
# TODO kotlin 1.9 upgrade: fix GraphQLTestUtils and GenerateKotlinxClientIT
14+
kotlinx-serialization = "1.6.3"
15+
ktor = "2.3.12"
16+
maven-plugin-annotation = "3.13.1"
17+
maven-plugin-api = "3.9.8"
2018
maven-project = "2.2.1"
21-
# TODO kotlin 1.9 upgrade -> kotlinxpoet 1.15+ uses kotlin 1.9
22-
poet = "1.14.2"
19+
poet = "1.17.0"
2320
## reactor and spring versions should be the same as defined in spring-boot-dependencies
24-
reactor-core = "3.5.15"
21+
reactor-core = "3.6.7"
2522
reactor-extensions = "1.2.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"
23+
slf4j = "2.0.13"
24+
spring = "6.1.10"
25+
spring-boot = "3.3.1"
3026

3127
# test dependencies
32-
compile-testing = "0.3.2"
33-
icu = "74.2"
28+
compile-testing = "0.5.0"
29+
icu = "75.1"
3430
junit = "5.10.2"
35-
logback = "1.5.4"
36-
# TODO kotlin 1.9 upgrade -> mockk 1.13.8+ uses kotlin 1.9
37-
mockk = "1.13.7"
31+
logback = "1.5.6"
32+
mockk = "1.13.11"
3833
rxjava = "3.1.8"
39-
wiremock = "3.5.2"
34+
wiremock = "3.6.0"
4035

4136
# plugins
42-
# TODO kotlin 1.9 upgrade -> detekt 1.23.1+ uses kotlin 1.9
43-
detekt = "1.23.0"
44-
dokka = "1.8.20"
37+
detekt = "1.23.6"
38+
dokka = "1.9.20"
4539
jacoco = "0.8.12"
46-
# klint gradle plugin breaks with 0.46.x+
47-
ktlint-core = "0.45.2"
48-
ktlint-plugin = "10.3.0"
40+
ktlint-core = "1.3.0"
41+
ktlint-plugin = "12.1.1"
4942
maven-plugin-development = "0.4.3"
50-
nexus-publish-plugin = "1.3.0"
43+
nexus-publish-plugin = "2.0.0"
5144
plugin-publish = "1.2.1"
5245

5346
# ====================
@@ -89,6 +82,7 @@ spring-boot-config = { group = "org.springframework.boot", name = "spring-boot-c
8982
spring-boot-netty = { group = "org.springframework.boot", name = "spring-boot-starter-reactor-netty", version.ref = "spring-boot" }
9083
spring-boot-webflux = { group = "org.springframework.boot", name = "spring-boot-starter-webflux", version.ref = "spring-boot" }
9184
spring-webflux = { group = "org.springframework", name = "spring-webflux", version.ref = "spring" }
85+
spring-context = { group = "org.springframework", name = "spring-context", version.ref = "spring" }
9286

9387
# test dependencies
9488
compile-testing = { group = "dev.zacsweers.kctfork", name = "core", version.ref = "compile-testing" }

‎gradle/wrapper/gradle-wrapper.jar

-19.5 KB
Binary file not shown.

‎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.7-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

‎gradlew

+10-9
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
# Darwin, MinGW, and NonStop.
5656
#
5757
# (3) This script is generated from the Groovy template
58-
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
58+
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
5959
# within the Gradle project.
6060
#
6161
# You can find Gradle at https://github.com/gradle/gradle/.
@@ -83,7 +83,8 @@ done
8383
# This is normally unused
8484
# shellcheck disable=SC2034
8585
APP_BASE_NAME=${0##*/}
86-
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
86+
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
87+
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
8788

8889
# Use the maximum available, or set MAX_FD != -1 to use that value.
8990
MAX_FD=maximum
@@ -144,15 +145,15 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
144145
case $MAX_FD in #(
145146
max*)
146147
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
147-
# shellcheck disable=SC3045
148+
# shellcheck disable=SC2039,SC3045
148149
MAX_FD=$( ulimit -H -n ) ||
149150
warn "Could not query maximum file descriptor limit"
150151
esac
151152
case $MAX_FD in #(
152153
'' | soft) :;; #(
153154
*)
154155
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
155-
# shellcheck disable=SC3045
156+
# shellcheck disable=SC2039,SC3045
156157
ulimit -n "$MAX_FD" ||
157158
warn "Could not set maximum file descriptor limit to $MAX_FD"
158159
esac
@@ -201,11 +202,11 @@ fi
201202
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
202203
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
203204

204-
# Collect all arguments for the java command;
205-
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
206-
# shell script including quotes and variable substitutions, so put them in
207-
# double quotes to make sure that they get re-expanded; and
208-
# * put everything else in single quotes, so that it's not re-expanded.
205+
# Collect all arguments for the java command:
206+
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
207+
# and any embedded shellness will be escaped.
208+
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
209+
# treated as '${Hostname}' itself on the command line.
209210

210211
set -- \
211212
"-Dorg.gradle.appname=$APP_BASE_NAME" \

0 commit comments

Comments
 (0)