Pill: Replace most of the hardcoded library coordinates with info from Gradle

This commit is contained in:
Yan Zhulanow
2018-02-28 00:12:57 +03:00
parent 6e65a4810e
commit 6950c256ce
7 changed files with 71 additions and 70 deletions
+1
View File
@@ -6,6 +6,7 @@ configureJvm6Project(project)
configureDist(project)
configurePublishing(project)
project.ext["jpsLibraryPath"] = rootProject.distLibDir
dependencies {
expectedBy project(':kotlin-test:kotlin-test-annotations-common')
+2 -1
View File
@@ -7,6 +7,8 @@ configureJvm6Project(project)
configureDist(project)
configurePublishing(project)
project.ext["jpsLibraryPath"] = rootProject.distLibDir
dependencies {
expectedBy project(':kotlin-test:kotlin-test-common')
compile project(':kotlin-stdlib')
@@ -14,7 +16,6 @@ dependencies {
testCompile('junit:junit:4.12')
}
archivesBaseName = 'kotlin-test'
jar {
+3
View File
@@ -1,6 +1,7 @@
import com.github.jengelman.gradle.plugins.shadow.transformers.Transformer
import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
import com.github.jengelman.gradle.plugins.shadow.transformers.TransformerContext
import org.gradle.kotlin.dsl.extra
import org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf
import proguard.gradle.ProGuardTask
import shadow.org.apache.tools.zip.ZipEntry
@@ -25,6 +26,8 @@ plugins { java }
callGroovy("configureJavaOnlyJvm6Project", this)
publish()
val jpsLibraryPath by extra(rootProject.extra["distLibDir"])
val core = "$rootDir/core"
val annotationsSrc = "$buildDir/annotations"
val relocatedCoreSrc = "$buildDir/core-relocated"
+2
View File
@@ -6,6 +6,8 @@ configureJvm6Project(project)
configureDist(project)
configurePublishing(project)
project.ext["jpsLibraryPath"] = rootProject.distLibDir
sourceSets {
annotations {
if(!System.properties.'idea.active') {
@@ -6,6 +6,8 @@ configureJvm6Project(project)
configureDist(project)
configurePublishing(project)
project.ext["jpsLibraryPath"] = rootProject.distLibDir
dependencies {
compileOnly project(':kotlin-stdlib')
}