azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Build: Minor refactoring intellij-sdk build.gradle.kts

Browse Source
This commit is contained in:
Vyacheslav Gerasimov
2018-11-13 18:34:44 +03:00
parent 45541296ad
commit 022691384a
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
buildSrc/prepare-deps/intellij-sdk/build.gradle.kts
+14 -6
View File
@@ -165,15 +165,23 @@ fun writeIvyXml(moduleName: String, fileName: String, jarFiles: FileCollection,
with(IvyDescriptorFileGenerator(DefaultIvyPublicationIdentity(customDepsOrg, moduleName, intellijVersion))) { with(IvyDescriptorFileGenerator(DefaultIvyPublicationIdentity(customDepsOrg, moduleName, intellijVersion))) {
addConfiguration(DefaultIvyConfiguration("default")) addConfiguration(DefaultIvyConfiguration("default"))
addConfiguration(DefaultIvyConfiguration("sources")) addConfiguration(DefaultIvyConfiguration("sources"))
jarFiles.asFileTree.files.forEach { jarFiles.asFileTree.files.forEach { jarFile ->
if (it.isFile && it.extension == "jar") { if (jarFile.isFile && jarFile.extension == "jar") {
val relativeName = it.toRelativeString(baseDir).removeSuffix(".jar") val relativeName = jarFile.toRelativeString(baseDir).removeSuffix(".jar")
addArtifact(FileBasedIvyArtifact(it, DefaultIvyPublicationIdentity(customDepsOrg, relativeName, intellijVersion)).also { it.conf = "default" }) addArtifact(
FileBasedIvyArtifact(jarFile, DefaultIvyPublicationIdentity(customDepsOrg, relativeName, intellijVersion)).also {
it.conf = "default"
}
)
} }
} }
if (sourcesJar != null) { if (sourcesJar != null) {
val sourcesArtifactName = sourcesJar.name.removeSuffix(".jar").substringBefore("-") val sourcesArtifactName = sourcesJar.name.substringBefore("-")
addArtifact(FileBasedIvyArtifact(sourcesJar, DefaultIvyPublicationIdentity(customDepsOrg, sourcesArtifactName, intellijVersion)).also { it.conf = "sources" }) addArtifact(
FileBasedIvyArtifact(sourcesJar, DefaultIvyPublicationIdentity(customDepsOrg, sourcesArtifactName, intellijVersion)).also {
it.conf = "sources"
}
)
} }
writeTo(File(customDepsRepoModulesDir, "$fileName.ivy.xml")) writeTo(File(customDepsRepoModulesDir, "$fileName.ivy.xml"))
} }