Disable packing module-info to libraries until Android issue is fixed
https://issuetracker.google.com/issues/77587908 #KT-21266 Open
This commit is contained in:
@@ -89,10 +89,13 @@ ext.manifestAttributes = { Manifest manifest, Project project, String component
|
|||||||
'Kotlin-Runtime-Component': component,
|
'Kotlin-Runtime-Component': component,
|
||||||
'Kotlin-Version': project.kotlinLanguageVersion
|
'Kotlin-Version': project.kotlinLanguageVersion
|
||||||
}
|
}
|
||||||
|
// TODO: enable as soon as this doesn't cause D8/DX to crash
|
||||||
|
/*
|
||||||
if (multiRelease) {
|
if (multiRelease) {
|
||||||
attributes \
|
attributes \
|
||||||
'Multi-Release': 'true'
|
'Multi-Release': 'true'
|
||||||
}
|
}
|
||||||
|
*/
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -23,7 +23,8 @@ archivesBaseName = 'kotlin-test'
|
|||||||
|
|
||||||
jar {
|
jar {
|
||||||
manifestAttributes(manifest, project, 'Test', true)
|
manifestAttributes(manifest, project, 'Test', true)
|
||||||
from sourceSets.java9.output
|
// TODO: enable as soon as this doesn't cause D8/DX to crash
|
||||||
|
// from sourceSets.java9.output
|
||||||
}
|
}
|
||||||
|
|
||||||
artifacts {
|
artifacts {
|
||||||
|
|||||||
@@ -40,7 +40,8 @@ jar {
|
|||||||
|
|
||||||
task java9Jar(type: Jar) {
|
task java9Jar(type: Jar) {
|
||||||
classifier = "java9"
|
classifier = "java9"
|
||||||
from sourceSets.java9.output
|
// TODO: enable as soon as this doesn't cause D8/DX to crash
|
||||||
|
// from sourceSets.java9.output
|
||||||
}
|
}
|
||||||
|
|
||||||
artifacts {
|
artifacts {
|
||||||
|
|||||||
@@ -71,7 +71,8 @@ jar {
|
|||||||
from("${rootDir}/dist/builtins")
|
from("${rootDir}/dist/builtins")
|
||||||
from sourceSets.builtins.output
|
from sourceSets.builtins.output
|
||||||
from sourceSets.experimental.output
|
from sourceSets.experimental.output
|
||||||
from sourceSets.java9.output
|
// TODO: enable as soon as this doesn't cause D8/DX to crash
|
||||||
|
// from sourceSets.java9.output
|
||||||
}
|
}
|
||||||
|
|
||||||
task distJar(type: Jar) {
|
task distJar(type: Jar) {
|
||||||
@@ -83,7 +84,8 @@ task distJar(type: Jar) {
|
|||||||
from sourceSets.builtins.output
|
from sourceSets.builtins.output
|
||||||
from sourceSets.main.output
|
from sourceSets.main.output
|
||||||
from sourceSets.experimental.output
|
from sourceSets.experimental.output
|
||||||
from sourceSets.java9.output
|
// TODO: enable as soon as this doesn't cause D8/DX to crash
|
||||||
|
// from sourceSets.java9.output
|
||||||
}
|
}
|
||||||
|
|
||||||
task builtinsJar(type: Jar) {
|
task builtinsJar(type: Jar) {
|
||||||
|
|||||||
@@ -35,7 +35,8 @@ sourceSets {
|
|||||||
|
|
||||||
jar {
|
jar {
|
||||||
manifestAttributes(manifest, project, 'Main', true)
|
manifestAttributes(manifest, project, 'Main', true)
|
||||||
from sourceSets.java9.output
|
// TODO: enable as soon as this doesn't cause D8/DX to crash
|
||||||
|
// from sourceSets.java9.output
|
||||||
}
|
}
|
||||||
|
|
||||||
artifacts {
|
artifacts {
|
||||||
|
|||||||
@@ -38,7 +38,8 @@ sourceSets {
|
|||||||
|
|
||||||
jar {
|
jar {
|
||||||
manifestAttributes(manifest, project, 'Main', true)
|
manifestAttributes(manifest, project, 'Main', true)
|
||||||
from sourceSets.java9.output
|
// TODO: enable as soon as this doesn't cause D8/DX to crash
|
||||||
|
// from sourceSets.java9.output
|
||||||
}
|
}
|
||||||
|
|
||||||
artifacts {
|
artifacts {
|
||||||
|
|||||||
Reference in New Issue
Block a user