From 5ec535b6809026e1dec15933b94c84cdd05348d9 Mon Sep 17 00:00:00 2001 From: Vyacheslav Gerasimov Date: Thu, 14 Jun 2018 17:22:57 +0300 Subject: [PATCH] Build: Rename File helper for creating file from pathes list to fileFrom --- build.gradle.kts | 2 +- build.gradle.kts.182 | 2 +- buildSrc/src/main/kotlin/AndroidSdkDependencies.kt | 1 + buildSrc/src/main/kotlin/CommonUtil.kt | 5 +++-- buildSrc/src/main/kotlin/dependencies.kt | 2 +- buildSrc/src/main/kotlin/embeddable.kt | 1 + buildSrc/src/main/kotlin/jdksFinder.kt | 4 ++-- core/builtins/build.gradle.kts | 4 ++-- custom-dependencies/protobuf-lite/build.gradle.kts | 2 +- prepare/cidr-plugin/build.gradle.kts | 2 +- prepare/compiler/build.gradle.kts | 4 ++-- prepare/compiler/build.gradle.kts.173 | 4 ++-- prepare/compiler/build.gradle.kts.182 | 4 ++-- 13 files changed, 20 insertions(+), 17 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index db6713178c3..97c74b48b45 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -680,7 +680,7 @@ tasks.create("findShadowJarsInClasspath").doLast { for (task in project.tasks) { when (task) { is ShadowJar -> { - shadowJars.add(File(task.archivePath)) + shadowJars.add(fileFrom(task.archivePath)) } is ProGuardTask -> { shadowJars.addAll(task.outputs.files.toList()) diff --git a/build.gradle.kts.182 b/build.gradle.kts.182 index 4791fc0fe8e..23c2a32fe48 100644 --- a/build.gradle.kts.182 +++ b/build.gradle.kts.182 @@ -679,7 +679,7 @@ tasks.create("findShadowJarsInClasspath").doLast { for (task in project.tasks) { when (task) { is ShadowJar -> { - shadowJars.add(File(task.archivePath)) + shadowJars.add(fileFrom(task.archivePath)) } is ProGuardTask -> { shadowJars.addAll(task.outputs.files.toList()) diff --git a/buildSrc/src/main/kotlin/AndroidSdkDependencies.kt b/buildSrc/src/main/kotlin/AndroidSdkDependencies.kt index 18c67b128a3..e0b3bd766c3 100644 --- a/buildSrc/src/main/kotlin/AndroidSdkDependencies.kt +++ b/buildSrc/src/main/kotlin/AndroidSdkDependencies.kt @@ -4,6 +4,7 @@ import org.gradle.api.Project import org.gradle.api.artifacts.dsl.RepositoryHandler import org.gradle.api.artifacts.repositories.IvyArtifactRepository import org.gradle.kotlin.dsl.extra +import java.io.File fun RepositoryHandler.androidDxJarRepo(project: Project): IvyArtifactRepository = ivy { val baseDir = File("${project.rootDir}/buildSrc/prepare-deps/android-dx/build/repo") diff --git a/buildSrc/src/main/kotlin/CommonUtil.kt b/buildSrc/src/main/kotlin/CommonUtil.kt index a46f5284662..adaa573c414 100644 --- a/buildSrc/src/main/kotlin/CommonUtil.kt +++ b/buildSrc/src/main/kotlin/CommonUtil.kt @@ -42,8 +42,9 @@ fun Project.getResourceFiles(): SourceDirectorySet? = withJavaPlugin { javaPluginConvention().sourceSets.getByName("main").resources } -fun File(root: File, vararg children: String): File = children.fold(root, { f, c -> File(f, c) }) -fun File(root: String, vararg children: String): File = children.fold(File(root), { f, c -> File(f, c) }) +fun fileFrom(root: File, vararg children: String): File = children.fold(root) { f, c -> File(f, c) } + +fun fileFrom(root: String, vararg children: String): File = children.fold(File(root)) { f, c -> File(f, c) } var Project.jvmTarget: String? get() = extra.takeIf { it.has("jvmTarget") }?.get("jvmTarget") as? String diff --git a/buildSrc/src/main/kotlin/dependencies.kt b/buildSrc/src/main/kotlin/dependencies.kt index 8fb83a291a2..1f91afab731 100644 --- a/buildSrc/src/main/kotlin/dependencies.kt +++ b/buildSrc/src/main/kotlin/dependencies.kt @@ -50,7 +50,7 @@ fun Project.preloadedDeps(vararg artifactBaseNames: String, baseDir: File = File } fun Project.ideaUltimatePreloadedDeps(vararg artifactBaseNames: String, subdir: String? = null): ConfigurableFileCollection { - val ultimateDepsDir = File(rootDir, "ultimate", "dependencies") + val ultimateDepsDir = fileFrom(rootDir, "ultimate", "dependencies") return if (ultimateDepsDir.isDirectory) preloadedDeps(*artifactBaseNames, baseDir = ultimateDepsDir, subdir = subdir) else files() } diff --git a/buildSrc/src/main/kotlin/embeddable.kt b/buildSrc/src/main/kotlin/embeddable.kt index cf2dfbeb7b2..6e28fb69318 100644 --- a/buildSrc/src/main/kotlin/embeddable.kt +++ b/buildSrc/src/main/kotlin/embeddable.kt @@ -6,6 +6,7 @@ import org.gradle.api.file.DuplicatesStrategy import org.gradle.jvm.tasks.Jar import org.gradle.kotlin.dsl.task import org.gradle.kotlin.dsl.* +import java.io.File val kotlinEmbeddableRootPackage = "org.jetbrains.kotlin" diff --git a/buildSrc/src/main/kotlin/jdksFinder.kt b/buildSrc/src/main/kotlin/jdksFinder.kt index e1336220f10..c63fa280543 100644 --- a/buildSrc/src/main/kotlin/jdksFinder.kt +++ b/buildSrc/src/main/kotlin/jdksFinder.kt @@ -133,7 +133,7 @@ fun MutableCollection.discoverJdksOnUnix(project: Project) { val installedJdks = File(loc).listFiles { dir -> dir.isDirectory && unixConventionalJdkDirRex.containsMatchIn(dir.name) && - File(dir, "bin", "java").isFile + fileFrom(dir, "bin", "java").isFile } ?: continue for (dir in installedJdks) { val versionMatch = javaVersionRegex.find(dir.name) @@ -172,7 +172,7 @@ fun MutableCollection.discoverJdksOnWindows(project: Project) { else { javaHome.takeIf { it.isNotEmpty() } ?.let { File(it) } - ?.takeIf { it.isDirectory && File(it, "bin", "java.exe").isFile } + ?.takeIf { it.isDirectory && fileFrom(it, "bin", "java.exe").isFile } ?.let { addIfBetter(project, versionMatch.value, jdkKey, it) } diff --git a/core/builtins/build.gradle.kts b/core/builtins/build.gradle.kts index 46b33f85158..f2b8bb61373 100644 --- a/core/builtins/build.gradle.kts +++ b/core/builtins/build.gradle.kts @@ -3,8 +3,8 @@ import org.jetbrains.kotlin.serialization.builtins.BuiltInsSerializer import org.gradle.jvm.tasks.Jar import java.io.File -val builtinsSrc = File(rootDir, "core", "builtins", "src") -val builtinsNative = File(rootDir, "core", "builtins", "native") +val builtinsSrc = fileFrom(rootDir, "core", "builtins", "src") +val builtinsNative = fileFrom(rootDir, "core", "builtins", "native") // TODO: rewrite dependent projects on using build results instead of the fixed location val builtinsSerialized = File(rootProject.extra["distDir"].toString(), "builtins") diff --git a/custom-dependencies/protobuf-lite/build.gradle.kts b/custom-dependencies/protobuf-lite/build.gradle.kts index 74fd721d2f4..4b539e4578d 100644 --- a/custom-dependencies/protobuf-lite/build.gradle.kts +++ b/custom-dependencies/protobuf-lite/build.gradle.kts @@ -41,7 +41,7 @@ task("prepare") { return result } - val allFiles = loadAllFromJar(File(relocatedProtobuf.singleFile)) + val allFiles = loadAllFromJar(relocatedProtobuf.singleFile) val keepClasses = arrayListOf() diff --git a/prepare/cidr-plugin/build.gradle.kts b/prepare/cidr-plugin/build.gradle.kts index e5f4952be5c..e4114701e9a 100644 --- a/prepare/cidr-plugin/build.gradle.kts +++ b/prepare/cidr-plugin/build.gradle.kts @@ -26,7 +26,7 @@ val pluginXml by tasks.creating { inputs.property("pluginFullVersionNumber", pluginFullVersionNumber) inputs.files(kotlinPlugin) - outputs.files(File(buildDir, name, pluginXmlPath)) + outputs.files(fileFrom(buildDir, name, pluginXmlPath)) doFirst { val placeholderRegex = Regex( diff --git a/prepare/compiler/build.gradle.kts b/prepare/compiler/build.gradle.kts index fb6c3e43837..299dc7924a7 100644 --- a/prepare/compiler/build.gradle.kts +++ b/prepare/compiler/build.gradle.kts @@ -30,7 +30,7 @@ val compile by configurations val compilerBaseName = name -val outputJar = File(buildDir, "libs", "$compilerBaseName.jar") +val outputJar = fileFrom(buildDir, "libs", "$compilerBaseName.jar") val compilerModules: Array by rootProject.extra @@ -97,7 +97,7 @@ val proguard by task { dependsOn(packCompiler) configuration("$rootDir/compiler/compiler.pro") - val outputJar = File(buildDir, "libs", "$compilerBaseName-after-proguard.jar") + val outputJar = fileFrom(buildDir, "libs", "$compilerBaseName-after-proguard.jar") inputs.files(packCompiler.outputs.files.singleFile) outputs.file(outputJar) diff --git a/prepare/compiler/build.gradle.kts.173 b/prepare/compiler/build.gradle.kts.173 index b15609a280a..1b2f6c8d5bb 100644 --- a/prepare/compiler/build.gradle.kts.173 +++ b/prepare/compiler/build.gradle.kts.173 @@ -30,7 +30,7 @@ val compile by configurations val compilerBaseName = name -val outputJar = File(buildDir, "libs", "$compilerBaseName.jar") +val outputJar = fileFrom(buildDir, "libs", "$compilerBaseName.jar") val compilerModules: Array by rootProject.extra @@ -97,7 +97,7 @@ val proguard by task { dependsOn(packCompiler) configuration("$rootDir/compiler/compiler.pro") - val outputJar = File(buildDir, "libs", "$compilerBaseName-after-proguard.jar") + val outputJar = fileFrom(buildDir, "libs", "$compilerBaseName-after-proguard.jar") inputs.files(packCompiler.outputs.files.singleFile) outputs.file(outputJar) diff --git a/prepare/compiler/build.gradle.kts.182 b/prepare/compiler/build.gradle.kts.182 index 3772ee7e54d..f1a385e15ba 100644 --- a/prepare/compiler/build.gradle.kts.182 +++ b/prepare/compiler/build.gradle.kts.182 @@ -30,7 +30,7 @@ val compile by configurations val compilerBaseName = name -val outputJar = File(buildDir, "libs", "$compilerBaseName.jar") +val outputJar = fileFrom(buildDir, "libs", "$compilerBaseName.jar") val compilerModules: Array by rootProject.extra @@ -97,7 +97,7 @@ val proguard by task { dependsOn(packCompiler) configuration("$rootDir/compiler/compiler.pro") - val outputJar = File(buildDir, "libs", "$compilerBaseName-after-proguard.jar") + val outputJar = fileFrom(buildDir, "libs", "$compilerBaseName-after-proguard.jar") inputs.files(packCompiler.outputs.files.singleFile) outputs.file(outputJar)