Skip to content

Commit e6133c0

Browse files
maiflaimaiflai
authored
Merge pull request #157 from scoverage/gradle7
Gradle7
2 parents f92c942 + 50498be commit e6133c0

File tree

34 files changed

+129
-127
lines changed

34 files changed

+129
-127
lines changed

‎build.gradle

Lines changed: 42 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
plugins {
22
id 'java-gradle-plugin'
33
id "com.gradle.plugin-publish" version "0.12.0"
4-
id "org.jetbrains.gradle.plugin.idea-ext" version "0.4.2"
4+
id "org.jetbrains.gradle.plugin.idea-ext" version "1.0"
55
}
66

77
repositories {
@@ -38,7 +38,7 @@ pluginBundle {
3838
tags = ['coverage', 'scala', 'scoverage']
3939
}
4040

41-
apply plugin: 'maven'
41+
apply plugin: 'maven-publish'
4242
apply plugin: 'groovy'
4343

4444
sourceCompatibility = '1.8'
@@ -107,79 +107,82 @@ gradlePlugin {
107107
}
108108

109109
task groovydocJar(type: Jar, dependsOn: groovydoc) {
110-
classifier = 'groovydoc'
111110
from "$buildDir/docs/groovydoc"
111+
classifier 'groovydoc'
112112
}
113113

114114
task sourcesJar(type: Jar) {
115115
from sourceSets.main.allSource
116-
classifier = 'sources'
116+
classifier 'sources'
117117
}
118118

119-
artifacts {
120-
archives groovydocJar
121-
archives sourcesJar
122-
}
123-
124-
if (project.properties.containsKey('signing.keyId')) {
125-
apply plugin: 'signing'
126-
signing {
127-
sign configurations.archives
119+
def propOrDefault(String property) {
120+
if (project.hasProperty(property)) {
121+
return project.getProperty(property)
122+
} else {
123+
return ''
128124
}
129125
}
130126

131-
uploadArchives {
127+
publishing {
132128
repositories {
133-
mavenDeployer {
134-
if (project.properties.containsKey('signing.keyId')) {
135-
beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
136-
}
137-
138-
snapshotRepository(url: 'https://oss.sonatype.org/content/repositories/snapshots') {
139-
authentication(userName: sonatypeUser, password: sonatypePass)
140-
}
141-
142-
repository(url: "https://oss.sonatype.org/service/local/staging/deploy/maven2/") {
143-
authentication(userName: sonatypeUser, password: sonatypePass)
129+
maven {
130+
url = "https://oss.sonatype.org/service/local/staging/deploy/maven2/"
131+
credentials(PasswordCredentials) {
132+
username = propOrDefault('sonatypeUser')
133+
password = propOrDefault('sonatypePass')
144134
}
145-
146-
pom.project {
147-
name 'GradleScoverage'
148-
description project.description
149-
url project.website
135+
}
136+
}
137+
publications {
138+
mavenJava(MavenPublication) {
139+
pom {
140+
name = 'GradleScoverage'
141+
description = project.description
142+
url = project.website
150143

151144
scm {
152-
url scmUrl
153-
developerConnection scmUrl
145+
url = scmUrl
146+
developerConnection = scmUrl
154147
}
155148

156149
licenses {
157150
license {
158-
name 'The Apache Software License, Version 2.0'
159-
url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
160-
distribution 'repo'
151+
name = 'The Apache Software License, Version 2.0'
152+
url = 'http://www.apache.org/licenses/LICENSE-2.0.txt'
153+
distribution = 'repo'
161154
}
162155
}
163156

164157
developers {
165158
developer {
166-
id 'maiflai'
159+
id = 'maiflai'
167160
}
168161
developer {
169-
id 'ubourdon'
162+
id = 'ubourdon'
170163
}
171164
developer {
172-
id 'D-Roch'
165+
id = 'D-Roch'
173166
}
174167
developer {
175-
id 'eyalroth'
168+
id = 'eyalroth'
176169
}
177170
}
178171
}
172+
from components.java
173+
artifact groovydocJar
174+
artifact sourcesJar
179175
}
180176
}
181177
}
182178

179+
if (project.properties.containsKey('signing.keyId')) {
180+
apply plugin: 'signing'
181+
signing {
182+
sign publishing.publications.mavenJava
183+
}
184+
}
185+
183186
// see https://stackoverflow.com/questions/44679007
184187
task fixIdeaPluginClasspath {
185188
doFirst {

‎gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

‎src/crossScalaVersionTest/resources/projects/scala-multi-module-cross-version/2_12/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
dependencies {
2-
compile group: 'org.scala-lang', name: 'scala-library', version: "2.12.8"
3-
testCompile group: 'org.scalatest', name: "scalatest_2.12", version: scalatestVersion
2+
implementation group: 'org.scala-lang', name: 'scala-library', version: "2.12.8"
3+
testImplementation group: 'org.scalatest', name: "scalatest_2.12", version: scalatestVersion
44
}

‎src/crossScalaVersionTest/resources/projects/scala-multi-module-cross-version/2_13/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
dependencies {
2-
compile group: 'org.scala-lang', name: 'scala-library', version: "2.13.1"
3-
testCompile group: 'org.scalatest', name: "scalatest_2.13", version: scalatestVersion
2+
implementation group: 'org.scala-lang', name: 'scala-library', version: "2.13.1"
3+
testImplementation group: 'org.scalatest', name: "scalatest_2.13", version: scalatestVersion
44
}

‎src/crossScalaVersionTest/resources/projects/scala-multi-module-cross-version/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ allprojects {
1717
apply plugin: 'org.scoverage'
1818

1919
dependencies {
20-
testRuntime group: 'org.junit.vintage', name: 'junit-vintage-engine', version: junitVersion
21-
testCompile group: 'org.junit.platform', name: 'junit-platform-runner', version: junitPlatformVersion
20+
testRuntimeOnly group: 'org.junit.vintage', name: 'junit-vintage-engine', version: junitVersion
21+
testImplementation group: 'org.junit.platform', name: 'junit-platform-runner', version: junitPlatformVersion
2222
}
2323

2424
test {

‎src/functionalTest/java/org/scoverage/DetectScalaLibraryTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,8 @@ public static Collection<Object[]> data() {
3939
{"/compileOnly", new String[] {".0", ".+"}, true, new String[0]},
4040
{"/implementation", new String[] {".0", ".+"}, true, new String[0]},
4141
{"/dependency-management", new String[] {".0", ".+"}, true, new String[0]},
42-
{"/gradle-consistent-versions", new String[] {"ignored"}, false, new String[] {"--write-locks"}},
42+
// disabled until the consistent-versions plugin supports Gradle 7
43+
// {"/gradle-consistent-versions", new String[] {"ignored"}, false, new String[] {"--write-locks"}},
4344
};
4445
return Arrays.asList(data);
4546
}

‎src/functionalTest/resources/projects/composite-build/proj1/build.gradle

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@ group "org.composite"
1616
version '1.0'
1717

1818
dependencies {
19-
compile group: 'org.scala-lang', name: 'scala-library', version: "${scalaVersionMajor}.${scalaVersionMinor}.${scalaVersionBuild}"
19+
implementation group: 'org.scala-lang', name: 'scala-library', version: "${scalaVersionMajor}.${scalaVersionMinor}.${scalaVersionBuild}"
2020

21-
testRuntime group: 'org.junit.vintage', name: 'junit-vintage-engine', version: junitVersion
22-
testCompile group: 'org.junit.platform', name: 'junit-platform-runner', version: junitPlatformVersion
21+
testRuntimeOnly group: 'org.junit.vintage', name: 'junit-vintage-engine', version: junitVersion
22+
testImplementation group: 'org.junit.platform', name: 'junit-platform-runner', version: junitPlatformVersion
2323

24-
testCompile group: 'org.scalatest', name: "scalatest_${scalaVersionMajor}.${scalaVersionMinor}", version: scalatestVersion
24+
testImplementation group: 'org.scalatest', name: "scalatest_${scalaVersionMajor}.${scalaVersionMinor}", version: scalatestVersion
2525

26-
compile "org.composite:proj2:1.0"
26+
implementation "org.composite:proj2:1.0"
2727
}
2828

2929
test {

‎src/functionalTest/resources/projects/composite-build/proj2/build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@ group "org.composite"
1616
version '1.0'
1717

1818
dependencies {
19-
compile group: 'org.scala-lang', name: 'scala-library', version: "${scalaVersionMajor}.${scalaVersionMinor}.${scalaVersionBuild}"
19+
implementation group: 'org.scala-lang', name: 'scala-library', version: "${scalaVersionMajor}.${scalaVersionMinor}.${scalaVersionBuild}"
2020

21-
testRuntime group: 'org.junit.vintage', name: 'junit-vintage-engine', version: junitVersion
22-
testCompile group: 'org.junit.platform', name: 'junit-platform-runner', version: junitPlatformVersion
21+
testRuntimeOnly group: 'org.junit.vintage', name: 'junit-vintage-engine', version: junitVersion
22+
testImplementation group: 'org.junit.platform', name: 'junit-platform-runner', version: junitPlatformVersion
2323

24-
testCompile group: 'org.scalatest', name: "scalatest_${scalaVersionMajor}.${scalaVersionMinor}", version: scalatestVersion
24+
testImplementation group: 'org.scalatest', name: "scalatest_${scalaVersionMajor}.${scalaVersionMinor}", version: scalatestVersion
2525
}
2626

2727
test {

‎src/functionalTest/resources/projects/detect-scala-library/compile/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ repositories {
66
jcenter()
77
}
88

9-
description = 'defines scala library using the "compile" configuration'
9+
description = 'defines scala library using the "implementation" configuration'
1010

1111
dependencies {
12-
compile group: 'org.scala-lang', name: 'scala-library', version: "${detectedScalaLibraryVersion}"
12+
implementation group: 'org.scala-lang', name: 'scala-library', version: "${detectedScalaLibraryVersion}"
1313
}

‎src/functionalTest/resources/projects/detect-scala-library/gradle-consistent-versions/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
plugins {
2-
id "com.palantir.consistent-versions" version "1.16.0"
2+
id "com.palantir.consistent-versions" version "1.28.0"
33
id 'org.scoverage'
44
}
55

‎src/functionalTest/resources/projects/multi-module-plugin-not-configured-for-scala/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ subprojects { p ->
1515
apply plugin: 'java'
1616
dependencies {
1717
implementation platform(project(':dependencies'))
18-
testCompile group: 'org.junit.platform', name: 'junit-platform-runner'
18+
testImplementation group: 'org.junit.platform', name: 'junit-platform-runner'
1919
}
2020

2121
test {

‎src/functionalTest/resources/projects/multi-module-plugin-not-configured-for-scala/java_only/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
dependencies {
2-
testRuntime group: 'org.junit.vintage', name: 'junit-vintage-engine'
2+
testRuntimeOnly group: 'org.junit.vintage', name: 'junit-vintage-engine'
33
}

‎src/functionalTest/resources/projects/multi-module-plugin-not-configured-for-scala/scala_only/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ apply plugin: 'scala'
22
// apply plugin: 'org.scoverage' // Oops forgot to configure scoverage
33

44
dependencies {
5-
compile group: 'org.scala-lang', name: 'scala-library'
5+
implementation group: 'org.scala-lang', name: 'scala-library'
66

7-
testRuntime group: 'org.junit.vintage', name: 'junit-vintage-engine'
8-
testCompile group: 'org.scalatest', name: "scalatest_${scalaVersionMajor}.${scalaVersionMinor}"
7+
testRuntimeOnly group: 'org.junit.vintage', name: 'junit-vintage-engine'
8+
testImplementation group: 'org.scalatest', name: "scalatest_${scalaVersionMajor}.${scalaVersionMinor}"
99
}

‎src/functionalTest/resources/projects/multiple-check-tasks/multiple-checks/build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ apply plugin: 'java'
1212
apply plugin: 'scala'
1313

1414
dependencies {
15-
compile group: 'org.scala-lang', name: 'scala-library', version: "${scalaVersionMajor}.${scalaVersionMinor}.${scalaVersionBuild}"
15+
implementation group: 'org.scala-lang', name: 'scala-library', version: "${scalaVersionMajor}.${scalaVersionMinor}.${scalaVersionBuild}"
1616

17-
testRuntime group: 'org.junit.vintage', name: 'junit-vintage-engine', version: junitVersion
18-
testCompile group: 'org.junit.platform', name: 'junit-platform-runner', version: junitPlatformVersion
17+
testRuntimeOnly group: 'org.junit.vintage', name: 'junit-vintage-engine', version: junitVersion
18+
testImplementation group: 'org.junit.platform', name: 'junit-platform-runner', version: junitPlatformVersion
1919

20-
testCompile group: 'org.scalatest', name: "scalatest_${scalaVersionMajor}.${scalaVersionMinor}", version: scalatestVersion
20+
testImplementation group: 'org.scalatest', name: "scalatest_${scalaVersionMajor}.${scalaVersionMinor}", version: scalatestVersion
2121
}
2222

2323
test {

‎src/functionalTest/resources/projects/multiple-check-tasks/no-check/build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ apply plugin: 'java'
1212
apply plugin: 'scala'
1313

1414
dependencies {
15-
compile group: 'org.scala-lang', name: 'scala-library', version: "${scalaVersionMajor}.${scalaVersionMinor}.${scalaVersionBuild}"
15+
implementation group: 'org.scala-lang', name: 'scala-library', version: "${scalaVersionMajor}.${scalaVersionMinor}.${scalaVersionBuild}"
1616

17-
testRuntime group: 'org.junit.vintage', name: 'junit-vintage-engine', version: junitVersion
18-
testCompile group: 'org.junit.platform', name: 'junit-platform-runner', version: junitPlatformVersion
17+
testRuntimeOnly group: 'org.junit.vintage', name: 'junit-vintage-engine', version: junitVersion
18+
testImplementation group: 'org.junit.platform', name: 'junit-platform-runner', version: junitPlatformVersion
1919

20-
testCompile group: 'org.scalatest', name: "scalatest_${scalaVersionMajor}.${scalaVersionMinor}", version: scalatestVersion
20+
testImplementation group: 'org.scalatest', name: "scalatest_${scalaVersionMajor}.${scalaVersionMinor}", version: scalatestVersion
2121
}
2222

2323
test {

‎src/functionalTest/resources/projects/multiple-check-tasks/old-and-new-syntax/build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ apply plugin: 'java'
1212
apply plugin: 'scala'
1313

1414
dependencies {
15-
compile group: 'org.scala-lang', name: 'scala-library', version: "${scalaVersionMajor}.${scalaVersionMinor}.${scalaVersionBuild}"
15+
implementation group: 'org.scala-lang', name: 'scala-library', version: "${scalaVersionMajor}.${scalaVersionMinor}.${scalaVersionBuild}"
1616

17-
testRuntime group: 'org.junit.vintage', name: 'junit-vintage-engine', version: junitVersion
18-
testCompile group: 'org.junit.platform', name: 'junit-platform-runner', version: junitPlatformVersion
17+
testRuntimeOnly group: 'org.junit.vintage', name: 'junit-vintage-engine', version: junitVersion
18+
testImplementation group: 'org.junit.platform', name: 'junit-platform-runner', version: junitPlatformVersion
1919

20-
testCompile group: 'org.scalatest', name: "scalatest_${scalaVersionMajor}.${scalaVersionMinor}", version: scalatestVersion
20+
testImplementation group: 'org.scalatest', name: "scalatest_${scalaVersionMajor}.${scalaVersionMinor}", version: scalatestVersion
2121
}
2222

2323
test {

‎src/functionalTest/resources/projects/multiple-check-tasks/single-check-new-syntax/build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ apply plugin: 'java'
1212
apply plugin: 'scala'
1313

1414
dependencies {
15-
compile group: 'org.scala-lang', name: 'scala-library', version: "${scalaVersionMajor}.${scalaVersionMinor}.${scalaVersionBuild}"
15+
implementation group: 'org.scala-lang', name: 'scala-library', version: "${scalaVersionMajor}.${scalaVersionMinor}.${scalaVersionBuild}"
1616

17-
testRuntime group: 'org.junit.vintage', name: 'junit-vintage-engine', version: junitVersion
18-
testCompile group: 'org.junit.platform', name: 'junit-platform-runner', version: junitPlatformVersion
17+
testRuntimeOnly group: 'org.junit.vintage', name: 'junit-vintage-engine', version: junitVersion
18+
testImplementation group: 'org.junit.platform', name: 'junit-platform-runner', version: junitPlatformVersion
1919

20-
testCompile group: 'org.scalatest', name: "scalatest_${scalaVersionMajor}.${scalaVersionMinor}", version: scalatestVersion
20+
testImplementation group: 'org.scalatest', name: "scalatest_${scalaVersionMajor}.${scalaVersionMinor}", version: scalatestVersion
2121
}
2222

2323
test {

‎src/functionalTest/resources/projects/multiple-check-tasks/single-check-old-syntax/build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ apply plugin: 'java'
1212
apply plugin: 'scala'
1313

1414
dependencies {
15-
compile group: 'org.scala-lang', name: 'scala-library', version: "${scalaVersionMajor}.${scalaVersionMinor}.${scalaVersionBuild}"
15+
implementation group: 'org.scala-lang', name: 'scala-library', version: "${scalaVersionMajor}.${scalaVersionMinor}.${scalaVersionBuild}"
1616

17-
testRuntime group: 'org.junit.vintage', name: 'junit-vintage-engine', version: junitVersion
18-
testCompile group: 'org.junit.platform', name: 'junit-platform-runner', version: junitPlatformVersion
17+
testRuntimeOnly group: 'org.junit.vintage', name: 'junit-vintage-engine', version: junitVersion
18+
testImplementation group: 'org.junit.platform', name: 'junit-platform-runner', version: junitPlatformVersion
1919

20-
testCompile group: 'org.scalatest', name: "scalatest_${scalaVersionMajor}.${scalaVersionMinor}", version: scalatestVersion
20+
testImplementation group: 'org.scalatest', name: "scalatest_${scalaVersionMajor}.${scalaVersionMinor}", version: scalatestVersion
2121
}
2222

2323
test {

‎src/functionalTest/resources/projects/scala-java-multi-module/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ subprojects {
1414
apply plugin: 'java'
1515

1616
dependencies {
17-
testCompile group: 'org.junit.platform', name: 'junit-platform-runner', version: junitPlatformVersion
17+
testImplementation group: 'org.junit.platform', name: 'junit-platform-runner', version: junitPlatformVersion
1818
}
1919

2020
test {

‎src/functionalTest/resources/projects/scala-java-multi-module/java_only/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
dependencies {
2-
testRuntime group: 'org.junit.vintage', name: 'junit-vintage-engine', version: junitVersion
2+
testRuntimeOnly group: 'org.junit.vintage', name: 'junit-vintage-engine', version: junitVersion
33
}

‎src/functionalTest/resources/projects/scala-java-multi-module/mixed_scala_java/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
apply plugin: 'scala'
22

33
dependencies {
4-
compile group: 'org.scala-lang', name: 'scala-library', version: "${scalaVersionMajor}.${scalaVersionMinor}.${scalaVersionBuild}"
4+
implementation group: 'org.scala-lang', name: 'scala-library', version: "${scalaVersionMajor}.${scalaVersionMinor}.${scalaVersionBuild}"
55

6-
testRuntime group: 'org.junit.vintage', name: 'junit-vintage-engine', version: junitVersion
6+
testRuntimeOnly group: 'org.junit.vintage', name: 'junit-vintage-engine', version: junitVersion
77

8-
testCompile group: 'org.scalatest', name: "scalatest_${scalaVersionMajor}.${scalaVersionMinor}", version: scalatestVersion
8+
testImplementation group: 'org.scalatest', name: "scalatest_${scalaVersionMajor}.${scalaVersionMinor}", version: scalatestVersion
99
}
1010

1111
// A common practice in mixed java/scala modules to make Java code able to import Scala code

‎src/functionalTest/resources/projects/scala-java-multi-module/scala_only/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
apply plugin: 'scala'
22

33
dependencies {
4-
compile group: 'org.scala-lang', name: 'scala-library', version: "${scalaVersionMajor}.${scalaVersionMinor}.${scalaVersionBuild}"
4+
implementation group: 'org.scala-lang', name: 'scala-library', version: "${scalaVersionMajor}.${scalaVersionMinor}.${scalaVersionBuild}"
55

6-
testRuntime group: 'org.junit.vintage', name: 'junit-vintage-engine', version: junitVersion
6+
testRuntimeOnly group: 'org.junit.vintage', name: 'junit-vintage-engine', version: junitVersion
77

8-
testCompile group: 'org.scalatest', name: "scalatest_${scalaVersionMajor}.${scalaVersionMinor}", version: scalatestVersion
8+
testImplementation group: 'org.scalatest', name: "scalatest_${scalaVersionMajor}.${scalaVersionMinor}", version: scalatestVersion
99
}
1010

1111
apply plugin: 'org.scoverage'

‎src/functionalTest/resources/projects/scala-multi-module-multiple-test-tasks/a/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
dependencies {
2-
compile project(":common")
2+
implementation project(":common")
33
}

0 commit comments

Comments
 (0)