Merge pull request #760 from graphql-java-kickstart/upgrade-java-11

Upgrade to Java 11
graphql-java-kickstart · Aug 18, 2023 · 05794cc · 05794cc
2 parents b2060cd + e3665bd
commit 05794cc
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 6 deletions.
diff --git a/pom.xml b/pom.xml
@@ -15,7 +15,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <java.version>11</java.version>
         <kotlin.version>1.8.21</kotlin.version>
-        <kotlin-coroutines.version>1.6.4</kotlin-coroutines.version>
+        <kotlin-coroutines.version>1.7.3</kotlin-coroutines.version>
         <jackson.version>2.15.2</jackson.version>
         <graphql-java.version>21.0</graphql-java.version>
         <reactive-streams.version>1.0.4</reactive-streams.version>
@@ -134,18 +134,25 @@
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>
             <artifactId>kotlin-stdlib</artifactId>
+            <!--TODO remove this after upgrading kotlin-->
+            <exclusions>
+                <exclusion>
+                    <groupId>org.jetbrains</groupId>
+                    <artifactId>annotations</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>
             <artifactId>kotlin-reflect</artifactId>
         </dependency>
         <dependency>
+            <!--
+            Depending on kotlinx-coroutines-core causes an ambiguous module reference warning.
+            See https://github.com/Kotlin/kotlinx.coroutines/issues/3842
+            -->
             <groupId>org.jetbrains.kotlinx</groupId>
-            <artifactId>kotlinx-coroutines-jdk8</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.jetbrains.kotlinx</groupId>
-            <artifactId>kotlinx-coroutines-core</artifactId>
+            <artifactId>kotlinx-coroutines-core-jvm</artifactId>
         </dependency>
         <dependency>
             <groupId>org.jetbrains.kotlinx</groupId>

diff --git a/src/main/kotlin/module-info.java b/src/main/kotlin/module-info.java
@@ -0,0 +1,24 @@
+module graphql.java.tools {
+    requires kotlin.stdlib;
+    requires kotlin.reflect;
+    requires kotlinx.coroutines.core;
+    requires kotlinx.coroutines.reactive;
+
+    requires com.graphqljava;
+
+    requires com.fasterxml.jackson.core;
+    requires com.fasterxml.jackson.kotlin;
+    requires com.fasterxml.jackson.databind;
+    requires com.fasterxml.jackson.datatype.jdk8;
+    requires com.fasterxml.classmate;
+
+    requires org.antlr.antlr4.runtime;
+    requires org.apache.commons.lang3;
+    requires org.reactivestreams;
+    requires org.slf4j;
+    requires spring.aop;
+
+    exports graphql.kickstart.tools;
+
+    opens graphql.kickstart.tools to com.fasterxml.jackson.databind;
+}