Pill: Replace most of the hardcoded library coordinates with info from Gradle
This commit is contained in:
@@ -6,6 +6,7 @@ configureJvm6Project(project)
|
||||
configureDist(project)
|
||||
configurePublishing(project)
|
||||
|
||||
project.ext["jpsLibraryPath"] = rootProject.distLibDir
|
||||
|
||||
dependencies {
|
||||
expectedBy project(':kotlin-test:kotlin-test-annotations-common')
|
||||
|
||||
@@ -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 {
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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')
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user