Skip to content

Commit 05794cc

Browse files
authored
Merge pull request #760 from graphql-java-kickstart/upgrade-java-11
Upgrade to Java 11
2 parents b2060cd + e3665bd commit 05794cc

File tree

2 files changed

+37
-6
lines changed

2 files changed

+37
-6
lines changed

pom.xml

+13-6
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1616
<java.version>11</java.version>
1717
<kotlin.version>1.8.21</kotlin.version>
18-
<kotlin-coroutines.version>1.6.4</kotlin-coroutines.version>
18+
<kotlin-coroutines.version>1.7.3</kotlin-coroutines.version>
1919
<jackson.version>2.15.2</jackson.version>
2020
<graphql-java.version>21.0</graphql-java.version>
2121
<reactive-streams.version>1.0.4</reactive-streams.version>
@@ -134,18 +134,25 @@
134134
<dependency>
135135
<groupId>org.jetbrains.kotlin</groupId>
136136
<artifactId>kotlin-stdlib</artifactId>
137+
<!--TODO remove this after upgrading kotlin-->
138+
<exclusions>
139+
<exclusion>
140+
<groupId>org.jetbrains</groupId>
141+
<artifactId>annotations</artifactId>
142+
</exclusion>
143+
</exclusions>
137144
</dependency>
138145
<dependency>
139146
<groupId>org.jetbrains.kotlin</groupId>
140147
<artifactId>kotlin-reflect</artifactId>
141148
</dependency>
142149
<dependency>
150+
<!--
151+
Depending on kotlinx-coroutines-core causes an ambiguous module reference warning.
152+
See https://github.com/Kotlin/kotlinx.coroutines/issues/3842
153+
-->
143154
<groupId>org.jetbrains.kotlinx</groupId>
144-
<artifactId>kotlinx-coroutines-jdk8</artifactId>
145-
</dependency>
146-
<dependency>
147-
<groupId>org.jetbrains.kotlinx</groupId>
148-
<artifactId>kotlinx-coroutines-core</artifactId>
155+
<artifactId>kotlinx-coroutines-core-jvm</artifactId>
149156
</dependency>
150157
<dependency>
151158
<groupId>org.jetbrains.kotlinx</groupId>

src/main/kotlin/module-info.java

+24
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
module graphql.java.tools {
2+
requires kotlin.stdlib;
3+
requires kotlin.reflect;
4+
requires kotlinx.coroutines.core;
5+
requires kotlinx.coroutines.reactive;
6+
7+
requires com.graphqljava;
8+
9+
requires com.fasterxml.jackson.core;
10+
requires com.fasterxml.jackson.kotlin;
11+
requires com.fasterxml.jackson.databind;
12+
requires com.fasterxml.jackson.datatype.jdk8;
13+
requires com.fasterxml.classmate;
14+
15+
requires org.antlr.antlr4.runtime;
16+
requires org.apache.commons.lang3;
17+
requires org.reactivestreams;
18+
requires org.slf4j;
19+
requires spring.aop;
20+
21+
exports graphql.kickstart.tools;
22+
23+
opens graphql.kickstart.tools to com.fasterxml.jackson.databind;
24+
}

0 commit comments

Comments
 (0)