Enable contracts in the 'compiler' module
This commit is contained in:
Generated
+1
-1
@@ -13,6 +13,6 @@
|
|||||||
</option>
|
</option>
|
||||||
</component>
|
</component>
|
||||||
<component name="KotlinCompilerSettings">
|
<component name="KotlinCompilerSettings">
|
||||||
<option name="additionalArguments" value="-version -Xallow-kotlin-package -Xskip-metadata-version-check" />
|
<option name="additionalArguments" value="-version -Xallow-kotlin-package -Xskip-metadata-version-check -Xread-deserialized-contracts" />
|
||||||
</component>
|
</component>
|
||||||
</project>
|
</project>
|
||||||
+2
-1
@@ -145,6 +145,7 @@ fun Project.getBooleanProperty(name: String): Boolean? = this.findProperty(name)
|
|||||||
|
|
||||||
val isTeamcityBuild = project.hasProperty("teamcity") || System.getenv("TEAMCITY_VERSION") != null
|
val isTeamcityBuild = project.hasProperty("teamcity") || System.getenv("TEAMCITY_VERSION") != null
|
||||||
val intellijUltimateEnabled = project.getBooleanProperty("intellijUltimateEnabled") ?: isTeamcityBuild
|
val intellijUltimateEnabled = project.getBooleanProperty("intellijUltimateEnabled") ?: isTeamcityBuild
|
||||||
|
val effectSystemEnabled by extra(project.getBooleanProperty("kotlin.compiler.effectSystemEnabled") ?: false)
|
||||||
|
|
||||||
val intellijSeparateSdks = project.getBooleanProperty("intellijSeparateSdks") ?: false
|
val intellijSeparateSdks = project.getBooleanProperty("intellijSeparateSdks") ?: false
|
||||||
|
|
||||||
@@ -291,7 +292,7 @@ allprojects {
|
|||||||
}
|
}
|
||||||
configureJvmProject(javaHome!!, jvmTarget!!)
|
configureJvmProject(javaHome!!, jvmTarget!!)
|
||||||
|
|
||||||
val commonCompilerArgs = listOf("-Xallow-kotlin-package")
|
val commonCompilerArgs = listOf("-Xallow-kotlin-package", "-Xread-deserialized-contracts")
|
||||||
|
|
||||||
tasks.withType<org.jetbrains.kotlin.gradle.dsl.KotlinCompile<*>> {
|
tasks.withType<org.jetbrains.kotlin.gradle.dsl.KotlinCompile<*>> {
|
||||||
kotlinOptions {
|
kotlinOptions {
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
|
|
||||||
import java.io.File
|
import java.io.File
|
||||||
import org.gradle.api.tasks.bundling.Jar
|
import org.gradle.api.tasks.bundling.Jar
|
||||||
|
import org.jetbrains.kotlin.gradle.dsl.KotlinCompile
|
||||||
|
|
||||||
apply { plugin("kotlin") }
|
apply { plugin("kotlin") }
|
||||||
|
|
||||||
@@ -9,6 +10,18 @@ jvmTarget = "1.6"
|
|||||||
val compilerModules: Array<String> by rootProject.extra
|
val compilerModules: Array<String> by rootProject.extra
|
||||||
val otherCompilerModules = compilerModules.filter { it != path }
|
val otherCompilerModules = compilerModules.filter { it != path }
|
||||||
|
|
||||||
|
val effectSystemEnabled: Boolean by rootProject.extra
|
||||||
|
if (effectSystemEnabled) {
|
||||||
|
allprojects {
|
||||||
|
tasks.withType<KotlinCompile<*>> {
|
||||||
|
kotlinOptions {
|
||||||
|
freeCompilerArgs += listOf("-Xeffect-system")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
val depDistProjects = listOf(
|
val depDistProjects = listOf(
|
||||||
":kotlin-script-runtime",
|
":kotlin-script-runtime",
|
||||||
":kotlin-stdlib",
|
":kotlin-stdlib",
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ org.gradle.configureondemand=false
|
|||||||
org.gradle.jvmargs=-Duser.country=US -Dkotlin.daemon.jvm.options=-Xmx1600m
|
org.gradle.jvmargs=-Duser.country=US -Dkotlin.daemon.jvm.options=-Xmx1600m
|
||||||
|
|
||||||
kotlin.incremental.usePreciseJavaTracking=true
|
kotlin.incremental.usePreciseJavaTracking=true
|
||||||
|
kotlin.compiler.effectSystemEnabled=true
|
||||||
#bootstrap.kotlin.repo=https://dl.bintray.com/kotlin/kotlin-dev
|
#bootstrap.kotlin.repo=https://dl.bintray.com/kotlin/kotlin-dev
|
||||||
#bootstrap.kotlin.version=1.1.50-dev-1451
|
#bootstrap.kotlin.version=1.1.50-dev-1451
|
||||||
#signingRequired=true
|
#signingRequired=true
|
||||||
|
|||||||
Reference in New Issue
Block a user