Build: Add jps artifact for kotlinc
This commit is contained in:
Vyacheslav Gerasimov
@@ -38,6 +38,7 @@ build/
|
||||
.idea/artifacts/dist_auto_*
|
||||
.idea/artifacts/dist.xml
|
||||
.idea/artifacts/ideaPlugin.xml
|
||||
.idea/artifacts/kotlinc.xml
|
||||
.idea/artifacts/kotlin_compiler_jar.xml
|
||||
.idea/artifacts/kotlin_plugin_jar.xml
|
||||
.idea/artifacts/kotlin_jps_plugin_jar.xml
|
||||
|
||||
Generated
-255
@@ -1,255 +0,0 @@
|
||||
<component name="ArtifactManager">
|
||||
<artifact name="kotlinc">
|
||||
<output-path>$PROJECT_DIR$/out/artifacts/kotlinc</output-path>
|
||||
<root id="root">
|
||||
<element id="directory" name="bin">
|
||||
<element id="dir-copy" path="$PROJECT_DIR$/compiler/cli/bin" />
|
||||
</element>
|
||||
<element id="directory" name="lib">
|
||||
<element id="file-copy" path="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains/annotations/13.0/919f0dfe192fb4e063e7dacadee7f8bb9a2672a9/annotations-13.0.jar" />
|
||||
<element id="file-copy" path="$PROJECT_DIR$/dependencies/repo/kotlin.build/ideaIC/191.6707.61/artifacts/lib/trove4j.jar" />
|
||||
<element id="archive" name="allopen-compiler-plugin.jar">
|
||||
<element id="module-output" name="kotlin.kotlin-allopen-compiler-plugin.main" />
|
||||
<element id="directory" name="META-INF">
|
||||
<element id="file-copy" path="$PROJECT_DIR$/plugins/allopen/allopen-cli/build/tmp/jar/MANIFEST.MF" />
|
||||
</element>
|
||||
</element>
|
||||
<element id="archive" name="android-extensions-runtime.jar">
|
||||
<element id="module-output" name="kotlin.kotlin-android-extensions-runtime.main" />
|
||||
<element id="directory" name="META-INF">
|
||||
<element id="file-copy" path="$PROJECT_DIR$/plugins/android-extensions/android-extensions-runtime/build/tmp/jar/MANIFEST.MF" />
|
||||
</element>
|
||||
</element>
|
||||
<element id="archive" name="kotlin-annotation-processing.jar">
|
||||
<element id="module-output" name="kotlin.kotlin-annotation-processing.main" />
|
||||
<element id="module-output" name="kotlin.kotlin-annotation-processing-runtime.main" />
|
||||
<element id="module-output" name="kotlin.kotlin-annotation-processing-cli.main" />
|
||||
<element id="module-output" name="kotlin.kotlin-annotation-processing-base.main" />
|
||||
<element id="directory" name="META-INF">
|
||||
<element id="file-copy" path="$PROJECT_DIR$/plugins/kapt3/kapt3-compiler/build/tmp/jar/MANIFEST.MF" />
|
||||
</element>
|
||||
</element>
|
||||
<element id="archive" name="kotlin-annotation-processing-cli.jar">
|
||||
<element id="module-output" name="kotlin.kotlin-annotation-processing-cli.main" />
|
||||
<element id="directory" name="META-INF">
|
||||
<element id="file-copy" path="$PROJECT_DIR$/plugins/kapt3/kapt3-cli/build/tmp/jar/MANIFEST.MF" />
|
||||
</element>
|
||||
</element>
|
||||
<element id="archive" name="kotlin-annotation-processing-runtime.jar">
|
||||
<element id="module-output" name="kotlin.kotlin-annotation-processing-runtime.main" />
|
||||
<element id="directory" name="META-INF">
|
||||
<element id="file-copy" path="$PROJECT_DIR$/plugins/kapt3/kapt3-runtime/build/tmp/jar/MANIFEST.MF" />
|
||||
</element>
|
||||
</element>
|
||||
<element id="archive" name="kotlin-annotations-android.jar">
|
||||
<element id="module-output" name="kotlin.kotlin-annotations-android.main" />
|
||||
<element id="directory" name="META-INF">
|
||||
<element id="file-copy" path="$PROJECT_DIR$/libraries/tools/kotlin-annotations-android/build/tmp/jar/MANIFEST.MF" />
|
||||
</element>
|
||||
</element>
|
||||
<element id="archive" name="kotlin-annotations-jvm.jar">
|
||||
<element id="module-output" name="kotlin.kotlin-annotations-jvm.main" />
|
||||
<element id="directory" name="META-INF">
|
||||
<element id="file-copy" path="$PROJECT_DIR$/libraries/tools/kotlin-annotations-jvm/build/tmp/jar/MANIFEST.MF" />
|
||||
</element>
|
||||
</element>
|
||||
<element id="archive" name="kotlin-annotations-jvm-sources.jar">
|
||||
<element id="dir-copy" path="$PROJECT_DIR$/libraries/tools/kotlin-annotations-jvm/src" />
|
||||
<element id="directory" name="main">
|
||||
<element id="directory" name="resources" />
|
||||
<element id="directory" name="kotlin" />
|
||||
<element id="directory" name="java" />
|
||||
</element>
|
||||
<element id="directory" name="test">
|
||||
<element id="directory" name="resources" />
|
||||
</element>
|
||||
<element id="directory" name="META-INF">
|
||||
<element id="file-copy" path="$PROJECT_DIR$/libraries/tools/kotlin-annotations-jvm/build/tmp/sourcesJar/MANIFEST.MF" />
|
||||
</element>
|
||||
</element>
|
||||
<element id="archive" name="kotlin-ant.jar">
|
||||
<element id="module-output" name="kotlin.kotlin-ant.main" />
|
||||
<element id="directory" name="META-INF">
|
||||
<element id="file-copy" path="$PROJECT_DIR$/ant/build/tmp/jar/MANIFEST.MF" />
|
||||
</element>
|
||||
</element>
|
||||
<element id="archive" name="noarg-compiler-plugin.jar">
|
||||
<element id="module-output" name="kotlin.kotlin-noarg-compiler-plugin.main" />
|
||||
<element id="directory" name="META-INF">
|
||||
<element id="file-copy" path="$PROJECT_DIR$/plugins/noarg/noarg-cli/build/tmp/jar/MANIFEST.MF" />
|
||||
</element>
|
||||
</element>
|
||||
<element id="archive" name="kotlin-preloader.jar">
|
||||
<element id="module-output" name="kotlin.kotlin-preloader.main" />
|
||||
<element id="directory" name="META-INF">
|
||||
<element id="file-copy" path="$PROJECT_DIR$/compiler/preloader/build/tmp/jar/MANIFEST.MF" />
|
||||
</element>
|
||||
</element>
|
||||
<element id="archive" name="kotlin-reflect-sources.jar">
|
||||
<element id="dir-copy" path="$PROJECT_DIR$/core/descriptors/src" />
|
||||
<element id="dir-copy" path="$PROJECT_DIR$/core/descriptors.jvm/src" />
|
||||
<element id="dir-copy" path="$PROJECT_DIR$/core/descriptors.runtime/src" />
|
||||
<element id="dir-copy" path="$PROJECT_DIR$/core/deserialization/src" />
|
||||
<element id="dir-copy" path="$PROJECT_DIR$/core/util.runtime/src" />
|
||||
<element id="dir-copy" path="$PROJECT_DIR$/core/reflection.jvm/src" />
|
||||
<element id="directory" name="META-INF">
|
||||
<element id="file-copy" path="$PROJECT_DIR$/libraries/reflect/build/tmp/sourcesJar/MANIFEST.MF" />
|
||||
</element>
|
||||
</element>
|
||||
<element id="archive" name="kotlin-runner.jar">
|
||||
<element id="module-output" name="kotlin.kotlin-runner.main" />
|
||||
<element id="directory" name="META-INF">
|
||||
<element id="file-copy" path="$PROJECT_DIR$/compiler/cli/cli-runner/build/tmp/jar/MANIFEST.MF" />
|
||||
</element>
|
||||
</element>
|
||||
<element id="archive" name="sam-with-receiver-compiler-plugin.jar">
|
||||
<element id="module-output" name="kotlin.kotlin-sam-with-receiver-compiler-plugin.main" />
|
||||
<element id="directory" name="META-INF">
|
||||
<element id="file-copy" path="$PROJECT_DIR$/plugins/sam-with-receiver/sam-with-receiver-cli/build/tmp/jar/MANIFEST.MF" />
|
||||
</element>
|
||||
</element>
|
||||
<element id="archive" name="kotlin-script-runtime.jar">
|
||||
<element id="module-output" name="kotlin.kotlin-script-runtime.main" />
|
||||
<element id="directory" name="META-INF">
|
||||
<element id="file-copy" path="$PROJECT_DIR$/libraries/tools/script-runtime/build/tmp/jar/MANIFEST.MF" />
|
||||
</element>
|
||||
</element>
|
||||
<element id="archive" name="kotlin-script-runtime-sources.jar">
|
||||
<element id="dir-copy" path="$PROJECT_DIR$/core/script.runtime/src" />
|
||||
<element id="directory" name="META-INF">
|
||||
<element id="file-copy" path="$PROJECT_DIR$/libraries/tools/script-runtime/build/tmp/sourcesJar/MANIFEST.MF" />
|
||||
</element>
|
||||
</element>
|
||||
<element id="archive" name="kotlin-scripting-common.jar">
|
||||
<element id="module-output" name="kotlin.kotlin-scripting-common.main" />
|
||||
<element id="directory" name="META-INF">
|
||||
<element id="file-copy" path="$PROJECT_DIR$/libraries/scripting/common/build/tmp/jar/MANIFEST.MF" />
|
||||
</element>
|
||||
</element>
|
||||
<element id="archive" name="kotlin-scripting-compiler.jar">
|
||||
<element id="module-output" name="kotlin.kotlin-scripting-compiler.main" />
|
||||
<element id="directory" name="META-INF">
|
||||
<element id="file-copy" path="$PROJECT_DIR$/plugins/scripting/scripting-compiler/build/tmp/jar/MANIFEST.MF" />
|
||||
</element>
|
||||
</element>
|
||||
<element id="archive" name="kotlin-scripting-compiler-impl.jar">
|
||||
<element id="module-output" name="kotlin.kotlin-scripting-compiler-impl.main" />
|
||||
</element>
|
||||
<element id="archive" name="kotlin-scripting-jvm.jar">
|
||||
<element id="module-output" name="kotlin.kotlin-scripting-jvm.main" />
|
||||
<element id="directory" name="META-INF">
|
||||
<element id="file-copy" path="$PROJECT_DIR$/libraries/scripting/jvm/build/tmp/jar/MANIFEST.MF" />
|
||||
</element>
|
||||
</element>
|
||||
<element id="archive" name="kotlin-source-sections-compiler-plugin.jar">
|
||||
<element id="module-output" name="kotlin.kotlin-source-sections-compiler-plugin.main" />
|
||||
<element id="directory" name="META-INF">
|
||||
<element id="file-copy" path="$PROJECT_DIR$/plugins/source-sections/source-sections-compiler/build/tmp/jar/MANIFEST.MF" />
|
||||
</element>
|
||||
</element>
|
||||
<element id="archive" name="kotlin-test-js.jar">
|
||||
<element id="module-output" name="kotlin.kotlin-test.kotlin-test-js.main" />
|
||||
<element id="directory" name="META-INF">
|
||||
<element id="file-copy" path="$PROJECT_DIR$/libraries/kotlin.test/js/build/tmp/jar/MANIFEST.MF" />
|
||||
</element>
|
||||
</element>
|
||||
<element id="archive" name="kotlin-test-js-sources.jar">
|
||||
<element id="dir-copy" path="$PROJECT_DIR$/libraries/kotlin.test/js/src/main/kotlin" />
|
||||
<element id="directory" name="META-INF">
|
||||
<element id="file-copy" path="$PROJECT_DIR$/libraries/kotlin.test/js/build/tmp/sourcesJar/MANIFEST.MF" />
|
||||
</element>
|
||||
</element>
|
||||
<element id="archive" name="kotlin-test-junit.jar">
|
||||
<element id="module-output" name="kotlin.kotlin-test.kotlin-test-junit.main" />
|
||||
<element id="directory" name="META-INF">
|
||||
<element id="file-copy" path="$PROJECT_DIR$/libraries/kotlin.test/junit/build/tmp/jar/MANIFEST.MF" />
|
||||
</element>
|
||||
</element>
|
||||
<element id="archive" name="kotlin-test-junit-sources.jar">
|
||||
<element id="dir-copy" path="$PROJECT_DIR$/libraries/kotlin.test/junit/src/main/kotlin" />
|
||||
<element id="directory" name="META-INF">
|
||||
<element id="file-copy" path="$PROJECT_DIR$/libraries/kotlin.test/junit/build/tmp/sourcesJar/MANIFEST.MF" />
|
||||
</element>
|
||||
</element>
|
||||
<element id="archive" name="kotlin-test-junit5.jar">
|
||||
<element id="module-output" name="kotlin.kotlin-test.kotlin-test-junit5.main" />
|
||||
<element id="directory" name="META-INF">
|
||||
<element id="file-copy" path="$PROJECT_DIR$/libraries/kotlin.test/junit5/build/tmp/jar/MANIFEST.MF" />
|
||||
</element>
|
||||
</element>
|
||||
<element id="archive" name="kotlin-test-junit5-sources.jar">
|
||||
<element id="dir-copy" path="$PROJECT_DIR$/libraries/kotlin.test/junit5/src/main/kotlin" />
|
||||
<element id="directory" name="META-INF">
|
||||
<element id="file-copy" path="$PROJECT_DIR$/libraries/kotlin.test/junit5/build/tmp/sourcesJar/MANIFEST.MF" />
|
||||
</element>
|
||||
</element>
|
||||
<element id="archive" name="kotlin-test.jar">
|
||||
<element id="module-output" name="kotlin.kotlin-test.kotlin-test-jvm.main" />
|
||||
<element id="directory" name="META-INF">
|
||||
<element id="file-copy" path="$PROJECT_DIR$/libraries/kotlin.test/jvm/build/tmp/jar/MANIFEST.MF" />
|
||||
</element>
|
||||
</element>
|
||||
<element id="archive" name="kotlin-test-sources.jar">
|
||||
<element id="dir-copy" path="$PROJECT_DIR$/libraries/kotlin.test/jvm/src/main/kotlin" />
|
||||
<element id="directory" name="META-INF">
|
||||
<element id="file-copy" path="$PROJECT_DIR$/libraries/kotlin.test/jvm/build/tmp/sourcesJar/MANIFEST.MF" />
|
||||
</element>
|
||||
</element>
|
||||
<element id="archive" name="kotlin-test-testng.jar">
|
||||
<element id="module-output" name="kotlin.kotlin-test.kotlin-test-testng.main" />
|
||||
<element id="directory" name="META-INF">
|
||||
<element id="file-copy" path="$PROJECT_DIR$/libraries/kotlin.test/testng/build/tmp/jar/MANIFEST.MF" />
|
||||
</element>
|
||||
</element>
|
||||
<element id="archive" name="kotlin-test-testng-sources.jar">
|
||||
<element id="dir-copy" path="$PROJECT_DIR$/libraries/kotlin.test/testng/src/main/kotlin" />
|
||||
<element id="directory" name="META-INF">
|
||||
<element id="file-copy" path="$PROJECT_DIR$/libraries/kotlin.test/testng/build/tmp/sourcesJar/MANIFEST.MF" />
|
||||
</element>
|
||||
</element>
|
||||
<element id="archive" name="kotlinx-serialization-compiler-plugin.jar">
|
||||
<element id="module-output" name="kotlin.kotlinx-serialization-compiler-plugin.main" />
|
||||
<element id="directory" name="META-INF">
|
||||
<element id="file-copy" path="$PROJECT_DIR$/plugins/kotlin-serialization/kotlin-serialization-compiler/build/tmp/jar/MANIFEST.MF" />
|
||||
</element>
|
||||
</element>
|
||||
<element id="archive" name="mutability-annotations-compat.jar">
|
||||
<element id="module-output" name="kotlin.libraries.tools.mutability-annotations-compat.main" />
|
||||
<element id="directory" name="META-INF">
|
||||
<element id="file-copy" path="$PROJECT_DIR$/libraries/tools/mutability-annotations-compat/build/tmp/jar/MANIFEST.MF" />
|
||||
</element>
|
||||
</element>
|
||||
<element id="archive" name="android-extensions-compiler.jar">
|
||||
<element id="module-output" name="kotlin.plugins.android-extensions-compiler.main" />
|
||||
<element id="module-output" name="kotlin.kotlin-android-extensions-runtime.main" />
|
||||
<element id="directory" name="META-INF">
|
||||
<element id="file-copy" path="$PROJECT_DIR$/plugins/android-extensions/android-extensions-compiler/build/tmp/jar/MANIFEST.MF" />
|
||||
</element>
|
||||
</element>
|
||||
<element id="file-copy" path="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk8/1.3.50-dev-526/d9da4521258618dcc687690f81e7430544098a80/kotlin-stdlib-jdk8-1.3.50-dev-526.jar" output-file-name="kotlin-stdlib-jdk8.jar" />
|
||||
<element id="file-copy" path="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk7/1.3.50-dev-526/8c795ad16d3e2edd465d97cda4063f906a4ecbaa/kotlin-stdlib-jdk7-1.3.50-dev-526.jar" output-file-name="kotlin-stdlib-jdk7.jar" />
|
||||
<element id="file-copy" path="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.3.50-dev-526/2fbb7e5d5a32d0754ee33e8ca38696fa22a3b70b/kotlin-stdlib-1.3.50-dev-526.jar" output-file-name="kotlin-stdlib.jar" />
|
||||
<element id="file-copy" path="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk7/1.3.50-dev-526/7c73dd25222b54224562d17184296dc8450c80cf/kotlin-stdlib-jdk7-1.3.50-dev-526-sources.jar" output-file-name="kotlin-stdlib-jdk7-sources.jar" />
|
||||
<element id="file-copy" path="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk8/1.3.50-dev-526/e9f538ede7b49a4d60265aa90f907d39993417d9/kotlin-stdlib-jdk8-1.3.50-dev-526-sources.jar" output-file-name="kotlin-stdlib-jdk8-sources.jar" />
|
||||
<element id="file-copy" path="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-js/1.3.50-dev-526/f171da8782d7f0000142818532b5e49693becb99/kotlin-stdlib-js-1.3.50-dev-526-sources.jar" />
|
||||
<element id="file-copy" path="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-js/1.3.50-dev-526/8a798b744fdbd46a7d93814f0f0b97c664c064d2/kotlin-stdlib-js-1.3.50-dev-526.jar" output-file-name="kotlin-stdlib-js.jar" />
|
||||
<element id="file-copy" path="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.3.50-dev-526/21e04af851994238d364653c103df336bf45fd4d/kotlin-stdlib-1.3.50-dev-526-sources.jar" output-file-name="kotlin-stdlib-sources.jar" />
|
||||
<element id="artifact" artifact-name="kotlin-compiler.jar" />
|
||||
<element id="artifact" artifact-name="kotlin-reflect.jar" />
|
||||
<element id="artifact" artifact-name="kotlin-daemon-client.jar" />
|
||||
<element id="artifact" artifact-name="kotlin-main-kts.jar" />
|
||||
<element id="artifact" artifact-name="kotlin-imports-dumper-compiler-plugin.jar" />
|
||||
<element id="archive" name="jvm-abi-gen.jar">
|
||||
<element id="module-output" name="kotlin.plugins.jvm-abi-gen.main" />
|
||||
<element id="directory" name="META-INF">
|
||||
<element id="file-copy" path="$PROJECT_DIR$/plugins/jvm-abi-gen/build/tmp/jar/MANIFEST.MF" />
|
||||
</element>
|
||||
</element>
|
||||
</element>
|
||||
<element id="directory" name="license">
|
||||
<element id="dir-copy" path="$PROJECT_DIR$/license" />
|
||||
</element>
|
||||
<element id="file-copy" path="$PROJECT_DIR$/bootstrap/build.txt" />
|
||||
</root>
|
||||
</artifact>
|
||||
</component>
|
||||
+74
-5
@@ -73,6 +73,8 @@ if (kotlinBuildProperties.isInJpsBuildIdeaSync) {
|
||||
|
||||
kotlinJpsPluginJar()
|
||||
|
||||
kotlinc()
|
||||
|
||||
ideaPlugin()
|
||||
|
||||
dist()
|
||||
@@ -266,6 +268,32 @@ fun NamedDomainObjectContainer<TopLevelArtifact>.dist() {
|
||||
}
|
||||
}
|
||||
|
||||
fun NamedDomainObjectContainer<TopLevelArtifact>.kotlinc() {
|
||||
val kotlinCompilerProject = project(":kotlin-compiler")
|
||||
val libraries by kotlinCompilerProject.configurations
|
||||
val compilerPlugins by kotlinCompilerProject.configurations
|
||||
val sources by kotlinCompilerProject.configurations
|
||||
|
||||
create("kotlinc") {
|
||||
directory("bin") {
|
||||
directoryContent("$rootDir/compiler/cli/bin")
|
||||
}
|
||||
|
||||
directory("lib") {
|
||||
artifact("kotlin-compiler.jar")
|
||||
jarsFromConfiguration(libraries) { it.replace("-$bootstrapKotlinVersion", "") }
|
||||
jarsFromConfiguration(compilerPlugins) { it.removePrefix("kotlin-") }
|
||||
sourceJarsFromConfiguration(sources) { it.replace("-$bootstrapKotlinVersion", "") }
|
||||
}
|
||||
|
||||
directory("license") {
|
||||
directoryContent("$rootDir/license")
|
||||
}
|
||||
|
||||
file("$rootDir/bootstrap/build.txt")
|
||||
}
|
||||
}
|
||||
|
||||
fun NamedDomainObjectContainer<TopLevelArtifact>.ideaPlugin() {
|
||||
val ideaPluginProject = project(":prepare:idea-plugin")
|
||||
(ideaPluginProject as ProjectInternal).evaluate()
|
||||
@@ -335,26 +363,67 @@ fun RecursiveArtifact.jarContentsFromConfiguration(configuration: Configuration)
|
||||
}
|
||||
}
|
||||
|
||||
fun RecursiveArtifact.jarsFromConfiguration(configuration: Configuration) {
|
||||
fun RecursiveArtifact.sourceJarsFromConfiguration(configuration: Configuration, renamer: (String) -> String = { it }) {
|
||||
val resolvedArtifacts = configuration
|
||||
.resolvedConfiguration
|
||||
.resolvedArtifacts
|
||||
|
||||
resolvedArtifacts.filter { it.id.componentIdentifier is ModuleComponentIdentifier }
|
||||
.map { it.file }
|
||||
.forEach(::file)
|
||||
jarsFromExternalModules(resolvedArtifacts, renamer)
|
||||
|
||||
resolvedArtifacts
|
||||
.map { it.id.componentIdentifier }
|
||||
.filterIsInstance<ProjectComponentIdentifier>()
|
||||
.forEach {
|
||||
val jarBaseName = project(it.projectPath).the<BasePluginConvention>().archivesBaseName
|
||||
val renamed = renamer("$jarBaseName-sources") + ".jar"
|
||||
archive(renamed) {
|
||||
project(it.projectPath)
|
||||
.mainSourceSet
|
||||
.allSource
|
||||
.sourceDirectories
|
||||
.forEach {sourceDirectory ->
|
||||
directoryContent(sourceDirectory)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fun RecursiveArtifact.jarsFromConfiguration(configuration: Configuration, renamer: (String) -> String = { it }) {
|
||||
val resolvedArtifacts = configuration
|
||||
.resolvedConfiguration
|
||||
.resolvedArtifacts
|
||||
|
||||
jarsFromExternalModules(resolvedArtifacts, renamer)
|
||||
|
||||
resolvedArtifacts
|
||||
.map { it.id.componentIdentifier }
|
||||
.filterIsInstance<ProjectComponentIdentifier>()
|
||||
.forEach {
|
||||
val artifactName = it.projectName + ".jar"
|
||||
val jarBaseName = project(it.projectPath).the<BasePluginConvention>().archivesBaseName
|
||||
val artifactName = renamer(jarBaseName) + ".jar"
|
||||
if (it.projectName in jarArtifactProjects) {
|
||||
artifact(artifactName)
|
||||
} else {
|
||||
archive(artifactName) {
|
||||
moduleOutput(moduleName(it.projectPath))
|
||||
jarContentsFromEmbeddedConfiguration(project(it.projectPath))
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fun RecursiveArtifact.jarsFromExternalModules(resolvedArtifacts: Iterable<ResolvedArtifact>, renamer: (String) -> String = { it }) {
|
||||
// Use output-file-name property when fixed https://github.com/JetBrains/gradle-idea-ext-plugin/issues/63
|
||||
resolvedArtifacts.filter { it.id.componentIdentifier is ModuleComponentIdentifier }
|
||||
.forEach {
|
||||
val baseName = it.file.nameWithoutExtension
|
||||
val renamed = renamer(baseName)
|
||||
if (it.file.extension == "jar" && renamed != baseName) {
|
||||
archive("$renamed.jar") {
|
||||
extractedDirectory(it.file)
|
||||
}
|
||||
} else {
|
||||
file(it.file)
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -100,10 +100,7 @@ val distCompilerPluginProjects = listOf(
|
||||
|
||||
val distSourcesProjects = listOfNotNull(
|
||||
":kotlin-annotations-jvm",
|
||||
":kotlin-reflect",
|
||||
":kotlin-script-runtime",
|
||||
":kotlin-stdlib-jdk7".takeIf { !kotlinBuildProperties.isInJpsBuildIdeaSync },
|
||||
":kotlin-stdlib-jdk8".takeIf { !kotlinBuildProperties.isInJpsBuildIdeaSync },
|
||||
":kotlin-stdlib-js-ir".takeIf { jsIrDist },
|
||||
":kotlin-test:kotlin-test-js",
|
||||
":kotlin-test:kotlin-test-js-ir".takeIf { jsIrDist },
|
||||
@@ -113,7 +110,7 @@ val distSourcesProjects = listOfNotNull(
|
||||
":kotlin-test:kotlin-test-testng"
|
||||
)
|
||||
|
||||
libraries.apply {
|
||||
configurations.all {
|
||||
resolutionStrategy {
|
||||
preferProjectModules()
|
||||
}
|
||||
@@ -157,9 +154,16 @@ dependencies {
|
||||
sources(project(it, configuration = "sources"))
|
||||
}
|
||||
|
||||
if (!kotlinBuildProperties.isInJpsBuildIdeaSync) {
|
||||
sources(kotlinStdlib("jdk7", classifier = "sources"))
|
||||
sources(kotlinStdlib("jdk8", classifier = "sources"))
|
||||
|
||||
if (kotlinBuildProperties.isInJpsBuildIdeaSync) {
|
||||
sources(kotlinStdlib(classifier = "sources"))
|
||||
sources("org.jetbrains.kotlin:kotlin-reflect:$bootstrapKotlinVersion:sources")
|
||||
} else {
|
||||
sources(project(":kotlin-stdlib", configuration = "distSources"))
|
||||
sources(project(":kotlin-stdlib-js", configuration = "distSources"))
|
||||
sources(project(":kotlin-reflect", configuration = "sources"))
|
||||
|
||||
distStdlibMinimalForTests(project(":kotlin-stdlib:jvm-minimal-for-test"))
|
||||
|
||||
|
||||
Reference in New Issue
Block a user