[gradle] 02/04: Fixed the build failure with Ant 1.10 (Closes: #894641)

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Wed Apr 4 15:33:03 UTC 2018


This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository gradle.

commit 6e9fe9e51798dccd12555b9dc6c3d302325023e9
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Apr 4 16:48:06 2018 +0200

    Fixed the build failure with Ant 1.10 (Closes: #894641)
---
 debian/changelog                  |  1 +
 debian/patches/series             |  1 +
 debian/patches/source-level.patch | 14 ++++++++++++++
 3 files changed, 16 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 7bbf1fc..cab7f03 100644
--- 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 at apache.org>  Wed, 04 Apr 2018 13:34:54 +0200
 
diff --git a/debian/patches/series b/debian/patches/series
index cc47f22..f7a5fb7 100644
--- 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
diff --git a/debian/patches/source-level.patch b/debian/patches/source-level.patch
new file mode 100644
index 0000000..78c1e61
--- /dev/null
+++ b/debian/patches/source-level.patch
@@ -0,0 +1,14 @@
+Description: Set the language level to 1.8 to fix the build failure with Ant 1.10
+Author: Emmanuel Bourg <ebourg at 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

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/gradle.git



More information about the pkg-java-commits mailing list