diff --git a/build.gradle.kts b/build.gradle.kts index 42b3a0d61d0..76a1e820950 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -22,7 +22,6 @@ buildscript { extra["repos"] = repos - extra["versions.shadow"] = "2.0.1" extra["versions.proguard"] = "5.3.3" repositories { diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 9dbc2f5a8ed..e5d69823494 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -67,6 +67,7 @@ dependencies { compile("com.jakewharton.dex:dex-method-list:2.0.0-alpha") // TODO: adding the dep to the plugin breaks the build unexpectedly, resolve and uncomment // compile("org.jetbrains.kotlin:kotlin-gradle-plugin:${rootProject.extra["bootstrap_kotlin_version"]}") + // Shadow plugin is used in many projects of the main build. Once it's no longer used in buildSrc, please move this dependency to the root project compile("com.github.jengelman.gradle.plugins:shadow:${property("versions.shadow")}") compile("org.ow2.asm:asm-all:6.0_BETA") } diff --git a/custom-dependencies/protobuf-relocated/build.gradle.kts b/custom-dependencies/protobuf-relocated/build.gradle.kts index 760d306ed9e..c4d671c42d1 100644 --- a/custom-dependencies/protobuf-relocated/build.gradle.kts +++ b/custom-dependencies/protobuf-relocated/build.gradle.kts @@ -1,16 +1,5 @@ - import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar -buildscript { - repositories { - jcenter() - } - - dependencies { - classpath("com.github.jengelman.gradle.plugins:shadow:${property("versions.shadow")}") - } -} - val baseProtobuf by configurations.creating val baseProtobufSources by configurations.creating @@ -62,4 +51,4 @@ val prepareSources by task { val clean by task { delete(buildDir) -} \ No newline at end of file +} diff --git a/libraries/reflect/build.gradle.kts b/libraries/reflect/build.gradle.kts index 5ccf4b4e944..b91e842e76b 100644 --- a/libraries/reflect/build.gradle.kts +++ b/libraries/reflect/build.gradle.kts @@ -17,7 +17,6 @@ buildscript { } dependencies { classpath("net.sf.proguard:proguard-gradle:${property("versions.proguard")}") - classpath("com.github.jengelman.gradle.plugins:shadow:${property("versions.shadow")}") } } diff --git a/prepare/compiler-client-embeddable/build.gradle.kts b/prepare/compiler-client-embeddable/build.gradle.kts index 453599ae77d..7adf17e5548 100644 --- a/prepare/compiler-client-embeddable/build.gradle.kts +++ b/prepare/compiler-client-embeddable/build.gradle.kts @@ -2,16 +2,6 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar description = "Kotlin compiler client embeddable" -buildscript { - repositories { - jcenter() - } - - dependencies { - classpath("com.github.jengelman.gradle.plugins:shadow:${property("versions.shadow")}") - } -} - plugins { maven } diff --git a/prepare/compiler/build.gradle.kts b/prepare/compiler/build.gradle.kts index ae681e3cb6b..96ec065d870 100644 --- a/prepare/compiler/build.gradle.kts +++ b/prepare/compiler/build.gradle.kts @@ -1,4 +1,3 @@ - import java.io.File import proguard.gradle.ProGuardTask import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar @@ -7,12 +6,7 @@ import org.gradle.api.file.DuplicatesStrategy description = "Kotlin Compiler" buildscript { - repositories { - jcenter() - } - dependencies { - classpath("com.github.jengelman.gradle.plugins:shadow:${property("versions.shadow")}") classpath("net.sf.proguard:proguard-gradle:${property("versions.proguard")}") } } diff --git a/prepare/idea-plugin/build.gradle.kts b/prepare/idea-plugin/build.gradle.kts index 7e21ba065bf..f0f90dc99e0 100644 --- a/prepare/idea-plugin/build.gradle.kts +++ b/prepare/idea-plugin/build.gradle.kts @@ -1,19 +1,8 @@ - import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar import org.gradle.jvm.tasks.Jar description = "Kotlin IDEA plugin" -buildscript { - repositories { - jcenter() - } - - dependencies { - classpath("com.github.jengelman.gradle.plugins:shadow:${property("versions.shadow")}") - } -} - plugins { `java-base` } diff --git a/prepare/jps-plugin/build.gradle.kts b/prepare/jps-plugin/build.gradle.kts index e4232263337..db8c2a25178 100644 --- a/prepare/jps-plugin/build.gradle.kts +++ b/prepare/jps-plugin/build.gradle.kts @@ -1,18 +1,7 @@ - import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar description = "Kotlin JPS plugin" -buildscript { - repositories { - jcenter() - } - - dependencies { - classpath("com.github.jengelman.gradle.plugins:shadow:${property("versions.shadow")}") - } -} - plugins { `java-base` }