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
45 changes: 23 additions & 22 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
plugins {
id 'java-gradle-plugin'
id "com.gradle.plugin-publish" version "1.1.0"
id 'org.jreleaser' version '1.25.0'
id "org.jetbrains.gradle.plugin.idea-ext" version "1.0"
}

Expand All @@ -11,14 +12,12 @@ repositories {
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'
version = '9.0.0-SNAPSHOT'
}
ext {
website = 'http://scoverage.org'
vcsUrl = 'https://github.com/scoverage/gradle-scoverage.git'
scmUrl = "scm:git:$vcsUrl"
sonatypeUser = System.env.SONATYPE_USER
sonatypePass = System.env.SONATYPE_PASS
}

gradlePlugin {
Expand All @@ -36,7 +35,6 @@ gradlePlugin {
}
}

apply plugin: 'maven-publish'
apply plugin: 'groovy'

java {
Expand Down Expand Up @@ -122,30 +120,19 @@ task groovydocJar(type: Jar, dependsOn: groovydoc) {
archiveClassifier.set('groovydoc')
}

def propOrDefault(String property) {
if (project.hasProperty(property)) {
return project.getProperty(property)
} else {
return ''
}
}

publishing {
repositories {
maven {
url = "https://oss.sonatype.org/service/local/staging/deploy/maven2/"
credentials(PasswordCredentials) {
username = propOrDefault('sonatypeUser')
password = propOrDefault('sonatypePass')
}
name = 'staging'
url = layout.buildDirectory.dir('staging-deploy')
}
}
publications {
mavenJava(MavenPublication) {
pom {
name = 'GradleScoverage'
description = project.description
url = project.website
url = project.ext.website

scm {
url = scmUrl
Expand Down Expand Up @@ -181,14 +168,28 @@ publishing {
}
}

if (project.hasProperty('signing.keyId')) {
apply plugin: 'signing'
jreleaser {
signing {
sign publishing.publications.mavenJava
pgp {
mode='COMMAND'
active = 'ALWAYS'
armored = true
}
}
deploy {
maven {
mavenCentral {
sonatype {
active = 'ALWAYS'
url = 'https://central.sonatype.com/api/v1/publisher'
stagingRepository('build/staging-deploy')
}
}
}
}
project.tasks.publishMavenJavaPublicationToMavenRepository.inputs.files(project.tasks.signMavenJavaPublication)
}


// see https://stackoverflow.com/questions/44679007
task fixIdeaPluginClasspath {
doFirst {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
package org.scoverage;

import org.junit.Assert;
import org.junit.Test;

import java.util.List;

public class ScalaSingleModuleScala2ExtensionTest extends ScalaSingleModuleScalaExtensionTest {

@Override
protected List<String> getVersionAgruments() {
return ScalaVersionArguments.version2;
}

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
package org.scoverage;

import org.junit.Assert;
import org.junit.Test;

import java.util.List;

public class ScalaSingleModuleScala3ExtensionTest extends ScalaSingleModuleScalaExtensionTest {

@Override
protected List<String> getVersionAgruments() {
return ScalaVersionArguments.version3;
}

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
package org.scoverage;

import org.junit.Assert;
import org.junit.Test;

import java.util.List;

public abstract class ScalaSingleModuleScalaExtensionTest extends ScoverageFunctionalTest {

public ScalaSingleModuleScalaExtensionTest() {
super("scala-single-module-scala-extension");
}

@Test
public void checkScoverage() throws Exception {

AssertableBuildResult result = run("clean", ScoveragePlugin.getCHECK_NAME());

result.assertTaskSucceeded(ScoveragePlugin.getCOMPILE_NAME());
result.assertTaskSucceeded(ScoveragePlugin.getREPORT_NAME());
result.assertTaskSucceeded(ScoveragePlugin.getCHECK_NAME());
result.assertTaskDoesntExist(ScoveragePlugin.getAGGREGATE_NAME());

assertReportFilesExist();
assertCoverage(100.0);
}

private void assertReportFilesExist() {

Assert.assertTrue(resolve(reportDir(), "index.html").exists());
Assert.assertTrue(resolve(reportDir(), "org/hello/World.scala.html").exists());
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
plugins {
id 'org.scoverage'
}

repositories {
mavenCentral()
}

description = 'a single-module Scala project that builds successfully configured via scala { ... }'

apply plugin: 'java'
apply plugin: 'scala'

scala.scalaVersion = "${scalaVersionMajor}.${scalaVersionMinor}.${scalaVersionBuild}"

dependencies {
if (project.findProperty("scalaVersionMajor") == "2") {
testImplementation "org.scalatest:scalatest_2.$scalaVersionMinor:$scalatestVersion"
testImplementation "org.scalatestplus:junit-4-13_2.$scalaVersionMinor:${scalatestVersion}.0"
} else {
testImplementation "org.scalatest:scalatest_3:$scalatestVersion"
testImplementation "org.scalatestplus:junit-4-13_3:${scalatestVersion}.0"
}

testRuntimeOnly "org.junit.vintage:junit-vintage-engine:$junitVersion"
testImplementation "org.junit.platform:junit-platform-runner:$junitPlatformVersion"
}

test {
useJUnitPlatform()
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
package org.hello

class World {

def foo(): String = {
val s = "a" + "b"
s
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
package org.hello

import org.junit.runner.RunWith
import org.scalatest.funsuite._
import org.scalatestplus.junit.JUnitRunner

@RunWith(classOf[JUnitRunner])
class WorldSuite extends AnyFunSuite {

test("foo") {
new World().foo()
}
}
2 changes: 1 addition & 1 deletion src/main/groovy/org/scoverage/ScalaVersion.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,6 @@ class ScalaVersion {

@Override
String toString() {
return majorVersion < 3 ? primaryVersion : "$primaryVersion (${secondaryVersion.get()})"
return majorVersion < 3 ? primaryVersion : "$primaryVersion ($secondaryVersion)"
}
}
1 change: 1 addition & 0 deletions src/main/groovy/org/scoverage/ScoverageExtension.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ class ScoverageExtension {
scoverageVersion.set('2.1.1')

scoverageScalaVersion = project.objects.property(String)
scoverageScalaVersion.convention(project.scala.scalaVersion)

dataDir = project.objects.property(File)
dataDir.set(project.layout.buildDirectory.dir('scoverage').get().asFile)
Expand Down
6 changes: 4 additions & 2 deletions src/main/groovy/org/scoverage/ScoveragePlugin.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,10 @@ class ScoveragePlugin implements Plugin<PluginAware> {
scoverage("org.scoverage:scalac-scoverage-domain_$scalacScoverageVersion:$scoverageVersion")
scoverage("org.scoverage:scalac-scoverage-reporter_$scalacScoverageVersion:$scoverageVersion")
scoverage("org.scoverage:scalac-scoverage-serializer_$scalacScoverageVersion:$scoverageVersion")
scoverage("org.scoverage:scalac-scoverage-runtime_$scalacScoverageRuntimeVersion:$scoverageVersion")
scoverage("org.scoverage:scalac-scoverage-plugin_$scalacScoveragePluginVersion:$scoverageVersion")
if (scalaVersion.majorVersion < 3) {
scoverage("org.scoverage:scalac-scoverage-runtime_$scalacScoverageRuntimeVersion:$scoverageVersion")
scoverage("org.scoverage:scalac-scoverage-plugin_$scalacScoveragePluginVersion:$scoverageVersion")
}
}
}
}
Expand Down
Loading