[K/N] Fix build-tools project compilation

Add necessary subprojects and dependencies
Add OptIn annotation for experimental stdlib methods in 1.5
Fix compilation errors and cleanup
This commit is contained in:
Pavel Punegov
2022-05-17 23:45:17 +03:00
committed by Space
parent 00892c2903
commit 83c2b3657f
14 changed files with 37 additions and 71 deletions
+2 -18
View File
@@ -15,7 +15,6 @@
*/
@file:Suppress("UnstableApiUsage")
import org.jetbrains.kotlin.VersionGenerator
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet
@@ -26,46 +25,31 @@ plugins {
val rootBuildDirectory by extra(file(".."))
apply(from="../gradle/loadRootProperties.gradle")
val konanVersion: String by extra
val kotlinVersion = project.bootstrapKotlinVersion
group = "org.jetbrains.kotlin"
version = konanVersion
repositories {
maven("https://cache-redirector.jetbrains.com/maven-central")
mavenCentral()
}
// FIXME(ddol): KLIB-REFACTORING-CLEANUP: drop generation of KonanVersion!
val generateCompilerVersion by tasks.registering(VersionGenerator::class) {}
sourceSets["main"].withConvention(KotlinSourceSet::class) {
kotlin.srcDir("src/main/kotlin")
kotlin.srcDir("src/library/kotlin")
kotlin.srcDir(generateCompilerVersion.get().versionSourceDirectory)
}
tasks.withType<KotlinCompile> {
dependsOn(generateCompilerVersion)
kotlinOptions.jvmTarget = "1.8"
kotlinOptions.freeCompilerArgs = listOf("-Xskip-prerelease-check")
}
tasks.clean {
doFirst {
val versionSourceDirectory = generateCompilerVersion.get().versionSourceDirectory
if (versionSourceDirectory.exists()) {
versionSourceDirectory.delete()
}
}
}
tasks.jar {
archiveFileName.set("shared.jar")
}
dependencies {
kotlinCompilerClasspath("org.jetbrains.kotlin:kotlin-compiler-embeddable:${project.bootstrapKotlinVersion}")
kotlinCompilerClasspath("org.jetbrains.kotlin:kotlin-compiler-embeddable:$kotlinVersion")
implementation("org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion")
implementation("org.jetbrains.kotlin:kotlin-reflect:$kotlinVersion")