From 9ed0b497460cb11f97e56025b8d38cc3bcb74ff8 Mon Sep 17 00:00:00 2001 From: Alexey Sedunov Date: Tue, 5 Dec 2017 21:04:28 +0300 Subject: [PATCH] Gradle: Compile Gradle models/model builders under JVM 1.6 This prevents imports failure in projects using older versions of Gradle #KT-21610 Fixed --- idea/kotlin-gradle-tooling/build.gradle.kts | 2 ++ .../android-extensions/android-extensions-idea/build.gradle.kts | 2 ++ plugins/kapt3/kapt3-idea/build.gradle.kts | 2 ++ 3 files changed, 6 insertions(+) diff --git a/idea/kotlin-gradle-tooling/build.gradle.kts b/idea/kotlin-gradle-tooling/build.gradle.kts index 2d452504f39..e05aa825ec3 100644 --- a/idea/kotlin-gradle-tooling/build.gradle.kts +++ b/idea/kotlin-gradle-tooling/build.gradle.kts @@ -3,6 +3,8 @@ description = "Kotlin Gradle Tooling support" apply { plugin("kotlin") } +jvmTarget = "1.6" + dependencies { compile(projectDist(":kotlin-stdlib")) compile(project(":compiler:cli-common")) diff --git a/plugins/android-extensions/android-extensions-idea/build.gradle.kts b/plugins/android-extensions/android-extensions-idea/build.gradle.kts index be1820ad338..a465986cc06 100644 --- a/plugins/android-extensions/android-extensions-idea/build.gradle.kts +++ b/plugins/android-extensions/android-extensions-idea/build.gradle.kts @@ -3,6 +3,8 @@ description = "Kotlin Android Extensions IDEA" apply { plugin("kotlin") } +jvmTarget = "1.6" + dependencies { compile(project(":compiler:util")) compile(project(":compiler:light-classes")) diff --git a/plugins/kapt3/kapt3-idea/build.gradle.kts b/plugins/kapt3/kapt3-idea/build.gradle.kts index 8ff5553b411..e824a90a41d 100644 --- a/plugins/kapt3/kapt3-idea/build.gradle.kts +++ b/plugins/kapt3/kapt3-idea/build.gradle.kts @@ -1,6 +1,8 @@ apply { plugin("kotlin") } +jvmTarget = "1.6" + dependencies { compile(projectDist(":kotlin-stdlib")) compile(project(":compiler:frontend"))