update Gradle to 7.0

Had to disable java.modularity.inferModulePath, because JUnit
was put on the module path and didn't want to start (class not
found). Probably because I didn't have a module-info.java.
This commit is contained in:
2021-04-16 18:41:43 +02:00
parent c6e1d47a83
commit a7b599c8b4
2 changed files with 11 additions and 6 deletions

View File

@@ -35,9 +35,9 @@ sourceCompatibility = javaVersion
* The shared configuration for all sub-projects: * The shared configuration for all sub-projects:
*/ */
subprojects { subprojects {
apply plugin: 'java' apply plugin: 'java-library'
apply plugin: 'eclipse' apply plugin: 'eclipse'
apply plugin: 'maven' //apply plugin: 'maven'
apply plugin: 'maven-publish' apply plugin: 'maven-publish'
apply plugin: 'me.champeau.gradle.jmh' apply plugin: 'me.champeau.gradle.jmh'
@@ -79,6 +79,11 @@ subprojects {
java { java {
withSourcesJar() withSourcesJar()
// Gradle 7.0 put half the dependencies on the module path. But without a module-info.java file
// JUnit didn't want to run because of a class not found error. By disabling modules we ensure
// all jars are put on the classpath.
modularity.inferModulePath.set(false)
} }
@@ -86,8 +91,8 @@ subprojects {
dependencies { dependencies {
testImplementation "org.junit.jupiter:junit-jupiter-api:${version_junit}" testImplementation "org.junit.jupiter:junit-jupiter-api:${version_junit}"
testImplementation "org.junit.jupiter:junit-jupiter-params:${version_junit}" // for @ParameterizedTest testImplementation "org.junit.jupiter:junit-jupiter-params:${version_junit}" // for @ParameterizedTest
testRuntime "org.junit.jupiter:junit-jupiter-engine:${version_junit}" testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:${version_junit}"
testRuntime "org.junit.platform:junit-platform-launcher:${version_junit_platform}" // needed by eclipse testRuntimeOnly "org.junit.platform:junit-platform-launcher:${version_junit_platform}" // needed by eclipse
} }
test { test {
@@ -103,5 +108,5 @@ subprojects {
} }
wrapper { wrapper {
gradleVersion = '6.8.3' gradleVersion = '7.0'
} }

View File

@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists