Skip to content
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -166,8 +166,8 @@ Migration to 3.x
```groovy
// can safely delete this from build scripts
dependencies {
scoverage group: 'org.scoverage', name: 'scalac-scoverage-plugin_2.12', version: '1.3.1'
scoverage group: 'org.scoverage', name: 'scalac-scoverage-runtime_2.12', version: '1.3.1'
scoverage 'org.scoverage:scalac-scoverage-plugin_2.12:1.3.1'
scoverage 'org.scoverage:scalac-scoverage-runtime_2.12:1.3.1'
}
```

Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ dependencies {
compileOnly 'org.scoverage:scalac-scoverage-plugin_2.13.14:2.1.1'
compileOnly 'org.scoverage:scalac-scoverage-reporter_2.13:2.1.1'

implementation group: 'commons-io', name: 'commons-io', version: '2.6'
implementation 'commons-io:commons-io:2.6'

testImplementation 'junit:junit:4.12'
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.5.2'
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
distributionSha256Sum=f397b287023acdba1e9f6fc5ea72d22dd63669d59ed4a289a29b1a76eee151c6
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
dependencies {
implementation group: 'org.scala-lang', name: 'scala-library', version: "2.12.17"
testImplementation group: 'org.scalatest', name: "scalatest_2.12", version: scalatestVersion
implementation 'org.scala-lang:scala-library:2.12.17'
testImplementation "org.scalatest:scalatest_2.12:${scalatestVersion}"
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
dependencies {
implementation group: 'org.scala-lang', name: 'scala-library', version: "2.13.10"
testImplementation group: 'org.scalatest', name: "scalatest_2.13", version: scalatestVersion
implementation "org.scala-lang:scala-library:2.13.10"
testImplementation "org.scalatest:scalatest_2.13:${scalatestVersion}"
}
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ allprojects {
apply plugin: 'org.scoverage'

dependencies {
testRuntimeOnly group: 'org.junit.vintage', name: 'junit-vintage-engine', version: junitVersion
testImplementation group: 'org.junit.platform', name: 'junit-platform-runner', version: junitPlatformVersion
testRuntimeOnly "org.junit.vintage:junit-vintage-engine:${junitVersion}"
testImplementation "org.junit.platform:junit-platform-runner:${junitPlatformVersion}"
}

test {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@ group "org.composite"
version '1.0'

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

testRuntimeOnly group: 'org.junit.vintage', name: 'junit-vintage-engine', version: junitVersion
testImplementation group: 'org.junit.platform', name: 'junit-platform-runner', version: junitPlatformVersion
testRuntimeOnly "org.junit.vintage:junit-vintage-engine:${junitVersion}"
testImplementation "org.junit.platform:junit-platform-runner:${junitPlatformVersion}"

testImplementation group: 'org.scalatest', name: "scalatest_${scalaVersionMajor}.${scalaVersionMinor}", version: scalatestVersion
testImplementation "org.scalatest:scalatest_${scalaVersionMajor}.${scalaVersionMinor}:${scalatestVersion}"

implementation "org.composite:proj2:1.0"
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@ group "org.composite"
version '1.0'

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

testRuntimeOnly group: 'org.junit.vintage', name: 'junit-vintage-engine', version: junitVersion
testImplementation group: 'org.junit.platform', name: 'junit-platform-runner', version: junitPlatformVersion
testRuntimeOnly "org.junit.vintage:junit-vintage-engine:${junitVersion}"
testImplementation "org.junit.platform:junit-platform-runner:${junitPlatformVersion}"

testImplementation group: 'org.scalatest', name: "scalatest_${scalaVersionMajor}.${scalaVersionMinor}", version: scalatestVersion
testImplementation "org.scalatest:scalatest_${scalaVersionMajor}.${scalaVersionMinor}:${scalatestVersion}"
}

test {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ repositories {
description = 'defines scala library using the "implementation" configuration'

dependencies {
implementation group: 'org.scala-lang', name: 'scala-library', version: "${detectedScalaLibraryVersion}"
implementation "org.scala-lang:scala-library:${detectedScalaLibraryVersion}"
}
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ repositories {
description = 'defines scala library using the "compileOnly" configuration'

dependencies {
compileOnly group: 'org.scala-lang', name: 'scala-library', version: "${detectedScalaLibraryVersion}"
compileOnly "org.scala-lang:scala-library:${detectedScalaLibraryVersion}"
}
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ description = 'defines scala library using the "implementation" configuration an

dependencyManagement {
dependencies {
dependency group: 'org.scala-lang', name: 'scala-library', version: "${detectedScalaLibraryVersion}"
dependency "org.scala-lang:scala-library:${detectedScalaLibraryVersion}"
}
}

dependencies {
implementation group: 'org.scala-lang', name: 'scala-library'
implementation 'org.scala-lang:scala-library'
}
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ repositories {
description = 'defines scala library using the "implementation" configuration and the gradle-consistent-versions plugin'

dependencies {
implementation group: 'org.scala-lang', name: 'scala-library'
implementation 'org.scala-lang:scala-library'
}

scoverage {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ repositories {
description = 'defines scala library using the "implementation" configuration'

dependencies {
implementation group: 'org.scala-lang', name: 'scala-library', version: "${detectedScalaLibraryVersion}"
implementation "org.scala-lang:scala-library:${detectedScalaLibraryVersion}"
}
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ subprojects { p ->
apply plugin: 'java'
dependencies {
implementation platform(project(':dependencies'))
testImplementation group: 'org.junit.platform', name: 'junit-platform-runner'
testImplementation 'org.junit.platform:junit-platform-runner'
}

test {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ plugins {

dependencies {
constraints {
api group: 'org.scala-lang', name: 'scala-library', version: "${scalaVersionMajor}.${scalaVersionMinor}.${scalaVersionBuild}"
api "org.scala-lang:scala-library:${scalaVersionMajor}.${scalaVersionMinor}.${scalaVersionBuild}"

api group: 'org.junit.vintage', name: 'junit-vintage-engine', version: junitVersion
api group: 'org.junit.platform', name: 'junit-platform-runner', version: junitPlatformVersion
api "org.junit.vintage:junit-vintage-engine:${junitVersion}"
api "org.junit.platform:junit-platform-runner:${junitPlatformVersion}"

api group: 'org.scalatest', name: "scalatest_${scalaVersionMajor}.${scalaVersionMinor}", version: scalatestVersion
api "org.scalatest:scalatest_${scalaVersionMajor}.${scalaVersionMinor}:${scalatestVersion}"
}
}
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
dependencies {
testRuntimeOnly group: 'org.junit.vintage', name: 'junit-vintage-engine'
testRuntimeOnly 'org.junit.vintage:junit-vintage-engine'
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ apply plugin: 'scala'
// apply plugin: 'org.scoverage' // Oops forgot to configure scoverage

dependencies {
implementation group: 'org.scala-lang', name: 'scala-library'
implementation 'org.scala-lang:scala-library'

testRuntimeOnly group: 'org.junit.vintage', name: 'junit-vintage-engine'
testRuntimeOnly 'org.junit.vintage:junit-vintage-engine'
testImplementation group: 'org.scalatest', name: "scalatest_${scalaVersionMajor}.${scalaVersionMinor}"
}
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ apply plugin: 'java'
apply plugin: 'scala'

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

testRuntimeOnly group: 'org.junit.vintage', name: 'junit-vintage-engine', version: junitVersion
testImplementation group: 'org.junit.platform', name: 'junit-platform-runner', version: junitPlatformVersion
testRuntimeOnly "org.junit.vintage:junit-vintage-engine:${junitVersion}"
testImplementation "org.junit.platform:junit-platform-runner:${junitPlatformVersion}"

testImplementation group: 'org.scalatest', name: "scalatest_${scalaVersionMajor}.${scalaVersionMinor}", version: scalatestVersion
testImplementation "org.scalatest:scalatest_${scalaVersionMajor}.${scalaVersionMinor}:${scalatestVersion}"
}

test {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ apply plugin: 'java'
apply plugin: 'scala'

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

testRuntimeOnly group: 'org.junit.vintage', name: 'junit-vintage-engine', version: junitVersion
testImplementation group: 'org.junit.platform', name: 'junit-platform-runner', version: junitPlatformVersion
testRuntimeOnly "org.junit.vintage:junit-vintage-engine:${junitVersion}"
testImplementation "org.junit.platform:junit-platform-runner:${junitPlatformVersion}"

testImplementation group: 'org.scalatest', name: "scalatest_${scalaVersionMajor}.${scalaVersionMinor}", version: scalatestVersion
testImplementation "org.scalatest:scalatest_${scalaVersionMajor}.${scalaVersionMinor}:${scalatestVersion}"
}

test {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ apply plugin: 'java'
apply plugin: 'scala'

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

testRuntimeOnly group: 'org.junit.vintage', name: 'junit-vintage-engine', version: junitVersion
testImplementation group: 'org.junit.platform', name: 'junit-platform-runner', version: junitPlatformVersion
testRuntimeOnly "org.junit.vintage:junit-vintage-engine:${junitVersion}"
testImplementation "org.junit.platform:junit-platform-runner:${junitPlatformVersion}"

testImplementation group: 'org.scalatest', name: "scalatest_${scalaVersionMajor}.${scalaVersionMinor}", version: scalatestVersion
testImplementation "org.scalatest:scalatest_${scalaVersionMajor}.${scalaVersionMinor}:${scalatestVersion}"
}

test {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ apply plugin: 'java'
apply plugin: 'scala'

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

testRuntimeOnly group: 'org.junit.vintage', name: 'junit-vintage-engine', version: junitVersion
testImplementation group: 'org.junit.platform', name: 'junit-platform-runner', version: junitPlatformVersion
testRuntimeOnly "org.junit.vintage:junit-vintage-engine:${junitVersion}"
testImplementation "org.junit.platform:junit-platform-runner:${junitPlatformVersion}"

testImplementation group: 'org.scalatest', name: "scalatest_${scalaVersionMajor}.${scalaVersionMinor}", version: scalatestVersion
testImplementation "org.scalatest:scalatest_${scalaVersionMajor}.${scalaVersionMinor}:${scalatestVersion}"
}

test {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ apply plugin: 'java'
apply plugin: 'scala'

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

testRuntimeOnly group: 'org.junit.vintage', name: 'junit-vintage-engine', version: junitVersion
testImplementation group: 'org.junit.platform', name: 'junit-platform-runner', version: junitPlatformVersion
testRuntimeOnly "org.junit.vintage:junit-vintage-engine:${junitVersion}"
testImplementation "org.junit.platform:junit-platform-runner:${junitPlatformVersion}"

testImplementation group: 'org.scalatest', name: "scalatest_${scalaVersionMajor}.${scalaVersionMinor}", version: scalatestVersion
testImplementation "org.scalatest:scalatest_${scalaVersionMajor}.${scalaVersionMinor}:${scalatestVersion}"
}

test {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ subprojects {
apply plugin: 'java'

dependencies {
testImplementation group: 'org.junit.platform', name: 'junit-platform-runner', version: junitPlatformVersion
testImplementation "org.junit.platform:junit-platform-runner:${junitPlatformVersion}"

compileOnly "org.projectlombok:lombok:$lombokVersion"
annotationProcessor "org.projectlombok:lombok:$lombokVersion"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
dependencies {
testRuntimeOnly group: 'org.junit.vintage', name: 'junit-vintage-engine', version: junitVersion
testRuntimeOnly "org.junit.vintage:junit-vintage-engine:${junitVersion}"
}
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
apply plugin: 'scala'

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

testRuntimeOnly group: 'org.junit.vintage', name: 'junit-vintage-engine', version: junitVersion
testRuntimeOnly "org.junit.vintage:junit-vintage-engine:${junitVersion}"

testImplementation group: 'org.scalatest', name: "scalatest_${scalaVersionMajor}.${scalaVersionMinor}", version: scalatestVersion
testImplementation "org.scalatest:scalatest_${scalaVersionMajor}.${scalaVersionMinor}:${scalatestVersion}"
}

apply plugin: 'org.scoverage'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ subprojects {
apply plugin: 'java'

dependencies {
testImplementation group: 'org.junit.platform', name: 'junit-platform-runner', version: junitPlatformVersion
testImplementation "org.junit.platform:junit-platform-runner:${junitPlatformVersion}"
}

test {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
dependencies {
testRuntimeOnly group: 'org.junit.vintage', name: 'junit-vintage-engine', version: junitVersion
testRuntimeOnly "org.junit.vintage:junit-vintage-engine:${junitVersion}"
}
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
apply plugin: 'scala'

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

testRuntimeOnly group: 'org.junit.vintage', name: 'junit-vintage-engine', version: junitVersion
testRuntimeOnly "org.junit.vintage:junit-vintage-engine:${junitVersion}"

testImplementation group: 'org.scalatest', name: "scalatest_${scalaVersionMajor}.${scalaVersionMinor}", version: scalatestVersion
testImplementation "org.scalatest:scalatest_${scalaVersionMajor}.${scalaVersionMinor}:${scalatestVersion}"
}

// A common practice in mixed java/scala modules to make Java code able to import Scala code
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
apply plugin: 'scala'

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

testRuntimeOnly group: 'org.junit.vintage', name: 'junit-vintage-engine', version: junitVersion
testRuntimeOnly "org.junit.vintage:junit-vintage-engine:${junitVersion}"

testImplementation group: 'org.scalatest', name: "scalatest_${scalaVersionMajor}.${scalaVersionMinor}", version: scalatestVersion
testImplementation "org.scalatest:scalatest_${scalaVersionMajor}.${scalaVersionMinor}:${scalatestVersion}"
}

apply plugin: 'org.scoverage'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@ allprojects {
apply plugin: 'org.scoverage'

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

testRuntimeOnly group: 'org.junit.vintage', name: 'junit-vintage-engine', version: junitVersion
testImplementation group: 'org.junit.platform', name: 'junit-platform-runner', version: junitPlatformVersion
testRuntimeOnly "org.junit.vintage:junit-vintage-engine:${junitVersion}"
testImplementation "org.junit.platform:junit-platform-runner:${junitPlatformVersion}"

testImplementation group: 'org.scalatest', name: "scalatest_${scalaVersionMajor}.${scalaVersionMinor}", version: scalatestVersion
testImplementation "org.scalatest:scalatest_${scalaVersionMajor}.${scalaVersionMinor}:${scalatestVersion}"
}

testing {
Expand All @@ -36,7 +36,6 @@ allprojects {
}
}
intTest(JvmTestSuite) {
testType = TestSuiteType.INTEGRATION_TEST
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure the implications here but this field was removed in Gradle 8.13

https://docs.gradle.org/current/userguide/upgrading_version_8.html#changes_to_jvmtestsuite

// dependencies { ... } does not appear to work as advertised?
sources {
scala {
Expand All @@ -45,7 +44,7 @@ allprojects {
}
}
targets.configureEach {
testTask.configure{
testTask.configure {
outputs.upToDateWhen { false }
mustRunAfter(test)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@ allprojects { p ->

dependencies {

implementation group: 'org.scala-lang', name: 'scala-library', version: "${scalaVersionMajor}.${scalaVersionMinor}.${scalaVersionBuild}"
implementation "org.scala-lang:scala-library:${scalaVersionMajor}.${scalaVersionMinor}.${scalaVersionBuild}"

testImplementation group: 'org.junit.platform', name: 'junit-platform-runner'
testImplementation 'org.junit.platform:junit-platform-runner'

testImplementation group: 'org.scalatest', name: "scalatest_${scalaVersionMajor}.${scalaVersionMinor}"
testImplementation "org.scalatest:scalatest_${scalaVersionMajor}.${scalaVersionMinor}"
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ allprojects { p ->
dependencies {
implementation platform(project(':dependencies'))

implementation group: 'org.scala-lang', name: 'scala-library'
implementation 'org.scala-lang:scala-library'

testRuntimeOnly group: 'org.junit.vintage', name: 'junit-vintage-engine'
testImplementation group: 'org.junit.platform', name: 'junit-platform-runner'
testRuntimeOnly 'org.junit.vintage:junit-vintage-engine'
testImplementation 'org.junit.platform:junit-platform-runner'

testImplementation group: 'org.scalatest', name: "scalatest_${scalaVersionMajor}.${scalaVersionMinor}"
}
Expand Down
Loading