Fixed the build failure with Ant 1.10 (Closes: #894641)

6e9fe9e5 · Emmanuel Bourg · b06af42d · 6e9fe9e5 · 6e9fe9e5 · 6e9fe9e5
Commit 6e9fe9e5 authored 7 years ago by Emmanuel Bourg
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ gradle (3.4.1-5) UNRELEASED; urgency=medium

  * Team upload.
  * Backported a fix to support the javac --module-source-path option
+  * Fixed the build failure with Ant 1.10 (Closes: #894641)

 -- Emmanuel Bourg <ebourg@apache.org>  Wed, 04 Apr 2018 13:34:54 +0200


--- a/debian/patches/series
+++ b/debian/patches/series
@@ -28,3 +28,4 @@ support-running-gradle-on-jdk-10-500485df3a18.patch
 add-test-case-for-10-internal_c1fe5e40a76b.patch
 support-zulu9-version-number_d9c35cf9d74c.patch
 disallow-both-module-source-path-and-source-path.patch
+source-level.patch
--- a/debian/patches/source-level.patch
+++ b/debian/patches/source-level.patch
+Description: Set the language level to 1.8 to fix the build failure with Ant 1.10
+Author: Emmanuel Bourg <ebourg@apache.org>
+Forwarded: not-needed
+--- a/subprojects/core/core.gradle
+++ b/subprojects/core/core.gradle
+@@ -14,7 +14,7 @@
+  * limitations under the License.
+  */
+ 
+-sourceCompatibility = javaVersion.java9Compatible ? 1.6 : 1.5
+sourceCompatibility = 1.8
+ 
+ configurations {
+     reports