Skip to content

Commit 3ea86c5

Browse files
committed
update to latest gradle version
1 parent f2d8b8c commit 3ea86c5

File tree

7 files changed

+14
-12
lines changed

7 files changed

+14
-12
lines changed

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jacoco = "0.8.10"
4949
# klint gradle plugin breaks with 0.46.x+
5050
ktlint-core = "0.45.2"
5151
ktlint-plugin = "10.3.0"
52-
maven-plugin-development = "0.4.1"
52+
maven-plugin-development = "0.4.2"
5353
nexus-publish-plugin = "1.3.0"
5454
plugin-publish = "1.2.0"
5555

gradle/wrapper/gradle-wrapper.jar

468 Bytes
Binary file not shown.
Lines changed: 1 addition & 1 deletion
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.0.2-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
44
networkTimeout=10000
55
zipStoreBase=GRADLE_USER_HOME
66
zipStorePath=wrapper/dists

gradlew

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,6 @@ done
8585
APP_BASE_NAME=${0##*/}
8686
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
8787

88-
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
89-
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
90-
9188
# Use the maximum available, or set MAX_FD != -1 to use that value.
9289
MAX_FD=maximum
9390

@@ -197,6 +194,10 @@ if "$cygwin" || "$msys" ; then
197194
done
198195
fi
199196

197+
198+
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
199+
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
200+
200201
# Collect all arguments for the java command;
201202
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
202203
# shell script including quotes and variable substitutions, so put them in

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

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,28 +28,25 @@ java {
2828
}
2929

3030
gradlePlugin {
31+
website.set("https://opensource.expediagroup.com/graphql-kotlin/docs/")
32+
vcsUrl.set("https://github.com/ExpediaGroup/graphql-kotlin")
3133
plugins {
3234
register("graphQLPlugin") {
3335
id = "com.expediagroup.graphql"
3436
displayName = "GraphQL Kotlin Gradle Plugin"
3537
description = "Gradle Plugin that can generate type-safe GraphQL Kotlin client and GraphQL schema in SDL format using reflections"
3638
implementationClass = "com.expediagroup.graphql.plugin.gradle.GraphQLGradlePlugin"
39+
tags.set(listOf("graphql", "kotlin", "graphql-client", "schema-generator", "sdl"))
3740
}
3841
}
3942
}
4043

41-
pluginBundle {
42-
website = "https://opensource.expediagroup.com/graphql-kotlin/docs/"
43-
vcsUrl = "https://github.com/ExpediaGroup/graphql-kotlin"
44-
tags = listOf("graphql", "kotlin", "graphql-client", "schema-generator", "sdl")
45-
}
46-
4744
val generateDefaultVersion by tasks.registering {
4845
val fileName = "PluginVersion.kt"
4946
val defaultVersionFile = File("$buildDir/generated/src/com/expediagroup/graphql/plugin/gradle", fileName)
5047

5148
inputs.property(fileName, project.version)
52-
outputs.file(defaultVersionFile.parent)
49+
outputs.dir(defaultVersionFile.parent)
5350

5451
doFirst {
5552
defaultVersionFile.parentFile.mkdirs()

plugins/schema/graphql-kotlin-sdl-generator/build.gradle.kts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,12 @@ testing {
4848

4949
tasks {
5050
jacocoTestReport {
51+
dependsOn(testing.suites.named("test"), testing.suites.named("integrationTest"))
5152
// we need to explicitly add integrationTest coverage info
5253
executionData.setFrom(fileTree(buildDir).include("/jacoco/*.exec"))
5354
}
5455
jacocoTestCoverageVerification {
56+
dependsOn(testing.suites.named("test"), testing.suites.named("integrationTest"))
5557
// we need to explicitly add integrationTest coverage info
5658
executionData.setFrom(fileTree(buildDir).include("/jacoco/*.exec"))
5759
violationRules {

plugins/server/graphql-kotlin-graalvm-metadata-generator/build.gradle.kts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,12 @@ testing {
4747

4848
tasks {
4949
jacocoTestReport {
50+
dependsOn(testing.suites.named("test"), testing.suites.named("integrationTest"))
5051
// we need to explicitly add integrationTest coverage info
5152
executionData.setFrom(fileTree(buildDir).include("/jacoco/*.exec"))
5253
}
5354
jacocoTestCoverageVerification {
55+
dependsOn(testing.suites.named("test"), testing.suites.named("integrationTest"))
5456
// we need to explicitly add integrationTest coverage info
5557
executionData.setFrom(fileTree(buildDir).include("/jacoco/*.exec"))
5658
violationRules {

0 commit comments

Comments
 (0)