Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bugfix/override plugin java 11 #232

Merged
merged 3 commits into from
Jan 31, 2024
Merged

Bugfix/override plugin java 11 #232

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ac2fb11
remove unused functional test task specs
lheimbs Jan 31, 2024
cf86382
update override plugin to 1.2
lheimbs Jan 31, 2024
3033d69
update coverage plugin to support java 11 and upgrade version to 1.2
lheimbs Jan 31, 2024
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 coverage-reporter/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ plugins {
}

group = "io.github.amosproj"
version = "1.1"
version = "1.2"

repositories {
mavenCentral()
Expand All @@ -24,7 +24,7 @@ tasks.test {
}

kotlin {
jvmToolchain(17)
jvmToolchain(11)
}

java {
Expand Down
29 changes: 1 addition & 28 deletions pitmutationmate-override-plugin/plugin/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ dependencies {
}

group = "io.github.amos-pitmutationmate.pitmutationmate.override"
version = "1.1"
version = "1.2"

gradlePlugin {
website = "https://github.com/amosproj/amos2023ws02-pitest-ide-plugin"
Expand All @@ -54,30 +54,3 @@ gradlePlugin {
}
}
}

// Add a source set for the functional test suite
val functionalTestSourceSet =
sourceSets.create("functionalTest") {
}

configurations["functionalTestImplementation"].extendsFrom(configurations["testImplementation"])
configurations["functionalTestRuntimeOnly"].extendsFrom(configurations["testRuntimeOnly"])

// Add a task to run the functional tests
val functionalTest by tasks.registering(Test::class) {
testClassesDirs = functionalTestSourceSet.output.classesDirs
classpath = functionalTestSourceSet.runtimeClasspath
useJUnitPlatform()
}

gradlePlugin.testSourceSets.add(functionalTestSourceSet)

tasks.named<Task>("check") {
// Run the functional tests as part of `check`
dependsOn(functionalTest)
}

tasks.named<Test>("test") {
// Use JUnit Jupiter for unit tests.
useJUnitPlatform()
}
2 changes: 1 addition & 1 deletion .../src/main/kotlin/com/amos/pitmutationmate/pitmutationmate/execution/GradleTaskExecutor.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ class GradleTaskExecutor : BasePitestExecutor() {
parameters.add("-Dpitmutationmate.override.targetClasses=$classFQN")
}
parameters.add("-Dpitmutationmate.override.outputFormats=XML,report-coverage")
parameters.add("-Dpitmutationmate.override.addCoverageListenerDependency=io.github.amosproj:coverage-reporter:1.1")
parameters.add("-Dpitmutationmate.override.addCoverageListenerDependency=io.github.amosproj:coverage-reporter:1.2")
parameters.add("-Dpitmutationmate.override.verbose=$verbose")
parameters.add("-Dpitmutationmate.override.port=$port")
parameters.add("-Dpitmutationmate.override.reportDir=${reportDir.toAbsolutePath()}")
Expand Down
4 changes: 2 additions & 2 deletions ...src/main/kotlin/com/amos/pitmutationmate/pitmutationmate/services/PluginCheckerService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,11 +178,11 @@ class PluginCheckerService(private val project: Project) {

private const val KOTLIN_PITEST_PLUGIN = "id(\"info.solidsoft.pitest\") version \"x.y.z\""
private const val KOTLIN_OVERRIDE_PLUGIN =
"id(\"io.github.amos-pitmutationmate.pitmutationmate.override\") version \"1.1\""
"id(\"io.github.amos-pitmutationmate.pitmutationmate.override\") version \"1.2\""

private const val GROOVY_PITEST_PLUGIN = "id 'info.solidsoft.pitest' version 'x.y.z'"
private const val GROOVY_OVERRIDE_PLUGIN =
"id \"io.github.amos-pitmutationmate.pitmutationmate.override\" version \"1.1\""
"id \"io.github.amos-pitmutationmate.pitmutationmate.override\" version \"1.2\""

const val ERROR_MESSAGE_TITLE = "Plugins for PITMutationPlugin are missing"
private val ERROR_MESSAGE_PITEST_PLUGIN_MISSING = """<b>The pitest gradle Plugin is missing.</b>
Expand Down
Loading