From b558382f17475af5502908033334fb682ebcc0e8 Mon Sep 17 00:00:00 2001 From: Ilya Gorbunov Date: Fri, 20 Jan 2023 05:23:23 +0100 Subject: [PATCH] Cleanup unneeded options in kotlin-stdlib-jdk7/8 compilations --- libraries/stdlib/jdk7/build.gradle | 18 ------------------ libraries/stdlib/jdk8/build.gradle | 16 ---------------- 2 files changed, 34 deletions(-) diff --git a/libraries/stdlib/jdk7/build.gradle b/libraries/stdlib/jdk7/build.gradle index a37feb2d258..7bb69c6ad7e 100644 --- a/libraries/stdlib/jdk7/build.gradle +++ b/libraries/stdlib/jdk7/build.gradle @@ -47,28 +47,10 @@ artifacts { compileKotlin { kotlinJavaToolchain.toolchain.use(JvmToolchain.getToolchainLauncherFor(project, JdkMajorVersion.JDK_1_7)) kotlinOptions.jvmTarget = "1.8" - kotlinOptions.freeCompilerArgs = [ - "-Xallow-kotlin-package", - "-Xmultifile-parts-inherit", - "-opt-in=kotlin.RequiresOptIn", - "-opt-in=kotlin.contracts.ExperimentalContracts", - "-Xno-new-java-annotation-targets", - ] kotlinOptions.moduleName = project.name } compileTestKotlin { - kotlinOptions.freeCompilerArgs = [ - "-Xallow-kotlin-package", - "-Xmulti-platform", - "-opt-in=kotlin.RequiresOptIn", - "-opt-in=kotlin.ExperimentalUnsignedTypes", - "-opt-in=kotlin.ExperimentalStdlibApi", - "-opt-in=kotlin.io.path.ExperimentalPathApi", - "-opt-in=kotlin.io.encoding.ExperimentalEncodingApi", - "-Xcommon-sources=${fileTree('../test').join(',')}", - "-XXLanguage:+RangeUntilOperator", - ] } tasks.withType(Test) { diff --git a/libraries/stdlib/jdk8/build.gradle b/libraries/stdlib/jdk8/build.gradle index a297c7cf586..0c5f1ae7118 100644 --- a/libraries/stdlib/jdk8/build.gradle +++ b/libraries/stdlib/jdk8/build.gradle @@ -56,26 +56,10 @@ artifacts { } compileKotlin { - kotlinOptions.freeCompilerArgs = [ - "-Xallow-kotlin-package", - "-Xmultifile-parts-inherit", - "-Xno-new-java-annotation-targets", - ] kotlinOptions.moduleName = project.name } compileTestKotlin { - kotlinOptions.freeCompilerArgs = [ - "-Xallow-kotlin-package", - "-Xmulti-platform", - "-opt-in=kotlin.RequiresOptIn", - "-opt-in=kotlin.ExperimentalUnsignedTypes", - "-opt-in=kotlin.ExperimentalStdlibApi", - "-opt-in=kotlin.io.path.ExperimentalPathApi", - "-opt-in=kotlin.io.encoding.ExperimentalEncodingApi", - "-Xcommon-sources=${fileTree('../test').join(',')}", - "-XXLanguage:+RangeUntilOperator", - ] } configureFrontendIr(project)