From a1a1bda5f39db6652afec6039e536d66ac1b7a09 Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Fri, 16 Jul 2021 01:48:15 +0300 Subject: [PATCH] Drop unused runIdeTask and excludeInAndroidStudio from localDependencies --- buildSrc/src/main/kotlin/localDependencies.kt | 73 +------------------ 1 file changed, 1 insertion(+), 72 deletions(-) diff --git a/buildSrc/src/main/kotlin/localDependencies.kt b/buildSrc/src/main/kotlin/localDependencies.kt index bfa8299e472..6d894731cb0 100644 --- a/buildSrc/src/main/kotlin/localDependencies.kt +++ b/buildSrc/src/main/kotlin/localDependencies.kt @@ -17,16 +17,11 @@ // usages in build scripts are not tracked properly @file:Suppress("unused") -import org.gradle.api.GradleException import org.gradle.api.Project import org.gradle.api.artifacts.ModuleDependency import org.gradle.api.artifacts.dsl.RepositoryHandler import org.gradle.api.artifacts.repositories.IvyArtifactRepository -import org.gradle.api.tasks.JavaExec -import org.gradle.api.tasks.TaskProvider -import org.gradle.kotlin.dsl.DependencyHandlerScope import org.gradle.kotlin.dsl.extra -import org.gradle.kotlin.dsl.register import java.io.File private fun Project.kotlinBuildLocalDependenciesDir(): File = @@ -146,70 +141,4 @@ fun ModuleDependency.includeIntellijCoreJarDependencies(project: Project, jarsFi rootProject = project.rootProject ) -fun Project.intellijRootDir() = IntellijRootUtils.getIntellijRootDir(project) - -fun DependencyHandlerScope.excludeInAndroidStudio(rootProject: Project, block: DependencyHandlerScope.() -> Unit) { - if (!rootProject.extra.has("versions.androidStudioRelease")) { - block() - } -} - -fun Project.runIdeTask(name: String, ideaPluginDir: File, ideaSandboxDir: File, body: JavaExec.() -> Unit): TaskProvider { - - return tasks.register(name) { - val ideaSandboxConfigDir = File(ideaSandboxDir, "config") - - classpath = mainSourceSet.runtimeClasspath - - mainClass.set("com.intellij.idea.Main") - - workingDir = File(intellijRootDir(), "bin") - - jvmArgs( - "-Xmx1250m", - "-XX:ReservedCodeCacheSize=240m", - "-XX:+HeapDumpOnOutOfMemoryError", - "-ea", - "-Didea.debug.mode=true", - "-Didea.system.path=$ideaSandboxDir", - "-Didea.config.path=$ideaSandboxConfigDir", - "-Didea.tooling.debug=true", - "-Dfus.internal.test.mode=true", - "-Dapple.laf.useScreenMenuBar=true", - "-Dapple.awt.graphics.UseQuartz=true", - "-Dsun.io.useCanonCaches=false", - "-Dplugin.path=${ideaPluginDir.absolutePath}" - ) - - jvmArgs("-Didea.platform.prefix=Idea") - - if (rootProject.findProperty("versions.androidStudioRelease") != null) { - jvmArgs("-Didea.platform.prefix=AndroidStudio") - } - - if (project.hasProperty("noPCE")) { - jvmArgs("-Didea.ProcessCanceledException=disabled") - } - - jvmArgs("-Didea.is.internal=${project.findProperty("idea.is.internal") ?: true}") - - project.findProperty("idea.args")?.let { arguments -> - jvmArgs(arguments.toString().split(" ")) - } - - args() - - doFirst { - val disabledPluginsFile = File(ideaSandboxConfigDir, "disabled_plugins.txt") - val disabledPluginsContents = disabledPluginsFile.takeIf { it.isFile }?.readLines() - val filteredContents = disabledPluginsContents?.filterNot { it.contains("org.jetbrains.kotlin") } - if (filteredContents != null && filteredContents.size != disabledPluginsContents.size) { - with(disabledPluginsFile.printWriter()) { - filteredContents.forEach(this::println) - } - } - } - - body() - } -} +fun Project.intellijRootDir() = IntellijRootUtils.getIntellijRootDir(project) \ No newline at end of file