Skip to content

Commit f989690

Browse files
authored
Merge pull request #482 from graphql-java-kickstart/replace-groovy-with-kotlin
Replace groovy with kotlin
2 parents d0d5e57 + d6f4811 commit f989690

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+3022
-3273
lines changed

pom.xml

Lines changed: 3 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -155,9 +155,9 @@
155155
</exclusions>
156156
</dependency>
157157
<dependency>
158-
<groupId>org.spockframework</groupId>
159-
<artifactId>spock-core</artifactId>
160-
<version>1.0-groovy-2.4</version>
158+
<groupId>junit</groupId>
159+
<artifactId>junit</artifactId>
160+
<version>4.12</version>
161161
<scope>test</scope>
162162
</dependency>
163163
<dependency>
@@ -209,7 +209,6 @@
209209
<configuration>
210210
<sources>
211211
<source>src/test/kotlin</source>
212-
<source>src/test/groovy</source>
213212
</sources>
214213
</configuration>
215214
</execution>
@@ -240,23 +239,6 @@
240239
</plugin>
241240

242241

243-
<!-- Compile Groovy tests -->
244-
<plugin>
245-
<groupId>org.codehaus.gmavenplus</groupId>
246-
<artifactId>gmavenplus-plugin</artifactId>
247-
<version>1.5</version>
248-
<executions>
249-
<execution>
250-
<goals>
251-
<goal>generateStubs</goal>
252-
<goal>testGenerateStubs</goal>
253-
<goal>addTestSources</goal>
254-
<goal>testCompile</goal>
255-
</goals>
256-
</execution>
257-
</executions>
258-
</plugin>
259-
260242
<plugin>
261243
<groupId>org.apache.maven.plugins</groupId>
262244
<artifactId>maven-compiler-plugin</artifactId>
@@ -279,7 +261,6 @@
279261
</dependencies>
280262
<configuration>
281263
<includes>
282-
<include>**/*Spec.*</include>
283264
<include>**/*Test.*</include>
284265
</includes>
285266
</configuration>

src/test/groovy/graphql/kickstart/tools/BuiltInIdSpec.groovy

Lines changed: 0 additions & 134 deletions
This file was deleted.

0 commit comments

Comments
 (0)