Skip to content

Commit 96f85a8

Browse files
dariuszkucdariuszkuc
authored
[build] update to latest dependencies (#1495)
### 📝 Description Update to the latest dependencies. Fixed duplicate publication from `graphql-kotlin-gradle-plugin` - this was a warning before but latest version of `com.gradle.plugin-publish` treats it as a failure NOTE: I did not update project to Kotlin v1.7 as I think that as a library we should target older version to allow for largest adoption. ### 🔗 Related Issues
1 parent 7711942 commit 96f85a8

File tree

8 files changed

+88
-56
lines changed

8 files changed

+88
-56
lines changed

‎build.gradle.kts‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ subprojects {
9999
sourceCompatibility = JavaVersion.VERSION_1_8
100100
}
101101

102-
// published artifacts
102+
// published sources and javadoc artifacts
103103
val jarComponent = currentProject.components.getByName("java")
104104
val sourcesJar by registering(Jar::class) {
105105
archiveClassifier.set("sources")
@@ -149,12 +149,15 @@ subprojects {
149149
}
150150
}
151151
}
152-
create<MavenPublication>("mavenJava") {
153-
from(jarComponent)
154-
artifact(sourcesJar.get())
155-
// no need to publish javadocs for SNAPSHOT builds
156-
if (rootProject.extra["isReleaseVersion"] as Boolean) {
157-
artifact(javadocJar.get())
152+
// com.gradle.plugin-publish creates publication automatically
153+
if (currentProject.name != "graphql-kotlin-gradle-plugin") {
154+
create<MavenPublication>("mavenJava") {
155+
from(jarComponent)
156+
artifact(sourcesJar.get())
157+
// no need to publish javadocs for SNAPSHOT builds
158+
if (rootProject.extra["isReleaseVersion"] as Boolean) {
159+
artifact(javadocJar.get())
160+
}
158161
}
159162
}
160163
}

‎examples/gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

‎generator/graphql-kotlin-schema-generator/src/main/kotlin/com/expediagroup/graphql/generator/execution/FlowSubscriptionExecutionStrategy.kt‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2021 Expedia, Inc
2+
* Copyright 2022 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.
@@ -58,7 +58,10 @@ class FlowSubscriptionExecutionStrategy(dfe: DataFetcherExceptionHandler) : Exec
5858
val instrumentation = executionContext.instrumentation
5959
val instrumentationParameters = InstrumentationExecutionStrategyParameters(executionContext, parameters)
6060
val executionStrategyCtx = ExecutionStrategyInstrumentationContext.nonNullCtx(
61-
instrumentation.beginExecutionStrategy(instrumentationParameters, executionContext.instrumentationState)
61+
instrumentation.beginExecutionStrategy(
62+
instrumentationParameters,
63+
executionContext.instrumentationState
64+
)
6265
)
6366

6467
val sourceEventStream = createSourceEventStream(executionContext, parameters)
@@ -147,7 +150,9 @@ class FlowSubscriptionExecutionStrategy(dfe: DataFetcherExceptionHandler) : Exec
147150

148151
val i13nFieldParameters = InstrumentationFieldParameters(executionContext) { subscribedFieldStepInfo }
149152
val subscribedFieldCtx = SimpleInstrumentationContext.nonNullCtx(
150-
instrumentation.beginSubscribedFieldEvent(i13nFieldParameters, executionContext.instrumentationState)
153+
instrumentation.beginSubscribedFieldEvent(
154+
i13nFieldParameters, executionContext.instrumentationState
155+
)
151156
)
152157

153158
val fetchedValue = unboxPossibleDataFetcherResult(newExecutionContext, parameters, eventPayload)
@@ -162,12 +167,12 @@ class FlowSubscriptionExecutionStrategy(dfe: DataFetcherExceptionHandler) : Exec
162167
overallResult.whenComplete(subscribedFieldCtx::onCompleted)
163168

164169
// allow them to instrument each ER should they want to
165-
val i13ExecutionParameters = InstrumentationExecutionParameters(
170+
val i13nExecutionParameters = InstrumentationExecutionParameters(
166171
executionContext.executionInput, executionContext.graphQLSchema, executionContext.instrumentationState
167172
)
168173

169174
return overallResult.thenCompose { executionResult ->
170-
instrumentation.instrumentExecutionResult(executionResult, i13ExecutionParameters, executionContext.instrumentationState)
175+
instrumentation.instrumentExecutionResult(executionResult, i13nExecutionParameters, executionContext.instrumentationState)
171176
}
172177
}
173178

‎gradle.properties‎

Lines changed: 21 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -16,40 +16,46 @@ org.gradle.jvmargs=-Xmx2g -XX:+HeapDumpOnOutOfMemoryError
1616
# dependencies
1717
kotlinJvmVersion = 1.8
1818
kotlinVersion = 1.6.21
19-
kotlinCoroutinesVersion = 1.6.1
19+
kotlinCoroutinesVersion = 1.6.4
20+
# kotlinx-serialization 1.3.3 calls Kotlin 1.7 API
2021
kotlinxSerializationVersion = 1.3.2
2122

2223
androidPluginVersion = 7.1.2
23-
classGraphVersion = 4.8.143
24-
federationGraphQLVersion = 0.9.0
24+
classGraphVersion = 4.8.149
25+
federationGraphQLVersion = 2.0.4
2526
graphQLJavaVersion = 19.0
2627
graphQLJavaDataLoaderVersion = 3.2.0
27-
jacksonVersion = 2.13.2
28+
jacksonVersion = 2.13.3
29+
# KotlinPoet v1.12.0+ requires Kotlin v1.7
2830
kotlinPoetVersion = 1.11.0
29-
ktorVersion = 2.0.0
30-
reactorVersion = 3.4.18
31-
reactorExtensionsVersion = 1.1.6
31+
ktorVersion = 2.0.3
32+
reactorVersion = 3.4.21
33+
reactorExtensionsVersion = 1.1.7
3234
slf4jVersion = 1.7.36
33-
springBootVersion = 2.7.0
34-
springVersion = 5.3.20
35+
springBootVersion = 2.7.2
36+
springVersion = 5.3.22
3537

3638
# test dependency versions
3739
# kotlin-compile-testing has to be using the same kotlin version as the kotlinx-serialization compiler
40+
# kotlin-compile-testing v1.4.9+ requires Kotlin v1.7
3841
compileTestingVersion = 1.4.8
3942
icuVersion=71.1
4043
junitVersion = 5.8.2
41-
mockkVersion = 1.12.3
44+
# mockk v1.12.5+ requires Kotlin 1.7
45+
mockkVersion = 1.12.4
4246
mustacheVersion = 0.9.10
43-
rxjavaVersion = 3.1.4
44-
wireMockVersion = 2.32.0
45-
kotlinxBenchmarkVersion = 0.4.2
47+
rxjavaVersion = 3.1.5
48+
wireMockVersion = 2.33.2
49+
kotlinxBenchmarkVersion = 0.4.4
4650

4751
# plugin versions
48-
detektVersion = 1.19.0
52+
detektVersion = 1.21.0
4953
dokkaVersion = 1.6.10
5054
jacocoVersion = 0.8.8
55+
# ktlint v0.46.0+ requires Kotlin 1.7
5156
ktlintVersion = 0.45.2
52-
ktlintPluginVersion = 10.2.1
57+
ktlintPluginVersion = 10.3.0
5358
mavenPluginDevelopmentVersion = 0.4.0
5459
nexusPublishPluginVersion = 1.1.0
5560
pluginPublishPluginVersion = 0.21.0
61+
# pluginPublishPluginVersion = 1.0.0

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

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

Lines changed: 24 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,19 @@ dependencies {
2525
testImplementation("org.junit.jupiter:junit-jupiter-params:$junitVersion")
2626
}
2727

28+
java {
29+
withSourcesJar()
30+
if (rootProject.extra["isReleaseVersion"] as Boolean) {
31+
withJavadocJar()
32+
}
33+
}
34+
2835
gradlePlugin {
2936
plugins {
3037
register("graphQLPlugin") {
3138
id = "com.expediagroup.graphql"
39+
displayName = "GraphQL Kotlin Gradle Plugin"
40+
description = "Gradle Plugin that can generate type-safe GraphQL Kotlin client and GraphQL schema in SDL format using reflections"
3241
implementationClass = "com.expediagroup.graphql.plugin.gradle.GraphQLGradlePlugin"
3342
}
3443
}
@@ -37,14 +46,7 @@ gradlePlugin {
3746
pluginBundle {
3847
website = "https://expediagroup.github.io/graphql-kotlin"
3948
vcsUrl = "https://github.com/ExpediaGroup/graphql-kotlin"
40-
41-
(plugins) {
42-
"graphQLPlugin" {
43-
displayName = "GraphQL Kotlin Gradle Plugin"
44-
description = "Gradle Plugin that can generate type-safe GraphQL Kotlin client and GraphQL schema in SDL format using reflections"
45-
tags = listOf("graphql", "kotlin", "graphql-client", "schema-generator", "sdl")
46-
}
47-
}
49+
tags = listOf("graphql", "kotlin", "graphql-client", "schema-generator", "sdl")
4850
}
4951

5052
sourceSets {
@@ -84,19 +86,6 @@ tasks {
8486
System.setProperty("gradle.publish.secret", System.getenv("PLUGIN_PORTAL_SECRET"))
8587
}
8688
}
87-
publishing {
88-
publications {
89-
afterEvaluate {
90-
named<MavenPublication>("graphQLPluginPluginMarkerMaven") {
91-
// update auto-generated pom.xml for plugin marker with required information
92-
pom {
93-
name.set(artifactId)
94-
description.set("Plugin descriptor for GraphQL Kotlin Gradle plugin")
95-
}
96-
}
97-
}
98-
}
99-
}
10089
test {
10190
// ensure we always run tests by setting new inputs
10291
//
@@ -115,4 +104,18 @@ tasks {
115104
systemProperty("springBootVersion", springBootVersion)
116105
systemProperty("junitVersion", junitVersion)
117106
}
107+
108+
publishing {
109+
afterEvaluate {
110+
publications {
111+
named<MavenPublication>("graphQLPluginPluginMarkerMaven") {
112+
// update auto-generated pom.xml for plugin marker with required information
113+
pom {
114+
name.set(artifactId)
115+
description.set("Plugin descriptor for GraphQL Kotlin Gradle plugin")
116+
}
117+
}
118+
}
119+
}
120+
}
118121
}

‎plugins/graphql-kotlin-gradle-plugin/src/test/kotlin/com/expediagroup/graphql/plugin/gradle/GraphQLGenerateClientIT.kt‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,15 @@ class GraphQLGenerateClientIT {
4242
.withPluginClasspath()
4343
.withArguments(
4444
"build",
45-
"--stacktrace",
46-
"-PGRAPHQL_KOTLIN_VERSION=$DEFAULT_PLUGIN_VERSION",
47-
"-PKOTLIN_VERSION=$kotlinVersion",
48-
"-PJUNIT_VERSION=$junitVersion",
49-
"-PMOCKK_VERSION=$mockkVersion"
45+
"--stacktrace"
46+
)
47+
.withEnvironment(
48+
mapOf(
49+
"GRAPHQL_KOTLIN_VERSION" to DEFAULT_PLUGIN_VERSION,
50+
"KOTLIN_VERSION" to kotlinVersion,
51+
"JUNIT_VERSION" to junitVersion,
52+
"MOCKK_VERSION" to mockkVersion
53+
)
5054
)
5155
.forwardOutput()
5256
.build()

‎plugins/graphql-kotlin-gradle-plugin/src/test/kotlin/com/expediagroup/graphql/plugin/gradle/GraphQLGradlePluginAndroidIT.kt‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,18 @@ class GraphQLGradlePluginAndroidIT {
4242
val buildResult = GradleRunner.create()
4343
.withProjectDir(testProjectDirectory)
4444
.withPluginClasspath()
45-
.withArguments("build", "--stacktrace", "-PGRAPHQL_KOTLIN_VERSION=$DEFAULT_PLUGIN_VERSION", "-PKOTLIN_VERSION=$kotlinVersion", "-PANDROID_PLUGIN_VERSION=$androidPluginVersion")
45+
.withArguments(
46+
"build",
47+
"--stacktrace"
48+
)
49+
.withEnvironment(
50+
mapOf(
51+
"GRAPHQL_KOTLIN_VERSION" to DEFAULT_PLUGIN_VERSION,
52+
"KOTLIN_VERSION" to kotlinVersion,
53+
"ANDROID_PLUGIN_VERSION" to androidPluginVersion,
54+
"ANDROID_SDK_ROOT" to System.getenv("ANDROID_SDK_ROOT")
55+
)
56+
)
4657
.forwardOutput()
4758
.build()
4859

0 commit comments

Comments
 (0)