From d32f6fb382eece22a3ec884fec519e382fd9615d Mon Sep 17 00:00:00 2001 From: Vyacheslav Gerasimov Date: Wed, 28 Nov 2018 17:31:57 +0300 Subject: [PATCH] Build: Fix compatibility with shadow plugin Apply java-base plugin since shadow task requires sourcesets --- libraries/reflect/build.gradle.kts | 2 +- .../kotlin-annotation-processing-embeddable/build.gradle.kts | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/libraries/reflect/build.gradle.kts b/libraries/reflect/build.gradle.kts index 8648c454fea..a4e95e28a05 100644 --- a/libraries/reflect/build.gradle.kts +++ b/libraries/reflect/build.gradle.kts @@ -95,7 +95,7 @@ class KotlinModuleShadowTransformer(private val logger: Logger) : Transformer { override fun hasTransformedResource(): Boolean = data.isNotEmpty() - override fun modifyOutputStream(os: ZipOutputStream) { + override fun modifyOutputStream(os: ZipOutputStream, preserveFileTimestamps: Boolean) { for ((path, bytes) in data) { os.putNextEntry(ZipEntry(path)) os.write(bytes) diff --git a/prepare/kotlin-annotation-processing-embeddable/build.gradle.kts b/prepare/kotlin-annotation-processing-embeddable/build.gradle.kts index 9d871b21061..59fe09b3001 100644 --- a/prepare/kotlin-annotation-processing-embeddable/build.gradle.kts +++ b/prepare/kotlin-annotation-processing-embeddable/build.gradle.kts @@ -4,7 +4,9 @@ import org.gradle.jvm.tasks.Jar description = "Annotation Processor for Kotlin (for using with embeddable compiler)" -plugins { base } +plugins { + `java-base` +} val packedJars by configurations.creating