Skip to content

Commit 2661efc

Browse files
committed
Removed Groovy plugin usage.
1 parent 4dd2183 commit 2661efc

8 files changed

Lines changed: 9 additions & 31 deletions

File tree

build.gradle.kts

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,7 @@ plugins {
88
alias(libs.plugins.tailrocks.idea) apply false
99
alias(libs.plugins.tailrocks.junit) apply false
1010
alias(libs.plugins.tailrocks.versions) apply false
11-
alias(libs.plugins.kotlin.jvm) apply false
12-
alias(libs.plugins.kotlin.kapt) apply false
13-
alias(libs.plugins.kotlin.plugin.allopen) apply false
11+
alias(libs.plugins.tailrocks.kotlin) apply false
1412
alias(libs.plugins.spring.dependency.management) apply false
1513
alias(libs.plugins.spring.boot) apply false
1614
}
@@ -49,8 +47,5 @@ subprojects {
4947
implementation(platform(rootProject.libs.boms.junit))
5048
testImplementation("org.junit.jupiter:junit-jupiter-api")
5149
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
52-
53-
// TODO remove after Spock started supports junit-jupiter engine
54-
testRuntimeOnly("org.junit.vintage:junit-vintage-engine")
5550
}
5651
}

gradle.properties

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,13 @@ org.gradle.caching=true
22
org.gradle.daemon=true
33
org.gradle.parallel=true
44
org.gradle.configureondemand=false
5+
org.gradle.unsafe.configuration-cache=false
56
org.gradle.jvmargs=-Dfile.encoding=UTF-8 -Duser.timezone=UTC
67

78
kotlin.stdlib.default.dependency=false
89

10+
systemProp.org.gradle.kotlin.dsl.precompiled.accessors.strict=true
11+
912
# Project
1013

1114
projectVersion=6.0.0-SNAPSHOT

gradle/libs.versions.toml

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
11
[versions]
22
# Libraries
3-
kotlin = "1.7.21"
4-
groovy = "3.0.13"
53
junit = "5.9.1"
64
graphql-java = "18.3"
75
graphql-kickstart-spring-boot = "14.1.0"
86
commons-text = "1.10.0"
97
spring-boot = "3.0.0"
10-
spock = "2.3-groovy-4.0"
118
dgs = "5.4.3"
129

1310
[libraries]
@@ -17,11 +14,8 @@ boms-spring-boot = { module = "org.springframework.boot:spring-boot-dependencies
1714
boms-dgs = { module = "com.netflix.graphql.dgs:graphql-dgs-platform-dependencies", version.ref = "dgs" }
1815

1916
# Libraries
20-
groovy-all = { module = "org.codehaus.groovy:groovy-all", version.ref = "groovy" }
2117
graphql-kickstart-spring-boot-starter = { module = "com.graphql-java-kickstart:graphql-spring-boot-starter", version.ref = "graphql-kickstart-spring-boot" }
2218
commons-text = { module = "org.apache.commons:commons-text", version.ref = "commons-text" }
23-
spock-core = { module = "org.spockframework:spock-core", version.ref = "spock" }
24-
spock-spring = { module = "org.spockframework:spock-spring", version.ref = "spock" }
2519
graphql-java = { module = "com.graphql-java:graphql-java", version.ref = "graphql-java" }
2620
tailrocks-maven-publish-conventions = { module = "com.tailrocks.gradle:maven-publish-conventions", version = "0.2.0" }
2721
tailrocks-signing-conventions = { module = "com.tailrocks.gradle:signing-conventions", version = "0.2.0" }
@@ -33,8 +27,6 @@ tailrocks-java = { id = "com.tailrocks.java", version = "0.1.4" }
3327
tailrocks-idea = { id = "com.tailrocks.idea", version = "0.2.1" }
3428
tailrocks-junit = { id = "com.tailrocks.junit", version = "0.1.5" }
3529
tailrocks-versions = { id = "com.tailrocks.versions", version = "0.1.4" }
36-
kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
37-
kotlin-kapt = { id = "org.jetbrains.kotlin.kapt", version.ref = "kotlin" }
38-
kotlin-plugin-allopen = { id = "org.jetbrains.kotlin.plugin.allopen", version.ref = "kotlin" }
30+
tailrocks-kotlin = { id = "com.tailrocks.kotlin", version = "0.2.0" }
3931
spring-dependency-management = { id = "io.spring.dependency-management", version = "1.1.0" }
4032
spring-boot = { id = "org.springframework.boot", version.ref = "spring-boot" }
Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,9 @@
11
plugins {
2-
groovy
2+
id("com.tailrocks.kotlin")
33
id("com.adarshr.test-logger")
44
id("graphql-datetime-library-conventions")
55
}
66

77
dependencies {
88
api(libs.graphql.java)
9-
10-
testImplementation(libs.groovy.all)
11-
testImplementation(libs.spock.core)
129
}

samples/dgs-webmvc/build.gradle.kts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
plugins {
2-
groovy
2+
id("com.tailrocks.kotlin")
33
id("com.adarshr.test-logger")
44
id("io.spring.dependency-management")
55
id("org.springframework.boot")
@@ -21,7 +21,5 @@ dependencies {
2121
implementation("com.netflix.graphql.dgs:graphql-dgs-spring-boot-starter")
2222
testImplementation("org.springframework.boot:spring-boot-starter-test")
2323

24-
testImplementation(libs.groovy.all)
25-
testImplementation(libs.spock.spring)
2624
testImplementation(libs.commons.text)
2725
}

samples/kickstart-webflux/build.gradle.kts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
plugins {
2-
groovy
2+
id("com.tailrocks.kotlin")
33
id("com.adarshr.test-logger")
44
id("io.spring.dependency-management")
55
id("org.springframework.boot")
@@ -18,7 +18,5 @@ dependencies {
1818
implementation("org.springframework.boot:spring-boot-starter-webflux")
1919
testImplementation("org.springframework.boot:spring-boot-starter-test")
2020

21-
testImplementation(libs.groovy.all)
22-
testImplementation(libs.spock.spring)
2321
testImplementation(libs.commons.text)
2422
}

samples/kickstart-webmvc/build.gradle.kts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
plugins {
2-
groovy
2+
id("com.tailrocks.kotlin")
33
id("com.adarshr.test-logger")
44
id("io.spring.dependency-management")
55
id("org.springframework.boot")
@@ -18,7 +18,5 @@ dependencies {
1818
implementation("org.springframework.boot:spring-boot-starter-web")
1919
testImplementation("org.springframework.boot:spring-boot-starter-test")
2020

21-
testImplementation(libs.groovy.all)
22-
testImplementation(libs.spock.spring)
2321
testImplementation(libs.commons.text)
2422
}

samples/spring-boot-webmvc/build.gradle.kts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
plugins {
2-
groovy
32
id("com.adarshr.test-logger")
43
id("io.spring.dependency-management")
54
id("org.springframework.boot")
@@ -19,7 +18,5 @@ dependencies {
1918
implementation("org.springframework.boot:spring-boot-starter-web")
2019
testImplementation("org.springframework.boot:spring-boot-starter-test")
2120

22-
testImplementation(libs.groovy.all)
23-
testImplementation(libs.spock.spring)
2421
testImplementation(libs.commons.text)
2522
}

0 commit comments

Comments
 (0)