diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
index 3037d602f3b..1010bfbd321 100644
--- a/.idea/kotlinc.xml
+++ b/.idea/kotlinc.xml
@@ -13,6 +13,6 @@
-
+
\ No newline at end of file
diff --git a/build.gradle.kts b/build.gradle.kts
index a1dbf3c5873..587b63f711f 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -151,8 +151,6 @@ if (!project.hasProperty("versions.kotlin-native")) {
extra["versions.kotlin-native"] = "1.6.0-dev-248"
}
-val effectSystemEnabled by extra(project.getBooleanProperty("kotlin.compiler.effectSystemEnabled") ?: false)
-val newInferenceEnabled by extra(project.getBooleanProperty("kotlin.compiler.newInferenceEnabled") ?: false)
val useJvmFir by extra(project.kotlinBuildProperties.useFir)
val intellijSeparateSdks = project.getBooleanProperty("intellijSeparateSdks") ?: false
@@ -447,7 +445,6 @@ allprojects {
val commonCompilerArgs = listOfNotNull(
"-Xopt-in=kotlin.RequiresOptIn",
- "-Xread-deserialized-contracts",
"-progressive".takeIf { hasProperty("test.progressive.mode") }
)
@@ -462,8 +459,7 @@ allprojects {
val jvmCompilerArgs = listOf(
"-Xjvm-default=compatibility",
"-Xno-optimized-callable-references",
- "-Xno-kotlin-nothing-value-exception",
- "-Xnormalize-constructor-calls=enable"
+ "-Xno-kotlin-nothing-value-exception"
)
tasks.withType {
@@ -1135,4 +1131,4 @@ afterEvaluate {
"https://cache-redirector.jetbrains.com/github.com/yarnpkg/yarn/releases/download"
}
}
-}
\ No newline at end of file
+}
diff --git a/compiler/build.gradle.kts b/compiler/build.gradle.kts
index 539dca8c7cd..8de809bba9b 100644
--- a/compiler/build.gradle.kts
+++ b/compiler/build.gradle.kts
@@ -12,25 +12,6 @@ val otherCompilerModules = compilerModules.filter { it != path }
val tasksWithWarnings: List by rootProject.extra
-val effectSystemEnabled: Boolean by rootProject.extra
-val newInferenceEnabled: Boolean by rootProject.extra
-
-configureFreeCompilerArg(effectSystemEnabled, "-Xeffect-system")
-configureFreeCompilerArg(newInferenceEnabled, "-Xnew-inference")
-configureFreeCompilerArg(true, "-Xuse-mixed-named-arguments")
-
-fun configureFreeCompilerArg(isEnabled: Boolean, compilerArgument: String) {
- if (isEnabled) {
- allprojects {
- tasks.withType> {
- kotlinOptions {
- freeCompilerArgs += listOf(compilerArgument)
- }
- }
- }
- }
-}
-
val antLauncherJar by configurations.creating
dependencies {
diff --git a/compiler/cli/build.gradle.kts b/compiler/cli/build.gradle.kts
index 83489d0bdf4..0cba666648f 100644
--- a/compiler/cli/build.gradle.kts
+++ b/compiler/cli/build.gradle.kts
@@ -60,7 +60,7 @@ tasks.withType> {
languageVersion = "1.3"
apiVersion = "1.3"
freeCompilerArgs = freeCompilerArgs - "-progressive" + listOf(
- "-Xskip-prerelease-check", "-Xsuppress-version-warnings"
+ "-Xskip-prerelease-check", "-Xsuppress-version-warnings", "-Xuse-mixed-named-arguments", "-Xnew-inference"
)
}
}
diff --git a/compiler/fir/tree/build.gradle.kts b/compiler/fir/tree/build.gradle.kts
index a261ca6eb99..8a6b4d3d1e1 100644
--- a/compiler/fir/tree/build.gradle.kts
+++ b/compiler/fir/tree/build.gradle.kts
@@ -50,12 +50,6 @@ val compileKotlin by tasks
compileKotlin.dependsOn(generateTree)
-tasks.withType> {
- kotlinOptions {
- freeCompilerArgs += "-Xinline-classes"
- }
-}
-
if (kotlinBuildProperties.isInJpsBuildIdeaSync) {
apply(plugin = "idea")
idea {
diff --git a/compiler/ir/serialization.common/build.gradle.kts b/compiler/ir/serialization.common/build.gradle.kts
index 4cf0f6f29db..bf1dad3703f 100644
--- a/compiler/ir/serialization.common/build.gradle.kts
+++ b/compiler/ir/serialization.common/build.gradle.kts
@@ -24,7 +24,6 @@ tasks {
val compileKotlin by existing(org.jetbrains.kotlin.gradle.tasks.KotlinCompile::class) {
kotlinOptions {
freeCompilerArgs += "-Xopt-in=org.jetbrains.kotlin.ir.ObsoleteDescriptorBasedAPI"
- freeCompilerArgs += "-Xinline-classes"
}
}
}
diff --git a/compiler/tests-common/build.gradle.kts b/compiler/tests-common/build.gradle.kts
index 65286d52c6a..df81e8f860e 100644
--- a/compiler/tests-common/build.gradle.kts
+++ b/compiler/tests-common/build.gradle.kts
@@ -74,12 +74,6 @@ dependencies {
testApiJUnit5()
}
-tasks.withType> {
- kotlinOptions {
- freeCompilerArgs += "-Xinline-classes"
- }
-}
-
sourceSets {
"main" { }
"test" { projectDefault() }
diff --git a/gradle.properties b/gradle.properties
index bdf5a37d1e7..2a618792aba 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -7,9 +7,6 @@ org.gradle.java.installations.fromEnv=JDK_16,JDK_17,JDK_18,JDK_9,JDK_10,JDK_11,J
cacheRedirectorEnabled=true
defaultSnapshotVersion=1.5.255-SNAPSHOT
-kotlin.compiler.effectSystemEnabled=true
-kotlin.compiler.newInferenceEnabled=true
-
# Enable JVM IR backend for kotlin-stdlib, kotlin-reflect, kotlin-test.
#kotlin.build.useIRForLibraries=true
diff --git a/kotlin-native/Interop/Runtime/build.gradle.kts b/kotlin-native/Interop/Runtime/build.gradle.kts
index 5227573c869..a6832a7facd 100644
--- a/kotlin-native/Interop/Runtime/build.gradle.kts
+++ b/kotlin-native/Interop/Runtime/build.gradle.kts
@@ -72,10 +72,11 @@ sourceSets.main.get().java.srcDir("src/jvm/kotlin")
tasks.withType().configureEach {
kotlinOptions {
- freeCompilerArgs = listOf("-Xopt-in=kotlin.ExperimentalUnsignedTypes",
- "-Xopt-in=kotlin.RequiresOptIn",
- "-Xinline-classes",
- "-Xskip-prerelease-check")
+ freeCompilerArgs = listOf(
+ "-Xopt-in=kotlin.ExperimentalUnsignedTypes",
+ "-Xopt-in=kotlin.RequiresOptIn",
+ "-Xskip-prerelease-check"
+ )
allWarningsAsErrors = true
}
}
diff --git a/kotlin-native/backend.native/build.gradle b/kotlin-native/backend.native/build.gradle
index 1279659b627..e675f260797 100644
--- a/kotlin-native/backend.native/build.gradle
+++ b/kotlin-native/backend.native/build.gradle
@@ -185,12 +185,11 @@ targetList.each { target ->
args = [*konanArgs,
'-output', project(':kotlin-native:runtime').file("build/${target}Stdlib"),
'-produce', 'library', '-module-name', 'stdlib',
- '-Xmulti-platform', '-Xopt-in=kotlin.RequiresOptIn', '-Xinline-classes',
+ '-Xmulti-platform', '-Xopt-in=kotlin.RequiresOptIn',
'-Xopt-in=kotlin.contracts.ExperimentalContracts',
'-Xopt-in=kotlin.ExperimentalMultiplatform',
'-Xopt-in=kotlin.native.internal.InternalForKotlinNative',
'-Xopt-in=kotlin.native.SymbolNameIsDeprecated',
- '-Xallow-result-return-type',
*commonSrc.toList(),
*testAnnotationCommon.toList(),
*testCommon.toList(),
diff --git a/kotlin-native/endorsedLibraries/kotlinx.cli/build.gradle b/kotlin-native/endorsedLibraries/kotlinx.cli/build.gradle
index 48d0e11e6fb..5802c037e0c 100644
--- a/kotlin-native/endorsedLibraries/kotlinx.cli/build.gradle
+++ b/kotlin-native/endorsedLibraries/kotlinx.cli/build.gradle
@@ -96,7 +96,7 @@ targetList.each { target ->
'-produce', 'library', '-module-name', moduleName,
'-Xmulti-platform', '-Xopt-in=kotlinx.cli.ExperimentalCli',
'-Xopt-in=kotlin.ExperimentalMultiplatform',
- '-Xallow-result-return-type', '-Werror', '-Xopt-in=kotlin.RequiresOptIn',
+ '-Werror', '-Xopt-in=kotlin.RequiresOptIn',
commonSrc.absolutePath,
"-Xcommon-sources=${commonSrc.absolutePath}",
nativeSrc]
diff --git a/libraries/kotlin.test/js-ir/build.gradle.kts b/libraries/kotlin.test/js-ir/build.gradle.kts
index 693bb3086ba..c8004740cec 100644
--- a/libraries/kotlin.test/js-ir/build.gradle.kts
+++ b/libraries/kotlin.test/js-ir/build.gradle.kts
@@ -49,10 +49,8 @@ kotlin {
tasks.withType>().configureEach {
kotlinOptions.freeCompilerArgs += listOf(
"-Xallow-kotlin-package",
- "-Xallow-result-return-type",
"-Xopt-in=kotlin.ExperimentalMultiplatform",
- "-Xopt-in=kotlin.contracts.ExperimentalContracts",
- "-Xinline-classes"
+ "-Xopt-in=kotlin.contracts.ExperimentalContracts"
)
}
diff --git a/libraries/kotlin.test/jvm/build.gradle b/libraries/kotlin.test/jvm/build.gradle
index 72860140551..17647a83a64 100644
--- a/libraries/kotlin.test/jvm/build.gradle
+++ b/libraries/kotlin.test/jvm/build.gradle
@@ -43,7 +43,6 @@ configureJavadocJar()
compileKotlin {
kotlinOptions.freeCompilerArgs = [
"-Xallow-kotlin-package",
- "-Xnormalize-constructor-calls=enable",
"-Xopt-in=kotlin.contracts.ExperimentalContracts",
"-Xsuppress-deprecated-jvm-target-warning",
"-Xopt-in=kotlin.RequiresOptIn",
diff --git a/libraries/reflect/api/build.gradle b/libraries/reflect/api/build.gradle
index a6f1c7b7596..803ddb846d5 100644
--- a/libraries/reflect/api/build.gradle
+++ b/libraries/reflect/api/build.gradle
@@ -44,13 +44,13 @@ if (includeJava9) {
compileKotlin {
kotlinOptions {
- freeCompilerArgs = ["-version",
- "-Xallow-kotlin-package",
- "-Xnormalize-constructor-calls=enable",
- "-Xno-optimized-callable-references",
- "-Xno-kotlin-nothing-value-exception",
- "-Xsuppress-deprecated-jvm-target-warning",
- "-Xopt-in=kotlin.RequiresOptIn"]
+ freeCompilerArgs = [
+ "-Xallow-kotlin-package",
+ "-Xno-optimized-callable-references",
+ "-Xno-kotlin-nothing-value-exception",
+ "-Xsuppress-deprecated-jvm-target-warning",
+ "-Xopt-in=kotlin.RequiresOptIn",
+ ]
moduleName = "kotlin-reflection"
}
}
diff --git a/libraries/stdlib/common/build.gradle b/libraries/stdlib/common/build.gradle
index 9dd22af4c60..5a489a64b25 100644
--- a/libraries/stdlib/common/build.gradle
+++ b/libraries/stdlib/common/build.gradle
@@ -43,9 +43,7 @@ compileKotlinCommon {
"-Xopt-in=kotlin.RequiresOptIn",
"-Xopt-in=kotlin.ExperimentalMultiplatform",
"-Xopt-in=kotlin.contracts.ExperimentalContracts",
- "-Xinline-classes",
"-Xallow-kotlin-package",
- "-Xallow-result-return-type"
]
}
}
diff --git a/libraries/stdlib/jdk7/build.gradle b/libraries/stdlib/jdk7/build.gradle
index 239f91b657c..2a2a98c0d1f 100644
--- a/libraries/stdlib/jdk7/build.gradle
+++ b/libraries/stdlib/jdk7/build.gradle
@@ -71,7 +71,6 @@ compileKotlin {
kotlinOptions.freeCompilerArgs = [
"-Xallow-kotlin-package",
"-Xmultifile-parts-inherit",
- "-Xnormalize-constructor-calls=enable",
"-Xopt-in=kotlin.RequiresOptIn",
"-Xopt-in=kotlin.contracts.ExperimentalContracts",
"-Xsuppress-deprecated-jvm-target-warning",
diff --git a/libraries/stdlib/jdk8/build.gradle b/libraries/stdlib/jdk8/build.gradle
index 298019939ed..d17292ca17d 100644
--- a/libraries/stdlib/jdk8/build.gradle
+++ b/libraries/stdlib/jdk8/build.gradle
@@ -59,7 +59,6 @@ compileKotlin {
kotlinOptions.freeCompilerArgs = [
"-Xallow-kotlin-package",
"-Xmultifile-parts-inherit",
- "-Xnormalize-constructor-calls=enable",
]
kotlinOptions.moduleName = project.name
}
diff --git a/libraries/stdlib/js-ir-minimal-for-test/build.gradle.kts b/libraries/stdlib/js-ir-minimal-for-test/build.gradle.kts
index e758510c2b4..f3fab803aaf 100644
--- a/libraries/stdlib/js-ir-minimal-for-test/build.gradle.kts
+++ b/libraries/stdlib/js-ir-minimal-for-test/build.gradle.kts
@@ -121,10 +121,8 @@ kotlin {
tasks.withType> {
kotlinOptions.freeCompilerArgs += listOf(
"-Xallow-kotlin-package",
- "-Xallow-result-return-type",
"-Xopt-in=kotlin.ExperimentalMultiplatform",
"-Xopt-in=kotlin.contracts.ExperimentalContracts",
- "-Xinline-classes",
"-Xopt-in=kotlin.RequiresOptIn",
"-Xopt-in=kotlin.ExperimentalUnsignedTypes",
"-Xopt-in=kotlin.ExperimentalStdlibApi"
diff --git a/libraries/stdlib/js-ir/build.gradle.kts b/libraries/stdlib/js-ir/build.gradle.kts
index 30b08430b41..e87e12ba536 100644
--- a/libraries/stdlib/js-ir/build.gradle.kts
+++ b/libraries/stdlib/js-ir/build.gradle.kts
@@ -137,10 +137,8 @@ kotlin {
tasks.withType>().configureEach {
kotlinOptions.freeCompilerArgs += listOf(
"-Xallow-kotlin-package",
- "-Xallow-result-return-type",
"-Xopt-in=kotlin.ExperimentalMultiplatform",
"-Xopt-in=kotlin.contracts.ExperimentalContracts",
- "-Xinline-classes",
"-Xopt-in=kotlin.RequiresOptIn",
"-Xopt-in=kotlin.ExperimentalUnsignedTypes",
"-Xopt-in=kotlin.ExperimentalStdlibApi"
@@ -169,4 +167,4 @@ val packFullRuntimeKLib by tasks.registering(Jar::class) {
from(buildDir.resolve("classes/kotlin/js/main"))
destinationDirectory.set(rootProject.buildDir.resolve("js-ir-runtime"))
archiveFileName.set("full-runtime.klib")
-}
\ No newline at end of file
+}
diff --git a/libraries/stdlib/js-v1/build.gradle b/libraries/stdlib/js-v1/build.gradle
index 201fdb5f98a..747080a278d 100644
--- a/libraries/stdlib/js-v1/build.gradle
+++ b/libraries/stdlib/js-v1/build.gradle
@@ -117,9 +117,7 @@ tasks.withType(org.jetbrains.kotlin.gradle.tasks.Kotlin2JsCompile) {
main = "noCall"
moduleKind = "commonjs"
freeCompilerArgs = [
- "-version",
"-Xallow-kotlin-package",
- "-Xallow-result-return-type"
]
}
}
@@ -143,7 +141,6 @@ compileKotlin2Js {
"-Xopt-in=kotlin.RequiresOptIn",
"-Xopt-in=kotlin.ExperimentalMultiplatform",
"-Xopt-in=kotlin.contracts.ExperimentalContracts",
- "-Xinline-classes"
]
}
}
diff --git a/libraries/stdlib/jvm/build.gradle b/libraries/stdlib/jvm/build.gradle
index 01b046e0d59..df5fb543d1b 100644
--- a/libraries/stdlib/jvm/build.gradle
+++ b/libraries/stdlib/jvm/build.gradle
@@ -115,15 +115,11 @@ DexMethodCountKt.dexMethodCount(project) { task ->
compileKotlin {
kotlinOptions {
freeCompilerArgs = [
- "-version",
"-Xallow-kotlin-package",
- "-Xallow-result-return-type",
"-Xmultifile-parts-inherit",
- "-Xnormalize-constructor-calls=enable",
"-Xopt-in=kotlin.RequiresOptIn",
"-Xopt-in=kotlin.ExperimentalMultiplatform",
"-Xopt-in=kotlin.contracts.ExperimentalContracts",
- "-Xinline-classes",
"-Xuse-14-inline-classes-mangling-scheme",
"-Xsuppress-deprecated-jvm-target-warning",
]
diff --git a/libraries/stdlib/wasm/build.gradle.kts b/libraries/stdlib/wasm/build.gradle.kts
index f037ed87e45..377055e344e 100644
--- a/libraries/stdlib/wasm/build.gradle.kts
+++ b/libraries/stdlib/wasm/build.gradle.kts
@@ -73,10 +73,8 @@ tasks.withType>().configureEach {
kotlinOptions.freeCompilerArgs += listOf(
"-Xallow-kotlin-package",
- "-Xallow-result-return-type",
"-Xopt-in=kotlin.ExperimentalMultiplatform",
"-Xopt-in=kotlin.contracts.ExperimentalContracts",
- "-Xinline-classes",
"-Xopt-in=kotlin.RequiresOptIn",
"-Xopt-in=kotlin.ExperimentalUnsignedTypes",
"-Xopt-in=kotlin.ExperimentalStdlibApi"
diff --git a/libraries/tools/binary-compatibility-validator/build.gradle b/libraries/tools/binary-compatibility-validator/build.gradle
index 16edaa80f6e..8e86b92cb99 100644
--- a/libraries/tools/binary-compatibility-validator/build.gradle
+++ b/libraries/tools/binary-compatibility-validator/build.gradle
@@ -28,12 +28,6 @@ sourceSets {
}
}
-compileTestKotlin {
- kotlinOptions {
- freeCompilerArgs = ["-Xnormalize-constructor-calls=enable"]
- }
-}
-
test {
dependsOn configurations.testArtifacts
diff --git a/libraries/tools/kotlin-annotations-jvm/build.gradle b/libraries/tools/kotlin-annotations-jvm/build.gradle
index 14c55d0da77..1b25202b33f 100644
--- a/libraries/tools/kotlin-annotations-jvm/build.gradle
+++ b/libraries/tools/kotlin-annotations-jvm/build.gradle
@@ -25,7 +25,6 @@ configureJavadocJar()
compileKotlin {
kotlinOptions.freeCompilerArgs = [
"-Xallow-kotlin-package",
- "-Xnormalize-constructor-calls=enable",
]
kotlinOptions.moduleName = project.name
}
diff --git a/libraries/tools/script-runtime/build.gradle b/libraries/tools/script-runtime/build.gradle
index 7c4cc88bac6..639fedbd5ab 100644
--- a/libraries/tools/script-runtime/build.gradle
+++ b/libraries/tools/script-runtime/build.gradle
@@ -37,7 +37,6 @@ configureJavadocJar()
compileKotlin {
kotlinOptions.freeCompilerArgs = [
"-Xallow-kotlin-package",
- "-Xnormalize-constructor-calls=enable",
"-Xsuppress-deprecated-jvm-target-warning",
]
kotlinOptions.moduleName = project.name