Commit 4331c15d authored by Markus Koschany's avatar Markus Koschany
Browse files

Update 06-source-target-level.patch

parent b63417e7
Loading
Loading
Loading
Loading
+54 −3
Original line number Diff line number Diff line
Description: Increases the source/target level to fix the build failure with Java 9
Author: Emmanuel Bourg <ebourg@apache.org>
From: Emmanuel Bourg <ebourg@apache.org>
Date: Tue, 30 Oct 2018 22:07:57 +0100
Subject: Increases the source/target level to fix the build failure with Java
 9 and 11

Forwarded: no
---
 build.gradle                     | 4 ++--
 buildSrc/build.gradle            | 4 +++-
 subprojects/testng/testng.gradle | 4 +++-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/build.gradle b/build.gradle
index 9602590..dbb32e8 100644
--- a/build.gradle
+++ b/build.gradle
@@ -26,8 +26,8 @@
@@ -26,8 +26,8 @@ apply plugin: 'java'
 
 group = 'org.mockito'
 description = 'Core API and implementation.'
@@ -14,3 +25,43 @@ Forwarded: no
 
 configurations {
     provided
diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
index 76b015b..082338a 100644
--- a/buildSrc/build.gradle
+++ b/buildSrc/build.gradle
@@ -1,6 +1,8 @@
 apply plugin: 'idea'
 apply plugin: 'groovy'
 
+sourceCompatibility = 1.7
+targetCompatibility = 1.7
 repositories { jcenter() }
 
 dependencies {
@@ -16,4 +18,4 @@ dependencies {
 
 if (gradle.parent && gradle.parent.startParameter.taskNames.any { it in ["ideaModule", "idea"] }) {
     build.dependsOn ideaModule
-}
\ No newline at end of file
+}
diff --git a/subprojects/testng/testng.gradle b/subprojects/testng/testng.gradle
index d6d304a..64281b5 100644
--- a/subprojects/testng/testng.gradle
+++ b/subprojects/testng/testng.gradle
@@ -2,6 +2,8 @@ apply plugin: 'java'
 apply plugin: 'maven'
 description = "Mockito for TestNG"
 
+sourceCompatibility = 1.7
+targetCompatibility = 1.7
 //TODO SF ensure this one is released, too (ensure source and target compatibility, too).
 
 Properties props = new Properties()
@@ -54,4 +56,4 @@ test {
     useTestNG() {
         suites file('src/test/resources/mockito-testng.xml')
     }
-}
\ No newline at end of file
+}