Build: Drop include/* project previously used in composite build

This commit is contained in:
Vyacheslav Gerasimov
2021-03-16 23:57:25 +03:00
parent 4f250ed498
commit 7fe0df2816
3 changed files with 0 additions and 89 deletions
-55
View File
@@ -1,55 +0,0 @@
plugins {
kotlin("jvm")
}
val compile by configurations
val fatJarContents by configurations.creating {
isCanBeResolved = true
isCanBeConsumed = false
attributes {
attribute(LibraryElements.LIBRARY_ELEMENTS_ATTRIBUTE, objects.named(LibraryElements.JAR))
}
}
val fatJarContentsStripMetadata by configurations.creating
val fatJarContentsStripServices by configurations.creating
val compilerModules: Array<String> by rootProject.extra
dependencies {
compilerModules.forEach { module ->
compile(project(module)) { isTransitive = false }
}
fatJarContents(kotlinBuiltins())
fatJarContents(commonDep("javax.inject"))
fatJarContents(commonDep("org.jline", "jline"))
fatJarContents(commonDep("org.fusesource.jansi", "jansi"))
fatJarContents(protobufFull())
fatJarContents(commonDep("com.google.code.findbugs", "jsr305"))
fatJarContents(commonDep("io.javaslang", "javaslang"))
fatJarContents(intellijCoreDep()) { includeJars("intellij-core") }
fatJarContents(intellijDep()) { includeIntellijCoreJarDependencies(project, { !(it.startsWith("jdom") || it.startsWith("log4j")) }) }
fatJarContents(intellijDep()) { includeJars("jna-platform") }
fatJarContentsStripServices(jpsStandalone()) { includeJars("jps-model") }
fatJarContentsStripMetadata(intellijDep()) { includeJars("oro", "jdom", "log4j", rootProject = rootProject) }
if (Platform.P202()) {
fatJarContents(intellijDep()) { includeJars("intellij-deps-fastutil-8.3.1-1") }
} else if (Platform.P203.orHigher()) {
fatJarContents(intellijDep()) { includeJars("intellij-deps-fastutil-8.3.1-3") }
}
}
val jar: Jar by tasks
jar.apply {
dependsOn(fatJarContents)
from { compile.filter { it.extension == "jar" }.map { zipTree(it) } }
from { fatJarContents.map { zipTree(it) } }
from { fatJarContentsStripServices.map { zipTree(it).matching { exclude("META-INF/services/**") } } }
from { fatJarContentsStripMetadata.map { zipTree(it).matching { exclude("META-INF/jb/** META-INF/LICENSE") } } }
manifest.attributes["Class-Path"] = compilerManifestClassPath
manifest.attributes["Main-Class"] = "org.jetbrains.kotlin.cli.jvm.K2JVMCompiler"
}
@@ -1,31 +0,0 @@
plugins {
base
}
val sources by configurations.creating {
attributes {
isCanBeResolved = true
isCanBeConsumed = false
attributes {
attribute(LibraryElements.LIBRARY_ELEMENTS_ATTRIBUTE, objects.named(LibraryElements.JAR))
attribute(Category.CATEGORY_ATTRIBUTE, objects.named(Category.DOCUMENTATION))
attribute(DocsType.DOCS_TYPE_ATTRIBUTE, objects.named(DocsType.SOURCES))
}
}
}
configurations["embeddedElements"].isCanBeConsumed = false
dependencies {
sources(project(":kotlin-stdlib-common"))
}
val buildSources by tasks.registering(Jar::class) {
dependsOn(sources)
from(provider { zipTree(sources.singleFile) })
}
artifacts.add("default", buildSources) {
name = "kotlin-stdlib-common"
classifier = "sources"
}
-3
View File
@@ -301,7 +301,6 @@ include ":benchmarks",
":pill:generate-all-tests",
":libraries:kotlin-prepush-hook",
":libraries:tools:mutability-annotations-compat",
":include:kotlin-compiler",
":plugins:jvm-abi-gen",
":plugins:jvm-abi-gen-embeddable",
":test-instrumenter",
@@ -418,8 +417,6 @@ if (buildProperties.inJpsBuildIdeaSync) {
":tools:binary-compatibility-validator",
":tools:kotlin-stdlib-gen",
":include:kotlin-stdlib-common-sources",
":kotlin-test",
":kotlin-test:kotlin-test-js",
":kotlin-test:kotlin-test-js-ir",