From ac00e0375473a5de711f7866cb17ea5c82f4e7a5 Mon Sep 17 00:00:00 2001 From: Simon Ogorodnik Date: Tue, 14 Nov 2017 13:32:46 +0300 Subject: Fix bundling of kotlin-runtime & reflect into Gradle plugin Fix #219 --- integration/build.gradle | 8 +++++--- runners/gradle-plugin/build.gradle | 7 +------ 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/integration/build.gradle b/integration/build.gradle index 55ac9dca..571ad0b3 100644 --- a/integration/build.gradle +++ b/integration/build.gradle @@ -7,7 +7,9 @@ buildscript { apply plugin: 'kotlin' dependencies { - 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 'com.github.yole:jkid:7d9c529c87' + compileOnly group: 'org.jetbrains.kotlin', name: 'kotlin-stdlib', version: kotlin_for_gradle_version + compileOnly group: 'org.jetbrains.kotlin', name: 'kotlin-reflect', version: kotlin_for_gradle_version + compile('com.github.yole:jkid:7d9c529c87') { + transitive = false + } } \ No newline at end of file diff --git a/runners/gradle-plugin/build.gradle b/runners/gradle-plugin/build.gradle index fff58092..21603a26 100644 --- a/runners/gradle-plugin/build.gradle +++ b/runners/gradle-plugin/build.gradle @@ -6,18 +6,13 @@ sourceCompatibility = 1.8 apply plugin: 'com.github.johnrengelman.shadow' apply plugin: "com.gradle.plugin-publish" -tasks.withType(AbstractCompile) { - classpath += configurations.shadow -} - compileKotlin { - kotlinOptions { freeCompilerArgs += "-Xjsr305-annotations=strict" } - } + dependencies { testCompile group: 'junit', name: 'junit', version: '4.12' -- cgit