Change previous gradle build for compatibility with the centralized build

incompatible with the main build yet
This commit is contained in:
Ilya Chernikov
2017-08-02 12:22:04 +02:00
parent 61dfb75e0e
commit 6b22282ad4
15 changed files with 129 additions and 81 deletions
+5 -4
View File
@@ -19,7 +19,7 @@ configureJvmProject(project)
configurePublishing(project)
def core = "${rootDir}/../core"
def core = "${rootDir}//core"
def annotationsSrc = "${buildDir}/annotations"
def relocatedCoreSrc = "${buildDir}/core-relocated"
@@ -47,9 +47,10 @@ configurations {
dependencies {
proguardDeps project(':kotlin-stdlib')
shadows 'javax.inject:javax.inject:1'
shadows project(path: ':tools:protobuf-lite')
shadows project(path: ':custom-dependencies:protobuf-lite', configuration: 'default')
compile project(':kotlin-stdlib')
compile project(path: ':custom-dependencies:protobuf-lite', configuration: 'default')
}
task copyAnnotations(type: Sync) {
@@ -70,6 +71,7 @@ compileJava {
compileKotlin {
dependsOn copyAnnotations
dependsOn ':custom-dependencies:protobuf-lite:prepare'
kotlinOptions {
freeCompilerArgs = ["-version",
"-Xallow-kotlin-package",
@@ -107,7 +109,7 @@ createScriptTask(project, "stripMetadata") {
inputs.file(inputJar)
outputs.file(outputJar)
args += [
"${rootDir}/../generators/infrastructure/strip-kotlin-annotations.kts",
"${rootDir}/generators/infrastructure/strip-kotlin-annotations.kts",
"kotlin/Metadata",
"kotlin/reflect/jvm/internal/impl/.*",
inputJar,
@@ -115,7 +117,6 @@ createScriptTask(project, "stripMetadata") {
]
}
def mainArchiveName = "${archivesBaseName}-${project.version}.jar"
def outputJarPath = "${libsDir}/${mainArchiveName}"
def rtJar = ['jre/lib/rt.jar', '../Classes/classes.jar'].collect { new File(JDK_16, it) }.find { it.isFile() }