Update shaded package name

projectnessie · Nov 2, 2021 · 5341112 · 5341112
1 parent 898b4ab
commit 5341112
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 28 deletions.
diff --git a/core/src/main/java/org/projectnessie/cel/parser/Helper.java b/core/src/main/java/org/projectnessie/cel/parser/Helper.java
@@ -35,8 +35,8 @@
 import org.agrona.collections.LongArrayList;
 import org.projectnessie.cel.common.Location;
 import org.projectnessie.cel.common.Source;
-import org.projectnessie.cel.parser.gen.antlr.v4.runtime.ParserRuleContext;
-import org.projectnessie.cel.parser.gen.antlr.v4.runtime.Token;
+import org.projectnessie.cel.shaded.org.antlr.v4.runtime.ParserRuleContext;
+import org.projectnessie.cel.shaded.org.antlr.v4.runtime.Token;
 
 final class Helper {
   private final Source source;

diff --git a/core/src/main/java/org/projectnessie/cel/parser/Parser.java b/core/src/main/java/org/projectnessie/cel/parser/Parser.java
@@ -70,22 +70,22 @@
 import org.projectnessie.cel.parser.gen.CELParser.StringContext;
 import org.projectnessie.cel.parser.gen.CELParser.UintContext;
 import org.projectnessie.cel.parser.gen.CELParser.UnaryContext;
-import org.projectnessie.cel.parser.gen.antlr.v4.runtime.ANTLRErrorListener;
-import org.projectnessie.cel.parser.gen.antlr.v4.runtime.CommonTokenStream;
-import org.projectnessie.cel.parser.gen.antlr.v4.runtime.DefaultErrorStrategy;
-import org.projectnessie.cel.parser.gen.antlr.v4.runtime.IntStream;
-import org.projectnessie.cel.parser.gen.antlr.v4.runtime.ParserRuleContext;
-import org.projectnessie.cel.parser.gen.antlr.v4.runtime.RecognitionException;
-import org.projectnessie.cel.parser.gen.antlr.v4.runtime.Recognizer;
-import org.projectnessie.cel.parser.gen.antlr.v4.runtime.RuleContext;
-import org.projectnessie.cel.parser.gen.antlr.v4.runtime.Token;
-import org.projectnessie.cel.parser.gen.antlr.v4.runtime.atn.ATNConfigSet;
-import org.projectnessie.cel.parser.gen.antlr.v4.runtime.dfa.DFA;
-import org.projectnessie.cel.parser.gen.antlr.v4.runtime.tree.AbstractParseTreeVisitor;
-import org.projectnessie.cel.parser.gen.antlr.v4.runtime.tree.ErrorNode;
-import org.projectnessie.cel.parser.gen.antlr.v4.runtime.tree.ParseTree;
-import org.projectnessie.cel.parser.gen.antlr.v4.runtime.tree.ParseTreeListener;
-import org.projectnessie.cel.parser.gen.antlr.v4.runtime.tree.TerminalNode;
+import org.projectnessie.cel.shaded.org.antlr.v4.runtime.ANTLRErrorListener;
+import org.projectnessie.cel.shaded.org.antlr.v4.runtime.CommonTokenStream;
+import org.projectnessie.cel.shaded.org.antlr.v4.runtime.DefaultErrorStrategy;
+import org.projectnessie.cel.shaded.org.antlr.v4.runtime.IntStream;
+import org.projectnessie.cel.shaded.org.antlr.v4.runtime.ParserRuleContext;
+import org.projectnessie.cel.shaded.org.antlr.v4.runtime.RecognitionException;
+import org.projectnessie.cel.shaded.org.antlr.v4.runtime.Recognizer;
+import org.projectnessie.cel.shaded.org.antlr.v4.runtime.RuleContext;
+import org.projectnessie.cel.shaded.org.antlr.v4.runtime.Token;
+import org.projectnessie.cel.shaded.org.antlr.v4.runtime.atn.ATNConfigSet;
+import org.projectnessie.cel.shaded.org.antlr.v4.runtime.dfa.DFA;
+import org.projectnessie.cel.shaded.org.antlr.v4.runtime.tree.AbstractParseTreeVisitor;
+import org.projectnessie.cel.shaded.org.antlr.v4.runtime.tree.ErrorNode;
+import org.projectnessie.cel.shaded.org.antlr.v4.runtime.tree.ParseTree;
+import org.projectnessie.cel.shaded.org.antlr.v4.runtime.tree.ParseTreeListener;
+import org.projectnessie.cel.shaded.org.antlr.v4.runtime.tree.TerminalNode;
 
 public final class Parser {
 
@@ -259,20 +259,20 @@ private RecoveryLimitErrorStrategy(int maxAttempts) {
 
     @Override
     public void recover(
-        org.projectnessie.cel.parser.gen.antlr.v4.runtime.Parser recognizer,
+        org.projectnessie.cel.shaded.org.antlr.v4.runtime.Parser recognizer,
         RecognitionException e) {
       checkAttempts(recognizer);
       super.recover(recognizer, e);
     }
 
     @Override
-    public Token recoverInline(org.projectnessie.cel.parser.gen.antlr.v4.runtime.Parser recognizer)
+    public Token recoverInline(org.projectnessie.cel.shaded.org.antlr.v4.runtime.Parser recognizer)
         throws RecognitionException {
       checkAttempts(recognizer);
       return super.recoverInline(recognizer);
     }
 
-    void checkAttempts(org.projectnessie.cel.parser.gen.antlr.v4.runtime.Parser recognizer)
+    void checkAttempts(org.projectnessie.cel.shaded.org.antlr.v4.runtime.Parser recognizer)
         throws RecognitionException {
       if (attempts >= maxAttempts) {
         attempts++;
@@ -307,7 +307,7 @@ public void syntaxError(
 
     @Override
     public void reportAmbiguity(
-        org.projectnessie.cel.parser.gen.antlr.v4.runtime.Parser recognizer,
+        org.projectnessie.cel.shaded.org.antlr.v4.runtime.Parser recognizer,
         DFA dfa,
         int startIndex,
         int stopIndex,
@@ -319,7 +319,7 @@ public void reportAmbiguity(
 
     @Override
     public void reportAttemptingFullContext(
-        org.projectnessie.cel.parser.gen.antlr.v4.runtime.Parser recognizer,
+        org.projectnessie.cel.shaded.org.antlr.v4.runtime.Parser recognizer,
         DFA dfa,
         int startIndex,
         int stopIndex,
@@ -330,7 +330,7 @@ public void reportAttemptingFullContext(
 
     @Override
     public void reportContextSensitivity(
-        org.projectnessie.cel.parser.gen.antlr.v4.runtime.Parser recognizer,
+        org.projectnessie.cel.shaded.org.antlr.v4.runtime.Parser recognizer,
         DFA dfa,
         int startIndex,
         int stopIndex,

diff --git a/core/src/main/java/org/projectnessie/cel/parser/StringCharStream.java b/core/src/main/java/org/projectnessie/cel/parser/StringCharStream.java
@@ -15,9 +15,9 @@
  */
 package org.projectnessie.cel.parser;
 
-import org.projectnessie.cel.parser.gen.antlr.v4.runtime.CharStream;
-import org.projectnessie.cel.parser.gen.antlr.v4.runtime.IntStream;
-import org.projectnessie.cel.parser.gen.antlr.v4.runtime.misc.Interval;
+import org.projectnessie.cel.shaded.org.antlr.v4.runtime.CharStream;
+import org.projectnessie.cel.shaded.org.antlr.v4.runtime.IntStream;
+import org.projectnessie.cel.shaded.org.antlr.v4.runtime.misc.Interval;
 
 public final class StringCharStream implements CharStream {
 

diff --git a/generated-antlr/build.gradle.kts b/generated-antlr/build.gradle.kts
@@ -47,7 +47,7 @@ tasks.named<ShadowJar>("shadowJar") {
     dependencies {
         include(dependency("org.antlr:antlr4-runtime"))
     }
-    relocate("org.antlr.v4.runtime", "org.projectnessie.cel.parser.gen.antlr.v4.runtime")
+    relocate("org.antlr.v4.runtime", "org.projectnessie.cel.shaded.org.antlr.v4.runtime")
     archiveClassifier.set("")
 }