From fb2eb521d3f1b7a360371ae845f379586aee9f4a Mon Sep 17 00:00:00 2001 From: devatherock Date: Mon, 9 May 2022 20:45:21 -0500 Subject: [PATCH] feat: Used integration test config from gradle-includes --- CHANGELOG.md | 4 ++++ build.gradle | 2 +- integration.gradle | 24 ------------------------ 3 files changed, 5 insertions(+), 25 deletions(-) delete mode 100644 integration.gradle diff --git a/CHANGELOG.md b/CHANGELOG.md index d92205f..20988ca 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,10 @@ # Changelog ## [Unreleased] +### Changed +- Used integration test config from `gradle-includes` + +## [1.0.0] - 2022-05-08 ### Added - [#51](https://github.com/devatherock/artifactory-badge/issues/51): Integration tests - [#14](https://github.com/devatherock/artifactory-badge/issues/14): Used native binary in docker image diff --git a/build.gradle b/build.gradle index cf749d1..67ad370 100644 --- a/build.gradle +++ b/build.gradle @@ -103,5 +103,5 @@ ext.jacoco = [ 'io/github/devatherock/test/ArtifactoryController.class' ] ] -apply from: 'integration.gradle' +apply from: 'https://raw.githubusercontent.com/devatherock/gradle-includes/master/integration.gradle' apply from: 'https://raw.githubusercontent.com/devatherock/gradle-includes/master/checks.gradle' \ No newline at end of file diff --git a/integration.gradle b/integration.gradle deleted file mode 100644 index fb7a2cf..0000000 --- a/integration.gradle +++ /dev/null @@ -1,24 +0,0 @@ -configurations { - integrationTestCompile.extendsFrom testCompile -} - -sourceSets { - integrationTest { - groovy { - compileClasspath += project.configurations.testCompileClasspath + main.output + test.output - runtimeClasspath += project.configurations.testRuntimeClasspath + main.output + test.output - srcDirs = [ - "$projectDir/src/integrationTest/groovy" - ] - } - resources.srcDir file('src/integrationTest/resources') - } -} - -task integrationTest(type: Test) { - testClassesDirs = project.sourceSets.integrationTest.output.classesDirs - classpath = project.sourceSets.integrationTest.runtimeClasspath - systemProperties([ - 'micronaut.env.deduction': 'false' - ]) -} \ No newline at end of file