From ca79efdeece7a66d1374ca2d3eed36fb1a1ecafd Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Tue, 30 Oct 2018 07:01:03 +0300 Subject: [PATCH] Remove unused methods from Gradle plugin --- .../internal/kapt/KaptWithKotlincTask.kt | 5 -- .../kotlin/gradle/plugin/gradleUtils.kt | 6 --- .../kotlin/gradle/tasks/jarSearchingUtil.kt | 18 ------- .../kotlin/gradle/utils/compatibiltiy.kt | 51 ------------------- .../kotlin/gradle/utils/fileUtils.kt | 3 -- .../kotlin/gradle/utils/reflectionUtils.kt | 12 ----- 6 files changed, 95 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/kapt/KaptWithKotlincTask.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/kapt/KaptWithKotlincTask.kt index 6179b4b94ae..2b0b55c51cc 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/kapt/KaptWithKotlincTask.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/kapt/KaptWithKotlincTask.kt @@ -81,9 +81,4 @@ open class KaptWithKotlincTask : KaptTask(), CompilerArgumentAwareWithInput FileCollection) { conventionMapping.map("classpath", fn) } diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/jarSearchingUtil.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/jarSearchingUtil.kt index 97baeb61d47..44eb6f32856 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/jarSearchingUtil.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/jarSearchingUtil.kt @@ -96,12 +96,6 @@ internal fun findKotlinStdlibClasspath(project: Project): List = internal fun findKotlinScriptRuntimeClasspath(project: Project): List = findKotlinModuleJar(project, KOTLIN_SCRIPT_RUNTIME_EXPECTED_CLASS, KOTLIN_SCRIPT_RUNTIME) -internal fun findKotlinScriptCommonClasspath(project: Project): List = - findKotlinModuleJar(project, KOTLIN_SCRIPT_ANNOTATION_EXPECTED_CLASS, KOTLIN_SCRIPT_COMMON) - -internal fun findKotlinScriptJvmClasspath(project: Project): List = - findKotlinModuleJar(project, KOTLIN_JVM_SCRIPT_COMPILER_EXPECTED_CLASS, KOTLIN_SCRIPT_JVM) - internal fun findKotlinReflectClasspath(project: Project): List = findKotlinModuleJar(project, KOTLIN_REFLECT_EXPECTED_CLASS, KOTLIN_REFLECT) @@ -120,18 +114,6 @@ internal fun findToolsJar(): File? { return javacUtilContextClass?.let(::findJarByClass) } -internal fun findCoroutinesClasspath(): List { - val classLoader = Thread.currentThread().contextClassLoader - val prefix = "kotlinx." // because shadow plugin rewrites strings too, so the fqn should be constructed on runtime - val clazz = try { - classLoader.loadClass(prefix + "coroutines.experimental.BuildersKt") - } catch (e: ClassNotFoundException) { - null - } ?: return emptyList() - - return (findJarByClass(clazz))?.let { listOf(it) } ?: emptyList() -} - private fun findJarByClass(klass: Class<*>): File? { val classFileName = klass.name.substringAfterLast(".") + ".class" val resource = klass.getResource(classFileName) ?: return null diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/utils/compatibiltiy.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/utils/compatibiltiy.kt index 71beeabc7ba..d81a6ee1968 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/utils/compatibiltiy.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/utils/compatibiltiy.kt @@ -18,7 +18,6 @@ package org.jetbrains.kotlin.gradle.utils import org.gradle.api.GradleException import org.gradle.api.Task -import org.gradle.api.tasks.SourceSetOutput import org.gradle.api.tasks.TaskInputs import org.gradle.api.tasks.TaskOutputs import org.gradle.util.GradleVersion @@ -27,16 +26,6 @@ internal val Task.inputsCompatible: TaskInputs get() = inputs internal val Task.outputsCompatible: TaskOutputs get() = outputs -private val filesMethod by lazy { - TaskInputs::class.java.methods.first { - it.name == "files" && it.parameterTypes.contentEquals(arrayOf(Array::class.java)) - } -} - -internal fun TaskInputs.filesCompatible(vararg files: Any) { - filesMethod(this, files) -} - private val propertyMethod by lazy { TaskInputs::class.java.methods.first { it.name == "property" && it.parameterTypes.contentEquals(arrayOf(String::class.java, Any::class.java)) @@ -47,36 +36,6 @@ internal fun TaskInputs.propertyCompatible(name: String, value: Any) { propertyMethod(this, name, value) } -private val outputsDirMethod by lazy { - TaskOutputs::class.java.methods.first { - it.name == "dir" && it.parameterTypes.contentEquals(arrayOf(Any::class.java)) - } -} - -internal fun TaskOutputs.dirCompatible(value: Any) { - outputsDirMethod(this, value) -} - -private val outputsFilesMethod by lazy { - TaskOutputs::class.java.methods.first { - it.name == "files" && it.parameterTypes.contentEquals(arrayOf(Array::class.java)) - } -} - -internal fun TaskOutputs.filesCompatible(vararg value: Any) { - outputsFilesMethod(this, value) -} - -private val fileMethod by lazy { - TaskInputs::class.java.methods.first { - it.name == "file" && it.parameterTypes.contentEquals(arrayOf(Any::class.java)) - } -} - -internal fun TaskInputs.fileCompatible(filePath: Any) { - fileMethod(this, filePath) -} - private val inputsDirMethod by lazy { TaskInputs::class.java.methods.first { it.name == "dir" && it.parameterTypes.contentEquals(arrayOf(Any::class.java)) @@ -87,16 +46,6 @@ internal fun TaskInputs.dirCompatible(dirPath: Any) { inputsDirMethod(this, dirPath) } -private val setClassesDirMethod by lazy { - SourceSetOutput::class.java.methods.first { - it.name == "setClassesDir" && it.parameterTypes.contentEquals(arrayOf(Any::class.java)) - } -} - -internal fun SourceSetOutput.setClassesDirCompatible(dirPath: Any) { - setClassesDirMethod(this, dirPath) -} - internal fun checkGradleCompatibility(minSupportedVersion: GradleVersion = GradleVersion.version("4.0")) { val currentVersion = GradleVersion.current() if (currentVersion < minSupportedVersion) { diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/utils/fileUtils.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/utils/fileUtils.kt index f6ca2b23c2d..00bb295e820 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/utils/fileUtils.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/utils/fileUtils.kt @@ -16,9 +16,6 @@ internal fun File.isJavaFile() = internal fun File.isKotlinFile(sourceFilesExtensions: List): Boolean = !isJavaFile() && sourceFilesExtensions.any { it.equals(extension, ignoreCase = true) } -internal fun File.isClassFile(): Boolean = - extension.equals("class", ignoreCase = true) - internal fun File.relativeOrCanonical(base: File): String = relativeToOrNull(base)?.path ?: canonicalPath diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/utils/reflectionUtils.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/utils/reflectionUtils.kt index 69fba42034e..97be6ceb9ad 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/utils/reflectionUtils.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/utils/reflectionUtils.kt @@ -16,20 +16,8 @@ package org.jetbrains.kotlin.gradle.utils -import java.lang.reflect.Field import java.lang.reflect.InvocationTargetException -internal fun Class<*>.getDeclaredFieldInHierarchy(name: String): Field? { - val inheritanceChain = generateSequence(this) { it.superclass } - return inheritanceChain.map { - try { - it.getDeclaredField(name) - } catch (_: NoSuchFieldException) { - null - } - }.filterNotNull().first() -} - internal inline fun checkedReflection(block: () -> T, onReflectionException: (Exception) -> T): T { return try { block()