From 8e56cba18ac7977cd4bae8a0ed73b458c0b5aa31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bartosz=20Ga=C5=82ek?= Date: Wed, 4 Sep 2024 00:32:41 +0200 Subject: [PATCH] mark integration as tests in IDE, include integration coverage in jacoco (#810) --- README.md | 1 - build.gradle.kts | 19 +++++++++++++------ 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index d02da269..150dc169 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,6 @@ axion-release-plugin *gradle release and version management plugin* [![Build Status](https://github.com/allegro/axion-release-plugin/actions/workflows/ci.yml/badge.svg)](https://github.com/allegro/axion-release-plugin/actions/workflows/ci.yml) -[![Coverage Status](https://coveralls.io/repos/allegro/axion-release-plugin/badge.svg?branch=development)](https://coveralls.io/r/allegro/axion-release-plugin) [![readthedocs](https://readthedocs.org/projects/axion-release-plugin/badge/?version=latest) ](http://axion-release-plugin.readthedocs.org/en/latest/) ![Maven Central](https://img.shields.io/maven-central/v/pl.allegro.tech.build/axion-release-plugin) [![Gradle Plugin Portal](https://img.shields.io/gradle-plugin-portal/v/pl.allegro.tech.build.axion-release?versionPrefix=1.1)](https://plugins.gradle.org/plugin/pl.allegro.tech.build.axion-release) diff --git a/build.gradle.kts b/build.gradle.kts index 30305da8..531549b9 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -4,8 +4,8 @@ plugins { `maven-publish` signing jacoco + idea id("pl.allegro.tech.build.axion-release") version "1.18.7" - id("com.github.kt3k.coveralls") version "2.12.2" id("com.gradle.plugin-publish") version "1.2.2" id("io.github.gradle-nexus.publish-plugin") version "2.0.0" id("com.coditory.integration-test") version "1.4.5" @@ -60,7 +60,7 @@ dependencies { runtimeOnly("org.eclipse.jgit:org.eclipse.jgit.gpg.bc:$jgitVersion") implementation("org.eclipse.jgit:org.eclipse.jgit:$jgitVersion") - implementation("org.eclipse.jgit:org.eclipse.jgit.ssh.jsch:$jgitVersion") { + implementation("org.eclipse.jgit:org.eclipse.jgit.ssh.jsch:$jgitVersion") { exclude("com.jcraft", "jsch") } implementation("com.github.mwiede:jsch:$jschVersion") @@ -112,13 +112,13 @@ tasks { reports { xml.required.set(true) } + executionData( + file("${layout.buildDirectory.asFile.get()}/jacoco/test.exec"), + file("${layout.buildDirectory.asFile.get()}/jacoco/integrationTest.exec"), + ) } } -jacoco { - toolVersion = "0.8.2" -} - gradlePlugin { testSourceSets(sourceSets.integration.get()) plugins { @@ -193,3 +193,10 @@ signing { ) sign(publishing.publications) } + +idea { + module { + testSourceDirs = testSourceDirs + sourceSets.integration.get().allSource.srcDirs + testResourceDirs = testResourceDirs + sourceSets.integration.get().resources.srcDirs + } +}