diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml index 1010bfbd321..3037d602f3b 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 76a1e820950..2684f0acf33 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -145,6 +145,7 @@ fun Project.getBooleanProperty(name: String): Boolean? = this.findProperty(name) val isTeamcityBuild = project.hasProperty("teamcity") || System.getenv("TEAMCITY_VERSION") != null val intellijUltimateEnabled = project.getBooleanProperty("intellijUltimateEnabled") ?: isTeamcityBuild +val effectSystemEnabled by extra(project.getBooleanProperty("kotlin.compiler.effectSystemEnabled") ?: false) val intellijSeparateSdks = project.getBooleanProperty("intellijSeparateSdks") ?: false @@ -291,7 +292,7 @@ allprojects { } configureJvmProject(javaHome!!, jvmTarget!!) - val commonCompilerArgs = listOf("-Xallow-kotlin-package") + val commonCompilerArgs = listOf("-Xallow-kotlin-package", "-Xread-deserialized-contracts") tasks.withType> { kotlinOptions { diff --git a/compiler/build.gradle.kts b/compiler/build.gradle.kts index 8edd894a06e..58bbb36f50d 100644 --- a/compiler/build.gradle.kts +++ b/compiler/build.gradle.kts @@ -1,6 +1,7 @@ import java.io.File import org.gradle.api.tasks.bundling.Jar +import org.jetbrains.kotlin.gradle.dsl.KotlinCompile apply { plugin("kotlin") } @@ -9,6 +10,18 @@ jvmTarget = "1.6" val compilerModules: Array by rootProject.extra val otherCompilerModules = compilerModules.filter { it != path } +val effectSystemEnabled: Boolean by rootProject.extra +if (effectSystemEnabled) { + allprojects { + tasks.withType> { + kotlinOptions { + freeCompilerArgs += listOf("-Xeffect-system") + } + } + } +} + + val depDistProjects = listOf( ":kotlin-script-runtime", ":kotlin-stdlib", diff --git a/gradle.properties b/gradle.properties index 9f199e11d27..b05f7d6849e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,6 +4,7 @@ org.gradle.configureondemand=false org.gradle.jvmargs=-Duser.country=US -Dkotlin.daemon.jvm.options=-Xmx1600m kotlin.incremental.usePreciseJavaTracking=true +kotlin.compiler.effectSystemEnabled=true #bootstrap.kotlin.repo=https://dl.bintray.com/kotlin/kotlin-dev #bootstrap.kotlin.version=1.1.50-dev-1451 #signingRequired=true