diff --git a/.gitignore b/.gitignore index be551da20fd..f5507b43daa 100644 --- a/.gitignore +++ b/.gitignore @@ -58,7 +58,6 @@ build/ .idea/artifacts/kotlin_stdlib_wasm_* .idea/jarRepositories.xml .idea/csv-plugin.xml -kotlin-ultimate/ node_modules/ .rpt2_cache/ libraries/tools/kotlin-test-js-runner/lib/ diff --git a/build.gradle.kts b/build.gradle.kts index 496b29f3668..eeaf49af2d6 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -89,10 +89,8 @@ val distKotlinHomeDir by extra("$distDir/kotlinc") val distLibDir = "$distKotlinHomeDir/lib" val commonLocalDataDir = "$rootDir/local" val ideaSandboxDir = "$commonLocalDataDir/ideaSandbox" -val ideaUltimateSandboxDir = "$commonLocalDataDir/ideaUltimateSandbox" val artifactsDir = "$distDir/artifacts" val ideaPluginDir = "$artifactsDir/ideaPlugin/Kotlin" -val ideaUltimatePluginDir = "$artifactsDir/ideaUltimatePlugin/Kotlin" extra["ktorExcludesForDaemon"] = listOf( "org.jetbrains.kotlin" to "kotlin-reflect", @@ -110,9 +108,7 @@ extra["distLibDir"] = project.file(distLibDir) extra["libsDir"] = project.file(distLibDir) extra["commonLocalDataDir"] = project.file(commonLocalDataDir) extra["ideaSandboxDir"] = project.file(ideaSandboxDir) -extra["ideaUltimateSandboxDir"] = project.file(ideaUltimateSandboxDir) extra["ideaPluginDir"] = project.file(ideaPluginDir) -extra["ideaUltimatePluginDir"] = project.file(ideaUltimatePluginDir) extra["isSonatypeRelease"] = false val kotlinNativeVersionObject = project.kotlinNativeVersionValue() subprojects { @@ -194,7 +190,6 @@ if (!project.hasProperty("versions.kotlin-native")) { extra["versions.kotlin-native"] = "1.5.20-dev-5613" } -val intellijUltimateEnabled by extra(project.kotlinBuildProperties.intellijUltimateEnabled) val effectSystemEnabled by extra(project.getBooleanProperty("kotlin.compiler.effectSystemEnabled") ?: false) val newInferenceEnabled by extra(project.getBooleanProperty("kotlin.compiler.newInferenceEnabled") ?: false) val useJvmIrBackend by extra(project.kotlinBuildProperties.useIR) @@ -951,22 +946,6 @@ tasks { ) } - register("kmmTest", AggregateTest::class) { - dependsOn( - ":idea:idea-gradle:test", - ":idea:test", - ":compiler:test", - ":compiler:container:test", - ":js:js.tests:test" - ) - - dependsOn(":kotlin-gradle-plugin-integration-tests:test") - if (Ide.AS40.orHigher()) - dependsOn(":kotlin-ultimate:ide:android-studio-native:test") - - testPatternFile = file("tests/mpp/kmm-patterns.csv") - } - register("test") { doLast { throw GradleException("Don't use directly, use aggregate tasks *-check instead") @@ -1051,8 +1030,7 @@ val zipTestData by task { val zipPlugin by task { val src = when (project.findProperty("pluginArtifactDir") as String?) { "Kotlin" -> ideaPluginDir - "KotlinUltimate" -> ideaUltimatePluginDir - null -> if (project.hasProperty("ultimate")) ideaUltimatePluginDir else ideaPluginDir + null -> ideaPluginDir else -> error("Unsupported plugin artifact dir") } val destPath = project.findProperty("pluginZipPath") as String? diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 9e73bfdc409..e93a92e36e2 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -69,7 +69,6 @@ rootProject.apply { } val isTeamcityBuild = kotlinBuildProperties.isTeamcityBuild -val intellijUltimateEnabled by extra(kotlinBuildProperties.intellijUltimateEnabled) val intellijSeparateSdks by extra(project.getBooleanProperty("intellijSeparateSdks") ?: false) extra["intellijReleaseType"] = when { diff --git a/buildSrc/prepare-deps/build.gradle.kts b/buildSrc/prepare-deps/build.gradle.kts index 6fd62f71ed1..a87a96893ef 100644 --- a/buildSrc/prepare-deps/build.gradle.kts +++ b/buildSrc/prepare-deps/build.gradle.kts @@ -15,7 +15,6 @@ plugins { base } -val intellijUltimateEnabled: Boolean by rootProject.extra val intellijReleaseType: String by rootProject.extra val intellijVersion = rootProject.extra["versions.intellijSdk"] as String val intellijVersionForIde = rootProject.intellijSdkVersionForIde() @@ -23,8 +22,6 @@ val asmVersion = rootProject.findProperty("versions.jar.asm-all") as String? val androidStudioRelease = rootProject.findProperty("versions.androidStudioRelease") as String? val androidStudioBuild = rootProject.findProperty("versions.androidStudioBuild") as String? val intellijSeparateSdks: Boolean by rootProject.extra -val installIntellijCommunity = !intellijUltimateEnabled || intellijSeparateSdks -val installIntellijUltimate = intellijUltimateEnabled && androidStudioRelease == null fun checkIntellijVersion(intellijVersion: String) { val intellijVersionDelimiterIndex = intellijVersion.indexOfAny(charArrayOf('.', '-')) @@ -35,14 +32,11 @@ fun checkIntellijVersion(intellijVersion: String) { checkIntellijVersion(intellijVersion) intellijVersionForIde?.let { checkIntellijVersion(it) } -logger.info("intellijUltimateEnabled: $intellijUltimateEnabled") logger.info("intellijVersion: $intellijVersion") logger.info("intellijVersionForIde: $intellijVersionForIde") logger.info("androidStudioRelease: $androidStudioRelease") logger.info("androidStudioBuild: $androidStudioBuild") logger.info("intellijSeparateSdks: $intellijSeparateSdks") -logger.info("installIntellijCommunity: $installIntellijCommunity") -logger.info("installIntellijUltimate: $installIntellijUltimate") val androidStudioOs by lazy { when { @@ -78,8 +72,6 @@ repositories { val intellij by configurations.creating val intellijForIde by configurations.creating -val intellijUltimate by configurations.creating -val intellijUltimateForIde by configurations.creating val androidStudio by configurations.creating val sources by configurations.creating val sourcesForIde by configurations.creating @@ -113,14 +105,8 @@ dependencies { androidStudio("google:android-studio-ide:$androidStudioBuild@$extension") } else { - if (installIntellijCommunity) { - intellij("com.jetbrains.intellij.idea:ideaIC:$intellijVersion") - intellijVersionForIde?.let { intellijForIde("com.jetbrains.intellij.idea:ideaIC:$it") } - } - if (installIntellijUltimate) { - intellijUltimate("com.jetbrains.intellij.idea:ideaIU:$intellijVersion") - intellijVersionForIde.let { intellijUltimateForIde("com.jetbrains.intellij.idea:ideaIU:$it") } - } + intellij("com.jetbrains.intellij.idea:ideaIC:$intellijVersion") + intellijVersionForIde?.let { intellijForIde("com.jetbrains.intellij.idea:ideaIC:$it") } } if (asmVersion != null) { @@ -133,19 +119,14 @@ dependencies { intellijVersionForIde?.let { jpsStandaloneForIde("com.jetbrains.intellij.idea:jps-standalone:$it") } intellijCore("com.jetbrains.intellij.idea:intellij-core:$intellijVersion") intellijVersionForIde?.let { intellijCoreForIde("com.jetbrains.intellij.idea:intellij-core:$it") } - if (intellijUltimateEnabled) { - nodeJSPlugin("com.jetbrains.plugins:NodeJS:${rootProject.extra["versions.idea.NodeJS"]}@zip") - } } fun prepareDeps( intellij: Configuration, intellijCore: Configuration, sources: Configuration, - intellijUltimate: Configuration, jpsStandalone: Configuration, - intellijVersion: String, - registerNodeJSPlugin: Boolean = false + intellijVersion: String ) { val makeIntellijCore = buildIvyRepositoryTask(intellijCore, customDepsOrg, customDepsRepoDir) @@ -207,11 +188,7 @@ fun prepareDeps( ::skipToplevelDirectory ) } else { - val task = if (installIntellijUltimate) { - buildIvyRepositoryTask(intellijUltimate, customDepsOrg, customDepsRepoDir, null, sourcesFile) - } else { - buildIvyRepositoryTask(intellij, customDepsOrg, customDepsRepoDir, null, sourcesFile) - } + val task = buildIvyRepositoryTask(intellij, customDepsOrg, customDepsRepoDir, null, sourcesFile) task.configure { dependsOn(mergeSources) @@ -230,17 +207,11 @@ fun prepareDeps( makeIntellijAnnotations ) } - - if (registerNodeJSPlugin && installIntellijUltimate) { - val buildNodeJsPlugin = - buildIvyRepositoryTask(nodeJSPlugin, customDepsOrg, customDepsRepoDir, ::skipToplevelDirectory, sourcesFile) - tasks.named("build") { dependsOn(buildNodeJsPlugin) } - } } -prepareDeps(intellij, intellijCore, sources, intellijUltimate, jpsStandalone, intellijVersion, registerNodeJSPlugin = true) +prepareDeps(intellij, intellijCore, sources, jpsStandalone, intellijVersion) if (intellijVersionForIde != null) { - prepareDeps(intellijForIde, intellijCoreForIde, sourcesForIde, intellijUltimateForIde, jpsStandaloneForIde, intellijVersionForIde) + prepareDeps(intellijForIde, intellijCoreForIde, sourcesForIde, jpsStandaloneForIde, intellijVersionForIde) } tasks.named("clean") { diff --git a/buildSrc/settings.gradle b/buildSrc/settings.gradle index c0c789e10c1..421e2ba2319 100644 --- a/buildSrc/settings.gradle +++ b/buildSrc/settings.gradle @@ -25,49 +25,4 @@ buildscript { } } -def buildProperties = BuildPropertiesKt.getKotlinBuildPropertiesForSettings(settings) -def projectVersions = file("../gradle/versions.properties").text - -include "prepare-deps" - -def target_AppCode_Clion = buildProperties.includeCidrPlugins && !projectVersions.contains("versions.androidStudioRelease") -def target_AndroidStudio = buildProperties.includeCidrPlugins && projectVersions.contains("versions.androidStudioRelease") -def target_IdeaUltimate = buildProperties.includeUltimate - -if (target_AppCode_Clion) { - logger.info("Including modules for AC and CL in buildSrc/settings.gradle") - - include ":prepare-deps:kotlin-native-platform-deps" - include ":prepare-deps:native-debug-plugin" - - project(":prepare-deps:kotlin-native-platform-deps").projectDir = - file("${buildProperties.propertiesProvider.rootProjectDir}/kotlin-ultimate/buildSrc/prepare-deps/kotlin-native-platform-deps") - project(":prepare-deps:native-debug-plugin").projectDir = - file("${buildProperties.propertiesProvider.rootProjectDir}/kotlin-ultimate/buildSrc/prepare-deps/native-debug-plugin") -} else if (target_AndroidStudio) { - logger.info("Including modules for AS (mobile plugin) in buildSrc/settings.gradle") - - include ":prepare-deps:appcode-binaries" - include ":prepare-deps:lldb-framework" - include ":prepare-deps:lldb-frontend" - - project(":prepare-deps:appcode-binaries").projectDir = - file("${buildProperties.propertiesProvider.rootProjectDir}/kotlin-ultimate/buildSrc/prepare-deps/appcode-binaries") - project(":prepare-deps:lldb-framework").projectDir = - file("${buildProperties.propertiesProvider.rootProjectDir}/kotlin-ultimate/buildSrc/prepare-deps/lldb-framework") - project(":prepare-deps:lldb-frontend").projectDir = - file("${buildProperties.propertiesProvider.rootProjectDir}/kotlin-ultimate/buildSrc/prepare-deps/lldb-frontend") -} else if (target_IdeaUltimate) { - logger.info("Including modules for IU in buildSrc/settings.gradle") - - include ":prepare-deps:lldb-frontend" - include ":prepare-deps:native-debug-plugin" - - project(":prepare-deps:lldb-frontend").projectDir = - file("${buildProperties.propertiesProvider.rootProjectDir}/kotlin-ultimate/buildSrc/prepare-deps/lldb-frontend") - project(":prepare-deps:native-debug-plugin").projectDir = - file("${buildProperties.propertiesProvider.rootProjectDir}/kotlin-ultimate/buildSrc/prepare-deps/native-debug-plugin") - -} else { - logger.info("Not including extra modules in buildSrc/settings.gradle") -} +include "prepare-deps" \ No newline at end of file diff --git a/buildSrc/src/main/kotlin/dependencies.kt b/buildSrc/src/main/kotlin/dependencies.kt index fd74c651ccb..8b85a41c187 100644 --- a/buildSrc/src/main/kotlin/dependencies.kt +++ b/buildSrc/src/main/kotlin/dependencies.kt @@ -91,12 +91,6 @@ fun Project.preloadedDeps( return files(*matchingFiles.map { it.canonicalPath }.toTypedArray()) } -fun Project.ideaUltimatePreloadedDeps(vararg artifactBaseNames: String, subdir: String? = null): ConfigurableFileCollection { - val ultimateDepsDir = fileFrom(rootDir, "ultimate", "dependencies") - return if (ultimateDepsDir.isDirectory) preloadedDeps(*artifactBaseNames, baseDir = ultimateDepsDir, subdir = subdir) - else files() -} - fun Project.kotlinDep(artifactBaseName: String, version: String, classifier: String? = null): String = listOfNotNull("org.jetbrains.kotlin:kotlin-$artifactBaseName:$version", classifier).joinToString(":") diff --git a/buildSrc/src/main/kotlin/localDependencies.kt b/buildSrc/src/main/kotlin/localDependencies.kt index 0cbe5f6b531..58aaebd1f6a 100644 --- a/buildSrc/src/main/kotlin/localDependencies.kt +++ b/buildSrc/src/main/kotlin/localDependencies.kt @@ -37,9 +37,7 @@ private fun Project.kotlinBuildLocalRepoDir(): File = kotlinBuildLocalDependenci fun Project.ideModuleName() = when (IdeVersionConfigurator.currentIde.kind) { Ide.Kind.AndroidStudio -> "android-studio-ide" - Ide.Kind.IntelliJ -> { - if (kotlinBuildProperties.intellijUltimateEnabled) "ideaIU" else "ideaIC" - } + Ide.Kind.IntelliJ -> "ideaIC" } private fun Project.ideModuleVersion(forIde: Boolean) = when (IdeVersionConfigurator.currentIde.kind) { @@ -110,10 +108,6 @@ fun Project.intellijRuntimeAnnotations() = "kotlin.build:intellij-runtime-annota fun Project.intellijPluginDep(plugin: String, forIde: Boolean = false) = intellijDep(plugin, forIde) -fun Project.intellijUltimateDep() = intellijDep("ideaIU") - -fun Project.intellijUltimatePluginDep(plugin: String) = intellijDep(plugin) - fun ModuleDependency.includeJars(vararg names: String, rootProject: Project? = null) { names.forEach { var baseName = it.removeSuffix(".jar") @@ -152,19 +146,8 @@ fun ModuleDependency.includeIntellijCoreJarDependencies(project: Project, jarsFi rootProject = project.rootProject ) -fun Project.isIntellijCommunityAvailable() = - !(rootProject.extra["intellijUltimateEnabled"] as Boolean) || rootProject.extra["intellijSeparateSdks"] as Boolean - -fun Project.isIntellijUltimateSdkAvailable() = (rootProject.extra["intellijUltimateEnabled"] as Boolean) - fun Project.intellijRootDir() = IntellijRootUtils.getIntellijRootDir(project) -fun Project.intellijUltimateRootDir() = - if (isIntellijUltimateSdkAvailable()) - File(kotlinBuildLocalRepoDir(), "kotlin.build/ideaIU/${rootProject.extra["versions.intellijSdk"]}/artifacts") - else - throw GradleException("intellij ultimate SDK is not available") - fun DependencyHandlerScope.excludeInAndroidStudio(rootProject: Project, block: DependencyHandlerScope.() -> Unit) { if (!rootProject.extra.has("versions.androidStudioRelease")) { block() @@ -198,7 +181,7 @@ fun Project.runIdeTask(name: String, ideaPluginDir: File, ideaSandboxDir: File, "-Dplugin.path=${ideaPluginDir.absolutePath}" ) - if (Platform[201].orHigher() && !isIntellijUltimateSdkAvailable()) { + if (Platform[201].orHigher()) { jvmArgs("-Didea.platform.prefix=Idea") } diff --git a/compiler/tests/org/jetbrains/kotlin/code/CodeConformanceTest.kt b/compiler/tests/org/jetbrains/kotlin/code/CodeConformanceTest.kt index a5e12df40a4..709219b218a 100644 --- a/compiler/tests/org/jetbrains/kotlin/code/CodeConformanceTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/code/CodeConformanceTest.kt @@ -174,18 +174,14 @@ class CodeConformanceTest : TestCase() { val atAuthorPattern = Pattern.compile("/\\*.+@author.+\\*/", Pattern.DOTALL) - val root = nonSourcesMatcher.root - val tests = listOf( TestData( "%d source files contain @author javadoc tag.\nPlease remove them or exclude in this test:\n%s" - ) { file, source -> + ) { _, source -> // substring check is an optimization "@author" in source && atAuthorPattern.matcher(source).find() && "ASM: a very small and fast Java bytecode manipulation framework" !in source && - "package org.jetbrains.kotlin.tools.projectWizard.settings.version.maven" !in source && - !file.relativeTo(root).systemIndependentPath.startsWith("kotlin-ultimate/ide/common-cidr-native") && - file.name != "CLionKonanProjectDataService.kt" + "package org.jetbrains.kotlin.tools.projectWizard.settings.version.maven" !in source }, TestData( "%d source files use something from com.beust.jcommander.internal package.\n" + @@ -358,7 +354,7 @@ class CodeConformanceTest : TestCase() { if (repoOccurrences.isNotEmpty()) { val repoOccurrencesStableOrder = repoOccurrences - .map { RepoOccurrences(it.repo, it.files.sortedBy { it.path }) } + .map { occurrence -> RepoOccurrences(occurrence.repo, occurrence.files.sortedBy { file -> file.path }) } .sortedBy { it.repo } fail( buildString { @@ -400,4 +396,4 @@ class CodeConformanceTest : TestCase() { } private fun String.ensureFileOrEndsWithSlash() = - if (endsWith("/") || "." in substringAfterLast('/')) this else this + "/" + if (endsWith("/") || "." in substringAfterLast('/')) this else "$this/" diff --git a/dependencies/kotlin-build-gradle-plugin/src/BuildProperties.kt b/dependencies/kotlin-build-gradle-plugin/src/BuildProperties.kt index 271c0874b32..e0e82723a2f 100644 --- a/dependencies/kotlin-build-gradle-plugin/src/BuildProperties.kt +++ b/dependencies/kotlin-build-gradle-plugin/src/BuildProperties.kt @@ -50,17 +50,8 @@ class KotlinBuildProperties( val isInJpsBuildIdeaSync: Boolean get() = isJpsBuildEnabled && isInIdeaSync - private val kotlinUltimateExists: Boolean = propertiesProvider.rootProjectDir.resolve("kotlin-ultimate").exists() - val isTeamcityBuild: Boolean = getBoolean("teamcity") || System.getenv("TEAMCITY_VERSION") != null - val intellijUltimateEnabled: Boolean = getBoolean("intellijUltimateEnabled", isTeamcityBuild) || - getBoolean("kotlin.build.dependencies.iu.enabled", isTeamcityBuild) - - val includeCidrPlugins: Boolean = kotlinUltimateExists && getBoolean("cidrPluginsEnabled") - - val includeUltimate: Boolean = kotlinUltimateExists && (isTeamcityBuild || intellijUltimateEnabled) - val buildCacheUrl: String? = getOrNull("kotlin.build.cache.url") as String? val pushToBuildCache: Boolean = getBoolean("kotlin.build.cache.push", isTeamcityBuild) diff --git a/gradle/jps.gradle.kts b/gradle/jps.gradle.kts index e89b34b4a20..3202411adc6 100644 --- a/gradle/jps.gradle.kts +++ b/gradle/jps.gradle.kts @@ -13,10 +13,6 @@ val ideaSandboxDir: File by extra val ideaSdkPath: String get() = IntellijRootUtils.getIntellijRootDir(rootProject).absolutePath -val intellijUltimateEnabled: Boolean by rootProject.extra -val ideaUltimatePluginDir: File by rootProject.extra -val ideaUltimateSandboxDir: File by rootProject.extra - fun JUnit.configureForKotlin(xmx: String = "1600m") { vmParameters = listOf( "-ea", @@ -230,10 +226,6 @@ if (kotlinBuildProperties.isInJpsBuildIdeaSync) { idea("[JPS] IDEA (No ProcessCanceledException)", ideaSandboxDir, ideaPluginDir, disableProcessCanceledException = true) - if (intellijUltimateEnabled) { - idea("[JPS] IDEA Ultimate", ideaUltimateSandboxDir, ideaPluginDir) - } - defaults { configureForKotlin() } @@ -245,14 +237,6 @@ if (kotlinBuildProperties.isInJpsBuildIdeaSync) { configureForKotlin() } - if (intellijUltimateEnabled) { - junit("[JPS] All IDEA Ultimate Plugin Tests") { - moduleName = "kotlin.ultimate.test" - pattern = "org.jetbrains.kotlin.*" - configureForKotlin() - } - } - junit("[JPS] Compiler Tests") { moduleName = "kotlin.compiler.test" pattern = "org.jetbrains.kotlin.*" diff --git a/gradle/modularizedTestConfigurations.gradle.kts b/gradle/modularizedTestConfigurations.gradle.kts index 5bda4c14158..a41966924af 100644 --- a/gradle/modularizedTestConfigurations.gradle.kts +++ b/gradle/modularizedTestConfigurations.gradle.kts @@ -13,10 +13,6 @@ val ideaSandboxDir: File by extra val ideaSdkPath: String get() = IntellijRootUtils.getIntellijRootDir(rootProject).absolutePath -val intellijUltimateEnabled: Boolean by rootProject.extra -val ideaUltimatePluginDir: File by rootProject.extra -val ideaUltimateSandboxDir: File by rootProject.extra - val pathToKotlinModularizedTestData = kotlinBuildProperties.pathToKotlinModularizedTestData fun MutableList.addModularizedTestArgs(prefix: String, benchFilter: String?) { diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index bbdddec8735..99132651568 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -2183,22 +2183,6 @@ - - - - - - - - - - - - - - - - @@ -5545,1198 +5529,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/idea/testData/gradle/highlighting/complexBuildGradleKts/build.gradle.kts b/idea/testData/gradle/highlighting/complexBuildGradleKts/build.gradle.kts index 1e62336995b..59df170eafc 100644 --- a/idea/testData/gradle/highlighting/complexBuildGradleKts/build.gradle.kts +++ b/idea/testData/gradle/highlighting/complexBuildGradleKts/build.gradle.kts @@ -37,28 +37,14 @@ val distKotlinHomeDir by extra("$distDir/kotlinc") val distLibDir = "$distKotlinHomeDir/lib" val commonLocalDataDir = "$rootDir/local" val ideaSandboxDir = "$commonLocalDataDir/ideaSandbox" -val ideaUltimateSandboxDir = "$commonLocalDataDir/ideaUltimateSandbox" -val clionSandboxDir = "$commonLocalDataDir/clionSandbox" -val appcodeSandboxDir = "$commonLocalDataDir/appcodeSandbox" val ideaPluginDir = "$distDir/artifacts/ideaPlugin/Kotlin" -val ideaUltimatePluginDir = "$distDir/artifacts/ideaUltimatePlugin/Kotlin" -val cidrPluginDir = "$distDir/artifacts/cidrPlugin/Kotlin" -val appcodePluginDir = "$distDir/artifacts/appcodePlugin/Kotlin" -val clionPluginDir = "$distDir/artifacts/clionPlugin/Kotlin" // TODO: use "by extra()" syntax where possible extra["distLibDir"] = project.file(distLibDir) extra["libsDir"] = project.file(distLibDir) extra["commonLocalDataDir"] = project.file(commonLocalDataDir) extra["ideaSandboxDir"] = project.file(ideaSandboxDir) -extra["ideaUltimateSandboxDir"] = project.file(ideaUltimateSandboxDir) -extra["clionSandboxDir"] = project.file(ideaSandboxDir) -extra["appcodeSandboxDir"] = project.file(ideaSandboxDir) extra["ideaPluginDir"] = project.file(ideaPluginDir) -extra["ideaUltimatePluginDir"] = project.file(ideaUltimatePluginDir) -extra["cidrPluginDir"] = project.file(cidrPluginDir) -extra["appcodePluginDir"] = project.file(appcodePluginDir) -extra["clionPluginDir"] = project.file(clionPluginDir) extra["isSonatypeRelease"] = false // Work-around necessary to avoid setting null javaHome. Will be removed after support of lazy task configuration @@ -85,13 +71,11 @@ extra["versions.markdown"] = "0.1.25" extra["versions.trove4j"] = "1.0.20181211" val isTeamcityBuild = false -val intellijUltimateEnabled = false val effectSystemEnabled by extra(false) val newInferenceEnabled by extra(false) val intellijSeparateSdks = false -extra["intellijUltimateEnabled"] = intellijUltimateEnabled extra["intellijSeparateSdks"] = intellijSeparateSdks extra["IntellijCoreDependencies"] = @@ -276,10 +260,6 @@ tasks { create("cleanupArtifacts") { doLast { delete(ideaPluginDir) - delete(ideaUltimatePluginDir) - delete(cidrPluginDir) - delete(appcodePluginDir) - delete(clionPluginDir) } } diff --git a/settings.gradle b/settings.gradle index 95008a04f06..94bff10a783 100644 --- a/settings.gradle +++ b/settings.gradle @@ -420,43 +420,6 @@ if (!buildProperties.getBoolean("disableKotlinPluginModules", false) && buildPro logger.info("Old Kotlin plugin modules are disabled") } -if (buildProperties.includeCidrPlugins) { - logger.info("Including CIDR modules in settings.gradle") - include ":kotlin-ultimate:ide:cidr-gradle-tooling", - ":kotlin-ultimate:ide:common-native", - ":kotlin-ultimate:ide:common-cidr-mobile", - ":kotlin-ultimate:ide:common-cidr-native", - ":kotlin-ultimate:ide:common-cidr-swift-native", - ":kotlin-ultimate:ide:common-noncidr-native", - ":kotlin-ultimate:ide:appcode-native", - ":kotlin-ultimate:ide:mobile-native", - ":kotlin-ultimate:prepare:cidr-plugin", - ":kotlin-ultimate:prepare:appcode-plugin", - ":kotlin-ultimate:prepare:mobile-plugin", - ":kotlin-ultimate:libraries:tools:apple-gradle-plugin-api" - - if (projectVersions.contains("versions.androidStudioRelease")) { - logger.info("Including KMM modules in settings.gradle") - include ":kotlin-ultimate:ide:android-studio-native", - ":kotlin-ultimate:prepare:kmm-plugin" - } else { - logger.info("NOT including KMM modules in settings.gradle") - } -} else { - logger.info("NOT including CIDR modules in settings.gradle") -} - -if (buildProperties.includeUltimate) { - include ":kotlin-ultimate:ultimate", - ":kotlin-ultimate:ultimate:ultimate-runner", - ":kotlin-ultimate:ide:common-native", - ":kotlin-ultimate:ide:common-noncidr-native", - ":kotlin-ultimate:ide:ultimate-native" - logger.info("Including extension for IJ Ultimate in settings.gradle") -} else { - logger.info("NOT including extension for IJ Ultimate in settings.gradle") -} - if (buildProperties.inJpsBuildIdeaSync) { include ":kotlin-stdlib:jps-build" project(":kotlin-stdlib:jps-build").projectDir = "$rootDir/libraries/stdlib/jps-build" as File