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

Build: Drop unused fromEmbeddedComponents helper

Browse Source
This commit is contained in:
Vyacheslav Gerasimov
2019-04-09 22:36:52 +03:00
parent b741d393ed
commit f71c2bf25e
1 changed files with 0 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
buildSrc/src/main/kotlin/dependencies.kt
-18
View File
@@ -121,7 +121,6 @@ private fun String.toMaybeVersionedJarRegex(): Regex {
return Regex(if (hasJarExtension) escaped else "$escaped(-\\d.*)?\\.jar") // TODO: consider more precise version part of the regex return Regex(if (hasJarExtension) escaped else "$escaped(-\\d.*)?\\.jar") // TODO: consider more precise version part of the regex
} }
fun Project.firstFromJavaHomeThatExists(vararg paths: String, jdkHome: File = File(this.property("JDK_18") as String)): File? = fun Project.firstFromJavaHomeThatExists(vararg paths: String, jdkHome: File = File(this.property("JDK_18") as String)): File? =
paths.map { File(jdkHome, it) }.firstOrNull { it.exists() }.also { paths.map { File(jdkHome, it) }.firstOrNull { it.exists() }.also {
if (it == null) if (it == null)
@@ -137,20 +136,3 @@ val compilerManifestClassPath
object EmbeddedComponents { object EmbeddedComponents {
val CONFIGURATION_NAME = "embedded" val CONFIGURATION_NAME = "embedded"
} }
fun AbstractCopyTask.fromEmbeddedComponents() {
val embeddedComponents = project.configurations.getByName(EmbeddedComponents.CONFIGURATION_NAME)
if (this is ShadowJar) {
from(embeddedComponents)
} else {
dependsOn(embeddedComponents)
from {
embeddedComponents.map { file ->
if (file.isDirectory)
project.files(file)
else
project.zipTree(file)
}
}
}
}