From 22c190716741d3abe3b3c051b72c1929d15cd581 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Thu, 28 Jun 2018 00:15:35 +0300 Subject: [PATCH] Track project version in ":kotlin-gradle-plugin:processResources" Before the change consecutive incremental builds with different project versions produced kotlin-gradle-plugin with the same project.version in project.properties file --- libraries/tools/kotlin-gradle-plugin/build.gradle | 4 +++- .../src/main/resources/project.properties | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin/build.gradle b/libraries/tools/kotlin-gradle-plugin/build.gradle index f46d44a713d..267c0951b42 100644 --- a/libraries/tools/kotlin-gradle-plugin/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin/build.gradle @@ -106,7 +106,9 @@ sourceSets { compileAgp25Kotlin.dependsOn compileGroovy processResources { - expand(project.properties) + def props = ["projectVersion" : project.version] + inputs.properties(props) + expand(props) } jar.dependsOn agp25Classes diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/resources/project.properties b/libraries/tools/kotlin-gradle-plugin/src/main/resources/project.properties index e362614406a..652aef75695 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/resources/project.properties +++ b/libraries/tools/kotlin-gradle-plugin/src/main/resources/project.properties @@ -1 +1 @@ -project.version=${project.version} \ No newline at end of file +project.version=${projectVersion} \ No newline at end of file