commit 06d3588e7515d064601785348c544346774930cf
author Rodrigo Bamboo <rodrigo@gradle.com> Wed Oct 21 23:16:06 2020
committer GitHub <noreply@github.com> Wed Oct 21 23:16:06 2020
tree 9eaf1cf8d01fb43cae93f5e898a1f7fa2e2272d9
parent 478e8d10009113fa79bb7e98f11ba3dd19ff0002
parent 258b860120d63f3c1396217acb20df96b0569fcc

Merge pull request #14935 from gradle/bamboo/cc/scopeids/i

Make `ScopeIdsFixture` compatible with Gradle 4.0+

released-versions.json

diff --git a/released-versions.json b/released-versions.json
index 2197fd6..75f4d92 100644
--- a/released-versions.json
+++ b/released-versions.json
@@ -1,7 +1,7 @@
 {
   "latestReleaseSnapshot": {
-    "version": "6.7-20201019230050+0000",
-    "buildTime": "20201019230050+0000"
+    "version": "6.7-20201021230030+0000",
+    "buildTime": "20201021230030+0000"
   },
   "latestRc": {
     "version": "6.7-rc-5",

subprojects/kotlin-dsl/src/main/kotlin/org/gradle/kotlin/dsl/support/KotlinCompiler.kt

diff --git a/subprojects/kotlin-dsl/src/main/kotlin/org/gradle/kotlin/dsl/support/KotlinCompiler.kt b/subprojects/kotlin-dsl/src/main/kotlin/org/gradle/kotlin/dsl/support/KotlinCompiler.kt
index 17ef668..8eb18ad 100644
--- a/subprojects/kotlin-dsl/src/main/kotlin/org/gradle/kotlin/dsl/support/KotlinCompiler.kt
+++ b/subprojects/kotlin-dsl/src/main/kotlin/org/gradle/kotlin/dsl/support/KotlinCompiler.kt
@@ -342,6 +342,7 @@
     apiVersion = ApiVersion.KOTLIN_1_3,
     specificFeatures = mapOf(
         LanguageFeature.NewInference to LanguageFeature.State.ENABLED,
+        LanguageFeature.DisableCompatibilityModeForNewInference to LanguageFeature.State.ENABLED,
         LanguageFeature.SamConversionForKotlinFunctions to LanguageFeature.State.ENABLED,
         LanguageFeature.SamConversionPerArgument to LanguageFeature.State.ENABLED,
         LanguageFeature.ReferencesToSyntheticJavaProperties to LanguageFeature.State.ENABLED