[Build] Add workarounds for https://github.com/gradle/gradle/issues/17936
#KT-44611 In Progress
This commit is contained in:
@@ -56,7 +56,10 @@ task libraryJarWithIr(type: Zip, dependsOn: libraryJarWithoutIr) {
|
|||||||
|
|
||||||
duplicatesStrategy DuplicatesStrategy.FAIL
|
duplicatesStrategy DuplicatesStrategy.FAIL
|
||||||
|
|
||||||
from zipTree(libraryJarWithoutIr.archiveFile)
|
// workaround for https://github.com/gradle/gradle/issues/17936
|
||||||
|
def archiveOperations = services.get(ArchiveOperations)
|
||||||
|
RegularFile libraryJarWithoutIrFile = libraryJarWithoutIr.archiveFile.get()
|
||||||
|
from { archiveOperations.zipTree(libraryJarWithoutIrFile) }
|
||||||
|
|
||||||
dependsOn(":kotlin-test:kotlin-test-js-ir:compileKotlinJs")
|
dependsOn(":kotlin-test:kotlin-test-js-ir:compileKotlinJs")
|
||||||
from {
|
from {
|
||||||
|
|||||||
@@ -276,7 +276,10 @@ task libraryJarWithIr(type: Zip, dependsOn: libraryJarWithoutIr) {
|
|||||||
|
|
||||||
duplicatesStrategy DuplicatesStrategy.FAIL
|
duplicatesStrategy DuplicatesStrategy.FAIL
|
||||||
|
|
||||||
from zipTree(libraryJarWithoutIr.archiveFile)
|
// workaround for https://github.com/gradle/gradle/issues/17936
|
||||||
|
def archiveOperations = services.get(ArchiveOperations)
|
||||||
|
RegularFile libraryJarWithoutIrFile = libraryJarWithoutIr.archiveFile.get()
|
||||||
|
from { archiveOperations.zipTree(libraryJarWithoutIrFile) }
|
||||||
dependsOn(":kotlin-stdlib-js-ir:compileKotlinJs")
|
dependsOn(":kotlin-stdlib-js-ir:compileKotlinJs")
|
||||||
from {
|
from {
|
||||||
def irKlib = tasks.getByPath(":kotlin-stdlib-js-ir:compileKotlinJs")
|
def irKlib = tasks.getByPath(":kotlin-stdlib-js-ir:compileKotlinJs")
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
import java.util.stream.Collectors
|
import java.util.stream.Collectors
|
||||||
import com.github.jengelman.gradle.plugins.shadow.transformers.Transformer
|
import com.github.jengelman.gradle.plugins.shadow.transformers.Transformer
|
||||||
import com.github.jengelman.gradle.plugins.shadow.transformers.TransformerContext
|
import com.github.jengelman.gradle.plugins.shadow.transformers.TransformerContext
|
||||||
|
import org.gradle.kotlin.dsl.support.serviceOf
|
||||||
import shadow.org.apache.tools.zip.ZipEntry
|
import shadow.org.apache.tools.zip.ZipEntry
|
||||||
import shadow.org.apache.tools.zip.ZipOutputStream
|
import shadow.org.apache.tools.zip.ZipOutputStream
|
||||||
|
|
||||||
@@ -56,13 +57,19 @@ val runtimeJar = runtimeJar(embeddableCompiler()) {
|
|||||||
sourcesJar {
|
sourcesJar {
|
||||||
val compilerTask = project(":kotlin-compiler").tasks.named<Jar>("sourcesJar")
|
val compilerTask = project(":kotlin-compiler").tasks.named<Jar>("sourcesJar")
|
||||||
dependsOn(compilerTask)
|
dependsOn(compilerTask)
|
||||||
from(compilerTask.map { zipTree(it.archiveFile) })
|
// workaround for https://github.com/gradle/gradle/issues/17936
|
||||||
|
val archiveOperations = serviceOf<ArchiveOperations>()
|
||||||
|
val sourcesJar by lazy { compilerTask.get().archiveFile.get() }
|
||||||
|
from({ archiveOperations.zipTree(sourcesJar) })
|
||||||
}
|
}
|
||||||
|
|
||||||
javadocJar {
|
javadocJar {
|
||||||
val compilerTask = project(":kotlin-compiler").tasks.named<Jar>("javadocJar")
|
val compilerTask = project(":kotlin-compiler").tasks.named<Jar>("javadocJar")
|
||||||
dependsOn(compilerTask)
|
dependsOn(compilerTask)
|
||||||
from(compilerTask.map { zipTree(it.archiveFile) })
|
// workaround for https://github.com/gradle/gradle/issues/17936
|
||||||
|
val archiveOperations = serviceOf<ArchiveOperations>()
|
||||||
|
val javadocJarFile by lazy { compilerTask.get().archiveFile.get() }
|
||||||
|
from({ archiveOperations.zipTree(javadocJarFile) })
|
||||||
}
|
}
|
||||||
|
|
||||||
projectTest {
|
projectTest {
|
||||||
|
|||||||
Reference in New Issue
Block a user