From 5eccead16bc430883e6c2e1020a8390db091c57c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jari-Matti=20M=C3=A4kel=C3=A4?= <jmjmak@utu.fi>
Date: Wed, 6 Mar 2024 19:14:47 +0200
Subject: [PATCH] Fixes for the modular build
---
.../ext/gfm/tables/internal/TableMarkdownNodeRenderer.java | 2 +-
commonmark/src/main/java/module-info.java | 2 ++
.../renderer/markdown/CoreMarkdownNodeRenderer.java | 4 ++--
.../java/org/commonmark/renderer/markdown/MarkdownWriter.java | 2 +-
4 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/commonmark-ext-gfm-tables/src/main/java/org/commonmark/ext/gfm/tables/internal/TableMarkdownNodeRenderer.java b/commonmark-ext-gfm-tables/src/main/java/org/commonmark/ext/gfm/tables/internal/TableMarkdownNodeRenderer.java
index 48714716..034a7f0b 100644
--- a/commonmark-ext-gfm-tables/src/main/java/org/commonmark/ext/gfm/tables/internal/TableMarkdownNodeRenderer.java
+++ b/commonmark-ext-gfm-tables/src/main/java/org/commonmark/ext/gfm/tables/internal/TableMarkdownNodeRenderer.java
@@ -2,8 +2,8 @@ package org.commonmark.ext.gfm.tables.internal;
import org.commonmark.ext.gfm.tables.*;
import org.commonmark.internal.util.AsciiMatcher;
-import org.commonmark.internal.util.CharMatcher;
import org.commonmark.node.Node;
+import org.commonmark.parser.beta.CharMatcher;
import org.commonmark.renderer.NodeRenderer;
import org.commonmark.renderer.markdown.MarkdownNodeRendererContext;
import org.commonmark.renderer.markdown.MarkdownWriter;
diff --git a/commonmark/src/main/java/module-info.java b/commonmark/src/main/java/module-info.java
index 4101708c..f216d798 100644
--- a/commonmark/src/main/java/module-info.java
+++ b/commonmark/src/main/java/module-info.java
@@ -8,4 +8,6 @@ module org.commonmark {
exports org.commonmark.renderer;
exports org.commonmark.renderer.html;
exports org.commonmark.renderer.text;
+ exports org.commonmark.renderer.markdown;
+ exports org.commonmark.internal.util;
}
diff --git a/commonmark/src/main/java/org/commonmark/renderer/markdown/CoreMarkdownNodeRenderer.java b/commonmark/src/main/java/org/commonmark/renderer/markdown/CoreMarkdownNodeRenderer.java
index 30d6d1a5..f50e4854 100644
--- a/commonmark/src/main/java/org/commonmark/renderer/markdown/CoreMarkdownNodeRenderer.java
+++ b/commonmark/src/main/java/org/commonmark/renderer/markdown/CoreMarkdownNodeRenderer.java
@@ -1,9 +1,9 @@
package org.commonmark.renderer.markdown;
import org.commonmark.internal.util.AsciiMatcher;
-import org.commonmark.internal.util.CharMatcher;
-import org.commonmark.internal.util.Parsing;
import org.commonmark.node.*;
+import org.commonmark.parser.beta.CharMatcher;
+import org.commonmark.parser.beta.Parsing;
import org.commonmark.renderer.NodeRenderer;
import java.util.Arrays;
diff --git a/commonmark/src/main/java/org/commonmark/renderer/markdown/MarkdownWriter.java b/commonmark/src/main/java/org/commonmark/renderer/markdown/MarkdownWriter.java
index 1231a4a7..b254b46d 100644
--- a/commonmark/src/main/java/org/commonmark/renderer/markdown/MarkdownWriter.java
+++ b/commonmark/src/main/java/org/commonmark/renderer/markdown/MarkdownWriter.java
@@ -1,6 +1,6 @@
package org.commonmark.renderer.markdown;
-import org.commonmark.internal.util.CharMatcher;
+import org.commonmark.parser.beta.CharMatcher;
import java.io.IOException;
import java.util.LinkedList;
--
GitLab