Fixing Gradle build

This commit is contained in:
Marcin Grzejszczak
2020-04-02 09:50:34 +02:00
parent 8a1eb9aef6
commit ceca07cfd2
2 changed files with 5 additions and 13 deletions

View File

@@ -29,7 +29,6 @@ ext {
JavaVersion javaVer = JavaVersion.current()
println "Current Java version equal to [${javaVer}]"
javaVersionNumber = javaVer.toString()
incompatibleJdk = javaVer.ordinal() > 8
}
project.version = findProperty('verifierVersion')
@@ -89,21 +88,12 @@ task libtest() {
}
}
task checkJdkVersion {
doLast {
if (incompatibleJdk) {
logger.warn("Java Version is equal to [${javaVersionNumber}]. The tests will be disabled (due to issues with compilation)")
}
}
}
test {
testLogging {
exceptionFormat = 'full'
}
systemProperties = testSystemProperties
dependsOn(checkJdkVersion)
enabled = !project.hasProperty('fast') && !incompatibleJdk
enabled = !project.hasProperty('fast')
}
groovydoc {

View File

@@ -17,8 +17,10 @@
package org.springframework.cloud.contract.verifier.plugin
import org.gradle.api.internal.provider.DefaultProperty
import org.gradle.api.internal.provider.PropertyHost
import org.gradle.api.model.ObjectFactory
import org.gradle.api.provider.Property
import org.gradle.internal.service.scopes.ProjectBackedPropertyHost
import spock.lang.Specification
import org.springframework.cloud.contract.stubrunner.StubConfiguration
@@ -97,7 +99,7 @@ class GradleContractsDownloaderHelperSpec extends Specification {
}
// Have to use this internal property impl here. Is there some better way?
static <T> Property<T> prop(Class<T> aClass) {
return new DefaultProperty(aClass)
public <T> Property<T> prop(Class<T> aClass) {
return new DefaultProperty(Stub(PropertyHost), aClass)
}
}