From b12234a4d6fc39b170e817ebce5ed7fd26e49f13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=B3bert=20Papp?= Date: Sun, 26 May 2019 23:47:44 +0100 Subject: [PATCH] Fix #76: use Gradle 4.10.3 to build (#77) * Gradle 4.10.3 * Fix breaking change: https://github.com/checkstyle/checkstyle/issues/6478 --- .travis.yml | 2 ++ build.gradle.kts | 4 ++-- buildSrc/build.gradle.kts | 5 +++++ .../config/checkstyle/import-control.xml | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- test/build.gradle.kts | 20 +++++++++---------- 6 files changed, 21 insertions(+), 14 deletions(-) diff --git a/.travis.yml b/.travis.yml index 148c2c002..bea95b3af 100644 --- a/.travis.yml +++ b/.travis.yml @@ -67,10 +67,12 @@ cache: # Prevent "Downloading https://services.gradle.org/distributions/gradle-4.2.1-all.zip" # Prevent "Unzipping /home/travis/.gradle/wrapper/dists/gradle-4.2.1-all/domrskppdhf3wtn5mziw0c2zr/gradle-4.2.1-all.zip" - $HOME/.gradle/wrapper/dists/gradle-4.9-all/ + - $HOME/.gradle/wrapper/dists/gradle-4.10.3-all/ # Prevent "Download https://jcenter.bintray.com/" during compilation - $HOME/.gradle/caches/modules-2/ # Prevent "Generating JAR file 'gradle-api-4.2.1.jar'" during compilation - $HOME/.gradle/caches/4.9/generated-gradle-jars/ + - $HOME/.gradle/caches/4.10.3/generated-gradle-jars/ # Prevent "Welcome to Gradle 4.9! Here are the highlights of this release:" in build log - $HOME/.gradle/notifications/4.9/release-features.rendered - $HOME/.gradle/notifications/4.10.3/release-features.rendered diff --git a/build.gradle.kts b/build.gradle.kts index e737b805c..cf15642fc 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -41,7 +41,7 @@ subprojects { } tasks { - "sourcesJar" (Jar::class) { + register("sourcesJar") { classifier = "sources" from(java.sourceSets["main"].kotlin.sourceDirectories) } @@ -235,7 +235,7 @@ project.tasks.create("tests", TestReport::class.java) { publishing { publications.invoke { subprojects.filterNot { it.name == "internal" }.forEach { project -> - project.name(MavenPublication::class) { + register(project.name) { // compiled files: artifact(tasks["jar"])) { classifier = null } + dependencies from(project.components["java"]) // source files diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 6290b9b96..9b75cba26 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -12,6 +12,11 @@ plugins { `kotlin-dsl` } +kotlinDslPluginOptions { + // https://docs.gradle.org/4.10.3/userguide/kotlin_dsl.html#sec:kotlin_compiler_arguments + experimentalWarning.set(false) +} + repositories { jcenter() } diff --git a/checkers/checkstyle/src/test/resources/checkstyle-config_loc/config/checkstyle/import-control.xml b/checkers/checkstyle/src/test/resources/checkstyle-config_loc/config/checkstyle/import-control.xml index 64954fa1b..ecb2bfb02 100644 --- a/checkers/checkstyle/src/test/resources/checkstyle-config_loc/config/checkstyle/import-control.xml +++ b/checkers/checkstyle/src/test/resources/checkstyle-config_loc/config/checkstyle/import-control.xml @@ -1,6 +1,6 @@ + "https://checkstyle.org/dtds/import_control_1_3.dtd"> diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 7dc503f14..ae45383b6 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-4.9-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.3-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/test/build.gradle.kts b/test/build.gradle.kts index 1b9ddec97..894e60eec 100644 --- a/test/build.gradle.kts +++ b/test/build.gradle.kts @@ -26,22 +26,22 @@ dependencies { } // Need to depend on the real artifact so TestPluginTest can work -val jar by tasks tasks { - "test" { - dependsOn(jar) + named("test") { + dependsOn("jar") doFirst { + val jar by tasks.named("jar") val artifactPath = jar.outputs.files.singleFile.parentFile (this as Test).jvmArgs("-Dnet.twisterrob.gradle.test.artifactPath=${artifactPath}") } } } -afterEvaluate { - //noinspection UnnecessaryQualifiedReference keep it explicitly together with code - val metaTask = tasks["pluginUnderTestMetadata"] as org.gradle.plugin.devel.tasks.PluginUnderTestMetadata - metaTask.pluginClasspath = files( - configurations.runtimeClasspath - configurations.compileOnly, - jar.outputs.files.singleFile - ) +//noinspection UnnecessaryQualifiedReference keep it explicitly together with code +tasks.named("pluginUnderTestMetadata") { + pluginClasspath.apply{ + setFrom() + from(configurations.runtimeClasspath - configurations.compileOnly) + from(tasks.getByName("jar").outputs.files.singleFile) + } }