diff --git a/README.md b/README.md
index 53b93a1..20d82f9 100644
--- a/README.md
+++ b/README.md
@@ -121,9 +121,9 @@ Migration to 4.x
 
 ```groovy
 plugins {
-    id 'org.scoverage' version '4.0.0' apply false
+    id 'org.scoverage' version '4.0.0'
 }
-allprojects {
+subprojects {
     apply plugin: 'org.scoverage'
 }
 ```
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 457aad0..5c2d1cf 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 9c80f8b..9492014 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=14cd15fc8cc8705bd69dcfa3c8fefb27eb7027f5de4b47a8b279218f76895a91
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.0.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index af6708f..b0d6d0a 100755
--- a/gradlew
+++ b/gradlew
@@ -1,5 +1,21 @@
 #!/usr/bin/env sh
 
+#
+# Copyright 2015 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 ##############################################################################
 ##
 ##  Gradle start up script for UN*X
@@ -28,7 +44,7 @@ APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m"'
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
diff --git a/gradlew.bat b/gradlew.bat
index 0f8d593..15e1ee3 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -1,3 +1,19 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      http://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
 @if "%DEBUG%" == "" @echo off
 @rem ##########################################################################
 @rem
@@ -14,7 +30,7 @@ set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS="-Xmx64m"
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
diff --git a/src/functionalTest/java/org.scoverage/ScalaSingleModuleWithDepdencyManagerTest.java b/src/functionalTest/java/org.scoverage/ScalaSingleModuleWithDependencyManagerTest.java
similarity index 85%
rename from src/functionalTest/java/org.scoverage/ScalaSingleModuleWithDepdencyManagerTest.java
rename to src/functionalTest/java/org.scoverage/ScalaSingleModuleWithDependencyManagerTest.java
index f8548fe..e7f701a 100644
--- a/src/functionalTest/java/org.scoverage/ScalaSingleModuleWithDepdencyManagerTest.java
+++ b/src/functionalTest/java/org.scoverage/ScalaSingleModuleWithDependencyManagerTest.java
@@ -3,9 +3,9 @@
 import org.junit.Assert;
 import org.junit.Test;
 
-public class ScalaSingleModuleWithDepdencyManagerTest extends ScoverageFunctionalTest {
+public class ScalaSingleModuleWithDependencyManagerTest extends ScoverageFunctionalTest {
 
-    public ScalaSingleModuleWithDepdencyManagerTest() {
+    public ScalaSingleModuleWithDependencyManagerTest() {
         super("scala-single-module-dependency-manager");
     }
 
diff --git a/src/functionalTest/resources/projects/scala-single-module-dependency-manager/build.gradle b/src/functionalTest/resources/projects/scala-single-module-dependency-manager/build.gradle
index 135d248..8d36fb3 100644
--- a/src/functionalTest/resources/projects/scala-single-module-dependency-manager/build.gradle
+++ b/src/functionalTest/resources/projects/scala-single-module-dependency-manager/build.gradle
@@ -22,10 +22,6 @@ dependencyManagement {
 dependencies {
     compile group: 'org.scala-lang', name: 'scala-library'
 
-    // scala compilation with the dependency management plugin needs this (otherwise compilation will fail)
-    zinc group: 'com.typesafe.zinc', name: 'zinc', version: '0.3.15'
-    zinc group: 'org.scala-lang', name: 'scala-library', version: '2.10.5'
-
     testRuntime group: 'org.junit.vintage', name: 'junit-vintage-engine', version: junitVersion
     testCompile group: 'org.junit.platform', name: 'junit-platform-runner', version: junitPlatformVersion
 
diff --git a/src/functionalTest/resources/projects/scala-single-module-multiple-test-tasks/build.gradle b/src/functionalTest/resources/projects/scala-single-module-multiple-test-tasks/build.gradle
index c0e0e6d..b26ba4f 100644
--- a/src/functionalTest/resources/projects/scala-single-module-multiple-test-tasks/build.gradle
+++ b/src/functionalTest/resources/projects/scala-single-module-multiple-test-tasks/build.gradle
@@ -21,10 +21,6 @@ dependencyManagement {
 dependencies {
     compile group: 'org.scala-lang', name: 'scala-library'
 
-    // scala compilation with the dependency management plugin needs this (otherwise compilation will fail)
-    zinc group: 'com.typesafe.zinc', name: 'zinc', version: '0.3.15'
-    zinc group: 'org.scala-lang', name: 'scala-library', version: '2.10.5'
-
     testRuntime group: 'org.junit.vintage', name: 'junit-vintage-engine', version: junitVersion
     testCompile group: 'org.junit.platform', name: 'junit-platform-runner', version: junitPlatformVersion
 
diff --git a/src/main/groovy/org/scoverage/ScoverageAggregate.groovy b/src/main/groovy/org/scoverage/ScoverageAggregate.groovy
index 1cffc13..b445e29 100644
--- a/src/main/groovy/org/scoverage/ScoverageAggregate.groovy
+++ b/src/main/groovy/org/scoverage/ScoverageAggregate.groovy
@@ -4,14 +4,14 @@ import org.gradle.api.DefaultTask
 import org.gradle.api.provider.ListProperty
 import org.gradle.api.provider.Property
 import org.gradle.api.tasks.Input
+import org.gradle.api.tasks.Nested
 import org.gradle.api.tasks.OutputDirectory
 import org.gradle.api.tasks.TaskAction
-// don't use scala.collection.JavaConverters as it breaks backward compatibility with scala 2.11
-import scala.collection.JavaConversions
 import scoverage.report.CoverageAggregator
 
 class ScoverageAggregate extends DefaultTask {
 
+    @Nested
     ScoverageRunner runner
 
     @OutputDirectory
diff --git a/src/main/groovy/org/scoverage/ScoverageReport.groovy b/src/main/groovy/org/scoverage/ScoverageReport.groovy
index 55cd701..ca8ceb2 100644
--- a/src/main/groovy/org/scoverage/ScoverageReport.groovy
+++ b/src/main/groovy/org/scoverage/ScoverageReport.groovy
@@ -4,6 +4,7 @@ import org.gradle.api.DefaultTask
 import org.gradle.api.provider.Property
 import org.gradle.api.tasks.CacheableTask
 import org.gradle.api.tasks.Input
+import org.gradle.api.tasks.Nested
 import org.gradle.api.tasks.OutputDirectory
 import org.gradle.api.tasks.TaskAction
 import scoverage.report.CoverageAggregator
@@ -11,6 +12,7 @@ import scoverage.report.CoverageAggregator
 @CacheableTask
 class ScoverageReport extends DefaultTask {
 
+    @Nested
     ScoverageRunner runner
 
     @Input
diff --git a/src/main/groovy/org/scoverage/ScoverageRunner.groovy b/src/main/groovy/org/scoverage/ScoverageRunner.groovy
index 48889e7..713b9e4 100644
--- a/src/main/groovy/org/scoverage/ScoverageRunner.groovy
+++ b/src/main/groovy/org/scoverage/ScoverageRunner.groovy
@@ -1,12 +1,14 @@
 package org.scoverage
 
 import org.gradle.api.file.FileCollection
+import org.gradle.api.tasks.Classpath
 
 import java.lang.reflect.Method
 
 class ScoverageRunner {
 
-    private FileCollection runtimeClasspath
+    @Classpath
+    final FileCollection runtimeClasspath
 
     ScoverageRunner(FileCollection runtimeClasspath) {