From 3da12b4f1d3018a0e4b66d01f2251f89b617854b Mon Sep 17 00:00:00 2001 From: Simon Ogorodnik Date: Tue, 17 Jan 2017 19:59:04 +0300 Subject: Fixed problems with 1.0.6 compiler conflict --- gradle.properties | 1 + integration/build.gradle | 7 +++---- runners/android-gradle-plugin/build.gradle | 1 + .../android-gradle-plugin/src/main/kotlin/mainAndroid.kt | 4 ++-- runners/ant/build.gradle | 2 ++ runners/build.gradle | 16 +++++++++++----- runners/cli/build.gradle | 2 ++ runners/fatjar/build.gradle | 1 + runners/gradle-plugin/build.gradle | 5 +++-- runners/maven-plugin/build.gradle | 1 - 10 files changed, 26 insertions(+), 14 deletions(-) diff --git a/gradle.properties b/gradle.properties index 8bdaec9e..8cd2b894 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,6 +3,7 @@ dokka_publication_channel=dokka #Kotlin compiler and plugin kotlin_version=1.1-M04 +kotlin_for_gradle_version=1.0.6 ant_version=1.9.6 diff --git a/integration/build.gradle b/integration/build.gradle index db2d6d78..2f6514cb 100644 --- a/integration/build.gradle +++ b/integration/build.gradle @@ -1,13 +1,12 @@ buildscript { dependencies { - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_for_gradle_version" } } apply plugin: 'kotlin' - dependencies { - compile group: 'org.jetbrains.kotlin', name: 'kotlin-runtime', version: kotlin_version - compile group: 'org.jetbrains.kotlin', name: 'kotlin-reflect', version: kotlin_version + compile group: 'org.jetbrains.kotlin', name: 'kotlin-runtime', version: kotlin_for_gradle_version + compile group: 'org.jetbrains.kotlin', name: 'kotlin-reflect', version: kotlin_for_gradle_version } \ No newline at end of file diff --git a/runners/android-gradle-plugin/build.gradle b/runners/android-gradle-plugin/build.gradle index afb0fb72..e93add83 100644 --- a/runners/android-gradle-plugin/build.gradle +++ b/runners/android-gradle-plugin/build.gradle @@ -1,4 +1,5 @@ apply plugin: 'java' +apply plugin: 'kotlin' sourceCompatibility = 1.6 diff --git a/runners/android-gradle-plugin/src/main/kotlin/mainAndroid.kt b/runners/android-gradle-plugin/src/main/kotlin/mainAndroid.kt index 5ca3066a..3c1e2284 100644 --- a/runners/android-gradle-plugin/src/main/kotlin/mainAndroid.kt +++ b/runners/android-gradle-plugin/src/main/kotlin/mainAndroid.kt @@ -41,8 +41,8 @@ open class DokkaAndroidPlugin : Plugin { val plugin = (project.plugins.findPlugin("android") ?: project.plugins.findPlugin("android-library") ?: project.plugins.findPlugin("com.android.test")) as BasePlugin - - val variantManagerProperty = plugin::class.memberProperties.find { it.name == "variantManager" }!! + + val variantManagerProperty = plugin.javaClass.kotlin.memberProperties.find { it.name == "variantManager" }!! variantManagerProperty.isAccessible = true val variantManager = variantManagerProperty.get(plugin) as VariantManager variantManager.variantDataList.flatMapTo(allVariantsClassPath) { it.variantConfiguration.compileClasspath } diff --git a/runners/ant/build.gradle b/runners/ant/build.gradle index 3c4d4ddb..20fc034d 100644 --- a/runners/ant/build.gradle +++ b/runners/ant/build.gradle @@ -1,3 +1,5 @@ +apply plugin: 'kotlin' + sourceCompatibility = 1.5 configurations { diff --git a/runners/build.gradle b/runners/build.gradle index 574f5ac7..e171800b 100644 --- a/runners/build.gradle +++ b/runners/build.gradle @@ -1,9 +1,15 @@ -buildscript { - dependencies { - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" +configure([project("ant"), project("cli"), project("fatjar"), project("maven-plugin")]) { + buildscript { + dependencies { + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" + } } } -subprojects { - apply plugin: 'kotlin' +configure([project("gradle-plugin"), project("android-gradle-plugin")]) { + buildscript { + dependencies { + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_for_gradle_version" + } + } } diff --git a/runners/cli/build.gradle b/runners/cli/build.gradle index 97b5c307..2fa2752f 100644 --- a/runners/cli/build.gradle +++ b/runners/cli/build.gradle @@ -1,3 +1,5 @@ +apply plugin: 'kotlin' + sourceCompatibility = 1.5 dependencies { diff --git a/runners/fatjar/build.gradle b/runners/fatjar/build.gradle index a9f0c721..a3aeadcc 100644 --- a/runners/fatjar/build.gradle +++ b/runners/fatjar/build.gradle @@ -1,6 +1,7 @@ import com.github.jengelman.gradle.plugins.shadow.transformers.ServiceFileTransformer import org.jetbrains.PluginXmlTransformer +apply plugin: 'kotlin' apply plugin: 'com.github.johnrengelman.shadow' dependencies { diff --git a/runners/gradle-plugin/build.gradle b/runners/gradle-plugin/build.gradle index b9757ddb..5d486bb7 100644 --- a/runners/gradle-plugin/build.gradle +++ b/runners/gradle-plugin/build.gradle @@ -1,4 +1,5 @@ apply plugin: 'java' +apply plugin: 'kotlin' sourceCompatibility = 1.6 @@ -17,8 +18,8 @@ tasks.withType(AbstractCompile) { dependencies { testCompile group: 'junit', name: 'junit', version: '4.12' - compile group: 'org.jetbrains.kotlin', name: 'kotlin-runtime', version: kotlin_version - compile group: 'org.jetbrains.kotlin', name: 'kotlin-reflect', version: kotlin_version + compile group: 'org.jetbrains.kotlin', name: 'kotlin-runtime', version: kotlin_for_gradle_version + compile group: 'org.jetbrains.kotlin', name: 'kotlin-reflect', version: kotlin_for_gradle_version compile project(":integration") diff --git a/runners/maven-plugin/build.gradle b/runners/maven-plugin/build.gradle index bf6b9476..3f80ba4a 100644 --- a/runners/maven-plugin/build.gradle +++ b/runners/maven-plugin/build.gradle @@ -1,7 +1,6 @@ import groovy.xml.QName import org.jetbrains.CrossPlatformExec - apply plugin: 'kotlin' apply plugin: 'com.github.johnrengelman.shadow' -- cgit