From e94e62be98ebf094f7b51791632a2f4e1394bc92 Mon Sep 17 00:00:00 2001 From: Sergey Igushkin Date: Mon, 16 Oct 2017 21:07:02 +0300 Subject: [PATCH] Add `android-extensions-compiler` content to `kotlin-android-extensions` --- .../android-extensions-compiler-gradle/build.gradle.kts | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/prepare/android-extensions-compiler-gradle/build.gradle.kts b/prepare/android-extensions-compiler-gradle/build.gradle.kts index 2a17fa9ecee..49776fcaeee 100644 --- a/prepare/android-extensions-compiler-gradle/build.gradle.kts +++ b/prepare/android-extensions-compiler-gradle/build.gradle.kts @@ -23,9 +23,14 @@ sourceSets { "test" {} } +// fixes a deadlock in projects evaluation order for :plugins:android-extensions-compiler +evaluationDependsOn(":plugins") + val jar: Jar by tasks jar.apply { - from(getSourceSetsFrom(":kotlin-android-extensions-runtime")["main"].output.classesDirs) + from(getSourceSetsFrom(":plugins:android-extensions-compiler")["main"].output) + from(getSourceSetsFrom(":kotlin-android-extensions-runtime")["main"].output) + duplicatesStrategy = DuplicatesStrategy.FAIL } runtimeJar(rewriteDepsToShadedCompiler(jar))