Skip to content

Commit c5870c9

Browse files
maiflaimaiflai
authored
Merge pull request #129 from scoverage/gradle_6_0_1
Gradle 6 0 1
2 parents 25ada50 + ba8d760 commit c5870c9

File tree

11 files changed

+46
-19
lines changed

11 files changed

+46
-19
lines changed

Diff for: ‎README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -121,9 +121,9 @@ Migration to 4.x
121121

122122
```groovy
123123
plugins {
124-
id 'org.scoverage' version '4.0.0' apply false
124+
id 'org.scoverage' version '4.0.0'
125125
}
126-
allprojects {
126+
subprojects {
127127
apply plugin: 'org.scoverage'
128128
}
129129
```

Diff for: ‎gradle/wrapper/gradle-wrapper.jar

-125 Bytes
Binary file not shown.

Diff for: ‎gradle/wrapper/gradle-wrapper.properties

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionSha256Sum=14cd15fc8cc8705bd69dcfa3c8fefb27eb7027f5de4b47a8b279218f76895a91
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.0.1-bin.zip
54
zipStoreBase=GRADLE_USER_HOME
65
zipStorePath=wrapper/dists

Diff for: ‎gradlew

+17-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,21 @@
11
#!/usr/bin/env sh
22

3+
#
4+
# Copyright 2015 the original author or authors.
5+
#
6+
# Licensed under the Apache License, Version 2.0 (the "License");
7+
# you may not use this file except in compliance with the License.
8+
# You may obtain a copy of the License at
9+
#
10+
# http://www.apache.org/licenses/LICENSE-2.0
11+
#
12+
# Unless required by applicable law or agreed to in writing, software
13+
# distributed under the License is distributed on an "AS IS" BASIS,
14+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
# See the License for the specific language governing permissions and
16+
# limitations under the License.
17+
#
18+
319
##############################################################################
420
##
521
## Gradle start up script for UN*X
@@ -28,7 +44,7 @@ APP_NAME="Gradle"
2844
APP_BASE_NAME=`basename "$0"`
2945

3046
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
31-
DEFAULT_JVM_OPTS='"-Xmx64m"'
47+
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
3248

3349
# Use the maximum available, or set MAX_FD != -1 to use that value.
3450
MAX_FD="maximum"

Diff for: ‎gradlew.bat

+17-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
1+
@rem
2+
@rem Copyright 2015 the original author or authors.
3+
@rem
4+
@rem Licensed under the Apache License, Version 2.0 (the "License");
5+
@rem you may not use this file except in compliance with the License.
6+
@rem You may obtain a copy of the License at
7+
@rem
8+
@rem http://www.apache.org/licenses/LICENSE-2.0
9+
@rem
10+
@rem Unless required by applicable law or agreed to in writing, software
11+
@rem distributed under the License is distributed on an "AS IS" BASIS,
12+
@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
@rem See the License for the specific language governing permissions and
14+
@rem limitations under the License.
15+
@rem
16+
117
@if "%DEBUG%" == "" @echo off
218
@rem ##########################################################################
319
@rem
@@ -14,7 +30,7 @@ set APP_BASE_NAME=%~n0
1430
set APP_HOME=%DIRNAME%
1531

1632
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
17-
set DEFAULT_JVM_OPTS="-Xmx64m"
33+
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
1834

1935
@rem Find java.exe
2036
if defined JAVA_HOME goto findJavaFromJavaHome

Diff for: ‎src/functionalTest/java/org.scoverage/ScalaSingleModuleWithDepdencyManagerTest.java renamed to ‎src/functionalTest/java/org.scoverage/ScalaSingleModuleWithDependencyManagerTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
import org.junit.Assert;
44
import org.junit.Test;
55

6-
public class ScalaSingleModuleWithDepdencyManagerTest extends ScoverageFunctionalTest {
6+
public class ScalaSingleModuleWithDependencyManagerTest extends ScoverageFunctionalTest {
77

8-
public ScalaSingleModuleWithDepdencyManagerTest() {
8+
public ScalaSingleModuleWithDependencyManagerTest() {
99
super("scala-single-module-dependency-manager");
1010
}
1111

Diff for: ‎src/functionalTest/resources/projects/scala-single-module-dependency-manager/build.gradle

-4
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,6 @@ dependencyManagement {
2222
dependencies {
2323
compile group: 'org.scala-lang', name: 'scala-library'
2424

25-
// scala compilation with the dependency management plugin needs this (otherwise compilation will fail)
26-
zinc group: 'com.typesafe.zinc', name: 'zinc', version: '0.3.15'
27-
zinc group: 'org.scala-lang', name: 'scala-library', version: '2.10.5'
28-
2925
testRuntime group: 'org.junit.vintage', name: 'junit-vintage-engine', version: junitVersion
3026
testCompile group: 'org.junit.platform', name: 'junit-platform-runner', version: junitPlatformVersion
3127

Diff for: ‎src/functionalTest/resources/projects/scala-single-module-multiple-test-tasks/build.gradle

-4
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,6 @@ dependencyManagement {
2121
dependencies {
2222
compile group: 'org.scala-lang', name: 'scala-library'
2323

24-
// scala compilation with the dependency management plugin needs this (otherwise compilation will fail)
25-
zinc group: 'com.typesafe.zinc', name: 'zinc', version: '0.3.15'
26-
zinc group: 'org.scala-lang', name: 'scala-library', version: '2.10.5'
27-
2824
testRuntime group: 'org.junit.vintage', name: 'junit-vintage-engine', version: junitVersion
2925
testCompile group: 'org.junit.platform', name: 'junit-platform-runner', version: junitPlatformVersion
3026

Diff for: ‎src/main/groovy/org/scoverage/ScoverageAggregate.groovy

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ import org.gradle.api.DefaultTask
44
import org.gradle.api.provider.ListProperty
55
import org.gradle.api.provider.Property
66
import org.gradle.api.tasks.Input
7+
import org.gradle.api.tasks.Nested
78
import org.gradle.api.tasks.OutputDirectory
89
import org.gradle.api.tasks.TaskAction
9-
// don't use scala.collection.JavaConverters as it breaks backward compatibility with scala 2.11
10-
import scala.collection.JavaConversions
1110
import scoverage.report.CoverageAggregator
1211

1312
class ScoverageAggregate extends DefaultTask {
1413

14+
@Nested
1515
ScoverageRunner runner
1616

1717
@OutputDirectory

Diff for: ‎src/main/groovy/org/scoverage/ScoverageReport.groovy

+2
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,15 @@ import org.gradle.api.DefaultTask
44
import org.gradle.api.provider.Property
55
import org.gradle.api.tasks.CacheableTask
66
import org.gradle.api.tasks.Input
7+
import org.gradle.api.tasks.Nested
78
import org.gradle.api.tasks.OutputDirectory
89
import org.gradle.api.tasks.TaskAction
910
import scoverage.report.CoverageAggregator
1011

1112
@CacheableTask
1213
class ScoverageReport extends DefaultTask {
1314

15+
@Nested
1416
ScoverageRunner runner
1517

1618
@Input

Diff for: ‎src/main/groovy/org/scoverage/ScoverageRunner.groovy

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
package org.scoverage
22

33
import org.gradle.api.file.FileCollection
4+
import org.gradle.api.tasks.Classpath
45

56
import java.lang.reflect.Method
67

78
class ScoverageRunner {
89

9-
private FileCollection runtimeClasspath
10+
@Classpath
11+
final FileCollection runtimeClasspath
1012

1113
ScoverageRunner(FileCollection runtimeClasspath) {
1214

0 commit comments

Comments
 (0)