diff --git a/build-plugins/src/main/groovy/com/cloudogu/scm/JavaModulePlugin.groovy b/build-plugins/src/main/groovy/com/cloudogu/scm/JavaModulePlugin.groovy index ed3950df99..1db269db72 100644 --- a/build-plugins/src/main/groovy/com/cloudogu/scm/JavaModulePlugin.groovy +++ b/build-plugins/src/main/groovy/com/cloudogu/scm/JavaModulePlugin.groovy @@ -49,6 +49,10 @@ class JavaModulePlugin implements Plugin { options.release = 8 } + project.compileTestJava { + options.release = 8 + } + project.tasks.withType(Javadoc) { failOnError false } diff --git a/settings.gradle b/settings.gradle index 4ac1314bb3..e5c07bcd38 100644 --- a/settings.gradle +++ b/settings.gradle @@ -38,16 +38,18 @@ buildscript { } apply plugin: 'org.kordamp.gradle.enforcer' +// https://kordamp.org/enforcer-gradle-plugin/ + enforce { + rule(enforcer.rules.RequireGradleVersion) { r -> + r.version = '6.7' + } rule(enforcer.rules.RequireJavaVersion) { r -> - r.version = '11.' + r.version = '11' } rule(enforcer.rules.EnforceBytecodeVersion) { r -> r.maxJdkVersion = '1.8' } - rule(enforcer.rules.RequireGradleVersion) { r -> - r.version = '6.7' - } } includeBuild 'build-plugins'