Do not depend on Shadow plugin in subprojects

Since buildSrc depends on the Shadow plugin, it's already in the
classpath of all build scripts
This commit is contained in:
Alexander Udalov
2017-11-16 17:43:49 +01:00
parent ad0cd7c176
commit 5338df6960
8 changed files with 2 additions and 52 deletions
-1
View File
@@ -22,7 +22,6 @@ buildscript {
extra["repos"] = repos extra["repos"] = repos
extra["versions.shadow"] = "2.0.1"
extra["versions.proguard"] = "5.3.3" extra["versions.proguard"] = "5.3.3"
repositories { repositories {
+1
View File
@@ -67,6 +67,7 @@ dependencies {
compile("com.jakewharton.dex:dex-method-list:2.0.0-alpha") 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 // 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"]}") // 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("com.github.jengelman.gradle.plugins:shadow:${property("versions.shadow")}")
compile("org.ow2.asm:asm-all:6.0_BETA") compile("org.ow2.asm:asm-all:6.0_BETA")
} }
@@ -1,16 +1,5 @@
import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar 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 baseProtobuf by configurations.creating
val baseProtobufSources by configurations.creating val baseProtobufSources by configurations.creating
@@ -62,4 +51,4 @@ val prepareSources by task<Jar> {
val clean by task<Delete> { val clean by task<Delete> {
delete(buildDir) delete(buildDir)
} }
-1
View File
@@ -17,7 +17,6 @@ buildscript {
} }
dependencies { dependencies {
classpath("net.sf.proguard:proguard-gradle:${property("versions.proguard")}") classpath("net.sf.proguard:proguard-gradle:${property("versions.proguard")}")
classpath("com.github.jengelman.gradle.plugins:shadow:${property("versions.shadow")}")
} }
} }
@@ -2,16 +2,6 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
description = "Kotlin compiler client embeddable" description = "Kotlin compiler client embeddable"
buildscript {
repositories {
jcenter()
}
dependencies {
classpath("com.github.jengelman.gradle.plugins:shadow:${property("versions.shadow")}")
}
}
plugins { plugins {
maven maven
} }
-6
View File
@@ -1,4 +1,3 @@
import java.io.File import java.io.File
import proguard.gradle.ProGuardTask import proguard.gradle.ProGuardTask
import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
@@ -7,12 +6,7 @@ import org.gradle.api.file.DuplicatesStrategy
description = "Kotlin Compiler" description = "Kotlin Compiler"
buildscript { buildscript {
repositories {
jcenter()
}
dependencies { dependencies {
classpath("com.github.jengelman.gradle.plugins:shadow:${property("versions.shadow")}")
classpath("net.sf.proguard:proguard-gradle:${property("versions.proguard")}") classpath("net.sf.proguard:proguard-gradle:${property("versions.proguard")}")
} }
} }
-11
View File
@@ -1,19 +1,8 @@
import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
import org.gradle.jvm.tasks.Jar import org.gradle.jvm.tasks.Jar
description = "Kotlin IDEA plugin" description = "Kotlin IDEA plugin"
buildscript {
repositories {
jcenter()
}
dependencies {
classpath("com.github.jengelman.gradle.plugins:shadow:${property("versions.shadow")}")
}
}
plugins { plugins {
`java-base` `java-base`
} }
-11
View File
@@ -1,18 +1,7 @@
import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
description = "Kotlin JPS plugin" description = "Kotlin JPS plugin"
buildscript {
repositories {
jcenter()
}
dependencies {
classpath("com.github.jengelman.gradle.plugins:shadow:${property("versions.shadow")}")
}
}
plugins { plugins {
`java-base` `java-base`
} }