Skip to content

Commit 0540730

Browse files
authored
build: update gradle plugin failure tests to use version catalog (#1659)
1 parent 00b1731 commit 0540730

File tree

6 files changed

+27
-15
lines changed

6 files changed

+27
-15
lines changed

plugins/graphql-kotlin-gradle-plugin/src/integration/client-deprecated-type/build.gradle.kts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
import com.expediagroup.graphql.plugin.gradle.tasks.GraphQLGenerateClientTask
22

3+
@Suppress("DSL_SCOPE_VIOLATION") // TODO: remove once KTIJ-19369 / Gradle#22797 is fi
34
plugins {
45
id("com.expediagroup.graphql")
5-
kotlin("jvm") version "1.7.21"
6+
alias(libs.plugins.kotlin.jvm)
67
}
78

89
repositories {
@@ -16,7 +17,7 @@ repositories {
1617

1718
dependencies {
1819
implementation("com.expediagroup:graphql-kotlin-spring-client")
19-
implementation("org.jetbrains.kotlin:kotlin-stdlib:1.7.21")
20+
implementation(libs.kotlin.stdlib)
2021
}
2122

2223
val graphqlGenerateClient by tasks.getting(GraphQLGenerateClientTask::class) {

plugins/graphql-kotlin-gradle-plugin/src/integration/download-sdl-timeout/build.gradle.kts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
import com.expediagroup.graphql.plugin.gradle.config.TimeoutConfiguration
22
import com.expediagroup.graphql.plugin.gradle.tasks.GraphQLDownloadSDLTask
33

4+
@Suppress("DSL_SCOPE_VIOLATION") // TODO: remove once KTIJ-19369 / Gradle#22797 is fi
45
plugins {
56
id("com.expediagroup.graphql")
6-
kotlin("jvm") version "1.7.21"
7+
alias(libs.plugins.kotlin.jvm)
78
}
89

910
repositories {
@@ -17,7 +18,7 @@ repositories {
1718

1819
dependencies {
1920
implementation("com.expediagroup:graphql-kotlin-spring-client")
20-
implementation("org.jetbrains.kotlin:kotlin-stdlib:1.7.21")
21+
implementation(libs.kotlin.stdlib)
2122
}
2223

2324
val serverUrl = System.getenv("wireMockServerUrl") ?: System.getProperty("wireMockServerUrl")
Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,28 @@
11
import com.expediagroup.graphql.plugin.gradle.config.TimeoutConfiguration
22
import com.expediagroup.graphql.plugin.gradle.tasks.GraphQLIntrospectSchemaTask
33

4+
@Suppress("DSL_SCOPE_VIOLATION") // TODO: remove once KTIJ-19369 / Gradle#22797 is fi
45
plugins {
5-
kotlin("jvm") version "1.7.21"
6-
id("com.expediagroup.graphql")
6+
id("com.expediagroup.graphql")
7+
alias(libs.plugins.kotlin.jvm)
78
}
89

910
repositories {
10-
mavenCentral()
11-
mavenLocal {
12-
content {
13-
includeGroup("com.expediagroup")
11+
mavenCentral()
12+
mavenLocal {
13+
content {
14+
includeGroup("com.expediagroup")
15+
}
1416
}
15-
}
1617
}
1718

1819
dependencies {
19-
implementation("org.jetbrains.kotlin:kotlin-stdlib:1.7.21")
20-
implementation("com.expediagroup:graphql-kotlin-spring-client")
20+
implementation("com.expediagroup:graphql-kotlin-spring-client")
21+
implementation(libs.kotlin.stdlib)
2122
}
2223

2324
val serverUrl = System.getenv("wireMockServerUrl") ?: System.getProperty("wireMockServerUrl")
2425
val graphqlIntrospectSchema by tasks.getting(GraphQLIntrospectSchemaTask::class) {
25-
endpoint.set("$serverUrl/graphql")
26-
timeoutConfig.set(com.expediagroup.graphql.plugin.gradle.config.TimeoutConfiguration(connect = 100, read = 100))
26+
endpoint.set("$serverUrl/graphql")
27+
timeoutConfig.set(com.expediagroup.graphql.plugin.gradle.config.TimeoutConfiguration(connect = 100, read = 100))
2728
}

plugins/graphql-kotlin-gradle-plugin/src/test/kotlin/com/expediagroup/graphql/plugin/gradle/tasks/GraphQLDownloadSDLTaskIT.kt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,9 @@ class GraphQLDownloadSDLTaskIT : WireMockAbstractIT() {
3838
val sourceDirectory = File("src/integration/download-sdl-timeout")
3939
sourceDirectory.copyRecursively(testProjectDirectory)
4040

41+
// version catalog setup
42+
File("../../gradle/libs.versions.toml").copyTo(File(testProjectDirectory, "gradle/libs.versions.toml"))
43+
4144
WireMock.reset()
4245
WireMock.stubFor(stubSdlEndpoint(delay = 10_000))
4346

plugins/graphql-kotlin-gradle-plugin/src/test/kotlin/com/expediagroup/graphql/plugin/gradle/tasks/GraphQLGenerateClientTaskIT.kt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,9 @@ class GraphQLGenerateClientTaskIT : WireMockAbstractIT() {
3737
val sourceDirectory = File("src/integration/download-sdl-timeout")
3838
sourceDirectory.copyRecursively(testProjectDirectory)
3939

40+
// version catalog setup
41+
File("../../gradle/libs.versions.toml").copyTo(File(testProjectDirectory, "gradle/libs.versions.toml"))
42+
4043
val buildResult = GradleRunner.create()
4144
.withProjectDir(testProjectDirectory)
4245
.withPluginClasspath()

plugins/graphql-kotlin-gradle-plugin/src/test/kotlin/com/expediagroup/graphql/plugin/gradle/tasks/GraphQLIntrospectSchemaTaskIT.kt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,9 @@ class GraphQLIntrospectSchemaTaskIT : WireMockAbstractIT() {
3838
val sourceDirectory = File("src/integration/introspection-timeout")
3939
sourceDirectory.copyRecursively(testProjectDirectory)
4040

41+
// version catalog setup
42+
File("../../gradle/libs.versions.toml").copyTo(File(testProjectDirectory, "gradle/libs.versions.toml"))
43+
4144
WireMock.reset()
4245
WireMock.stubFor(stubIntrospectionResult(delay = 10_000))
4346

0 commit comments

Comments
 (0)