diff options
| author | Jeff Gaston <jeffrygaston@google.com> | 2020-02-13 12:24:20 -0500 |
|---|---|---|
| committer | Jeff Gaston <jeffrygaston@google.com> | 2020-02-13 12:35:47 -0500 |
| commit | fddad9ae6f912035e7af3471841c28acdd7a651a (patch) | |
| tree | 7412df111fc7de0049a43b94c3cb2a6bf5320793 | |
| parent | b7b2c990c4b42fb545f3045aaf0226bf236958a5 (diff) | |
| download | dokka-fddad9ae6f912035e7af3471841c28acdd7a651a.tar.gz | |
Making dokka_version propagate correctly into built artifacts when it changes
Bug: 149482984
Test: cd external/dokka \
&& grep dokka_version gradle.properties \
&& echo "see dokka_version=0.9.17-g007" \
&& ./gradlew publish \
&& sed -i 's/007/008/' gradle.properties \
&& ./gradlew publish \
&& cd build/dist-maven/org/jetbrains/dokka/dokka-android-gradle-plugin/0.9.17-g008 \
&& unzip dokka-android-gradle-plugin-0.9.17-g008.jar -d dokka-android-gradle-plugin-0.9.17-g008.jar_unzipped \
&& grep dokka-version dokka-android-gradle-plugin-0.9.17-g008.jar_unzipped/META-INF/gradle-plugins/org.jetbrains.dokka-android.properties \
# and see that this says 'dokka-version=0.9.17-g008' as expected
Change-Id: Ic134e764e066a6664caec07ccf1c3905d1a2ebcd
| -rw-r--r-- | runners/android-gradle-plugin/build.gradle | 3 | ||||
| -rw-r--r-- | runners/gradle-plugin/build.gradle | 3 | ||||
| -rw-r--r-- | runners/maven-plugin/build.gradle | 3 |
3 files changed, 7 insertions, 2 deletions
diff --git a/runners/android-gradle-plugin/build.gradle b/runners/android-gradle-plugin/build.gradle index 72d1be9eb..22403dc63 100644 --- a/runners/android-gradle-plugin/build.gradle +++ b/runners/android-gradle-plugin/build.gradle @@ -38,6 +38,7 @@ task sourceJar(type: Jar) { } processResources { + inputs.property("dokka_version", dokka_version) eachFile { if (it.name == "org.jetbrains.dokka-android.properties") { it.filter { line -> @@ -98,4 +99,4 @@ pluginBundle { groupId = "org.jetbrains.dokka" artifactId = "dokka-android-gradle-plugin" } -}
\ No newline at end of file +} diff --git a/runners/gradle-plugin/build.gradle b/runners/gradle-plugin/build.gradle index 661d432be..a0670803c 100644 --- a/runners/gradle-plugin/build.gradle +++ b/runners/gradle-plugin/build.gradle @@ -35,6 +35,7 @@ task sourceJar(type: Jar) { } processResources { + inputs.property("dokka_version", dokka_version) eachFile { if (it.name == "org.jetbrains.dokka.properties") { it.filter { line -> @@ -96,4 +97,4 @@ pluginBundle { groupId = "org.jetbrains.dokka" artifactId = "dokka-gradle-plugin" } -}
\ No newline at end of file +} diff --git a/runners/maven-plugin/build.gradle b/runners/maven-plugin/build.gradle index 79a8c22bb..acd3415d7 100644 --- a/runners/maven-plugin/build.gradle +++ b/runners/maven-plugin/build.gradle @@ -33,6 +33,9 @@ dependencies { task generatePom() { inputs.file(new File(projectDir, "pom.tpl.xml")) + inputs.property("dokka_version", dokka_version) + inputs.property("maven_version", maven_version) + inputs.property("maven_plugin_tools_version", maven_plugin_tools_version) outputs.file(new File(buildDir, "pom.xml")) doLast { final pomTemplate = new File(projectDir, "pom.tpl.xml") |