Skip to content

Commit 5156622

Browse files
committed
update configuration names in preparation for gradle 7
1 parent 2843f9e commit 5156622

File tree

29 files changed

+84
-84
lines changed

29 files changed

+84
-84
lines changed
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
}
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/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 {
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
}

0 commit comments

Comments
 (0)