mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-02-08 13:17:38 -08:00
ee4ae9f475
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>
29 lines
1.3 KiB
Diff
29 lines
1.3 KiB
Diff
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
|
|
|