From 5ccd7365cb99c213759667bc45c4e87a7235bca1 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Thu, 13 Nov 2014 13:45:34 +0000 Subject: [PATCH] Reinstate Java 7 compatibility --- build.gradle | 4 ++++ spring-restdocs-core/.settings/org.eclipse.jdt.core.prefs | 6 +++--- .../springframework/restdocs/core/IterableEnumeration.java | 5 +++++ 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 47c62655..55117d1a 100644 --- a/build.gradle +++ b/build.gradle @@ -7,6 +7,10 @@ allprojects { project(':spring-restdocs-core') { apply plugin: 'java' + + sourceCompatibility = 1.7 + targetCompatibility = 1.7 + dependencies { compile 'junit:junit:4.11' compile "org.springframework:spring-test:$springVersion" diff --git a/spring-restdocs-core/.settings/org.eclipse.jdt.core.prefs b/spring-restdocs-core/.settings/org.eclipse.jdt.core.prefs index a92f7ab8..521f4160 100644 --- a/spring-restdocs-core/.settings/org.eclipse.jdt.core.prefs +++ b/spring-restdocs-core/.settings/org.eclipse.jdt.core.prefs @@ -1,14 +1,14 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.compliance=1.7 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.8 +org.eclipse.jdt.core.compiler.source=1.7 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 diff --git a/spring-restdocs-core/src/main/java/org/springframework/restdocs/core/IterableEnumeration.java b/spring-restdocs-core/src/main/java/org/springframework/restdocs/core/IterableEnumeration.java index 42f77cc9..b374fbc0 100644 --- a/spring-restdocs-core/src/main/java/org/springframework/restdocs/core/IterableEnumeration.java +++ b/spring-restdocs-core/src/main/java/org/springframework/restdocs/core/IterableEnumeration.java @@ -41,6 +41,11 @@ public final class IterableEnumeration implements Iterable { return IterableEnumeration.this.enumeration.nextElement(); } + @Override + public void remove() { + throw new UnsupportedOperationException(); + } + }; }