Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
M
mockito
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container registry
Model registry
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Debian Java Maintainers
mockito
Commits
4331c15d
Commit
4331c15d
authored
6 years ago
by
Markus Koschany
Browse files
Options
Downloads
Patches
Plain Diff
Update 06-source-target-level.patch
parent
b63417e7
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
debian/patches/06-source-target-level.patch
+54
-3
54 additions, 3 deletions
debian/patches/06-source-target-level.patch
with
54 additions
and
3 deletions
debian/patches/06-source-target-level.patch
+
54
−
3
View file @
4331c15d
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
+}
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment