From 5bcfd1fb70e13cdd953cb1ee14c2588574b6ff15 Mon Sep 17 00:00:00 2001 From: Razvan Bunea Date: Wed, 7 Sep 2022 00:04:42 +0200 Subject: [PATCH 1/2] feat: add support for kotlin multiplatform sources sets. --- CHANGELOG.md | 3 ++ README.md | 12 +++++-- build.gradle.kts | 4 ++- gradle.properties | 2 +- src/main/kotlin/JacocoToCoberturaPlugin.kt | 39 ++++++++++++++++++---- 5 files changed, 48 insertions(+), 12 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ba193f2..4bb2cbe 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,9 @@ This list is not intended to be all-encompassing - it will document major and breaking changes with their rationale when appropriate: +### v1.0.2 +- Fix: support sources from kotlin multiplatform projects + ### v1.0.1 - Fix: multiple sourceinfo entries support in the jacoco report diff --git a/README.md b/README.md index 825fd0c..c382031 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # JacocoToCobertura Gradle Plugin ![Current release](https://img.shields.io/github/v/release/razvn/jacoco-to-cobertura-gradle-plugin) -[![Gradle Plugin Portal](https://img.shields.io/badge/Gradle-v1.0.1-blue.svg)](https://plugins.gradle.org/plugin/net.razvan.jacoco-to-cobertura) +[![Gradle Plugin Portal](https://img.shields.io/badge/Gradle-v1.0.2-blue.svg)](https://plugins.gradle.org/plugin/net.razvan.jacoco-to-cobertura) The aim of the plugin is to convert the Jacoco XML report to Cobertura report in order for GitLab to use the infos for [showing the lines covered by tests in the Merge Request](https://docs.gitlab.com/ee/ci/testing/test_coverage_visualization.html). @@ -14,7 +14,7 @@ The project is an adaptation of the python version [cover2cover](https://github. ```kotlin plugins { jacoco - id("net.razvan.jacoco-to-cobertura") version "1.0.1" + id("net.razvan.jacoco-to-cobertura") version "1.0.2" } ``` @@ -37,10 +37,16 @@ Run the task: `jacocoToCobertura`. The task should be run after `jacocoTestRepor ./gradlew jacocoToCobertura ``` -or just set it after jacocoTestReport +or just set it after `jacocoTestReport` ```kotlin tasks.jacocoTestReport { finalizedBy(tasks.jacocoToCobertura) } ``` +or `koverXmlReport` +```kotlin +tasks.koverXmlReport { + finalizedBy(tasks.jacocoToCobertura) +} +``` diff --git a/build.gradle.kts b/build.gradle.kts index 45a972f..6366426 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,8 +1,9 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile +import java.util.regex.Pattern.compile plugins { id("java-gradle-plugin") - kotlin("jvm") version "1.7.0" + kotlin("jvm") version "1.7.10" id("maven-publish") id("com.gradle.plugin-publish") version "0.18.0" } @@ -15,6 +16,7 @@ repositories { dependencies { implementation("org.simpleframework:simple-xml:2.7.1") + implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.10") testImplementation(kotlin("test")) testImplementation("org.junit.jupiter:junit-jupiter:5.8.2") } diff --git a/gradle.properties b/gradle.properties index cc197d9..f0b1d2b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,2 +1,2 @@ kotlin.code.style=official -version=1.0.1 +version=1.0.2 diff --git a/src/main/kotlin/JacocoToCoberturaPlugin.kt b/src/main/kotlin/JacocoToCoberturaPlugin.kt index 1197821..15d7594 100644 --- a/src/main/kotlin/JacocoToCoberturaPlugin.kt +++ b/src/main/kotlin/JacocoToCoberturaPlugin.kt @@ -7,7 +7,7 @@ import org.gradle.api.plugins.JavaPluginExtension import org.gradle.api.tasks.InputFile import org.gradle.api.tasks.OutputFile import org.gradle.api.tasks.SourceSet -import org.gradle.api.tasks.SourceSetContainer +import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension import org.simpleframework.xml.Serializer import org.simpleframework.xml.core.Persister import org.simpleframework.xml.stream.Format @@ -34,9 +34,33 @@ class JacocoToCoberturaPlugin : Plugin { } val output = extension.outputFile.getOrNull()?.asFile ?: defaultOutputFile(input) + val customSourcesConf = emptySet() + val jacocoData = loadJacocoData(input) + + val kotlinSourcesSet = mutableSetOf() + val kotlinSources = kotlin.runCatching { + project.extensions.getByType(KotlinMultiplatformExtension::class.java) + .sourceSets + .filterNot { it.name.contains("test", true) } + .forEach { + it.kotlin.srcDirs.forEach { + it.walkTopDown().forEach { + if (it.isFile) kotlinSourcesSet.add(it) + } + } + } + kotlinSourcesSet + }.getOrNull() ?: kotlinSourcesSet + val javaSources = kotlin.runCatching { project.extensions.getByType(JavaPluginExtension::class.java).sourceSets }.getOrNull() + ?.getByName(SourceSet.MAIN_SOURCE_SET_NAME)?.allSource?.files ?: emptySet() + val customSources = customSourcesConf + .filter { it.exists() } + .mapNotNull { it.listFiles()?.toList() } + .flatten() + .toSet() val roots = sourcesRoots( - project.extensions.getByType(JavaPluginExtension::class.java).sourceSets, + kotlinSources + javaSources + customSources, jacocoData ) @@ -83,15 +107,16 @@ class JacocoToCoberturaPlugin : Plugin { return outputFile } - private fun sourcesRoots(sourcesSet: SourceSetContainer?, jacocoData: Jacoco.Report): Set { - val allSources = sourcesSet?.getByName(SourceSet.MAIN_SOURCE_SET_NAME)?.allSource - ?: emptyList() + private fun sourcesRoots(allSources: Set, jacocoData: Jacoco.Report): Set { val jacocoPackages = jacocoData.packagesNames() - return allSources.map { it.canonicalPath } .mapNotNull { sourceName -> val p = jacocoPackages.firstOrNull { sourceName.contains(it) } - p?.let { sourceName.substringBefore(it) } + ?: jacocoPackages.firstOrNull { sourceName.contains(it.replace("/", ".")) } // in case the package is in dot format + p?.let { + val sourcePath = sourceName.substringBefore(it) + if (sourcePath != sourceName) sourcePath else sourceName.substringBefore(it.replace("/", ".")) + } }.toSet() } } From f2a53af55a57c0d72620820e824252408a1f651e Mon Sep 17 00:00:00 2001 From: Razvan Bunea Date: Wed, 7 Sep 2022 00:20:36 +0200 Subject: [PATCH 2/2] chore: update gradle-publish plugin and wrapper --- .idea/kotlinc.xml | 6 + build.gradle.kts | 3 +- gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew | 257 +++++++++-------------- 4 files changed, 112 insertions(+), 156 deletions(-) create mode 100644 .idea/kotlinc.xml diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml new file mode 100644 index 0000000..b1077fb --- /dev/null +++ b/.idea/kotlinc.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/build.gradle.kts b/build.gradle.kts index 6366426..47fac17 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,11 +1,10 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile -import java.util.regex.Pattern.compile plugins { id("java-gradle-plugin") kotlin("jvm") version "1.7.10" id("maven-publish") - id("com.gradle.plugin-publish") version "0.18.0" + id("com.gradle.plugin-publish") version "1.0.0" } group = "net.razvan" diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 92f06b5..8fad3f5 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 1b6c787..744e882 100755 --- a/gradlew +++ b/gradlew @@ -1,7 +1,7 @@ -#!/bin/sh +#!/usr/bin/env sh # -# Copyright © 2015-2021 the original authors. +# Copyright 2015 the original author or authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,101 +17,67 @@ # ############################################################################## -# -# Gradle start up script for POSIX generated by Gradle. -# -# Important for running: -# -# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is -# noncompliant, but you have some other compliant shell such as ksh or -# bash, then to run this script, type that shell name before the whole -# command line, like: -# -# ksh Gradle -# -# Busybox and similar reduced shells will NOT work, because this script -# requires all of these POSIX shell features: -# * functions; -# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», -# «${var#prefix}», «${var%suffix}», and «$( cmd )»; -# * compound commands having a testable exit status, especially «case»; -# * various built-in commands including «command», «set», and «ulimit». -# -# Important for patching: -# -# (2) This script targets any POSIX shell, so it avoids extensions provided -# by Bash, Ksh, etc; in particular arrays are avoided. -# -# The "traditional" practice of packing multiple parameters into a -# space-separated string is a well documented source of bugs and security -# problems, so this is (mostly) avoided, by progressively accumulating -# options in "$@", and eventually passing that to Java. -# -# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, -# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; -# see the in-line comments for details. -# -# There are tweaks for specific operating systems such as AIX, CygWin, -# Darwin, MinGW, and NonStop. -# -# (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt -# within the Gradle project. -# -# You can find Gradle at https://github.com/gradle/gradle/. -# +## +## Gradle start up script for UN*X +## ############################################################################## # Attempt to set APP_HOME - # Resolve links: $0 may be a link -app_path=$0 - -# Need this for daisy-chained symlinks. -while - APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path - [ -h "$app_path" ] -do - ls=$( ls -ld "$app_path" ) - link=${ls#*' -> '} - case $link in #( - /*) app_path=$link ;; #( - *) app_path=$APP_HOME$link ;; - esac +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi done - -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null APP_NAME="Gradle" -APP_BASE_NAME=${0##*/} +APP_BASE_NAME=`basename "$0"` # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD=maximum +MAX_FD="maximum" warn () { echo "$*" -} >&2 +} die () { echo echo "$*" echo exit 1 -} >&2 +} # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "$( uname )" in #( - CYGWIN* ) cygwin=true ;; #( - Darwin* ) darwin=true ;; #( - MSYS* | MINGW* ) msys=true ;; #( - NONSTOP* ) nonstop=true ;; +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MSYS* | MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar @@ -121,9 +87,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD=$JAVA_HOME/jre/sh/java + JAVACMD="$JAVA_HOME/jre/sh/java" else - JAVACMD=$JAVA_HOME/bin/java + JAVACMD="$JAVA_HOME/bin/java" fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -132,7 +98,7 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD=java + JAVACMD="java" which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the @@ -140,95 +106,80 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then - case $MAX_FD in #( - max*) - MAX_FD=$( ulimit -H -n ) || - warn "Could not query maximum file descriptor limit" - esac - case $MAX_FD in #( - '' | soft) :;; #( - *) - ulimit -n "$MAX_FD" || - warn "Could not set maximum file descriptor limit to $MAX_FD" - esac +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi fi -# Collect all arguments for the java command, stacking in reverse order: -# * args from the command line -# * the main class name -# * -classpath -# * -D...appname settings -# * --module-path (only if needed) -# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi # For Cygwin or MSYS, switch paths to Windows format before running java -if "$cygwin" || "$msys" ; then - APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) - CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) - - JAVACMD=$( cygpath --unix "$JAVACMD" ) - +if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi # Now convert the arguments - kludge to limit ourselves to /bin/sh - for arg do - if - case $arg in #( - -*) false ;; # don't mess with options #( - /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath - [ -e "$t" ] ;; #( - *) false ;; - esac - then - arg=$( cygpath --path --ignore --mixed "$arg" ) + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" fi - # Roll the args list around exactly as many times as the number of - # args, so each arg winds up back in the position where it started, but - # possibly modified. - # - # NB: a `for` loop captures its iteration list before it begins, so - # changing the positional parameters here affects neither the number of - # iterations, nor the values presented in `arg`. - shift # remove old arg - set -- "$@" "$arg" # push replacement arg + i=`expr $i + 1` done + case $i in + 0) set -- ;; + 1) set -- "$args0" ;; + 2) set -- "$args0" "$args1" ;; + 3) set -- "$args0" "$args1" "$args2" ;; + 4) set -- "$args0" "$args1" "$args2" "$args3" ;; + 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac fi -# Collect all arguments for the java command; -# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of -# shell script including quotes and variable substitutions, so put them in -# double quotes to make sure that they get re-expanded; and -# * put everything else in single quotes, so that it's not re-expanded. - -set -- \ - "-Dorg.gradle.appname=$APP_BASE_NAME" \ - -classpath "$CLASSPATH" \ - org.gradle.wrapper.GradleWrapperMain \ - "$@" - -# Use "xargs" to parse quoted args. -# -# With -n1 it outputs one arg per line, with the quotes and backslashes removed. -# -# In Bash we could simply go: -# -# readarray ARGS < <( xargs -n1 <<<"$var" ) && -# set -- "${ARGS[@]}" "$@" -# -# but POSIX shell has neither arrays nor command substitution, so instead we -# post-process each arg (as a line of input to sed) to backslash-escape any -# character that might be a shell metacharacter, then use eval to reverse -# that process (while maintaining the separation between arguments), and wrap -# the whole thing up as a single "set" statement. -# -# This will of course break if any of these variables contains a newline or -# an unmatched quote. -# +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=`save "$@"` -eval "set -- $( - printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | - xargs -n1 | - sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | - tr '\n' ' ' - )" '"$@"' +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" exec "$JAVACMD" "$@"