From d1c3e0260dcb2d8f64ab4a96c7f9fa05188fc5d9 Mon Sep 17 00:00:00 2001
From: Sam Gammon <sam@elide.ventures>
Date: Wed, 21 Feb 2024 21:13:20 -0800
Subject: [PATCH] fixup! jpms for server module

Signed-off-by: Sam Gammon <sam@elide.ventures>
---
 pkl-core/src/main/java/module-info.java   | 17 ++++++++++++-----
 pkl-server/src/main/java/module-info.java |  3 +++
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/pkl-core/src/main/java/module-info.java b/pkl-core/src/main/java/module-info.java
index f933c4f40..f416f47cd 100644
--- a/pkl-core/src/main/java/module-info.java
+++ b/pkl-core/src/main/java/module-info.java
@@ -26,16 +26,19 @@
       pkl.cli,
       pkl.commons.cli,
       pkl.config.java,
-      pkl.doc;
+      pkl.doc,
+      pkl.server;
   exports org.pkl.core.packages to
       pkl.cli,
       pkl.commons.cli,
       pkl.config.java,
-      pkl.doc;
+      pkl.doc,
+      pkl.server;
   exports org.pkl.core.project to
       pkl.cli,
       pkl.commons.cli,
-      pkl.config.java;
+      pkl.config.java,
+      pkl.server;
   exports org.pkl.core.repl to
       pkl.cli,
       pkl.commons.cli,
@@ -43,11 +46,13 @@
   exports org.pkl.core.resource to
       pkl.cli,
       pkl.commons.cli,
-      pkl.config.java;
+      pkl.config.java,
+      pkl.server;
   exports org.pkl.core.runtime to
       pkl.cli,
       pkl.commons.cli,
-      pkl.config.java;
+      pkl.config.java,
+      pkl.server;
   exports org.pkl.core.stdlib.test.report to
       pkl.cli,
       pkl.commons.cli,
@@ -64,6 +69,8 @@
       pkl.doc;
   exports org.pkl.core.util.json to
       pkl.doc;
+  exports org.pkl.core.ast.member to
+      pkl.server;
   exports org.pkl.core.plugin;
   exports org.pkl.core;
 
diff --git a/pkl-server/src/main/java/module-info.java b/pkl-server/src/main/java/module-info.java
index 0d2456f46..b4ff25f1f 100644
--- a/pkl-server/src/main/java/module-info.java
+++ b/pkl-server/src/main/java/module-info.java
@@ -15,6 +15,9 @@
 /** Pkl: Server. */
 module pkl.server {
   requires java.base;
+  requires kotlin.stdlib;
+
+  requires pkl.core;
 
   exports org.pkl.server;
 }