Skip to content

Commit f2d8b8c

Browse files
committed
build: update to gradle8
1 parent 2520867 commit f2d8b8c

File tree

4 files changed

+22
-26
lines changed

4 files changed

+22
-26
lines changed

gradle/wrapper/gradle-wrapper.jar

34 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-7.6-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
44
networkTimeout=10000
55
zipStoreBase=GRADLE_USER_HOME
66
zipStorePath=wrapper/dists

gradlew

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,15 +144,15 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
144144
case $MAX_FD in #(
145145
max*)
146146
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
147-
# shellcheck disable=SC3045
147+
# shellcheck disable=SC3045
148148
MAX_FD=$( ulimit -H -n ) ||
149149
warn "Could not query maximum file descriptor limit"
150150
esac
151151
case $MAX_FD in #(
152152
'' | soft) :;; #(
153153
*)
154154
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
155-
# shellcheck disable=SC3045
155+
# shellcheck disable=SC3045
156156
ulimit -n "$MAX_FD" ||
157157
warn "Could not set maximum file descriptor limit to $MAX_FD"
158158
esac

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

Lines changed: 19 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -44,38 +44,34 @@ pluginBundle {
4444
tags = listOf("graphql", "kotlin", "graphql-client", "schema-generator", "sdl")
4545
}
4646

47-
sourceSets {
48-
main {
49-
java {
50-
srcDir("$buildDir/generated/src")
51-
}
52-
}
53-
}
54-
55-
tasks {
56-
val generateDefaultVersion by registering {
57-
val fileName = "PluginVersion.kt"
58-
val defaultVersionFile = File("$buildDir/generated/src/com/expediagroup/graphql/plugin/gradle", fileName)
47+
val generateDefaultVersion by tasks.registering {
48+
val fileName = "PluginVersion.kt"
49+
val defaultVersionFile = File("$buildDir/generated/src/com/expediagroup/graphql/plugin/gradle", fileName)
5950

60-
inputs.property(fileName, project.version)
61-
outputs.file(defaultVersionFile)
51+
inputs.property(fileName, project.version)
52+
outputs.file(defaultVersionFile.parent)
6253

63-
doFirst {
64-
defaultVersionFile.parentFile.mkdirs()
65-
defaultVersionFile.writeText(
66-
"""
54+
doFirst {
55+
defaultVersionFile.parentFile.mkdirs()
56+
defaultVersionFile.writeText(
57+
"""
6758
package com.expediagroup.graphql.plugin.gradle
6859
internal const val DEFAULT_PLUGIN_VERSION = "${project.version}"
6960
70-
""".trimIndent()
71-
)
72-
}
61+
""".trimIndent()
62+
)
7363
}
64+
}
7465

75-
compileKotlin {
76-
dependsOn(generateDefaultVersion)
66+
sourceSets {
67+
main {
68+
java {
69+
srcDir(generateDefaultVersion)
70+
}
7771
}
72+
}
7873

74+
tasks {
7975
publishPlugins {
8076
doFirst {
8177
System.setProperty("gradle.publish.key", System.getenv("PLUGIN_PORTAL_KEY"))

0 commit comments

Comments
 (0)