Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
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
12 changes: 6 additions & 6 deletions .github/workflows/gradle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,18 +20,18 @@ jobs:
continue-on-error: false
- name: 'fail on warning'
additional-check-args: '--warning-mode=fail -PfailOnWarning'
continue-on-error: true
continue-on-error: false

runs-on: ubuntu-latest
continue-on-error: ${{ matrix.continue-on-error }}

steps:
- uses: actions/checkout@v2
- name: Set up JDK 11
uses: actions/setup-java@v2
- uses: actions/checkout@v4
- name: Set up JDK 17
uses: actions/setup-java@v4
with:
java-version: '11'
distribution: 'adopt'
java-version: '17'
distribution: 'temurin'
- name: Grant execute permission for gradlew
run: chmod +x gradlew
- name: Build with Gradle
Expand Down
12 changes: 7 additions & 5 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ repositories {
mavenCentral()
}

group 'org.scoverage'
group = 'org.scoverage'
description = 'gradle-scoverage is a Gradle plugin for calculating code coverage using Scoverage'
if (project.version == 'unspecified') {
version = '8.0.0-SNAPSHOT'
Expand Down Expand Up @@ -48,8 +48,10 @@ 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 localGroovy()
testImplementation gradleApi()
testImplementation 'junit:junit:4.12'
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.5.2'
testRuntimeOnly 'org.junit.vintage:junit-vintage-engine:5.5.2'
Expand Down Expand Up @@ -116,7 +118,7 @@ gradlePlugin {
}

task groovydocJar(type: Jar, dependsOn: groovydoc) {
from "$buildDir/docs/groovydoc"
from layout.buildDirectory.dir('docs/groovydoc')
archiveClassifier.set('groovydoc')
}

Expand Down Expand Up @@ -179,7 +181,7 @@ publishing {
}
}

if (project.properties.containsKey('signing.keyId')) {
if (project.hasProperty('signing.keyId')) {
apply plugin: 'signing'
signing {
sign publishing.publications.mavenJava
Expand All @@ -191,7 +193,7 @@ if (project.properties.containsKey('signing.keyId')) {
task fixIdeaPluginClasspath {
doFirst {
configure(tasks.pluginUnderTestMetadata) {
def ideaClassesPath = project.buildDir.toPath().resolveSibling("out").resolve("production")
def ideaClassesPath = project.layout.buildDirectory.get().asFile.toPath().resolveSibling("out").resolve("production")
def newClasspath = pluginClasspath as List
newClasspath.add(0, ideaClassesPath)
pluginClasspath.setFrom(newClasspath)
Expand Down
4 changes: 2 additions & 2 deletions 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
distributionSha256Sum=f397b287023acdba1e9f6fc5ea72d22dd63669d59ed4a289a29b1a76eee151c6
distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.0-bin.zip
distributionSha256Sum=bbaeb2fef8710818cf0e261201dab964c572f92b942812df0c3620d62a529a01
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 @@ -12,16 +12,16 @@ apply plugin: 'java'
apply plugin: 'scala'


group "org.composite"
version '1.0'
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 @@ -12,16 +12,16 @@ apply plugin: 'java'
apply plugin: 'scala'


group "org.composite"
version '1.0'
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
@@ -1,5 +1,5 @@
plugins {
id 'io.spring.dependency-management' version "1.1.5"
id 'io.spring.dependency-management' version "1.1.7"
id 'org.scoverage'
}

Expand All @@ -16,5 +16,5 @@ dependencyManagement {
}

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'
testImplementation group: 'org.scalatest', name: "scalatest_${scalaVersionMajor}.${scalaVersionMinor}"
testRuntimeOnly 'org.junit.vintage:junit-vintage-engine'
testImplementation "org.scalatest: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
Loading
Loading