Skip to content

Commit de5ef47

Browse files
committed
Fikse bygg og legge til dependabot for gradle.
1 parent 5964c82 commit de5ef47

File tree

2 files changed

+14
-4
lines changed

2 files changed

+14
-4
lines changed

.github/dependabot.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@ updates:
55
schedule:
66
interval: "daily"
77
- package-ecosystem: "docker"
8+
directory: "/"
9+
schedule:
10+
interval: "daily"
11+
- package-ecosystem: "gradle"
812
directory: "/"
913
schedule:
1014
interval: "daily"

dp-inntekt-api/build.gradle.kts

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -141,27 +141,33 @@ tasks.named("test") {
141141
dependsOn("copySchemaToResources")
142142
}
143143

144+
tasks.named("processResources") {
145+
dependsOn("copySchemaToResources")
146+
}
147+
144148
tasks.named("graphqlGenerateClient") {
149+
dependsOn("copySchemaToResources")
145150
dependsOn("downloadPdlSDL")
146151
}
147152

153+
val Project.buildDir_: File get() = layout.buildDirectory.get().asFile
148154
val schema = "schema.graphql"
149155

150156
val graphqlGenerateClient by tasks.getting(com.expediagroup.graphql.plugin.gradle.tasks.GraphQLGenerateClientTask::class) {
151157
packageName.set("no.nav.pdl")
152-
schemaFile.set(File("$buildDir/$schema"))
158+
schemaFile.set(File("$buildDir_/$schema"))
153159
queryFileDirectory.set(File("$projectDir/src/main/resources"))
154160
}
155161

156162
val downloadPdlSDL by tasks.register<de.undercouch.gradle.tasks.download.Download>("downloadPdlSDL") {
157163
src("https://navikt.github.io/pdl/pdl-api-sdl.graphqls")
158-
dest(File(buildDir, schema))
164+
dest(File(buildDir_, schema))
159165
}
160166

161167
tasks.register<Copy>("copySchemaToResources") {
162168
dependsOn(downloadPdlSDL)
163169

164-
from(buildDir) {
170+
from(buildDir_) {
165171
include(schema)
166172
}
167173
into("$projectDir/src/main/resources")
@@ -170,7 +176,7 @@ tasks.register<Copy>("copySchemaToResources") {
170176
// To get intellij to make sense of generated sources from graphql client
171177
java {
172178
val mainJavaSourceSet: SourceDirectorySet = sourceSets.getByName("main").java
173-
val graphqlDir = "$buildDir/generated/source/graphql/main"
179+
val graphqlDir = "$buildDir_/generated/source/graphql/main"
174180
mainJavaSourceSet.srcDirs(graphqlDir)
175181
}
176182

0 commit comments

Comments
 (0)