gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-11-03 04:37:06 -08:00
Code Issues Projects Releases Wiki Activity

dev-java/stringtemplate: Add 4.3.1, resolve antlr-3.5 circular dep

Browse Source 
stringtemplate-4 requires antlr-3.5 only during the build time to
generate *.java files from src/org/stringtemplate/v4/compiler/*.g files.
This causes the circular dependency issue described by the linked bug
since antlr-3.5 depends on stringtemplate-4.  Fortunately, the sources
JAR for stringtemplate 4.3.1 from Maven Central contains those generated
*.java files (presumably pre-generated by the upstream), so if the Java
sources from that JAR are used, the build-time dependency on antlr-3.5
can be eliminated, finally resolving this chicken-or-egg problem.

Bug: https://bugs.gentoo.org/742554
Signed-off-by: Yuan Liao <liaoyuan@gmail.com>
Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>
This commit is contained in:
Yuan Liao
2022-01-25 10:30:03 +01:00
committed by Miroslav Šulc
parent 909450e1de
commit ee4ae9f475
3 changed files with 104 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dev-java/stringtemplate/files/stringtemplate-4.3.1-BaseTest-javac-source-target.patch
+28
View File
@@ -0,0 +1,28 @@
From 4e12a210f2b933c92ded6ee141f6399144a866f5 Mon Sep 17 00:00:00 2001
From: Yuan Liao <liaoyuan@gmail.com>
Date: Mon, 24 Jan 2022 06:17:03 -0800
Subject: [PATCH] BaseTest.java: Change javac source/target to 1.8 for JDK 17
JDK 17 no longer supports 1.6 as the source or target version.
Signed-off-by: Yuan Liao <liaoyuan@gmail.com>
---
test/org/stringtemplate/v4/test/BaseTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/test/org/stringtemplate/v4/test/BaseTest.java b/test/org/stringtemplate/v4/test/BaseTest.java
index 536d686..74a3949 100644
--- a/test/org/stringtemplate/v4/test/BaseTest.java
+++ b/test/org/stringtemplate/v4/test/BaseTest.java
@@ -258,7 +258,7 @@ public abstract class BaseTest {
fileManager.getJavaFileObjectsFromFiles(files);
Iterable<String> compileOptions =
- Arrays.asList("-g", "-source", "1.6", "-target", "1.6", "-implicit:class", "-Xlint:-options", "-d", workingDirName, "-cp", workingDirName+pathSep+CLASSPATH);
+ Arrays.asList("-g", "-source", "1.8", "-target", "1.8", "-implicit:class", "-Xlint:-options", "-d", workingDirName, "-cp", workingDirName+pathSep+CLASSPATH);
JavaCompiler.CompilationTask task =
compiler.getTask(null, fileManager, null, compileOptions, null,
--
2.34.1