Update Kotlin repo for bootstrap update

^KT-27301 Fixed
This commit is contained in:
Yahor Berdnikau
2022-09-16 13:17:15 +02:00
parent e606018372
commit e94c1ea0ed
8 changed files with 16 additions and 1 deletions
@@ -162,6 +162,7 @@ abstract class BenchmarkingPlugin: Plugin<Project> {
protected fun Project.configureNativeTarget(hostPreset: AbstractKotlinNativeTargetPreset<*>) {
kotlin.targetFromPreset(hostPreset, NATIVE_TARGET_NAME) {
@Suppress("DEPRECATION")
compilations.getByName("main").kotlinOptions.freeCompilerArgs = benchmark.compilerOpts + project.compilerArgs
compilations.getByName("main").enableEndorsedLibs = true
configureNativeOutput(this@configureNativeTarget)
@@ -202,6 +203,7 @@ abstract class BenchmarkingPlugin: Plugin<Project> {
return result
}
@Suppress("DEPRECATION")
protected open fun getCompilerFlags(project: Project, nativeTarget: KotlinNativeTarget) =
compilerFlagsFromBinary(project) + nativeTarget.compilations.main.kotlinOptions.freeCompilerArgs.map { "\"$it\"" }
@@ -133,6 +133,7 @@ open class KotlinNativeBenchmarkingPlugin: BenchmarkingPlugin() {
private fun Project.configureJVMTarget() {
kotlin.jvm {
compilations.all {
@Suppress("DEPRECATION")
compileKotlinTask.kotlinOptions {
jvmTarget = "1.8"
suppressWarnings = true