From be54667d36d83a25d8d2080d142b91d0171bf530 Mon Sep 17 00:00:00 2001 From: Nikita Skvortsov Date: Fri, 22 Mar 2019 17:19:53 +0300 Subject: [PATCH] add a command line parameter for a version suffix of gradle api jars IDEA-CR-45392 --- .../dependencies/gradle-api-deps/build.gradle | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/build/dependencies/gradle-api-deps/build.gradle b/build/dependencies/gradle-api-deps/build.gradle index a09097fc98cc..ef4ecf04f359 100644 --- a/build/dependencies/gradle-api-deps/build.gradle +++ b/build/dependencies/gradle-api-deps/build.gradle @@ -85,10 +85,12 @@ task setupGradleApiDeps(dependsOn: configurations.gradleApiDeps, type: Sync) { } } +def patchedVersionName = gradleApiVersion + (findProperty('versionNameSuffix') ?: '') + task gradleApiJar(type: Zip, dependsOn: expandGradleApiJar) { extension 'jar' baseName gradleApiArtifactId - version gradleApiVersion + version patchedVersionName from gradleApiDepsDir exclude 'org/gradle/internal/impldep/**' @@ -100,7 +102,7 @@ task gradleApiJar(type: Zip, dependsOn: expandGradleApiJar) { task gradleApiImplDepJar(type: Zip, dependsOn: expandGradleApiJar) { extension 'jar' baseName gradleApiImplDepArtifactId - version gradleApiVersion + version patchedVersionName from gradleApiDepsDir include 'org/gradle/internal/impldep/**' @@ -111,24 +113,24 @@ publishing { gradleApi(MavenPublication) { groupId intelliJDepsGroupId artifactId gradleApiArtifactId - version gradleApiVersion + version patchedVersionName pom.withXml { def dependencies = asNode().appendNode('dependencies') def apiImplDep = dependencies.appendNode("dependency") apiImplDep.appendNode('groupId', intelliJDepsGroupId) apiImplDep.appendNode('artifactId', gradleApiImplDepArtifactId) - apiImplDep.appendNode('version', gradleApiVersion) + apiImplDep.appendNode('version', patchedVersionName) def wrapper = dependencies.appendNode("dependency") wrapper.appendNode('groupId', intelliJDepsGroupId) wrapper.appendNode('artifactId', gradleWrapperArtifactId) - wrapper.appendNode('version', gradleApiVersion) + wrapper.appendNode('version', patchedVersionName) def launcher = dependencies.appendNode("dependency") launcher.appendNode('groupId', intelliJDepsGroupId) launcher.appendNode('artifactId', gradleLauncherArtifactId) - launcher.appendNode('version', gradleApiVersion) + launcher.appendNode('version', patchedVersionName) } artifact gradleApiJar @@ -136,14 +138,14 @@ publishing { gradleApiImplDep(MavenPublication) { groupId intelliJDepsGroupId artifactId gradleApiImplDepArtifactId - version gradleApiVersion + version patchedVersionName artifact gradleApiImplDepJar } gradleWrapper(MavenPublication) { groupId intelliJDepsGroupId artifactId gradleWrapperArtifactId - version gradleApiVersion + version patchedVersionName artifact(new File(gradleApiDepsDir, gradleWrapperFileName)) { builtBy expandGradleApiJar @@ -152,7 +154,7 @@ publishing { gradleLauncher(MavenPublication) { groupId intelliJDepsGroupId artifactId gradleLauncherArtifactId - version gradleApiVersion + version patchedVersionName artifact(new File(gradleApiDepsDir, gradleLauncherFileName)) { builtBy expandGradleApiJar @@ -178,7 +180,7 @@ bintray { userOrg = 'jetbrains' version { - name = gradleApiVersion + name = patchedVersionName } }