Skip to content

Commit 9d11d44

Browse files
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

Lines changed: 37 additions & 3 deletions
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

Lines changed: 5 additions & 0 deletions
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 2 additions & 5 deletions
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 2 additions & 1 deletion
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

Lines changed: 2 additions & 2 deletions
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

Lines changed: 2 additions & 2 deletions
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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
}

0 commit comments

Comments
 (0)