Extract manifest attribute specification to helper function.

Specify default jdkHome for all projects.
This commit is contained in:
Ilya Gorbunov
2017-01-19 07:09:07 +03:00
parent 5755210498
commit d3afc1ba2e
6 changed files with 14 additions and 27 deletions
+9
View File
@@ -61,6 +61,8 @@ subprojects {
compileKotlin.compilerJarFile = project.file("${rootDir}/../dist/kotlinc/lib/kotlin-compiler.jar") compileKotlin.compilerJarFile = project.file("${rootDir}/../dist/kotlinc/lib/kotlin-compiler.jar")
compileTestKotlin.compilerJarFile = project.file("${rootDir}/../dist/kotlinc/lib/kotlin-compiler.jar") compileTestKotlin.compilerJarFile = project.file("${rootDir}/../dist/kotlinc/lib/kotlin-compiler.jar")
compileKotlin.kotlinOptions.jdkHome = JDK_16
signing { signing {
required { project.ext.has('signing.keyId') } required { project.ext.has('signing.keyId') }
sign configurations.archives sign configurations.archives
@@ -81,3 +83,10 @@ subprojects {
} }
} }
} }
static def manifestAttributes(Manifest manifest, Project project, String component) {
manifest.attributes \
'Kotlin-Runtime-Component': component,
'Kotlin-Version': "${project.kotlin_language_version}",
'Implementation-Title': "${project.description ?: project.name}"
}
+1 -6
View File
@@ -19,12 +19,7 @@ sourceSets {
} }
jar { jar {
manifest { manifestAttributes(manifest, project, 'Core')
attributes \
'Kotlin-Runtime-Component': 'Core',
'Kotlin-Version': "$kotlin_language_version",
'Implementation-Title': "${project.description ?: project.name}"
}
} }
artifacts { artifacts {
+1 -6
View File
@@ -20,12 +20,7 @@ sourceSets {
} }
jar { jar {
manifest { manifestAttributes(manifest, project, 'Core')
attributes \
'Kotlin-Runtime-Component': 'Core',
'Kotlin-Version': "$kotlin_language_version",
'Implementation-Title': "${project.description ?: project.name}"
}
} }
artifacts { artifacts {
+1 -6
View File
@@ -22,12 +22,7 @@ sourceSets {
} }
jar { jar {
manifest { manifestAttributes(manifest, project, 'Core')
attributes \
'Kotlin-Runtime-Component': 'Core',
'Kotlin-Version': "$kotlin_language_version",
'Implementation-Title': "${project.description ?: project.name}"
}
} }
artifacts { artifacts {
+1 -5
View File
@@ -19,11 +19,7 @@ sourceSets {
} }
jar { jar {
manifest { manifestAttributes(manifest, project, 'Core')
attributes 'Kotlin-Runtime-Component': 'Core',
'Kotlin-Version': "$kotlin_language_version",
'Implementation-Title': "${project.description ?: project.name}"
}
from("${rootDir}/../dist/builtins") from("${rootDir}/../dist/builtins")
} }
+1 -4
View File
@@ -14,10 +14,7 @@ sourceSets {
} }
jar { jar {
manifest { manifestAttributes(manifest, project, 'Core')
attributes 'Kotlin-Runtime-Component': 'Core',
'Implementation-Title': "${project.description ?: project.name}"
}
} }
artifacts { artifacts {