Commit 726f7084 authored by Emmanuel Bourg's avatar Emmanuel Bourg

Adjust the source/target level to 1.7 in anticipation of the 1.6 removal in Java 11

parent 02f1d628
ant (1.9.10-3) UNRELEASED; urgency=medium
* Adjust the source/target level to 1.7 in anticipation of the 1.6 removal
in Java 11
-- Emmanuel Bourg <ebourg@apache.org> Wed, 28 Mar 2018 00:36:12 +0200
ant (1.9.10-2) unstable; urgency=medium
* Non maintainer upload.
......
From: "ebourg@apache.org" <ebourg@apache.org>
Date: Fri, 30 Jun 2017 00:35:44 +0200
Subject: Adjust the source compatibility automatically for Debian builds with
Java 9
Description: Adjust the source compatibility automatically for Debian builds with Java 9
Author: Emmanuel Bourg <ebourg@apache.org>
Forwarded: no
---
src/main/org/apache/tools/ant/taskdefs/Javac.java | 13 ++++-
.../org/apache/tools/ant/taskdefs/Javadoc.java | 7 ++-
.../apache/tools/ant/taskdefs/LanguageLevel.java | 62 ++++++++++++++++++++++
3 files changed, 79 insertions(+), 3 deletions(-)
create mode 100644 src/main/org/apache/tools/ant/taskdefs/LanguageLevel.java
--- a/src/main/org/apache/tools/ant/taskdefs/Javac.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Javac.java
@@ -210,7 +210,10 @@
......@@ -77,10 +67,10 @@ Forwarded: no
+class LanguageLevel {
+
+ /** The minimum language level supported by the current javac */
+ private static final String MIN_LEVEL = "1.6";
+ private static final String MIN_LEVEL = "1.7";
+
+ /** The list of language levels no longer supported by the current javac */
+ private static final List<String> UNSUPPORTED_LEVELS = Arrays.asList(new String[]{"1.1", "1.2", "1.3", "1.4", "1.5", "5"});
+ private static final List<String> UNSUPPORTED_LEVELS = Arrays.asList(new String[]{"1.1", "1.2", "1.3", "1.4", "1.5", "5", "1.6", "6"});
+
+ /** Detect if a Debian build is in process */
+ static boolean isDebianBuild() {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment