From 30586e57c22c30572cf66998835cfb87cc6206ee Mon Sep 17 00:00:00 2001
From: Oryan M <oryan.mat@eblock.ca>
Date: Wed, 9 Aug 2023 13:24:20 -0400
Subject: [PATCH 1/2] Fix javadoc error by adding module-info

---
 pom.xml                          | 11 +++++++++--
 src/main/kotlin/module-info.java | 24 ++++++++++++++++++++++++
 2 files changed, 33 insertions(+), 2 deletions(-)
 create mode 100644 src/main/kotlin/module-info.java

diff --git a/pom.xml b/pom.xml
index 74ea6ee2..00a962a7 100644
--- 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,6 +134,13 @@
         <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>
@@ -141,7 +148,7 @@
         </dependency>
         <dependency>
             <groupId>org.jetbrains.kotlinx</groupId>
-            <artifactId>kotlinx-coroutines-jdk8</artifactId>
+            <artifactId>kotlinx-coroutines-jdk9</artifactId>
         </dependency>
         <dependency>
             <groupId>org.jetbrains.kotlinx</groupId>
diff --git a/src/main/kotlin/module-info.java b/src/main/kotlin/module-info.java
new file mode 100644
index 00000000..2ec2dd1b
--- /dev/null
+++ 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;
+}

From e3665bd21828b453bf61b124c6c4ce3259ee5555 Mon Sep 17 00:00:00 2001
From: oryan <oryan.mat@eblock.ca>
Date: Fri, 18 Aug 2023 09:26:10 -0400
Subject: [PATCH 2/2] Fix coroutines module warning

---
 pom.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index 00a962a7..939b1028 100644
--- a/pom.xml
+++ b/pom.xml
@@ -147,12 +147,12 @@
             <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-jdk9</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>