diff --git a/build.gradle b/build.gradle index f069ec0..9da45c8 100644 --- a/build.gradle +++ b/build.gradle @@ -16,39 +16,12 @@ */ plugins { - id 'groovy' - id 'idea' - id 'maven-publish' - id 'com.gradle.plugin-publish' version '0.9.7' - id 'nebula.release' version '5.0.0' - id 'jacoco' - id "com.github.kt3k.coveralls" version "2.8.1" + id "net.wooga.plugins" version "0.2.1" } group 'net.wooga.gradle' description = 'Paket plugin for Gradle.' -sourceSets { - integrationTest { - groovy { - compileClasspath += main.output + test.output - runtimeClasspath += main.output + test.output - srcDir file('src/integrationTest/groovy') - } - resources.srcDir 'src/integrationTest/resources' - } -} - -configurations { - integrationTestCompile.extendsFrom testCompile - integrationTestRuntime.extendsFrom testRuntime -} - -idea.module { - testSourceDirs += file('src/integrationTest/groovy') - scopes.TEST.plus += [configurations.integrationTestCompile] -} - pluginBundle { website = 'https://github.com/wooga/atlas-paket' vcsUrl = 'https://github.com/wooga/atlas-paket' @@ -87,65 +60,12 @@ pluginBundle { } } -repositories { - jcenter() +github { + repositoryName = "wooga/atlas-paket" } dependencies { - testCompile('org.spockframework:spock-core:1.0-groovy-2.4') { - exclude module: 'groovy-all' - } - - testCompile 'com.netflix.nebula:nebula-test:latest.release' testCompile('org.jfrog.artifactory.client:artifactory-java-client-services:+') { exclude module: 'logback-classic' } - - compile gradleApi() - compile localGroovy() -} - -publishing { - publications { - mavenJava(MavenPublication) { - from components.java - } - } -} - -task integrationTest(type: Test) { - testClassesDir = sourceSets.integrationTest.output.classesDir - classpath = sourceSets.integrationTest.runtimeClasspath - outputs.upToDateWhen { false } -} - -check.dependsOn integrationTest -integrationTest.mustRunAfter test - -tasks.withType(Test) { - reports.html.destination = file("${reporting.baseDir}/${name}") -} - -jacocoTestReport { - reports { - xml.enabled = true - html.enabled = true - } - - executionData(test) - executionData(integrationTest) -} - -tasks.coveralls { - onlyIf {System.getenv("CI") && JavaVersion.current().isJava8Compatible()} -} - -project.tasks.releaseCheck.dependsOn project.tasks.check -project.tasks.release.dependsOn project.tasks.assemble - -project.tasks.final.dependsOn project.tasks.publishPlugins -project.tasks.publishPlugins.mustRunAfter project.tasks.postRelease - -project.tasks.snapshot.dependsOn project.tasks.publishToMavenLocal - -project.tasks.publishToMavenLocal.mustRunAfter project.tasks.postRelease \ No newline at end of file +} \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 1180ee5..8860e7f 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -20,4 +20,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-3.4.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.0-all.zip diff --git a/src/main/groovy/wooga/gradle/paket/base/tasks/AbstractPaketTask.groovy b/src/main/groovy/wooga/gradle/paket/base/tasks/AbstractPaketTask.groovy index decdbee..4e8530b 100644 --- a/src/main/groovy/wooga/gradle/paket/base/tasks/AbstractPaketTask.groovy +++ b/src/main/groovy/wooga/gradle/paket/base/tasks/AbstractPaketTask.groovy @@ -87,6 +87,7 @@ abstract class AbstractPaketTask extends Convention } AbstractPaketTask setLogFile(Object file) { + logFile = fileResolver.resolveLater(file) return this }